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

Re: [Cluster-devel] [PATCH 000/003] ccs cleanup



001_ccs_clean_build_linking

both libccs and daemon were building and linking common/log.c.
Make libccs sucks in log.o and make ccsd link against libccs.
Also fix ccs top level makefile to build in proper order.

-- 
I'm going to make him an offer he can't refuse.
#! /bin/sh /usr/share/dpatch/dpatch-run
## 001_ccs_clean_build_linking.dpatch by  <fabbione gordian int fabbione net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad redhat-cluster-suite-2.20070430~/ccs/Makefile redhat-cluster-suite-2.20070430/ccs/Makefile
--- redhat-cluster-suite-2.20070430~/ccs/Makefile	2007-04-30 13:31:44.000000000 +0200
+++ redhat-cluster-suite-2.20070430/ccs/Makefile	2007-05-01 17:45:16.000000000 +0200
@@ -12,7 +12,7 @@
 
 include ../make/defines.mk
 
-SUBDIRS=daemon lib ccs_test ccs_tool man
+SUBDIRS=lib daemon ccs_test ccs_tool man
 
 all: ${SUBDIRS}
 
diff -urNad redhat-cluster-suite-2.20070430~/ccs/daemon/Makefile redhat-cluster-suite-2.20070430/ccs/daemon/Makefile
--- redhat-cluster-suite-2.20070430~/ccs/daemon/Makefile	2007-04-30 13:31:44.000000000 +0200
+++ redhat-cluster-suite-2.20070430/ccs/daemon/Makefile	2007-05-01 17:45:16.000000000 +0200
@@ -18,7 +18,6 @@
 	cnx_mgr.o \
 	cluster_mgr.o \
 	misc.o \
-	log.o \
 	globals.o
 
 CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE -DCCS_RELEASE_NAME=\"${RELEASE}\"
@@ -32,7 +31,8 @@
 CFLAGS += -O2
 endif
 
-LDFLAGS += -L${cmanlibdir} -lcman -L${libdir} `xml2-config --libs` -lpthread -ldl
+LDFLAGS += -L${cmanlibdir} -lcman -L${ccslibdir} -lccs
+LDFLAGS += -L${libdir} `xml2-config --libs` -lpthread -ldl
 
 all: ${TARGET}
 
@@ -42,9 +42,6 @@
 %.o: %.c
 	$(CC) $(CFLAGS) -c -o $@ $^
 
-log.c:
-	ln -sf ../common/log.c log.c
-
 install: all
 	install -d ${sbindir}
 	install ${TARGET} ${sbindir}

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