diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 34 |
1 files changed, 20 insertions, 14 deletions
diff --git a/Makefile.am b/Makefile.am index 3f2c3dedd..f3eb432d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -135,7 +135,6 @@ dist_script_DATA = \ lib/mdate-sh \ lib/missing \ lib/mkinstalldirs \ - lib/elisp-comp \ lib/ylwrap \ lib/depcomp \ lib/compile \ @@ -261,14 +260,13 @@ dist_automake_ac_DATA = \ m4/ar-lib.m4 \ m4/as.m4 \ m4/auxdir.m4 \ - m4/ccstdc.m4 \ m4/cond.m4 \ m4/cond-if.m4 \ m4/depend.m4 \ m4/depout.m4 \ m4/dmalloc.m4 \ + m4/extra-recurs.m4 \ m4/gcj.m4 \ - m4/header.m4 \ m4/init.m4 \ m4/install-sh.m4 \ m4/lead-dot.m4 \ @@ -279,9 +277,6 @@ dist_automake_ac_DATA = \ m4/minuso.m4 \ m4/missing.m4 \ m4/mkdirp.m4 \ - m4/obsol-gt.m4 \ - m4/obsol-lt.m4 \ - m4/obsolete.m4 \ m4/options.m4 \ m4/protos.m4 \ m4/python.m4 \ @@ -294,6 +289,9 @@ dist_automake_ac_DATA = \ m4/upc.m4 \ m4/vala.m4 +automake_internal_acdir = $(automake_acdir)/internal +dist_automake_internal_ac_DATA = m4/internal/ac-config-macro-dirs.m4 + dist_system_ac_DATA = m4/acdir/README # We build amversion.m4 here, instead of from config.status, @@ -392,6 +390,11 @@ EXTRA_DIST += gen-testsuite-part $(generated_TESTS): $(srcdir)/gen-testsuite-part $(srcdir)/t/testsuite-part.am: $(srcdir)/gen-testsuite-part Makefile.am +# Hand-written tests for stuff in 'contrib/'. +include $(srcdir)/contrib/t/local.am +TESTS += $(contrib_TESTS) +EXTRA_DIST += $(contrib_TESTS) + # Static dependencies valid for each test case (also further # extended later). Note that use 'noinst_' rather than 'check_' # as the prefix, because we really want them to be built by @@ -509,7 +512,7 @@ check-no-trailing-backslash-in-recipes: .PHONY: check-no-trailing-backslash-in-recipes ## Checking the list of tests. -test_subdirs = t t/pm +test_subdirs = t t/pm contrib/t include $(srcdir)/t/CheckListOfTests.am # Run the testsuite with the installed aclocal and automake. @@ -529,13 +532,16 @@ EXTRA_DIST += $(perf_TESTS) clean-local: clean-local-check .PHONY: clean-local-check clean-local-check: - -set x t/*.dir; shift; \ - if test "$$#,$$1" = "1,*.dir"; then \ - : there is no test directory to clean; \ - else \ - find "$$@" -type d ! -perm -700 -exec chmod u+rwx {} ';'; \ - rm -rf "$$@"; \ - fi; +## Directories candidate to be test directories match this wildcard. + @globs='t/*.dir t/*/*.dir */t/*.dir */t/*/*.dir'; \ +## The 'nullglob' bash option is not portable, so use perl. + dirs=`$(PERL) -e "print join(' ', glob('$$globs'));"` || exit 1; \ + if test -n "$$dirs"; then \ +## Errors in find are acceptable, errors in rm are not. + find $$dirs -type d ! -perm -700 -exec chmod u+rwx {} ';'; \ + echo " rm -rf $$dirs"; \ + rm -rf $$dirs || exit 1; \ + fi ## ---------------- ## |