[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] Cluster Project branch, master, updated. cluster-2.99.01-10-g61872df



This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=61872df7226c92719ad984cc45d0bb126daf9441

The branch, master has been updated
       via  61872df7226c92719ad984cc45d0bb126daf9441 (commit)
       via  0c11e91f1a43ff2010947dbdc369aac025c074dd (commit)
      from  ef50cab216748d5528594212d62a8f5893275fbd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 61872df7226c92719ad984cc45d0bb126daf9441
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Fri May 16 08:43:29 2008 +0200

    [CONFIG] Add missing Makefiles
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

commit 0c11e91f1a43ff2010947dbdc369aac025c074dd
Author: Fabio M. Di Nitto <fdinitto redhat com>
Date:   Fri May 16 08:39:46 2008 +0200

    [CONFIG] Create config/ subsystem
    
    Move libccsconfdb to config/libs/
    Move ccs_test to config/tools/
    
    top level Makefile:
     - use config/ subsystem
     - reorder build dependencies
     - ccs is now on its own
    
    configure:
     - change default location for libccs
    
    Update Makefiles to cope with new locations
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto redhat com>

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                        |   23 +++++++++++------------
 ccs/Makefile                                    |    2 +-
 ccs/man/Makefile                                |    1 -
 {fence => config}/Makefile                      |    2 +-
 {fence => config/libs}/Makefile                 |    4 ++--
 {ccs => config/libs}/libccsconfdb/Makefile      |    2 +-
 {ccs => config/libs}/libccsconfdb/ccs.h         |    0 
 {ccs => config/libs}/libccsconfdb/libccs.c      |    0 
 {fence => config/tools}/Makefile                |    4 ++--
 {ccs => config/tools}/ccs_test/Makefile         |    4 ++--
 {ccs => config/tools}/ccs_test/ccs_test.c       |    0 
 {fence/agents/rsa => config/tools/man}/Makefile |    8 ++++----
 {ccs => config/tools}/man/ccs_test.8            |    0 
 configure                                       |    8 ++++----
 make/defines.mk.input                           |    2 +-
 15 files changed, 29 insertions(+), 31 deletions(-)
 copy {fence => config}/Makefile (91%)
 copy {fence => config/libs}/Makefile (88%)
 rename {ccs => config/libs}/libccsconfdb/Makefile (97%)
 rename {ccs => config/libs}/libccsconfdb/ccs.h (100%)
 rename {ccs => config/libs}/libccsconfdb/libccs.c (100%)
 copy {fence => config/tools}/Makefile (88%)
 rename {ccs => config/tools}/ccs_test/Makefile (94%)
 rename {ccs => config/tools}/ccs_test/ccs_test.c (100%)
 copy {fence/agents/rsa => config/tools/man}/Makefile (84%)
 rename {ccs => config/tools}/man/ccs_test.8 (100%)

diff --git a/Makefile b/Makefile
index a3104db..dcc9e98 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 ###############################################################################
 ###############################################################################
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -12,14 +12,13 @@
 include make/defines.mk
 
 REALSUBDIRS = gnbd-kernel/src gfs-kernel/src/gfs \
-	      cman/lib ccs cman dlm fence/libfenced group fence gfs gfs2 gnbd rgmanager
+	      config cman ccs dlm fence/libfenced group fence gfs gfs2 gnbd rgmanager
 
 SUBDIRS = $(filter-out \
 	  $(if ${without_gnbd-kernel/src},gnbd-kernel/src) \
 	  $(if ${without_gfs-kernel/src/gfs},gfs-kernel/src/gfs) \
-	  $(if ${without_cman},cman/lib) \
-	  $(if ${without_ccs},ccs) \
 	  $(if ${without_cman},cman) \
+	  $(if ${without_ccs},ccs) \
 	  $(if ${without_dlm},dlm) \
 	  $(if ${without_fence},fence/libfenced) \
 	  $(if ${without_group},group) \
@@ -46,17 +45,17 @@ gfs-kernel: gfs-kernel/src/gfs
 
 # Dependencies
 
-cman/lib:
-ccs: cman/lib
-cman: ccs
-dlm:
+config:
+cman: config
+ccs: cman
+dlm: config
 fence/libfenced:
-group: ccs dlm fence/libfenced
-fence: group dlm
+group: config dlm fence/libfenced
+fence: group
 gfs:
 gfs2:
-gnbd: cman/lib
-rgmanager: ccs dlm
+gnbd: cman
+rgmanager: cman dlm
 
 install: all
 	set -e && for i in ${SUBDIRS}; do ${MAKE} -C $$i $@; done
diff --git a/ccs/Makefile b/ccs/Makefile
index ed456a1..baabc05 100644
--- a/ccs/Makefile
+++ b/ccs/Makefile
@@ -13,4 +13,4 @@
 include ../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=libccscompat libccsconfdb daemon ccsais ccs_test ccs_tool man
+SUBDIRS=libccscompat daemon ccsais ccs_tool man
diff --git a/ccs/man/Makefile b/ccs/man/Makefile
index 87871df..7a0fbb8 100644
--- a/ccs/man/Makefile
+++ b/ccs/man/Makefile
@@ -14,7 +14,6 @@
 TARGET= cluster.conf.5 \
 	ccs.7 \
 	ccsd.8 \
-	ccs_test.8 \
 	ccs_tool.8
 
 include ../../make/defines.mk
diff --git a/fence/Makefile b/config/Makefile
similarity index 91%
copy from fence/Makefile
copy to config/Makefile
index 1da7db5..e83caa3 100644
--- a/fence/Makefile
+++ b/config/Makefile
@@ -14,4 +14,4 @@
 include ../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=agents libfence libfenced fenced fence_node fence_tool man
+SUBDIRS=libs tools
diff --git a/fence/Makefile b/config/libs/Makefile
similarity index 88%
copy from fence/Makefile
copy to config/libs/Makefile
index 1da7db5..1c3c594 100644
--- a/fence/Makefile
+++ b/config/libs/Makefile
@@ -11,7 +11,7 @@
 ###############################################################################
 ###############################################################################
 
-include ../make/defines.mk
+include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=agents libfence libfenced fenced fence_node fence_tool man
+SUBDIRS=libccsconfdb
diff --git a/ccs/libccsconfdb/Makefile b/config/libs/libccsconfdb/Makefile
similarity index 97%
rename from ccs/libccsconfdb/Makefile
rename to config/libs/libccsconfdb/Makefile
index 91bf214..c9b6d94 100644
--- a/ccs/libccsconfdb/Makefile
+++ b/config/libs/libccsconfdb/Makefile
@@ -21,7 +21,7 @@ LIBSYMT=$(TARGET).so \
 
 INCDIRT=ccs.h
 
-include ../../make/defines.mk
+include ../../../make/defines.mk
 
 SHAREDLIB=$(TARGET).so.${SOMAJOR}.${SOMINOR}
 STATICLIB=$(TARGET).a
diff --git a/ccs/libccsconfdb/ccs.h b/config/libs/libccsconfdb/ccs.h
similarity index 100%
rename from ccs/libccsconfdb/ccs.h
rename to config/libs/libccsconfdb/ccs.h
diff --git a/ccs/libccsconfdb/libccs.c b/config/libs/libccsconfdb/libccs.c
similarity index 100%
rename from ccs/libccsconfdb/libccs.c
rename to config/libs/libccsconfdb/libccs.c
diff --git a/fence/Makefile b/config/tools/Makefile
similarity index 88%
copy from fence/Makefile
copy to config/tools/Makefile
index 1da7db5..2898cfd 100644
--- a/fence/Makefile
+++ b/config/tools/Makefile
@@ -11,7 +11,7 @@
 ###############################################################################
 ###############################################################################
 
-include ../make/defines.mk
+include ../../make/defines.mk
 include $(OBJDIR)/make/passthrough.mk
 
-SUBDIRS=agents libfence libfenced fenced fence_node fence_tool man
+SUBDIRS=ccs_test man
diff --git a/ccs/ccs_test/Makefile b/config/tools/ccs_test/Makefile
similarity index 94%
rename from ccs/ccs_test/Makefile
rename to config/tools/ccs_test/Makefile
index 8819828..83ab6e8 100644
--- a/ccs/ccs_test/Makefile
+++ b/config/tools/ccs_test/Makefile
@@ -16,7 +16,7 @@ SBINDIRT=$(TARGET)
 
 all: depends ${TARGET}
 
-include ../../make/defines.mk
+include ../../../make/defines.mk
 include $(OBJDIR)/make/cobj.mk
 include $(OBJDIR)/make/clean.mk
 include $(OBJDIR)/make/install.mk
@@ -35,7 +35,7 @@ ${TARGET}: ${OBJS}
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 depends:
-	$(MAKE) -C ../libccsconfdb all
+	$(MAKE) -C ../../libs all
 
 clean: generalclean
 
diff --git a/ccs/ccs_test/ccs_test.c b/config/tools/ccs_test/ccs_test.c
similarity index 100%
rename from ccs/ccs_test/ccs_test.c
rename to config/tools/ccs_test/ccs_test.c
diff --git a/fence/agents/rsa/Makefile b/config/tools/man/Makefile
similarity index 84%
copy from fence/agents/rsa/Makefile
copy to config/tools/man/Makefile
index 1d29063..0808d02 100644
--- a/fence/agents/rsa/Makefile
+++ b/config/tools/man/Makefile
@@ -2,8 +2,8 @@
 ###############################################################################
 ##
 ##  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
-##  
+##  Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
+##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
 ##  of the GNU General Public License v.2.
@@ -11,7 +11,7 @@
 ###############################################################################
 ###############################################################################
 
-TARGET= fence_rsa
+TARGET= ccs_test.8
 
 include ../../../make/defines.mk
-include $(OBJDIR)/make/fencebuild.mk
+include $(OBJDIR)/make/man.mk
diff --git a/ccs/man/ccs_test.8 b/config/tools/man/ccs_test.8
similarity index 100%
rename from ccs/man/ccs_test.8
rename to config/tools/man/ccs_test.8
diff --git a/configure b/configure
index 014044a..c798363 100755
--- a/configure
+++ b/configure
@@ -224,8 +224,8 @@ if ($help || !$err) {
   print "--kernel_build=\tthe directory containing the kernel object tree you wish to\n\t\tcompile against. (Default: /lib/modules/`uname -r`/build\n\t\tif available or /usr/src/linux as fallback)\n";
   print "--kernel_src=\tthe directory containing the kernel source you wish to\n\t\tcompile against.  (Default: /lib/modules/`uname -r`/source\n\t\tif available or \$kernel_build as fallback)\n";
   print "--incdir=\tthe base directory for include files.  (Default: {prefix}/include)\n";
-  print "--ccsincdir=\tthe base directory for ccs include files.  (Default: ./ccs/libccsconfdb)\n";
-  print "--ccslibdir=\tthe base directory for ccs libraries.  (Default: ./ccs/libccsconfdb)\n";
+  print "--ccsincdir=\tthe base directory for ccs include files.  (Default: ./config/libs/libccsconfdb)\n";
+  print "--ccslibdir=\tthe base directory for ccs libraries.  (Default: ./config/libs/libccsconfdb)\n";
   print "--cmanincdir=\tthe base directory for cman include files.  (Default: ./cman/lib)\n";
   print "--cmanlibdir=\tthe base directory for cman libraries.  (Default: ./cman/lib)\n";
   print "--dlmincdir=\tthe base directory for dlm include files.  (Default: ./dlm/libdlm)\n";
@@ -422,10 +422,10 @@ if (!$libdir) {
   $libdir="${prefix}/lib";
 }
 if (!$ccsincdir) {
-  $ccsincdir="${cdir}/ccs/libccsconfdb";
+  $ccsincdir="${cdir}/config/libs/libccsconfdb";
 }
 if (!$ccslibdir) {
-  $ccslibdir="${objdir}/ccs/libccsconfdb";
+  $ccslibdir="${objdir}/config/libs/libccsconfdb";
 }
 if (!$cmanincdir) {
   $cmanincdir="${cdir}/cman/lib";
diff --git a/make/defines.mk.input b/make/defines.mk.input
index dec3ed5..6298bbc 100644
--- a/make/defines.mk.input
+++ b/make/defines.mk.input
@@ -2,7 +2,7 @@
 ###############################################################################
 ##
 ##  Copyright (C) Sistina Software, Inc.  1997-2003  All rights reserved.
-##  Copyright (C) 2004 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2004-2008 Red Hat, Inc.  All rights reserved.
 ##  
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions


hooks/post-receive
--
Cluster Project


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]