[gjs/wip/ptomato/autotools: 15/16] build: Don't define clean-local target twice



commit 8f7f5e3e77c53d08554c256e23cbef9d6f507865
Author: Philip Chimento <philip chimento gmail com>
Date:   Mon Sep 26 22:59:09 2016 -0700

    build: Don't define clean-local target twice
    
    Autoreconf complains about this target being defined twice. In that case
    the second target supersedes the first target, so previously the test
    data would not get cleaned if coverage was enabled.

 Makefile-test.am |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/Makefile-test.am b/Makefile-test.am
index 029b8b1..76e40ca 100644
--- a/Makefile-test.am
+++ b/Makefile-test.am
@@ -36,7 +36,6 @@ endif
 
 GTESTER = ${XVFB_START} ${TESTS_ENVIRONMENT} ${RUN_WITH_DBUS} gtester
 CLEANFILES += uninstalled-system-test-bus.conf uninstalled-test-bus.conf
-clean-local: test-user-data-clean
 
 test-user-data-clean:
        -rm -fr $(builddir)/test_user_data
@@ -148,7 +147,7 @@ lcov-clean:
 lcov-realclean: lcov-clean
        find . -name '*.gcno' -delete
 
-clean-local: lcov-realclean
+clean-local: test-user-data-clean lcov-realclean
 
 .PHONY: lcov lcov-clean lcov-realclean
 else
@@ -156,5 +155,7 @@ lcov:
        @echo >&1 "*** ERROR: 'configure --enable-coverage' required"
        @exit 1
 
+clean-local: test-user-data-clean
+
 .PHONY: lcov
 endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]