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: rgmanager: master - build: remove duplication in makefile.am Date: Wed, 08 Jul 2009 07:59:00 -0000 [thread overview] Message-ID: <20090708075838.02B1212036B@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=b97a67f6ea847cfd1bc9d346869eca5f72bf90e9 Commit: b97a67f6ea847cfd1bc9d346869eca5f72bf90e9 Parent: 31d270c5ebfb4d287c2665062825a4df9d83bacb Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Wed Jul 8 09:58:18 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Wed Jul 8 09:58:18 2009 +0200 build: remove duplication in makefile.am Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- rgmanager/src/clulib/Makefile.am | 5 +---- rgmanager/src/daemons/Makefile.am | 13 +++++++------ 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/rgmanager/src/clulib/Makefile.am b/rgmanager/src/clulib/Makefile.am index 13d112c..1a08e1f 100644 --- a/rgmanager/src/clulib/Makefile.am +++ b/rgmanager/src/clulib/Makefile.am @@ -23,7 +23,7 @@ libclulib_la_SOURCES = cman.c \ vft.c \ wrap_lock.c -libclulib_la_CPPFLAGS = -D_GNU_SOURCE \ +AM_CPPFLAGS = -D_GNU_SOURCE \ -I$(top_srcdir)/rgmanager/include libclulib_la_CFLAGS = $(cman_CFLAGS) $(logt_CFLAGS) @@ -32,9 +32,6 @@ libclulib_la_LDFLAGS = $(cman_LIBS) $(logt_LIBS) -lpthread noinst_PROGRAMS = msgtest -msgtest_CPPFLAGS = -D_GNU_SOURCE \ - -I$(top_srcdir)/rgmanager/include - msgtest_CFLAGS = $(cman_CFLAGS) msgtest_LDFLAGS = $(cman_LIBS) -lpthread diff --git a/rgmanager/src/daemons/Makefile.am b/rgmanager/src/daemons/Makefile.am index 5e45e31..5f9a3e5 100644 --- a/rgmanager/src/daemons/Makefile.am +++ b/rgmanager/src/daemons/Makefile.am @@ -5,6 +5,10 @@ SUBDIRS = tests sbin_PROGRAMS = rgmanager \ rg_test +AM_CPPFLAGS = -I$(top_srcdir)/rgmanager/include + +clulib = $(top_builddir)/rgmanager/src/clulib/libclulib.la + rgmanager_SOURCES = fo_domain.c \ groups.c \ main.c \ @@ -23,8 +27,6 @@ rgmanager_SOURCES = fo_domain.c \ event_config.c \ watchdog.c -rgmanager_CPPFLAGS = -I$(top_srcdir)/rgmanager/include - rgmanager_CFLAGS = $(ccs_CFLAGS) $(cman_CFLAGS) $(dlm_CFLAGS) \ $(xml_CFLAGS) $(slang_CFLAGS) $(logt_CFLAGS) @@ -32,7 +34,7 @@ rgmanager_LDFLAGS = $(ccs_LIBS) $(cman_LIBS) $(dlm_LIBS) \ $(xml_LIBS) $(slang_LIBS) $(logt_LIBS) \ -lpthread -rgmanager_LDADD = $(top_builddir)/rgmanager/src/clulib/libclulib.la +rgmanager_LDADD = $(clulib) rg_test_SOURCES = fo_domain.c \ restart_counter.c \ @@ -43,15 +45,14 @@ rg_test_SOURCES = fo_domain.c \ event_config.c \ test.c -rg_test_CPPFLAGS = -DNO_CCS \ - -I$(top_srcdir)/rgmanager/include +rg_test_CPPFLAGS = $(AM_CPPFLAGS) -DNO_CCS rg_test_CFLAGS = $(cman_CFLAGS) $(xml_CFLAGS) $(logt_CFLAGS) rg_test_LDFLAGS = $(cman_LIBS) $(xml_LIBS) $(logt_LIBS) \ -lpthread -rg_test_LDADD = $(top_builddir)/rgmanager/src/clulib/libclulib.la +rg_test_LDADD = $(clulib) # this fails because it expects RAs in the tree. Needs fixing #check-local: rg_test
reply other threads:[~2009-07-08 7:59 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=20090708075838.02B1212036B@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).