patch-4: fixup libltdl/Makefile.in and libltdl/aclocal.m4 (was: HEAD: patch queue)

[Ralf Wildenhues]

* Ralf Wildenhues wrote on Sun, Dec 04, 2005 at 03:56:15PM CET:
> - several (dunno how many yet) patches to fix the actual `make dist' 
>   stuff for clients.

This patch ensures that libltdl/aclocal.m4 and libltdl/Makefile.in are
always up to date.  These dependencies are not real in the Libtool
source tree, but they will be in the client source tree, in the
subpackage case.

For the subpackage case, these files will then be correct (after a
following patch that fixes Makefile.inc somewhat).

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.

This is similar to what I posted earlier about the issue.

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.

--- Makefile.am 2005-12-04 15:41:25.000000000 +0100
+++ Makefile.am 2005-12-04 15:49:06.000000000 +0100
@@ -218,11 +219,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
 
 
 ## -------- ##