public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: STABLE3 - build: drop dtest target in rgmanager daemon Makefile Date: Thu, 09 Jul 2009 06:39:00 -0000 [thread overview] Message-ID: <20090709063846.A805D120282@lists.fedorahosted.org> (raw) 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)
reply other threads:[~2009-07-09 6:39 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090709063846.A805D120282@lists.fedorahosted.org \ --to=fabbione@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).