Enhance cleaning of programs in libtool mode.

* lib/am/progs.am (clean-%DIR%PROGRAMS) [?LIBTOOL?]: Fork less
often, avoid removing programs twice if $(EXEEXT) is empty.
* tests/nobase-libtool.test: Also test PROGRAMS, in order to
exercise the code path.
* THANKS: Update.
Report by Toralf Förster.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index e5b4eb652604943f270dad6b3e36d0d8f1884266..ede89609dfef82be3eb2eccad5b2bb73a7c35674 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Enhance cleaning of programs in libtool mode.
+       * lib/am/progs.am (clean-%DIR%PROGRAMS) [?LIBTOOL?]: Fork less
+       often, avoid removing programs twice if $(EXEEXT) is empty.
+       * tests/nobase-libtool.test: Also test PROGRAMS, in order to
+       exercise the code path.
+       * THANKS: Update.
+       Report by Toralf Förster.
+
 2008-09-07  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
            Jim Meyering <jim@meyering.net>
 
@@ -1059,7 +1069,7 @@
        * tests/libtoo10.test: New test.
        * tests/Makefile.am: Update.
        * THANKS: Update.
-       Report by Guillermo Ontañón.
+       Report by Guillermo Ontañón.
 
 2007-08-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
@@ -1485,7 +1495,7 @@
 
        * automake.in (handle_compile): Use subst, for maintainer-check.
 
-2006-10-09  Andreas Köhler  <andi5.py@gmx.net>  (tiny change)
+2006-10-09  Andreas Köhler  <andi5.py@gmx.net>  (tiny change)
 
        For PR automake/505:
        * lib/am/configure.am (am__CONFIG_DISTCLEAN_FILES):

diff --git a/THANKS b/THANKS
index 2b64ee8ee08f09702f78ebbcc1e8e7bb9172ea0d..9b987496a004ab315bba0de6cad9b6001ad4b620 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -303,6 +303,7 @@ Thomas Gagne                tgagne@ix.netcom.com
 Thomas Morgan          tmorgan@pobox.com
 Thomas Schwinge                tschwinge@gnu.org
 Thomas Tanner          tanner@ffii.org
+Toralf Förster                toralf.foerster@gmx.de
 Tim Goodwin            tjg@star.le.ac.uk
 Tim Mooney             mooney@dogbert.cc.ndsu.NoDak.edu
 Tim Van Holder         tim.van.holder@pandora.be

diff --git a/lib/am/progs.am b/lib/am/progs.am
index cc4cf4a9e18ed649d1982b65b951a4eb1a7253e2..24fd10f5a8e974fe9292969e977092fd9502c9bb 100644 (file)
--- a/lib/am/progs.am
+++ b/lib/am/progs.am
@@ -92,11 +92,13 @@ clean-%DIR%PROGRAMS:
 ## Cleaning the `_libs/' or `.libs/' directory is done from clean-libtool.
 ## FIXME: In the future (i.e., when it works) it would be nice to delegate
 ## this task to `libtool --mode=clean'.
-?LIBTOOL?      @list='$(%DIR%_PROGRAMS)'; for p in $$list; do \
-?LIBTOOL?        f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-?LIBTOOL?        echo " rm -f $$p $$f"; \
-?LIBTOOL?        rm -f $$p $$f ; \
-?LIBTOOL?      done
+?LIBTOOL?      @list='$(%DIR%_PROGRAMS)'; test -n "$$list" || exit 0; \
+?LIBTOOL?      echo " rm -f" $$list; \
+?LIBTOOL?      rm -f $$list || exit $$?; \
+?LIBTOOL?      test -n "$(EXEEXT)" || exit 0; \
+?LIBTOOL?      list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+?LIBTOOL?      echo " rm -f" $$list; \
+?LIBTOOL?      rm -f $$list
 
 
 ## ---------- ##

diff --git a/tests/nobase-libtool.test b/tests/nobase-libtool.test
index bb027c6225340cdaa29096580b7e95ae10813f8c..4da415b15185c010e9358da9ef135bcc33365296 100755 (executable)
--- a/tests/nobase-libtool.test
+++ b/tests/nobase-libtool.test
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Make sure nobase_* works for libtool libraries as well.
+# Make sure nobase_* works for libtool libraries and programs as well.
 # This is just the libtool equivalent of nobase.test, split
 # up for greater exposure of nobase.test.
 
@@ -34,8 +34,12 @@ cat > Makefile.am << 'EOF'
 fooexecdir = $(prefix)/foo
 fooexec_LTLIBRARIES = sub/libbase.la
 nobase_fooexec_LTLIBRARIES = sub/libnobase.la
+fooexec_PROGRAMS = sub/base
+nobase_fooexec_PROGRAMS = sub/nobase
 sub_libbase_la_SOURCES = source2.c
 sub_libnobase_la_SOURCES = source2.c
+sub_base_SOURCES = source.c
+sub_nobase_SOURCES = source.c
 
 test-install-data: install-data
        test ! -f inst/foo/sub/libnobase.la
@@ -49,13 +53,14 @@ EOF
 
 mkdir sub
 
-cat >source2.c <<'EOF'
+cat >source.c <<'EOF'
 int
 main (int argc, char *argv[])
 {
   return 0;
 }
 EOF
+cp source.c source2.c
 
 rm -f install-sh