From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14500 invoked by alias); 8 Jul 2009 07:59:08 -0000 Received: (qmail 14492 invoked by alias); 8 Jul 2009 07:59:08 -0000 X-SWARE-Spam-Status: No, hits=1.1 required=5.0 tests=AWL,BAYES_99,SPF_HELO_PASS X-Spam-Status: No, hits=1.1 required=5.0 tests=AWL,BAYES_99,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: rgmanager: master - build: remove duplication in makefile.am To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: rgmanager.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 31d270c5ebfb4d287c2665062825a4df9d83bacb X-Git-Newrev: b97a67f6ea847cfd1bc9d346869eca5f72bf90e9 From: "Fabio M. Di Nitto" Message-Id: <20090708075838.02B1212036B@lists.fedorahosted.org> Date: Wed, 08 Jul 2009 07:59: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/msg00016.txt.bz2 Gitweb: http://git.fedorahosted.org/git/rgmanager.git?p=rgmanager.git;a=commitdiff;h=b97a67f6ea847cfd1bc9d346869eca5f72bf90e9 Commit: b97a67f6ea847cfd1bc9d346869eca5f72bf90e9 Parent: 31d270c5ebfb4d287c2665062825a4df9d83bacb Author: Fabio M. Di Nitto AuthorDate: Wed Jul 8 09:58:18 2009 +0200 Committer: Fabio M. Di Nitto CommitterDate: Wed Jul 8 09:58:18 2009 +0200 build: remove duplication in makefile.am Signed-off-by: Fabio M. Di Nitto --- 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