This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
master - rgmanger: fix build system
- From: "Fabio M. Di Nitto" <fabbione at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Mon, 10 Nov 2008 14:47:29 +0000 (UTC)
- Subject: master - rgmanger: fix build system
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=4f0d4ea06e11c8ccec56bc1abf7fbde880e7f969
Commit: 4f0d4ea06e11c8ccec56bc1abf7fbde880e7f969
Parent: 698d89f9c61158e9825b8c05430cb915c04e4dc1
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Mon Nov 10 15:46:21 2008 +0100
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Mon Nov 10 15:46:21 2008 +0100
rgmanger: fix build system
Make rgmanger build again.
Install clurgmgrd compat symlink.
Signed-off-by: Lon Hohberger <lhh@redhat.com>
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
rgmanager/src/daemons/Makefile | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 0691677..df07aab 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -1,10 +1,12 @@
TARGET1= rgmanager
TARGET2= rg_test
TARGET3= dtest
+TARGET4= clurgmgrd
-SBINDIRT=$(TARGET1) $(TARGET3)
+SBINDIRT=$(TARGET1) $(TARGET2)
+SBINSYMT=$(TARGET4)
-all: depends ${TARGET1} ${TARGET3}
+all: depends ${TARGET1} ${TARGET2} ${TARGET4}
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -90,15 +92,18 @@ ${TARGET1}: ${OBJS1} ${LDDEPS}
# This is NOT meant to be an installed binary. Rather, RPMs and/or other
# packages should run 'make check' as part of the build process.
#
-${TARGET2}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS} ${LOCAL_LDDEPS}
+${TARGET2}: ${SHAREDOBJS} ${OBJS2} ${LDDEPS} ${LOCAL_LDDEPS}
$(CC) -o $@ $^ $(CMAN_LDFLAGS) $(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) \
$(XML2_LDFLAGS) $(LOGSYS_LDFLAGS) $(LDFLAGS)
-${TARGET3}: ${SHAREDOBJS} ${OBJS4} ${LDDEPS} ${LOCAL_LDDEPS}
+${TARGET3}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS} ${LOCAL_LDDEPS}
$(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
$(LOCAL_LDFLAGS) $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) \
$(READLINE_LDFLAGS) $(LDFLAGS)
+${TARGET4}: ${TARGET1}
+ ln -sf ${TARGET1} ${TARGET4}
+
check: rg_test
cd tests && ./runtests.sh