From: Rob Browning <rlb@defaultvalue.org>
To: guile-devel@gnu.org
Subject: [PATCH 2/6] Ensure GUILE-VERSION changes propagate to .version and Makefiles
Date: Mon, 1 Jul 2024 21:45:16 -0500 [thread overview]
Message-ID: <20240702024708.217581-3-rlb@defaultvalue.org> (raw)
In-Reply-To: <20240702024708.217581-1-rlb@defaultvalue.org>
Have .version depend on the Makefile, and move our
CONFIG_STATUS_DEPENDENCIES setting to an AC_SUBST, as recommended by the
automake info pages "Rebuilding Makefiles" section, so that changes to
GUILE-VERSION will update the VERSION, etc. in the generated Makefiles.
* Makefile.am (CONFIG_STATUS_DEPENDENCIES): drop.
($(top_srcdir/.version)): depend on Makefile.
* configure: add GUILE-VERSION to CONFIG_STATUS_DEPENDENCIES via
AC_SUBST.
Signed-off-by: Rob Browning <rlb@defaultvalue.org>
---
Makefile.am | 4 +---
configure.ac | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index b2ac5539e..c74761628 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -110,8 +110,6 @@ endif !HAVE_READLINE
clean-local:
rm -rf cache/
-CONFIG_STATUS_DEPENDENCIES = GUILE-VERSION
-
gen_start_rev = 61db429e251bfd2f75cb4632972e0238056eb24b
.PHONY: gen-ChangeLog
gen-ChangeLog:
@@ -133,7 +131,7 @@ assert-no-store-file-names:
fi
BUILT_SOURCES += $(top_srcdir)/.version
-$(top_srcdir)/.version:
+$(top_srcdir)/.version: Makefile
echo $(VERSION) > $@-t && mv $@-t $@
gen-tarball-version:
echo $(VERSION) > $(distdir)/.tarball-version
diff --git a/configure.ac b/configure.ac
index 0dcb71cce..262b171f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERB
AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT)
AC_CONFIG_SRCDIR([GUILE-VERSION])
+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/GUILE-VERSION'])
. $srcdir/GUILE-VERSION
GUILE_VERSION="$PACKAGE_VERSION"
--
2.43.0
next prev parent reply other threads:[~2024-07-02 2:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-02 2:45 [PATCH 0/6] A handful of post 3.0.10 fixups Rob Browning
2024-07-02 2:45 ` [PATCH 1/6] define-meta-command: mention effects of a missing category Rob Browning
2024-07-02 2:45 ` Rob Browning [this message]
2024-07-02 2:45 ` [PATCH 3/6] Add guile-procedures.txt to BUILT_SOURCES Rob Browning
2024-07-02 4:15 ` Rob Browning
2024-07-02 2:45 ` [PATCH 4/6] test-hashing: support 32-bit Rob Browning
2024-07-02 2:45 ` [PATCH 5/6] scm_i_utf8_string_hash: don't overrun when len is zero Rob Browning
2024-07-02 2:45 ` [PATCH 6/6] scm_i_utf8_string_hash: optimize ASCII Rob Browning
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/guile/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240702024708.217581-3-rlb@defaultvalue.org \
--to=rlb@defaultvalue.org \
--cc=guile-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).