[Cluster-devel] cluster/group daemon/Makefile dlm_controld/Mak ...

[fabbione at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	fabbione at sourceware.org	2007-08-09 09:37:37

Modified files:
	group/daemon   : Makefile 
	group/dlm_controld: Makefile 
	group/gfs_controld: Makefile 

Log message:
	Clean up some Makefiles that did not use proper openaisincdir and dlmincdir.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/daemon/Makefile.diff?cvsroot=cluster&r1=1.19&r2=1.20
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/dlm_controld/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/group/gfs_controld/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- cluster/group/daemon/Makefile	2007/06/01 09:45:35	1.19
+++ cluster/group/daemon/Makefile	2007/08/09 09:37:36	1.20
@@ -21,7 +21,7 @@
 	main.o
 
 CFLAGS += -g 
-CFLAGS += -I${cmanincdir}
+CFLAGS += -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -I. -I../include/ -I../lib/
 CFLAGS += -I${incdir}
 
--- cluster/group/dlm_controld/Makefile	2007/08/06 21:50:26	1.9
+++ cluster/group/dlm_controld/Makefile	2007/08/09 09:37:36	1.10
@@ -21,12 +21,13 @@
 	deadlock.o
 
 CFLAGS += -g 
-CFLAGS += -I${ccsincdir} -I${cmanincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${openaisincdir}
 CFLAGS += -idirafter ${KERNEL_SRC}/include/linux
-CFLAGS += -I../../group/lib/ -I../include/ -I../../dlm/lib/
+CFLAGS += -I../../group/lib/ -I../include/
 CFLAGS += -I${incdir}
 
-LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${openaislibdir} -lccs -lcman -lcpg -lSaCkpt -ldlm
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -L${dlmlibdir} -lccs -lcman -ldlm
+LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
 LDFLAGS += -L../lib -lgroup
 
 all: depends ${TARGET}
--- cluster/group/gfs_controld/Makefile	2007/06/08 19:01:10	1.11
+++ cluster/group/gfs_controld/Makefile	2007/08/09 09:37:36	1.12
@@ -22,14 +22,14 @@
 	recover.o
 
 CFLAGS += -g -O2
-CFLAGS += -I${ccsincdir}
-CFLAGS += -I${cmanincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${openaisincdir}
 CFLAGS += -idirafter ${KERNEL_SRC}/include/linux
 CFLAGS += -I../include/ -I../lib/
 CFLAGS += -I${incdir}
 
-LDFLAGS += -L${cmanlibdir} -L${openaislibdir} -L${libdir} -lcman -lcpg -lSaCkpt
-LDFLAGS += -L${ccslibdir} -lccs
+LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lcman -lccs
+LDFLAGS += -L${openaislibdir} -lcpg -lSaCkpt
+LDFLAGS += -L${libdir}
 LDFLAGS += -L../lib -lgroup
 
 all: depends ${TARGET}