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

[Cluster-devel] [PATCH 003/008] cman includes all over



Both gnbd and rgmanager needs cman to build and link.

diff -urNad redhat-cluster-suite-2.20060627~/gnbd/client/Makefile redhat-cluster-suite-2.20060627/gnbd/client/Makefile
--- redhat-cluster-suite-2.20060627~/gnbd/client/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/gnbd/client/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -24,7 +24,7 @@
 
 INCLUDE= -I$(top_srcdir)/include -I$(top_srcdir)/server -I$(top_srcdir)/utils \
 	-I${top_srcdir}/config -I${gnbdkincdir} -I${incdir} -I${cmanincdir} \
-	-I../../group/lib
+	-I../../group/lib -I../../cman/lib
 
 ifneq (${KERNEL_SRC}, )
 # Use the kernel tree if patched, otherwise, look where cluster headers
@@ -33,7 +33,7 @@
 		echo '-I${KERNEL_SRC}/include'; fi)
 endif
 
-LDLIBS+= -L${libdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
+LDLIBS+= -L${libdir} -L../../group/lib -L../../cman/lib -lcman -lgroup -ldl -lpthread
 
 CFLAGS+= -O2 -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 
diff -urNad redhat-cluster-suite-2.20060627~/gnbd/server/Makefile redhat-cluster-suite-2.20060627/gnbd/server/Makefile
--- redhat-cluster-suite-2.20060627~/gnbd/server/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/gnbd/server/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -19,14 +19,14 @@
 CLU_SOURCE= gnbd_clusterd.c $(top_srcdir)/utils/gnbd_utils.c \
 	$(top_srcdir)/utils/member_cman.c $(top_srcdir)/utils/group.c
 
-LDLIBS+= -L${libdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
+LDLIBS+= -L${libdir} -L../../group/lib -L../../cman/lib -lcman -lgroup -ldl -lpthread
 
 SRV_SOURCE= gnbd_serv.c local_req.c extern_req.c device.c gserv.c fence.c \
 	$(top_srcdir)/utils/trans.c $(top_srcdir)/utils/gnbd_utils.c
 
 INCLUDE= -I$(top_srcdir)/include -I$(top_srcdir)/utils -I${groupincdir}\
 	-I${top_srcdir}/config -I${gnbdkincdir} -I${incdir} -I${cmanincdir} \
-	-I../../group/lib
+	-I../../group/lib -I../../cman/lib
 
 ifneq (${KERNEL_SRC}, )
 # Use the kernel tree if patched, otherwise, look where cluster headers
diff -urNad redhat-cluster-suite-2.20060627~/gnbd/tools/gnbd_export/Makefile redhat-cluster-suite-2.20060627/gnbd/tools/gnbd_export/Makefile
--- redhat-cluster-suite-2.20060627~/gnbd/tools/gnbd_export/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/gnbd/tools/gnbd_export/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -20,9 +20,9 @@
 
 INCLUDE= -I$(top_srcdir)/include -I$(top_srcdir)/server \
 	-I$(top_srcdir)/utils -I${top_srcdir}/config \
-	-I${gnbdkincdir} -I${incdir}
+	-I${gnbdkincdir} -I${incdir} -I../../../cman/lib
 
-LDLIBS+= -L${libdir} -lcman -ldl -lpthread
+LDLIBS+= -L${libdir} -L../../../cman/lib -lcman -ldl -lpthread
 
 include ${top_srcdir}/make/defines.mk
 
diff -urNad redhat-cluster-suite-2.20060627~/gnbd/tools/gnbd_import/Makefile redhat-cluster-suite-2.20060627/gnbd/tools/gnbd_import/Makefile
--- redhat-cluster-suite-2.20060627~/gnbd/tools/gnbd_import/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/gnbd/tools/gnbd_import/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -21,9 +21,10 @@
 
 INCLUDE= -I$(top_srcdir)/include -I$(top_srcdir)/client \
 	-I$(top_srcdir)/server -I$(top_srcdir)/utils \
-	-I${gnbdkincdir} -I${top_srcdir}/config
+	-I${gnbdkincdir} -I${top_srcdir}/config \
+	-I$(top_srcdir)/../cman/lib
 
-LDLIBS+= -L${libdir} -lcman -ldl -lpthread
+LDLIBS+= -L${libdir} -ldl -lpthread -L../../../cman/lib -lcman
 
 ifneq (${KERNEL_SRC}, )
 # Use the kernel tree if patched, otherwise, look where cluster headers
diff -urNad redhat-cluster-suite-2.20060627~/rgmanager/src/clulib/Makefile redhat-cluster-suite-2.20060627/rgmanager/src/clulib/Makefile
--- redhat-cluster-suite-2.20060627~/rgmanager/src/clulib/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/rgmanager/src/clulib/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -14,7 +14,7 @@
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
 include ${top_srcdir}/make/defines.mk
-INCLUDE += -I $(top_srcdir)/include
+INCLUDE += -I $(top_srcdir)/include -I $(top_srcdir)/../cman/lib
 
 CFLAGS+= -g -I${incdir} -DCMAN_RELEASE_NAME=\"${RELEASE}\"
 
diff -urNad redhat-cluster-suite-2.20060627~/rgmanager/src/daemons/Makefile redhat-cluster-suite-2.20060627/rgmanager/src/daemons/Makefile
--- redhat-cluster-suite-2.20060627~/rgmanager/src/daemons/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/rgmanager/src/daemons/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -14,7 +14,7 @@
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
 include ${top_srcdir}/make/defines.mk
-INCLUDE += -I $(top_srcdir)/include
+INCLUDE += -I $(top_srcdir)/include -I $(top_srcdir)/../cman/lib
 
 CFLAGS+= -g -I${incdir} -I/usr/include/libxml2 -L${libdir}
 
@@ -22,7 +22,7 @@
 
 CFLAGS+= -L ../clulib 
 
-LDFLAGS+= -lclulib -lxml2 -lpthread -ldl
+LDFLAGS+= -lclulib -lxml2 -lpthread -ldl -L../../../cman/lib
 TARGETS=clurgmgrd clurmtabd rg_test
 
 all: ${TARGETS}
@@ -42,7 +42,7 @@
 		rg_queue.o rg_forward.o reslist.o \
 		resrules.o restree.o fo_domain.o nodeevent.o \
 		watchdog.o rg_state.o
-	$(CC) -o $@ $^ $(INCLUDE) $(CFLAGS) $(LDFLAGS) -lccs -lcman 
+	$(CC) -o $@ $^ $(INCLUDE) $(CFLAGS) $(LDFLAGS) -lccs -lcman
 
 #
 # Our test program links against the local allocator so that
diff -urNad redhat-cluster-suite-2.20060627~/rgmanager/src/utils/Makefile redhat-cluster-suite-2.20060627/rgmanager/src/utils/Makefile
--- redhat-cluster-suite-2.20060627~/rgmanager/src/utils/Makefile	2006-06-28 09:15:58.000000000 +0200
+++ redhat-cluster-suite-2.20060627/rgmanager/src/utils/Makefile	2006-06-28 09:15:59.000000000 +0200
@@ -14,7 +14,7 @@
 UNINSTALL=${top_srcdir}/scripts/uninstall.pl
 
 include ${top_srcdir}/make/defines.mk
-INCLUDE += -I $(top_srcdir)/include
+INCLUDE += -I $(top_srcdir)/include -I $(top_srcdir)/../cman/lib
 
 CFLAGS+= -g -I${incdir}
 
@@ -22,7 +22,7 @@
 
 CFLAGS+= -L${libdir} -DPACKAGE_VERSION=\"${RELEASE}\"
 
-LDFLAGS+= -lcman -lpthread -ldl -lncurses -L../clulib -lclulib -lccs
+LDFLAGS+= -L../../../cman/lib -lcman -lpthread -ldl -lncurses -L../clulib -lclulib -lccs
 TARGETS=clubufflush clufindhostname clustat clusvcadm clulog clunfslock
 
 all: ${TARGETS}


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