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

[Cluster-devel] [PATCH 001/002] gnbd: needs cmanincdir propagated



When bootstrapping from a fresh cvs checkout, gnbd needs cman here and there
as include path both for -I and -L.

Index: configure
===================================================================
RCS file: /cvs/cluster/cluster/configure,v
retrieving revision 1.14
diff -u -r1.14 configure
--- configure	28 Jun 2006 19:54:32 -0000	1.14
+++ configure	19 Jul 2006 12:30:28 -0000
@@ -28,7 +28,7 @@
 (cd gfs2; ./configure $@ --gfs2kincdir=`pwd`/../gfs2-kernel/src/gfs2 --iddevlibdir=`pwd`/../iddev/lib --iddevincdir=`pwd`/../iddev/lib)
 
 echo "configure gnbd"
-(cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src) 
+(cd gnbd; ./configure $@ --gnbdkincdir=`pwd`/../gnbd-kernel/src --cmanincdir=`pwd`/../cman/lib) 
 
 echo "configure rgmanager"
 (cd rgmanager; ./configure $@) 
Index: gnbd/client/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/client/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- gnbd/client/Makefile	16 May 2006 19:08:17 -0000	1.7
+++ gnbd/client/Makefile	19 Jul 2006 12:30:35 -0000
@@ -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${cmanincdir} -L../../group/lib -lcman -lgroup -ldl -lpthread
 
 CFLAGS+= -O2 -DGNBD_RELEASE_NAME=\"${RELEASE}\"
 
Index: gnbd/server/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/server/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- gnbd/server/Makefile	16 May 2006 19:08:17 -0000	1.7
+++ gnbd/server/Makefile	19 Jul 2006 12:30:35 -0000
@@ -19,7 +19,7 @@
 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${cmanincdir} -L../../group/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
Index: gnbd/tools/gnbd_export/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/gnbd_export/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- gnbd/tools/gnbd_export/Makefile	26 Jun 2006 17:29:31 -0000	1.9
+++ gnbd/tools/gnbd_export/Makefile	19 Jul 2006 12:30:35 -0000
@@ -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${cmanincdir}
 
-LDLIBS+= -L${libdir} -lcman -ldl -lpthread
+LDLIBS+= -L${libdir} -L${cmanincdir} -lcman -ldl -lpthread
 
 include ${top_srcdir}/make/defines.mk
 
Index: gnbd/tools/gnbd_import/Makefile
===================================================================
RCS file: /cvs/cluster/cluster/gnbd/tools/gnbd_import/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- gnbd/tools/gnbd_import/Makefile	16 May 2006 19:08:18 -0000	1.6
+++ gnbd/tools/gnbd_import/Makefile	19 Jul 2006 12:30:35 -0000
@@ -21,9 +21,9 @@
 
 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${cmanincdir}
 
-LDLIBS+= -L${libdir} -lcman -ldl -lpthread
+LDLIBS+= -L${libdir} -L${cmanincdir} -lcman -ldl -lpthread
 
 ifneq (${KERNEL_SRC}, )
 # Use the kernel tree if patched, otherwise, look where cluster headers


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