* Makefile.am (stamp-vcl): New rules to force libtool and

libtoolize scripts to update when the TIMESTAMP changes in
ChangeLog, but the file modification time doesn't (e.g in cvs
commit).  Otherwise we'll carry on releasing tarballs with the
wrong version numbers in the tools!

diff --git a/ChangeLog b/ChangeLog
index ccc5953ba95e7ad0a8aea0d0b748b9b29ed4572c..0c0e9de876e60a90c07e500f288170a140784d5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-11-26  Gary V. Vaughan  <gary@gnu.org>
 
+       * Makefile.am (stamp-vcl): New rules to force libtool and
+       libtoolize scripts to update when the TIMESTAMP changes in
+       ChangeLog, but the file modification time doesn't (e.g in cvs
+       commit).  Otherwise we'll carry on releasing tarballs with the
+       wrong version numbers in the tools!
+
        * config/mkstamp: Change output format to ` $rev $date'.
        * configure.ac: Make the banner more like suggestions in
        http://www.gnu.org/prep/standards_toc.html Section 4.6.

diff --git a/Makefile.am b/Makefile.am
index 1d25fbe6a145d2fb21a0734a481acf21eb6e71ed..bba27b80b5ec394bb613e673034c4fdd61832a66 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -42,7 +42,7 @@ bin_SCRIPTS = libtool libtoolize
 
 config_status = $(top_builddir)/config.status
 
-libtool: config/ltmain.sh $(top_builddir)/configure
+libtool: config/ltmain.sh $(top_builddir)/config.status
        CONFIG_FILES= CONFIG_HEADERS= CONFIG_COMMANDS=$@ $(SHELL) $(config_status)
        chmod +x $@
 
@@ -51,7 +51,14 @@ libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status
        chmod +x $@
 
 # Make sure configure is regenerated when the version timestamp changes
-configure: ChangeLog
+$(top_builddir)/config.status: stamp-vcl $(top_srcdir)/ChangeLog
+stamp-vcl: vcl.tmp
+vcl.tmp:
+       @set `$(SHELL) config/mkstamp < $(top_srcdir)/ChangeLog`; \
+       echo "$$1" > vcl.tmp
+       @cmp -s vcl.tmp stamp-vcl \
+         || (echo "Updating stamp-vcl"; cp vcl.tmp stamp-vcl)
+       -@rm -f vcl.tmp
 
 .PHONY: configure-subdirs
 configure-subdirs distdir: $(DIST_MAKEFILE_LIST)