[Cluster-devel] cluster/ccs Makefile daemon/Makefile
fabbione at sourceware.org
fabbione at sourceware.org
Wed May 2 12:41:50 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: fabbione at sourceware.org 2007-05-02 12:41:50
Modified files:
ccs : Makefile
ccs/daemon : Makefile
Log message:
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.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/Makefile.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/ccs/daemon/Makefile.diff?cvsroot=cluster&r1=1.10&r2=1.11
--- cluster/ccs/Makefile 2007/04/30 11:21:58 1.11
+++ cluster/ccs/Makefile 2007/05/02 12:41:50 1.12
@@ -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}
--- cluster/ccs/daemon/Makefile 2007/04/30 11:21:59 1.10
+++ cluster/ccs/daemon/Makefile 2007/05/02 12:41:50 1.11
@@ -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}
More information about the Cluster-devel
mailing list