From 8dce3875bc0d1ba8d2c3b2702810e5fc7e78a29c Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Thu, 7 Aug 2008 18:37:07 -0400 Subject: [PATCH] Keep .version and PACKAGE_VERSION in sync. * Makefile.am ($(top_srcdir)/.version): Declare configure as a dependency, and add comments justifying this in more detail. Discussed starting at . --- ChangeLog | 8 ++++++++ Makefile.am | 12 ++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5af268ee..dd85885f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-08-07 Joel E. Denny + + Keep .version and PACKAGE_VERSION in sync. + * Makefile.am ($(top_srcdir)/.version): Declare configure as a + dependency, and add comments justifying this in more detail. Discussed + starting at + . + 2008-08-06 Eric Blake Partial m4sugar merge from autoconf: m4_shiftn. diff --git a/Makefile.am b/Makefile.am index 7113484e..28d59f43 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,9 +43,17 @@ maintainer-push-check: maintainer-xml-check: cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ -# See comments in build-aux/git-version-gen. +# See comments in build-aux/git-version-gen. However, we make .version depend +# on configure so that .version and VERSION/PACKAGE_VERSION stay in sync in the +# working copy (for example, when you run autoreconf && make). Allowing these +# to fall out of sync appears to have little potential to improve Bison build +# efficiency (even if we were to replace VERSION/PACKAGE_VERSION with .version +# everywhere possible). On the other hand, it could be harmful. For example, +# a developer might naively reference .version in a test case while the bison +# executable still compiles with VERSION, and so the test case might fail or +# pass incorrectly. BUILT_SOURCES = $(top_srcdir)/.version -$(top_srcdir)/.version: +$(top_srcdir)/.version: configure echo $(VERSION) > $@-t && mv $@-t $@ dist-hook: echo $(VERSION) > $(distdir)/.tarball-version -- 2.47.2