libtool ChangeLog Makefile.am

[Ralf Wildenhues]

CVSROOT:        /cvsroot/libtool
Module name:    libtool
Changes by:     Ralf Wildenhues <rwild> 06/06/10 07:36:25

Modified files:
        .              : ChangeLog Makefile.am 

Log message:
        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>.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libtool/ChangeLog?cvsroot=libtool&r1=1.2307&r2=1.2308
http://cvs.savannah.gnu.org/viewcvs/libtool/Makefile.am?cvsroot=libtool&r1=1.195&r2=1.196

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/libtool/libtool/ChangeLog,v
retrieving revision 1.2307
retrieving revision 1.2308
diff -u -b -r1.2307 -r1.2308
--- ChangeLog   9 Jun 2006 15:13:45 -0000       1.2307
+++ ChangeLog   10 Jun 2006 07:36:25 -0000      1.2308
@@ -1,3 +1,16 @@
+2006-06-10  Ralf Wildenhues  <address@hidden>
+
+       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>.
+
 2006-06-09  Ralf Wildenhues  <address@hidden>
 
        * Makefile.am (install-data-local): Do not use $(INSTALL_DATA)
@@ -428,6 +441,6 @@
 
 Continued in ChangeLog.2005
 
-       $Revision: 1.2307 $ $Date: 2006/06/09 15:13:45 $
+       $Revision: 1.2308 $ $Date: 2006/06/10 07:36:25 $
 
 vim:tw=72

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -b -r1.195 -r1.196
--- Makefile.am 9 Jun 2006 15:13:45 -0000       1.195
+++ Makefile.am 10 Jun 2006 07:36:25 -0000      1.196
@@ -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,9 +241,8 @@
        mv -f Makefile.inT Makefile.in
        echo stamp > $@
 
-EXTRA_DIST += $(srcdir)/libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
-
-$(srcdir)/libltdl/aclocal.m4: \
+sub_aclocal_m4_deps = \
+       $(srcdir)/libltdl/configure.ac \
            $(m4dir)/libtool.m4 \
            $(m4dir)/ltoptions.m4 \
            $(m4dir)/ltdl.m4 \
@@ -241,10 +250,18 @@
            $(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: $(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 $@
 
 
 ## -------- ##