HEAD: Fix dependencies for libltdl generated files

[Ralf Wildenhues]

The nightly CVS tarball currently has an outdated libltdl/configure
file.  This is presumably because the tarball generation does not
consequently run a full ./bootstrap.  Anyway, it's a bug that we don't
specify all dependencies anyway, including manual rebuilding rules.

I've applied the following patch to fix that.  Note the explicit touch
of config-h.in is to defeat autoheader not updating the time stamp for
unchanged file.  (This is so that autoheader isn't accidentally
triggered later in a test with a read-only source tree, which leads to
an error even if it wouldn't really have to update anything.  I wonder
whether we need to do this for 'configure' as well...)

Cheers,
Ralf

        Fix libltdl to always have all generated files up to date.

        * Makefile.am (all-local): Depend on all generated files in
        libltdl, namely...
        (libltdl/aclocal.m4, libltdl/configure, libltdl/config-h.in):
        ...these.  List explicitly, including dependencies and
        rebuilding rules, using...
        (sub_aclocal_m4_deps, sub_configure_deps): ...these new
        variables.
        Report by Dan Lacher <address@hidden>.

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.195
diff -u -r1.195 Makefile.am
--- Makefile.am 9 Jun 2006 15:13:45 -0000       1.195
+++ Makefile.am 10 Jun 2006 07:34:50 -0000
@@ -219,6 +219,16 @@
               -e 's,\$$(libltdl_,$$(,' >> $$out;
        chmod a-w $(srcdir)/libltdl/Makefile.am
 
+
+## 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 \
+       $(srcdir)/libltdl/stamp-mk \
+       $(srcdir)/libltdl/configure \
+       $(srcdir)/libltdl/config-h.in
+
+EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
+
 $(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
            $(srcdir)/libltdl/aclocal.m4 
        cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
@@ -231,20 +241,27 @@
        mv -f Makefile.inT Makefile.in
        echo stamp > $@
 
-EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
+sub_aclocal_m4_deps = \
+       $(srcdir)/libltdl/configure.ac \
+       $(m4dir)/libtool.m4 \
+       $(m4dir)/ltoptions.m4 \
+       $(m4dir)/ltdl.m4 \
+       $(srcdir)/$(m4dir)/ltversion.m4 \
+       $(m4dir)/ltsugar.m4 \
+       $(m4dir)/argz.m4 \
+       $(m4dir)/lt~obsolete.m4
+
+sub_configure_deps = $(sub_aclocal_m4_deps) $(srcdir)/libltdl/aclocal.m4
 
-$(srcdir)/libltdl/aclocal.m4: \
-           $(m4dir)/libtool.m4 \
-           $(m4dir)/ltoptions.m4 \
-           $(m4dir)/ltdl.m4 \
-           $(srcdir)/$(m4dir)/ltversion.m4 \
-           $(m4dir)/ltsugar.m4 \
-           $(m4dir)/argz.m4 \
-           $(m4dir)/lt~obsolete.m4
+$(srcdir)/libltdl/aclocal.m4: $(sub_aclocal_m4_deps)
        cd $(srcdir)/libltdl && $(ACLOCAL) -I m4
 
-# We want the libltdl files to be up to date as much as possible.
-all-local: $(srcdir)/libltdl/stamp-mk
+$(srcdir)/libltdl/configure: $(sub_configure_deps)
+       cd $(srcdir)/libltdl && $(AUTOCONF)
+
+$(srcdir)/libltdl/config-h.in: $(sub_configure_deps)
+       cd $(srcdir)/libltdl && $(AUTOHEADER)
+       touch $@
 
 
 ## -------- ##