From f3d1939fe2041fbf6d83f5697dcab8c0749afa44 Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Wed, 26 Nov 2003 15:36:08 +0000 Subject: [PATCH] Okay, the problem I am trying to solve is that when a change (say, bumping the version to 1.6 for the next release) is committed, the timestamp in ChangeLog is updated, but ltmain.sh and libtoolize inherit the pre-commit build number from config.status. This delta notes the change in build number in the unstamped ChangeLog and forces a rerun of configure etc. to roll a new ltmain.sh with the correct TIMESTAMP: * Makefile.am (stamp-vcl): We actually need a new config.status to force the correct timestamp into libtoolize and ltmain.sh, rerunning autoconf has no effect at all if configure.ac hasn't changed. --- ChangeLog | 15 +++++++++++++++ Makefile.am | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c0e9de87..248ee3a35 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2003-11-26 Gary V. Vaughan + + Okay, the problem I am trying to solve is that when a change (say, + bumping the version to 1.6 for the next release) is committed, the + timestamp in ChangeLog is updated, but ltmain.sh and libtoolize + inherit the pre-commit build number from config.status. This + delta notes the change in build number in the unstamped ChangeLog + and forces a rerun of configure etc. to roll a new ltmain.sh with + the correct TIMESTAMP: + + * Makefile.am (stamp-vcl): We actually need a new config.status to + force the correct timestamp into libtoolize and ltmain.sh, + rerunning autoconf has no effect at all if configure.ac hasn't + changed. + 2003-11-26 Gary V. Vaughan * Makefile.am (stamp-vcl): New rules to force libtool and diff --git a/Makefile.am b/Makefile.am index bba27b80b..b422ad5fe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,9 +50,9 @@ libtoolize: $(srcdir)/libtoolize.in $(top_builddir)/config.status CONFIG_FILES=$@ CONFIG_HEADERS= CONFIG_COMMANDS= $(SHELL) $(config_status) chmod +x $@ -# Make sure configure is regenerated when the version timestamp changes -$(top_builddir)/config.status: stamp-vcl $(top_srcdir)/ChangeLog -stamp-vcl: vcl.tmp +# Make sure config.status is regenerated when the version timestamp changes +$(config_status): stamp-vcl +stamp-vcl: vcl.tmp $(top_srcdir)/ChangeLog vcl.tmp: @set `$(SHELL) config/mkstamp < $(top_srcdir)/ChangeLog`; \ echo "$$1" > vcl.tmp -- 2.47.2