* 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.

diff --git a/ChangeLog b/ChangeLog
index 2b631a4119ca64062184f13ae3a3ef3f934099ee..5251db87bb04d6887124b1f73348cad19593cce2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2005-12-16  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 
+       * 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.
+
        * tests/testsuite.at (PREPARE_TESTS): New variable `tst_dist',
        default to empty.
        * tests/nonrecursive.at, tests/recursive.at,

diff --git a/HACKING b/HACKING
index 7f7164ec44fcce8100c7e050585786865f293e4f..bd54317517584a724caa12d155ec1edbef9404a3 100644 (file)
--- a/HACKING
+++ b/HACKING
@@ -192,6 +192,14 @@ yyyy-mm-dd  Name of Author  <email@address>  (tiny change)
 * 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
 ========================

diff --git a/Makefile.am b/Makefile.am
index a3e0cc4951dc38701bae2266cf98ac4575b294a7..81dbc6e21fc29971c31b735ff9d039f83f7ffc89 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -77,7 +77,7 @@ $(srcdir)/libtoolize.in: $(sh_files) libtoolize.m4sh Makefile.am
        $(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 @@ $(srcdir)/libltdl/Makefile.am: $(srcdir)/libltdl/Makefile.inc
              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
 
 
 ## -------- ##