From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9681 invoked by alias); 9 Jul 2009 06:39:20 -0000 Received: (qmail 9673 invoked by alias); 9 Jul 2009 06:39:20 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - build: drop dtest target in rgmanager daemon Makefile To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 5713c7a68e9c1b22fb54b19faf17af3dc00ea6d9 X-Git-Newrev: 7bbf2de22435d690b1a84bbd6064cec59c8e98a0 From: "Fabio M. Di Nitto" Message-Id: <20090709063846.A805D120282@lists.fedorahosted.org> Date: Thu, 09 Jul 2009 06:39:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q3/txt/msg00025.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7bbf2de22435d690b1a84bbd6064cec59c8e98a0 Commit: 7bbf2de22435d690b1a84bbd6064cec59c8e98a0 Parent: 5713c7a68e9c1b22fb54b19faf17af3dc00ea6d9 Author: Fabio M. Di Nitto AuthorDate: Thu Jul 9 08:37:43 2009 +0200 Committer: Fabio M. Di Nitto 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 --- 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)