Re: patch-4: fixup libltdl/Makefile.in and libltdl/aclocal.m4

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Wed, Dec 14, 2005 at 12:52:22PM CET:
> Ralf Wildenhues wrote:
> >
> >        * Makefile.am (libltdl/Makefile.in): also depend on
> >        libltdl/aclocal.m4, so that we guarantee timestamp consistency.
> >        (libltdl/stamp-mk): New target, to fix `libltdl/Makefile.in'.
> >        (EXTRA_DIST): Distribute `libltdl/stamp-mk'.
> >        (all-local): Ensure the stamp files is up to date.
> >        (libltdl/aclocal.m4): New target, to ensure timestamp
> >        consistency.  Depend on all m4 files.
> 
> Looks good to me.  Please apply.

Thanks.  Done as below, with your following comments addressed:

> >-$(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am
> >+$(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
> >+    $(srcdir)/libltdl/aclocal.m4 
> >     cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
> 
> One nit:
> 
> It would be nice if dependency continuation lines were indented
> differently to the actual rules that follow.  Will make accept the
> following?

Yes.  I've done it the way you suggested; but upon second thought
it may be more useful (because more compact) to just use less indenting
for continued dependencies.  Oh well.

> If so, might me worth a mention in HACKING.

* Gary V. Vaughan wrote on Wed, Dec 14, 2005 at 12:57:27PM CET:
> Ralf Wildenhues wrote:
> >One needs to remember that for our whole logic to function correctly,
> >all we need to ensure *before the client runs libtoolize*, is that the
> >subpackage case is correct.  All others can and will be fixed in the
> >`libtoolize --ltdl --(non)recursive' stage.
> 
> Hmmm... that's a useful invariant for us to document somewhere.  Another
> addition to HACKING?

Yep.

One should note that even now not all dependencies are fully specified.
(Within a later patch..)

Cheers,
Ralf

        * Makefile.am (libltdl/Makefile.in): also depend on
        libltdl/aclocal.m4, so that we guarantee timestamp consistency.
        (libltdl/stamp-mk): New target, to fix `libltdl/Makefile.in'.
        (EXTRA_DIST): Distribute `libltdl/stamp-mk'.
        (all-local): Ensure the stamp files is up to date.
        (libltdl/aclocal.m4): New target, to ensure timestamp
        consistency.  Depend on all m4 files.
        * HACKING: Updated.

Index: HACKING
===================================================================
RCS file: /cvsroot/libtool/libtool/HACKING,v
retrieving revision 1.23
diff -u -r1.23 HACKING
--- HACKING     14 Nov 2005 20:48:14 -0000      1.23
+++ HACKING     16 Dec 2005 16:26:38 -0000
@@ -192,6 +192,14 @@
 * In general, if a loop is required, it should be silent.  Then the body
   of the loop itself should print each "important" command it runs.
 
+* Use 4 extra spaces to indent continued dependencies.
+
+* One needs to remember that for our whole logic for the different
+  libltdl modes to function correctly, the thing we need to ensure
+  *before the client runs libtoolize*, is that the subpackage case is
+  correct (because all files may be symlinked there).  All others can
+  and will be fixed in the `libtoolize --ltdl --(non)recursive' stage.
+
 
 7. Editing `.m4sh' Files
 ========================
Index: Makefile.am
===================================================================
RCS file: /cvsroot/libtool/libtool/Makefile.am,v
retrieving revision 1.182
diff -u -r1.182 Makefile.am
--- Makefile.am 4 Dec 2005 14:48:08 -0000       1.182
+++ Makefile.am 16 Dec 2005 16:26:38 -0000
@@ -77,7 +77,7 @@
        $(M4SH) -B $(auxdir) libtoolize.m4sh > libtoolize.in
 
 libtool: $(top_builddir)/config.status $(srcdir)/$(auxdir)/ltmain.sh \
-        $(srcdir)/stamp-vcl
+           $(srcdir)/stamp-vcl
        cd $(top_builddir) && $(SHELL) ./config.status $@
 
 .PHONY: configure-subdirs
@@ -218,11 +218,32 @@
              s,\$$(libltdl_,$$(,; p; }' $$in >> $$out;
        chmod a-w $(srcdir)/libltdl/Makefile.am
 
-$(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am
+$(srcdir)/libltdl/Makefile.in: $(srcdir)/libltdl/Makefile.am \
+           $(srcdir)/libltdl/aclocal.m4 
        cd $(srcdir)/libltdl && $(AUTOMAKE) Makefile
 
+$(srcdir)/libltdl/stamp-mk: $(srcdir)/libltdl/Makefile.in
+       cd $(srcdir)/libltdl && \
+       sed -e 's,config/mdate-sh,,' -e 's,config/texinfo.tex,,' \
+           -e 's,config/mkinstalldirs,,' \
+           < Makefile.in > Makefile.inT && \
+       mv -f Makefile.inT Makefile.in
+       echo stamp > $@
+
+EXTRA_DIST += libltdl/stamp-mk $(m4dir)/lt~obsolete.m4
+
+$(srcdir)/libltdl/aclocal.m4: \
+           $(m4dir)/libtool.m4 \
+           $(m4dir)/ltoptions.m4 \
+           $(m4dir)/ltdl.m4 \
+           $(m4dir)/ltversion.m4 \
+           $(m4dir)/ltsugar.m4 \
+           $(m4dir)/argz.m4 \
+           $(m4dir)/lt~obsolete.m4
+       cd $(srcdir)/libltdl && $(ACLOCAL) -I m4
+
 # We want the libltdl files to be up to date as much as possible.
-all-local: $(srcdir)/libltdl/Makefile.in
+all-local: $(srcdir)/libltdl/stamp-mk
 
 
 ## -------- ##