From c6ed4148b0981d39d95b67013716d77c5ac9c420 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Fri, 16 Jan 2015 16:30:51 +0000 Subject: 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 --- Makefile.am | 5 +++-- tests/libtoolize.at | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.am b/Makefile.am index f1b7ead2..3a2bdcee 100644 --- 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 7758f9d2..46c9ec7e 100644 --- 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' -- cgit v1.2.1