[SCM] GNU Libtool branch, master, updated. v2.2.10-90-g10c6cb2

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  10c6cb25e5f8e5212e1c770568017184a7575122 (commit)
      from  a662d7c46eb9a5734e6356049ccc82e28dbffbf4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 10c6cb25e5f8e5212e1c770568017184a7575122
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Aug 22 06:14:06 2010 +0200

    Tidy and fix clean and distclean rules for old testsuite.
    
    * Makefile.am (clean-local-legacy): Use $(CONF_SUBDIRS) instead
    of hard-coding the list of test directories.  Use
    $(AM_MAKEFLAGS).
    (fake-distclean-legacy): New phony rule, to create fake Makefile
    files if needed so that the automake-generated
    distclean-recursive rule can work properly.
    (distclean_recursive): New helper variable.
    (distclean-recursive): Depend on fake-distclean-legacy.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog   |   12 ++++++++++++
 Makefile.am |   22 ++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f5e23a..6b8767f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-08-22  Ralf Wildenhues  <address@hidden>
+
+       Tidy and fix clean and distclean rules for old testsuite.
+       * Makefile.am (clean-local-legacy): Use $(CONF_SUBDIRS) instead
+       of hard-coding the list of test directories.  Use
+       $(AM_MAKEFLAGS).
+       (fake-distclean-legacy): New phony rule, to create fake Makefile
+       files if needed so that the automake-generated
+       distclean-recursive rule can work properly.
+       (distclean_recursive): New helper variable.
+       (distclean-recursive): Depend on fake-distclean-legacy.
+
 2010-08-22  Paolo Bonzini  <address@hidden>
 
        Fix sed_make_literal_regex.
diff --git a/Makefile.am b/Makefile.am
index d689e09..2c4a3db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -712,12 +712,26 @@ $(srcdir)/tests/defs.in: $(auxdir)/general.m4sh 
tests/defs.m4sh Makefile.am
 
 # We need to remove any files that the above tests created.
 clean-local-legacy:
-       -cd tests; \
-       for dir in cdemo demo depdemo f77demo fcdemo mdemo mdemo2 pdemo 
tagdemo; \
-       do \
-           test -f $$dir/Makefile && ( cd $$dir && $(MAKE) distclean; ); \
+       -for dir in $(CONF_SUBDIRS); do \
+         if test -f $$dir/Makefile; then \
+           (cd $$dir && $(MAKE) $(AM_MAKEFLAGS) distclean); \
+         else :; fi; \
        done
        rm -rf _inst
 
+# For distclean, we may have to fake Makefiles in the test directories
+# so that descending in DIST_SUBDIRS works.
+# Hide the additional dependency from automake so it still outputs the rule.
+distclean_recursive = distclean-recursive
+$(distclean_recursive): fake-distclean-legacy
+.PHONY: fake-distclean-legacy
+fake-distclean-legacy:
+       -for dir in $(CONF_SUBDIRS); do \
+         if test ! -f $$dir/Makefile; then \
+           $(mkinstalldirs) $$dir; \
+           echo 'distclean: ; rm -f Makefile' > $$dir/Makefile; \
+         else :; fi; \
+       done
+
 $(TESTS): tests/defs
 DISTCLEANFILES += tests/defs


hooks/post-receive
-- 
GNU Libtool