automake: allow multiple {install,all,...}-local targets

Replace install-data-local: with install-data-local:: (two :) so that
other Makefile.am can have the same target and all get concatenated
instead of being overridden.

Signed-off-by: Loic Dachary <ldachary@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index a1c29d61b693891b6d16c3f184433c6a7ca6a3df..b400ca1a03f23054911a6ce42ed1e98a55a9202e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,13 +19,13 @@ EXTRA_DIST += \
        share/id_dsa_drop.ceph.com.pub
 
 # why is it so hard to make autotools to this?
-install-data-local:
+install-data-local::
        -mkdir -p $(DESTDIR)$(datadir)/ceph
        -install -m 644 share/known_hosts_drop.ceph.com $(DESTDIR)$(datadir)/ceph/known_hosts_drop.ceph.com
        -install -m 644 share/id_dsa_drop.ceph.com $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com
        -install -m 644 share/id_dsa_drop.ceph.com.pub $(DESTDIR)$(datadir)/ceph/id_dsa_drop.ceph.com.pub
 
-all-local:
+all-local::
 if WITH_DEBUG
 #      We need gtest to build the rados-api tests. We only build those in
 #      a debug build, though.
@@ -33,7 +33,7 @@ if WITH_DEBUG
        @cd src/gmock && $(MAKE) $(AM_MAKEFLAGS) lib/libgmock.la lib/libgmock_main.la
 endif
 
-check-local: all
+check-local:: all
 #      We build gtest this way, instead of using SUBDIRS, because with that,
 #      gtest's own tests would be run and that would slow us down.
        @cd src/gmock/gtest && $(MAKE) $(AM_MAKEFLAGS) lib/libgtest.la lib/libgtest_main.la

diff --git a/src/Makefile.am b/src/Makefile.am
index 0e0a145837b6a9d405cd9fab01bc2272df6fe4ca..97505da3ae25022c28ea53d6050a7c5541b89276 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -151,7 +151,7 @@ TESTS = \
        $(check_TESTPROGRAMS) \
        $(check_SCRIPTS)
 
-check-local:
+check-local::
        $(top_srcdir)/qa/workunits/erasure-code/encode-decode-non-regression.sh 
        $(srcdir)/test/encoding/readable.sh ../ceph-object-corpus
 
@@ -205,7 +205,7 @@ CLEANFILES += ceph_ver.h sample.fetch_config
 
 # cleaning
 
-clean-local:
+clean-local::
        rm -f *.so 
        find . -name '*.gcno' -o -name '*.gcda' -o -name '*.lcov' -o -name "*.o" -o -name "*.lo" | xargs rm -f
        rm -f ceph java/java/com/ceph/crush/Bucket.class
@@ -255,12 +255,12 @@ if ENABLE_COVERAGE
        -test/coverage.sh -d $(srcdir) -o check-coverage make check
 endif
 
-install-data-local: install-coverage
+install-data-local:: install-coverage
        -mkdir -p $(DESTDIR)$(sysconfdir)/ceph
        -mkdir -p $(DESTDIR)$(localstatedir)/log/ceph
        -mkdir -p $(DESTDIR)$(localstatedir)/lib/ceph/tmp
 
-uninstall-local: uninstall-coverage
+uninstall-local:: uninstall-coverage
        -rmdir -p $(DESTDIR)$(sysconfdir)/ceph/
        -rmdir -p $(DESTDIR)$(localstatedir)/log/ceph
        -rmdir -p $(DESTDIR)$(localstatedir)/lib/ceph/tmp