* automake.in (handle_ltlibraries): Fill $libtool_clean_directories

here, with directories where .la files are built...
(handle_single_transform_list): ... not here with directories
where .lo files are built.
* tests/libtool3.test: Build a library in a subdirectory to
check for this.
Reported by Peter Gavin.

diff --git a/ChangeLog b/ChangeLog
index faf83b0d9f35da7c72e7321ea9dba81bd47fe4bc..337232778e1ec8ee10ee2dde0530ed1c45b643c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2002-09-22  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
+       * automake.in (handle_ltlibraries): Fill $libtool_clean_directories
+       here, with directories where .la files are built...
+       (handle_single_transform_list): ... not here with directories
+       where .lo files are built.
+       * tests/libtool3.test: Build a library in a subdirectory to
+       check for this.
+       Reported by Peter Gavin.
+
        * tests/cond5.test: Give more time to automake.
        Reported by Art Haas.
 

diff --git a/THANKS b/THANKS
index b80707cca172141e1b75632842be4e0028050f25..9be301a3988faf0be880cc3fa9cf90d976a74a56 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -152,6 +152,7 @@ Per Bothner         bothner@cygnus.com
 Per Cederqvist         ceder@lysator.liu.se
 Per Oyvind Hvidsten    poeh@enter.vg
 Peter Breitenlohner     peb@mppmu.mpg.de
+Peter Gavin            pgavin@debaser.kicks-ass.org
 Peter Mattis           petm@scam.XCF.Berkeley.EDU
 Peter Muir             iyhi@yahoo.com
 Petter Reinholdtsen    pere@hungry.com

diff --git a/automake.in b/automake.in
index ecad4ae30d1b907bea50505b37421cae77cff1c5..2916cc6fcd440c898a0ec48fda89fbb3142aa9ec 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2542,8 +2542,6 @@ sub handle_single_transform_list ($$$$@)
                {
                    (my $xobj = $object) =~ s,lo$,\$(OBJEXT),;
                    $compile_clean_files{$xobj} = MOSTLY_CLEAN;
-
-                   $libtool_clean_directories{$directory} = 1;
                }
 
                 push (@dep_list, require_build_directory ($directory));
@@ -3415,6 +3413,10 @@ sub handle_ltlibraries
       # make sure this directory will exist.
       my $dirstamp = require_build_directory_maybe ($onelib);
 
+      # Remember to cleanup .libs/ in this directory.
+      my $dirname = dirname $onelib;
+      $libtool_clean_directories{$dirname} = 1;
+
       $output_rules .= &file_contents ('ltlibrary',
                                       ('LTLIBRARY'  => $onelib,
                                        'XLTLIBRARY' => $xlib,

diff --git a/tests/libtool3.test b/tests/libtool3.test
index 66f50e69a51302054ca7e5ab9a1af96530edec57..208558cbe5e429313c9127475039f73078cc2989 100755 (executable)
--- a/tests/libtool3.test
+++ b/tests/libtool3.test
@@ -23,6 +23,8 @@
 required='libtoolize gcc'
 . ./defs || exit 1
 
+set -e
+
 cat >> configure.in << 'END'
 AC_PROG_CC
 AM_PROG_LIBTOOL
@@ -30,14 +32,17 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-lib_LTLIBRARIES = lib0.la
+lib_LTLIBRARIES = lib0.la liba/liba.la
 lib0_la_SOURCES = 0.c
+liba_liba_la_SOURCES = liba/a.c
 
 bin_PROGRAMS = 1
 1_SOURCES = 1.c
-1_LDADD = lib0.la
+1_LDADD = lib0.la $(top_builddir)/liba/liba.la
 END
 
+mkdir liba
+
 cat > 0.c << 'END'
 int
 zero (void)
@@ -56,7 +61,13 @@ main ()
 }
 END
 
-set -e
+cat > liba/a.c << 'END'
+int
+a (void)
+{
+   return 'a';
+}
+END
 
 # Use --copy to workaround a bug in Cygwin's `cp -p' during distcheck.
 # (This bug is already exhibited by subobj9.test.)  In brief: Cygwin's