Eliminate too-expansive "clean" rule kluge by requiring fixed Automake.

The NEWS for Automake 1.10.1 mentions the following bug fix:

  - All directories `.libs'/`_libs' used by libtool are cleaned now,
    not only those in which libraries are built.

This describes the situation for the kluged "clean" rule in
tests/automake.mk, so by requiring Automake 1.10.1 or later we can also
eliminate the clean rule.

diff --git a/Makefile.am b/Makefile.am
index b3ebdad0d43234b245ac94245d0aa9eeb9939287..02ae7d5b2129e882d72e65559bf81c9d7d3ad5fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
-AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects
+AUTOMAKE_OPTIONS = gnits 1.10.1 subdir-objects
 
 SUBDIRS = gl
 DISTCLEANFILES = ./po/stamp-po xconfigure 

diff --git a/tests/automake.mk b/tests/automake.mk
index a95bf3e5c2e3ff21c7edcc2a7f7a01c7239d9b54..8a974a32f7033545d91cd075b8c879180a7c7eed 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -209,13 +209,6 @@ tests_data_datasheet_test_SOURCES = \
 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 -fr tests/data
-
-CLEAN_LOCAL += tests_data_datasheet_test_CLEAN
-
 tests_libpspp_ll_test_SOURCES = \
        src/libpspp/ll.c \
        src/libpspp/ll.h \