This change fixes another VPATH build bug, where the vcl.tmp

target forced a rebuild of stamp-vcl in the build tree (and
hence regeneration of m4/ltversion.m4, thus an automake driven
rebootstrap that doesn't know about $fakes) requiring a fresh
./bootstrap after every cvs/tla update:

* Makefile.am (vcl.tmp): Removed.
(stamp-vcl): Adopt former vcl.tmp target rules.

diff --git a/ChangeLog b/ChangeLog
index 05c7bb0ea156cc83deaea484682a401222a84a67..fd98b1f728b5cd6ab0c25b855b3d5f77fdf41d73 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-07-27  Gary V. Vaughan  <gary@gnu.org>
+
+       This change fixes another VPATH build bug, where the vcl.tmp
+       target forced a rebuild of stamp-vcl in the build tree (and
+       hence regeneration of m4/ltversion.m4, thus an automake driven
+       rebootstrap that doesn't know about $fakes) requiring a fresh
+       ./bootstrap after every cvs/tla update:
+
+       * Makefile.am (vcl.tmp): Removed.
+       (stamp-vcl): Adopt former vcl.tmp target rules.
+
 2004-07-25  Gary V. Vaughan  <gary@gnu.org>
 
        * ltmain.in: Make sure that dependency libraries of -dlpreopened

diff --git a/Makefile.am b/Makefile.am
index 8f10d83558f5c9d627be69135b4d521823109f1e..a6c3df39909a3dbb2ef9e9c1fa72ca692abef0bb 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,8 +67,7 @@ bin_SCRIPTS = libtool libtoolize
 ## at the top of this rule takes care of prefering the right one on
 ## subsequent runs.
 MKSTAMP = $(SHELL) $(top_srcdir)/config/mkstamp
-stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog
-vcl.tmp:
+stamp-vcl: $(top_srcdir)/ChangeLog
        @dir=.; test -f $$dir/stamp-vcl || dir=$(srcdir); \
        set `$(MKSTAMP) < $(top_srcdir)/ChangeLog`; \
        echo "$$1" > vcl.tmp; \

diff --git a/configure.ac b/configure.ac
index c920fe1a5db7835ee29ee50a08744e5eb1868d90..73a1b68489b7ed5bc7696f13c343421b4a846248 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ(2.58) ## We use AS_HELP_STRING
 ## ------------------------ ##
 ## Autoconf initialisation. ##
 ## ------------------------ ##
-AC_INIT([libtool], [1.5b], [bug-libtool@gnu.org])
+AC_INIT([libtool], [1.5a], [bug-libtool@gnu.org])
 AC_CONFIG_HEADERS([config.h:config-h.in])
 AC_CONFIG_SRCDIR([ltmain.in])
 AC_CONFIG_AUX_DIR([config])