From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 10 Jun 2010 17:44:23 +0000 (+0200)
Subject: Ensure libltdl is up to date for check-local.
X-Git-Tag: v2.4~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e31ea01adea39d3dccf4f7752c20caa72cbb386;p=thirdparty%2Flibtool.git

Ensure libltdl is up to date for check-local.

* Makefile.am (LTDL_BOOTSTRAP_DEPS): New variable.
(all-local): Use it to simplify dependencies.
(testsuite_deps_uninstalled): Add $(LTDL_BOOTSTRAP_DEPS).
Report by Peter Rosin.

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

diff --git a/ChangeLog b/ChangeLog
index ce76dcfd4..c94b0c771 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-06-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Ensure libltdl is up to date for check-local.
+	* Makefile.am (LTDL_BOOTSTRAP_DEPS): New variable.
+	(all-local): Use it to simplify dependencies.
+	(testsuite_deps_uninstalled): Add $(LTDL_BOOTSTRAP_DEPS).
+	Report by Peter Rosin.
+
 2010-06-10  Gary V. Vaughan  <gary@gnu.org>
 
 	Support shell tracing inside functions even with ksh.
diff --git a/Makefile.am b/Makefile.am
index a7de46d52..7c7f571c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -256,11 +256,13 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
 
 ## Unfortunately, all this bogeyness means that we have to manually
 ## keep the generated files in libltdl up to date.
-all-local: $(srcdir)/libltdl/aclocal.m4 \
+LTDL_BOOTSTRAP_DEPS = $(srcdir)/libltdl/aclocal.m4 \
 	$(srcdir)/libltdl/stamp-mk \
 	$(srcdir)/libltdl/configure \
 	$(srcdir)/libltdl/config-h.in
 
+all-local: $(LTDL_BOOTSTRAP_DEPS)
+
 EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
 
 $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
@@ -558,7 +560,8 @@ DISTCLEANFILES += tests/atconfig
 CD_TESTDIR	= abs_srcdir=`$(lt__cd) $(srcdir) && pwd`; cd tests
 
 testsuite_deps = tests/atconfig $(srcdir)/$(TESTSUITE)
-testsuite_deps_uninstalled = $(testsuite_deps) libltdl/libltdlc.la $(bin_SCRIPTS)
+testsuite_deps_uninstalled = $(testsuite_deps) libltdl/libltdlc.la \
+			     $(bin_SCRIPTS) $(LTDL_BOOTSTRAP_DEPS)
 
 # Hook the test suite into the check rule
 check-local: $(testsuite_deps_uninstalled)