Fix make distcheck

diff --git a/Makefile.am b/Makefile.am
index f606cbf1123b5d8c8d8f468fd6fadb90dc1c2512..f87d56c106e846f8c65c637a259089723d8bc72f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,6 +30,7 @@ pkgsysconfdir = $(sysconfdir)/@PACKAGE@
 EXTRA_DIST = OChangeLog ONEWS config.rpath pspp-mode.el
 
 CLEANFILES = 
+CLEAN_LOCAL =
 ACLOCAL_AMFLAGS = -I m4 -I gl/m4
 noinst_LIBRARIES=
 noinst_LTLIBRARIES=
@@ -78,5 +79,4 @@ install-data-hook: $(INSTALL_DATA_HOOKS)
 
 uninstall-hook: $(UNINSTALL_DATA_HOOKS)
 
-
-
+clean-local: $(CLEAN_LOCAL)

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 9527dbbd528feffd755b908c6ff892e554a6cc94..4450112039e0877230631d1f5a777aaee8fcd70b 100644 (file)
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -54,13 +54,15 @@ check-local:
        LANG=C LD_LIBRARY_PATH=$$llp sh -c "cd perl-module && $(MAKE) $(AM_MAKEFLAGS) test"
 
 
-clean-local:
+perl_module_CLEAN:
        cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
        if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
          $(RM) $(module_sources) ; \
        fi
        $(RM) perl-module/Makefile.old
 
+CLEAN_LOCAL += perl_module_CLEAN
+
 CLEANFILES += \
         perl-module/PSPP-Perl-$(VERSION).tar.gz \
        perl-module/pspp-module-config \

diff --git a/tests/automake.mk b/tests/automake.mk
index 15e297a0150209c1586636de126a7a92a5d8defe..9d76bc99ee92b6bbff4f6329a51e2f61b5c5b7cf 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -205,7 +205,15 @@ check_PROGRAMS += \
 
 tests_data_datasheet_test_SOURCES = \
        tests/data/datasheet-test.c
-tests_data_datasheet_test_LDADD = src/libpspp-core.la @LIBINTL@ 
+tests_data_datasheet_test_LDADD = gl/libgl.la src/libpspp-core.la @LIBINTL@ 
+tests_data_datasheet_test_CFLAGS = $(AM_CFLAGS)
+
+# This seems to be necessary as the libtool artifacts aren't removed
+# Automake bug ?
+tests_data_datasheet_test_CLEAN:
+       $(RM) -r tests/data
+
+CLEAN_LOCAL += tests_data_datasheet_test_CLEAN
 
 tests_libpspp_ll_test_SOURCES = \
        src/libpspp/ll.c \