[Cluster-devel] cluster/rgmanager/src clulib/Makefile daemons/ ...

[lhh at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	lhh at sourceware.org	2006-07-12 14:38:01

Modified files:
	rgmanager/src/clulib: Makefile 
	rgmanager/src/daemons: Makefile 
	rgmanager/src/utils: Makefile 

Log message:
	Patch for in-tree builds from Fabio M. Di Nitto. <fabbione at ubuntu.com>

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/clulib/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/Makefile.diff?cvsroot=cluster&r1=1.13&r2=1.14
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/utils/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11

--- cluster/rgmanager/src/clulib/Makefile	2006/07/11 23:52:41	1.9
+++ cluster/rgmanager/src/clulib/Makefile	2006/07/12 14:38:00	1.10
@@ -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 -I $(top_srcdir)/../ccs/lib -I $(top_srcdir)/../dlm/lib
 
 CFLAGS+= -g -I${incdir} -DCMAN_RELEASE_NAME=\"${RELEASE}\"
 
@@ -30,7 +30,7 @@
 uninstall:
 
 msgtest: msgtest.o libclulib.a
-	gcc -o msgtest msgtest.o -lcman -L. -lclulib -llalloc -lpthread
+	gcc -o msgtest msgtest.o -L$(top_srcdir)/../cman/lib -lcman -L. -lclulib -llalloc -lpthread
 
 libclulib.a: clulog.o daemon_init.o signals.o msgsimple.o \
 		gettid.o rg_strings.o message.o members.o fdops.o \
--- cluster/rgmanager/src/daemons/Makefile	2006/07/11 23:52:41	1.13
+++ cluster/rgmanager/src/daemons/Makefile	2006/07/12 14:38:01	1.14
@@ -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 -I $(top_srcdir)/../ccs/lib -I $(top_srcdir)/../dlm/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 -L../../../ccs/lib -L../../../dlm/lib
 TARGETS=clurgmgrd clurmtabd rg_test
 
 all: ${TARGETS}
--- cluster/rgmanager/src/utils/Makefile	2006/06/02 17:37:10	1.10
+++ cluster/rgmanager/src/utils/Makefile	2006/07/12 14:38:01	1.11
@@ -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 -I $(top_srcdir)/../ccs/lib -I $(top_srcdir)/../dlm/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 -L../../../ccs/lib -lcman -lpthread -ldl -lncurses -L../clulib -lclulib -lccs
 TARGETS=clubufflush clufindhostname clustat clusvcadm clulog clunfslock
 
 all: ${TARGETS}