This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
cluster: master - build: fix dlm_controld makefile
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 8 Dec 2008 12:25:33 +0000 (UTC)
- Subject: cluster: master - build: fix dlm_controld makefile
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=3bc2ce2997af4c210013d780a45679051c82601d
Commit: 3bc2ce2997af4c210013d780a45679051c82601d
Parent: c071892a74c181810227032168123181d7e5215a
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Mon Dec 8 13:17:17 2008 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon Dec 8 13:17:17 2008 +0100
build: fix dlm_controld makefile
clean a bit the ifdef enable_pacemaker and fix an object entry.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
group/dlm_controld/Makefile | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
index 14d0030..d3fbd44 100644
--- a/group/dlm_controld/Makefile
+++ b/group/dlm_controld/Makefile
@@ -24,6 +24,14 @@ OBJS= action.o \
plock.o \
group.o
+ifdef enable_pacemaker
+OBJS += pacemaker.o
+else
+OBJS += config.o \
+ member_cman.o \
+ logging.o
+endif
+
CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir}
CFLAGS += -I${dlmincdir} -I${dlmcontrolincdir}
CFLAGS += -I${corosyncincdir} -I${openaisincdir}
@@ -46,20 +54,18 @@ LDFLAGS += -L${libdir}
LDDEPS += ../lib/libgroup.a
-PCMK_OBJS = pacemaker.o
PCMK_LDFLAGS += -lcib -lcrmcommon -lcrmcluster -ltotem_pg
PCMK_LDFLAGS += `pkg-config glib-2.0 --libs`
PCMK_LDFLAGS += `xml2-config --libs`
-CMAN_OBJS = config.o member_cman.o logger.o
CMAN_LDFLAGS += -L${ccslibdir} -L${cmanlibdir} -lccs -lcman
CMAN_LDFLAGS += -L../../fence/libfenced/ -lfenced
CMAN_LDDEPS += ../../fence/libfenced/libfenced.a
-dlm_controld: ${OBJS} ${CMAN_OBJS} ${LDDEPS} ${CMAN_LDDEPS}
+dlm_controld: ${OBJS} ${LDDEPS} ${CMAN_LDDEPS}
$(CC) -o $@ $^ $(LDFLAGS) $(CMAN_LDFLAGS)
-dlm_controld.pcmk: ${OBJS} ${PCMK_OBJS} ${LDDEPS} ${PCMK_LDDEPS}
+dlm_controld.pcmk: ${OBJS} ${LDDEPS} ${PCMK_LDDEPS}
$(CC) -o $@ $^ $(LDFLAGS) $(PCMK_LDFLAGS)
depends: