This is the mail archive of the cluster-cvs@sourceware.org mailing list for the cluster.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

master - rgmanager: fix build after port to logsys

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5d8d4ad4f252cef80a3655cbb821e5fd2fd5c78f
Commit:        5d8d4ad4f252cef80a3655cbb821e5fd2fd5c78f
Parent:        e85d18d96a209bd05688045cb85cecc2df928ab5
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Mon Oct 20 10:56:53 2008 +0200
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon Oct 20 10:56:53 2008 +0200

rgmanager: fix build after port to logsys

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 rgmanager/src/clulib/Makefile  |    6 ++++--
 rgmanager/src/daemons/Makefile |    9 +++++----
 rgmanager/src/utils/Makefile   |   15 ++++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/rgmanager/src/clulib/Makefile b/rgmanager/src/clulib/Makefile
index 980a066..85fd4fc 100644
--- a/rgmanager/src/clulib/Makefile
+++ b/rgmanager/src/clulib/Makefile
@@ -20,13 +20,15 @@ OBJS2= alloc.o
 OBJS3= msgtest.o
 
 CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
-CFLAGS += -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -L${corosyncincdir}
 CFLAGS += -I$(S)/../../include
 CFLAGS += -I${incdir}
 
 LDFLAGS += -L${cmanlibdir} -lcman 
 LDFLAGS += -L. -lclulib -llalloc
-LDFLAGS += -lpthread -llogsys
+LDFLAGS += -lpthread
+LDFLAGS += -L${corosynclibdir} -llogsys
 LDFLAGS += -L${libdir}
 
 ${TARGET1}: ${OBJS1}
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 9c8eaea..97819f2 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -50,7 +50,7 @@ SHAREDOBJS=	depends-noccs.o \
 
 CFLAGS += -DSHAREDIR=\"${sharedir}\"
 CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${corosyncincdir}
 CFLAGS += `xml2-config --cflags` -I${readlineincdir} -I${slangincdir}
 CFLAGS += -I$(S)/../../include
 CFLAGS += -I${incdir}
@@ -61,7 +61,8 @@ LDFLAGS += -L../clulib -lclulib
 LDFLAGS += -L${libdir}
 
 CCS_LDFLAGS += -L${ccslibdir} -lccs 
-CMAN_LDFLAGS += -L${cmanlibdir} -lcman -llogsys
+CMAN_LDFLAGS += -L${cmanlibdir} -lcman
+LOGSYS_LDFLAGS += -L${corosynclibdir} -llogsys
 DLM_LDFLAGS += -L${dlmlibdir} -ldlm
 XML2_LDFLAGS += `xml2-config --libs`
 SLANG_LDFLAGS += -L${slanglibdir} -lslang
@@ -77,7 +78,7 @@ ${TARGET1}: ${OBJS1} ${LDDEPS}
 	$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
 			$(DLM_LDFLAGS) $(XML2_LDFLAGS) \
 			$(SLANG_LDFLAGS) $(EXTRA_LDFLAGS) \
-			$(LD_FLAGS)
+			$(LOGSYS_LDFLAGS) $(LD_FLAGS)
 
 #${TARGET2}: ${OBJS2} ${LDDEPS}
 #	$(CC) -o $@ $^ $(LDFLAGS)
@@ -98,7 +99,7 @@ ${TARGET1}: ${OBJS1} ${LDDEPS}
 #
 ${TARGET3}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS} ${LOCAL_LDDEPS}
 	$(CC) -o $@ $^ $(CMAN_LDFLAGS) $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) \
-			$(XML2_LDFLAGS) $(LDFLAGS)
+			$(XML2_LDFLAGS) $(LOGSYS_LDFLAGS) $(LDFLAGS)
 
 ${TARGET4}: ${SHAREDOBJS} ${OBJS4} ${LDDEPS} ${LOCAL_LDDEPS}
 	$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
diff --git a/rgmanager/src/utils/Makefile b/rgmanager/src/utils/Makefile
index b6c41f8..a24b4eb 100644
--- a/rgmanager/src/utils/Makefile
+++ b/rgmanager/src/utils/Makefile
@@ -18,7 +18,8 @@ include $(OBJDIR)/make/uninstall.mk
 DISABLEDTARGETS= cluarp
 
 CFLAGS += -Werror -Wstrict-prototypes -Wshadow -fPIC -D_GNU_SOURCE
-CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir} -I${ncursesincdir}
+CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${dlmincdir}
+CFLAGS += -I${corosyncincdir} -I${ncursesincdir}
 CFLAGS += -I$(S)/../../include
 CFLAGS += -I${incdir}
 
@@ -28,7 +29,8 @@ LDFLAGS += -L${libdir}
 LDDEPS += ../clulib/libclulib.a
 
 CCS_LDFLAGS += -L${ccslibdir} -lccs
-CMAN_LDFLAGS += -L${cmanlibdir} -lcman -llogsys
+CMAN_LDFLAGS += -L${cmanlibdir} -lcman
+LOGSYS_LDFLAGS += -L${corosynclibdir} -llogsys
 NCURSES_LDFLAGS += -L${ncurseslibdir} -lncurses
 PTHREAD_LDFLAGS += -lpthread 
 
@@ -46,13 +48,16 @@ ${TARGET2}: ${OBJS2} ${LDDEPS}
 
 ${TARGET3}: ${OBJS3} ${LDDEPS}
 	$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
-			$(NCURSES_LDFLAGS) $(PTHREAD_LDFLAGS) $(LDFLAGS)
+			$(NCURSES_LDFLAGS) $(PTHREAD_LDFLAGS) \
+			$(LOGSYS_LDFLAGS) $(LDFLAGS)
 
 ${TARGET4}: ${OBJS4} ${LDDEPS}
-	$(CC) -o $@ $^ $(CMAN_LDFLAGS) $(PTHREAD_LDFLAGS) $(LDFLAGS)
+	$(CC) -o $@ $^ $(CMAN_LDFLAGS) $(PTHREAD_LDFLAGS) \
+			$(LOGSYS_LDFLAGS) $(LDFLAGS)
 
 ${TARGET5}: ${OBJS5} ${LDDEPS}
-	$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) $(LDFLAGS)
+	$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
+			$(LOGSYS_LDFLAGS) $(LDFLAGS)
 
 ${TARGET6}:
 	cp $(S)/${TARGET6}.sh ${TARGET6}
Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]