libtoolize: fix ltdl installation order.

Fixes regression caused by commit 99a808be.
Makefile.in has aclocal.m4 as prerequisite, so Makefile.in
should be installed later to avoid unnecessary rebuild by
(versioned) aclocal.
* Makefile.am (pkgltdl_files): Move the Makefile.in file down in
the list after aclocal.m4.
* tests/libtoolize.at: Adjust to match reordered output.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

diff --git a/Makefile.am b/Makefile.am
index f1b7ead23bc8d29449f6889568092b9b2d2995db..3a2bdceeb38595e758a1a203798fbb080f247627 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -441,13 +441,14 @@ pkgmacro_files    = libtool.m4 ltargz.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 \
                  ltversion.m4 lt~obsolete.m4
 
 ## These are installed as a subdirectory of pkgdatadir so that
-## libtoolize --ltdl can find them later:
+## libtoolize --ltdl can find them later. Note that this list requires
+## specific order to avoid unnecessary re-autotooling after libtoolize run.
 pkgltdl_files  = COPYING.LIB \
                  Makefile.am \
-                 Makefile.in \
                  README \
                  configure.ac \
                  aclocal.m4 \
+                 Makefile.in \
                  config-h.in \
                  configure \
                  libltdl/lt__alloc.h \

diff --git a/tests/libtoolize.at b/tests/libtoolize.at
index 7758f9d28101d7d6f5f3cd9e512dde5480f85651..46c9ec7eab62f1c05600f9b4b4f109bd2b7eae81 100644 (file)
--- a/tests/libtoolize.at
+++ b/tests/libtoolize.at
@@ -467,10 +467,10 @@ libtoolize: linking file 'm4/lt~obsolete.m4'
 libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, 'ltdl'.
 libtoolize: linking file 'ltdl/COPYING.LIB'
 libtoolize: linking file 'ltdl/Makefile.am'
-libtoolize: linking file 'ltdl/Makefile.in'
 libtoolize: linking file 'ltdl/README'
 libtoolize: linking file 'ltdl/configure.ac'
 libtoolize: copying file 'ltdl/aclocal.m4'
+libtoolize: linking file 'ltdl/Makefile.in'
 libtoolize: linking file 'ltdl/config-h.in'
 libtoolize: copying file 'ltdl/configure'
 libtoolize: linking file 'ltdl/libltdl/lt__alloc.h'
@@ -566,10 +566,10 @@ libtoolize: copying file 'm4/lt~obsolete.m4'
 libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, 'ltdl'.
 libtoolize: copying file 'ltdl/COPYING.LIB'
 libtoolize: copying file 'ltdl/Makefile.am'
-libtoolize: copying file 'ltdl/Makefile.in'
 libtoolize: copying file 'ltdl/README'
 libtoolize: copying file 'ltdl/configure.ac'
 libtoolize: copying file 'ltdl/aclocal.m4'
+libtoolize: copying file 'ltdl/Makefile.in'
 libtoolize: copying file 'ltdl/config-h.in'
 libtoolize: copying file 'ltdl/configure'
 libtoolize: copying file 'ltdl/libltdl/lt__alloc.h'
@@ -967,10 +967,10 @@ libtoolize: copying file 'acm4/lt~obsolete.m4'
 libtoolize: putting libltdl files in LT_CONFIG_LTDL_DIR, 'ltdl'.
 libtoolize: copying file 'ltdl/COPYING.LIB'
 libtoolize: creating file 'ltdl/Makefile.am'
-libtoolize: creating file 'ltdl/Makefile.in'
 libtoolize: copying file 'ltdl/README'
 libtoolize: creating file 'ltdl/configure.ac'
 libtoolize: creating file 'ltdl/aclocal.m4'
+libtoolize: creating file 'ltdl/Makefile.in'
 libtoolize: copying file 'ltdl/config-h.in'
 libtoolize: creating file 'ltdl/configure'
 libtoolize: copying file 'ltdl/libltdl/lt__alloc.h'
@@ -1043,10 +1043,10 @@ libtoolize: linking file 'ltdl/m4/lt~obsolete.m4'
 libtoolize: putting libltdl files in 'ltdl'.
 libtoolize: linking file 'ltdl/COPYING.LIB'
 libtoolize: creating file 'ltdl/Makefile.am'
-libtoolize: creating file 'ltdl/Makefile.in'
 libtoolize: linking file 'ltdl/README'
 libtoolize: creating file 'ltdl/configure.ac'
 libtoolize: creating file 'ltdl/aclocal.m4'
+libtoolize: creating file 'ltdl/Makefile.in'
 libtoolize: linking file 'ltdl/config-h.in'
 libtoolize: creating file 'ltdl/configure'
 libtoolize: linking file 'ltdl/libltdl/lt__alloc.h'