diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/Makefile.am | 20 | ||||
-rw-r--r-- | tests/Makefile.am | 6 |
3 files changed, 33 insertions, 1 deletions
@@ -1,5 +1,13 @@ 2019-02-04 Bruno Haible <bruno@clisp.org> + Remove left-over empty directories in 'make distclean'. + * lib/Makefile.am (DISTCLEANDIRS, DISTCLEANDIRS_NOT_IN_SRCDIR): New + variables. + (distclean-local): New target. + * tests/Makefile.am (distclean-local): New target. + +2019-02-04 Bruno Haible <bruno@clisp.org> + Move run-test to gnulib. * autogen.sh: Copy build-aux/run-test from gnulib. * build-aux/run-test: Remove file. diff --git a/lib/Makefile.am b/lib/Makefile.am index 1dff4d5..c63c235 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -178,7 +178,7 @@ EXTRA_DIST += unistring/cdefs.in.h nobase_nodist_include_HEADERS += unistring/woe32dll.h # Directories that contain some CLEANFILES. -CLEANDIRS = +CLEANDIRS = CLEANDIRS_NOT_IN_SRCDIR = unistring clean-local: clean-generic @for dir in '' $(CLEANDIRS); do \ @@ -195,6 +195,24 @@ clean-local: clean-generic fi; \ : +# Directories that contain some DISTCLEANFILES. +DISTCLEANDIRS = sys +DISTCLEANDIRS_NOT_IN_SRCDIR = +distclean-local: distclean-generic + @for dir in '' $(DISTCLEANDIRS); do \ + if test -n "$$dir" && test -d $$dir; then \ + echo "rmdir $$dir"; rmdir $$dir; \ + fi; \ + done; \ + if test '$(srcdir)' != '.'; then \ + for dir in '' $(DISTCLEANDIRS_NOT_IN_SRCDIR); do \ + if test -n "$$dir" && test -d $$dir; then \ + echo "rmdir $$dir"; rmdir $$dir; \ + fi; \ + done; \ + fi; \ + : + # List of header files that get installed and that declare 'extern' symbols. HEADERS_WITH_EXTERNS = \ unitypes.h \ diff --git a/tests/Makefile.am b/tests/Makefile.am index a79b9d9..97a3adb 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -37,3 +37,9 @@ CHECKER_END_OF_COMMENTS = # This must be the last thing that gets added to TESTS_ENVIRONMENT. TESTS_ENVIRONMENT += $(SHELL) $(top_srcdir)/build-aux/run-test '$(CHECKER)' + + +# Remove .deps directories creates by 'configure'. +# I would say that this left-over is an Automake 1.16.1 bug. +distclean-local: + rm -rf $(DEPDIR) */$(DEPDIR) |