cluster: STABLE3 - build: drop dtest target in rgmanager daemon Makefile
Fabio M. Di Nitto
fabbione@fedoraproject.org
Thu Jul 9 06:39:00 GMT 2009
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7bbf2de22435d690b1a84bbd6064cec59c8e98a0
Commit: 7bbf2de22435d690b1a84bbd6064cec59c8e98a0
Parent: 5713c7a68e9c1b22fb54b19faf17af3dc00ea6d9
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate: Thu Jul 9 08:37:43 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Thu Jul 9 08:37:43 2009 +0200
build: drop dtest target in rgmanager daemon Makefile
dtest code has been dropped a long time ago. Cleanup the
Makefile.
Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
rgmanager/src/daemons/Makefile | 39 ++++++++++++++-------------------------
1 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/rgmanager/src/daemons/Makefile b/rgmanager/src/daemons/Makefile
index 7ce5a96..71bbdf7 100644
--- a/rgmanager/src/daemons/Makefile
+++ b/rgmanager/src/daemons/Makefile
@@ -1,12 +1,11 @@
TARGET1= rgmanager
TARGET2= rg_test
-TARGET3= dtest
-TARGET4= clurgmgrd
+TARGET3= clurgmgrd
SBINDIRT=$(TARGET1) $(TARGET2)
-SBINSYMT=$(TARGET4)
+SBINSYMT=$(TARGET3)
-all: depends ${TARGET1} ${TARGET2} ${TARGET4}
+all: depends ${TARGET1} ${TARGET2} ${TARGET3}
include ../../../make/defines.mk
include $(OBJDIR)/make/cobj.mk
@@ -32,17 +31,14 @@ OBJS1= fo_domain.o \
event_config.o \
watchdog.o
-OBJS2= test-noccs.o
-
-OBJS3= dtest-noccs.o
-
-SHAREDOBJS= fo_domain-noccs.o \
- restart_counter.o \
- reslist-noccs.o \
- resrules-noccs.o \
- restree-noccs.o \
- rg_locks-noccs.o \
- event_config-noccs.o
+OBJS2= test-noccs.o \
+ fo_domain-noccs.o \
+ restart_counter.o \
+ reslist-noccs.o \
+ resrules-noccs.o \
+ restree-noccs.o \
+ rg_locks-noccs.o \
+ event_config-noccs.o
CFLAGS += -DSHAREDIR=\"${sharedir}\"
CFLAGS += -fPIC
@@ -87,17 +83,12 @@ ${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} ${OBJS2} ${LDDEPS}
+${TARGET2}: ${OBJS2} ${LDDEPS}
$(CC) -o $@ $^ $(CMAN_LDFLAGS) $(EXTRA_LDFLAGS) \
$(XML2_LDFLAGS) $(LOGSYS_LDFLAGS) $(LDFLAGS)
-${TARGET3}: ${SHAREDOBJS} ${OBJS3} ${LDDEPS}
- $(CC) -o $@ $^ $(CCS_LDFLAGS) $(CMAN_LDFLAGS) \
- $(EXTRA_LDFLAGS) $(XML2_LDFLAGS) \
- $(READLINE_LDFLAGS) $(LOGSYS_LDFLAGS) $(LDFLAGS)
-
-${TARGET4}: ${TARGET1}
- ln -sf ${TARGET1} ${TARGET4}
+${TARGET3}: ${TARGET1}
+ ln -sf ${TARGET1} ${TARGET3}
check: rg_test
cd tests && ./runtests.sh
@@ -111,5 +102,3 @@ clean: generalclean
-include $(OBJS1:.o=.d)
-include $(OBJS2:.o=.d)
-include $(OBJS3:.o=.d)
--include $(OBJS4:.o=.d)
--include $(SHAREDOBJS:.o=.d)
More information about the Cluster-cvs
mailing list