From: Andrew Burgess <aburgess@redhat.com>
To: gdb-patches@sourceware.org
Cc: Andrew Burgess <aburgess@redhat.com>
Subject: [PATCHv2 2/6] gdb/Makefile: rewrite dependencies for config.status target
Date: Sat, 6 Apr 2024 18:03:11 +0100 [thread overview]
Message-ID: <20e8e8749d8119823ce18d23dffd2e47f9ad5791.1712422921.git.aburgess@redhat.com> (raw)
In-Reply-To: <cover.1712422921.git.aburgess@redhat.com>
I noticed something weird, the rule for the config.status target looks
like this:
config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ../bfd/development.sh
$(SHELL) config.status --recheck
What bothered me is that 'configure' is specified as being in
$(srcdir), while all of the other files are not, even though those
files are in the same $(srcdir) as the configure script.
However, I tried touching one of those files, and the config.status
rule does trigger!
This is thanks to the VPATH variable, which is set to $(srcdir), so
make looks in $(srcdir) for any dependencies.
However, this inconsistency bothers me. Better, I think, to add the
$(srcdir) prefix to each of these files.
I also spotted that the configure script also includes the files
../bfd/config.bfd, yet that is missing from the include list, so in
this commit I plan to add this as a dependency.
The configure script also pulls in two TCL and TK related files:
. ${TCL_BIN_DIR}/tclConfig.sh
. ${TK_BIN_DIR}/tkConfig.sh
However, I don't think ${TCL_BIN_DIR} and ${TK_BIN_DIR} are currently
visible in GDB's Makefile, so I'm not planning to add these
dependencies at this time.
In this commit I add a new variable config_status_deps which holds the
list of all the dependencies for config.status, with the $(srcdir)
prefix included, and then I use this in the config.status rule.
After this commit config.status will regenerate if config.bfd changes,
which it wouldn't before, but nothing else changes.
---
gdb/Makefile.in | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index df044288b5e..9340becbdc9 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -2333,7 +2333,18 @@ nm.h: stamp-nmh ; @true
stamp-nmh: config.status
$(SHELL) config.status nm.h
-config.status: $(srcdir)/configure configure.nat configure.tgt configure.host ../bfd/development.sh
+# Files included from config.status or the configure script. When
+# these change the configure script doesn't need regenerating, but its
+# output (and so that of config.status) might change.
+config_status_deps = \
+ $(srcdir)/configure \
+ $(srcdir)/configure.nat \
+ $(srcdir)/configure.tgt \
+ $(srcdir)/configure.host \
+ $(srcdir)/../bfd/development.sh \
+ $(srcdir)/../bfd/config.bfd
+
+config.status: $(config_status_deps)
$(SHELL) config.status --recheck
ACLOCAL = aclocal
--
2.25.4
next prev parent reply other threads:[~2024-04-06 17:03 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-05 12:21 [PATCH 0/4] gcore and config.status related Makefile changes Andrew Burgess
2024-04-05 12:21 ` [PATCH 1/4] gdb/Makefile: add gcore to the 'all' target dependency list Andrew Burgess
2024-04-05 12:21 ` [PATCH 2/4] gdb/Makefile: rewrite dependencies for config.status target Andrew Burgess
2024-04-05 12:21 ` [PATCH 3/4] gdb/Makefile: add some missing config.status dependencies Andrew Burgess
2024-04-05 12:21 ` [PATCH 4/4] gdb/Makefile: Print 'GEN' message, and pass SILENT_FLAG more Andrew Burgess
2024-04-06 17:03 ` [PATCHv2 0/6] gcore and config.status related Makefile changes Andrew Burgess
2024-04-06 17:03 ` [PATCHv2 1/6] gdb/Makefile: add gcore to the 'all' target dependency list Andrew Burgess
2024-04-06 17:03 ` Andrew Burgess [this message]
2024-04-08 3:09 ` [PATCHv2 2/6] gdb/Makefile: rewrite dependencies for config.status target Simon Marchi
2024-04-06 17:03 ` [PATCHv2 3/6] gdb/Makefile: add some missing config.status dependencies Andrew Burgess
2024-04-06 17:03 ` [PATCHv2 4/6] gdb/Makefile: Print 'GEN' message, and pass SILENT_FLAG more Andrew Burgess
2024-04-06 17:03 ` [PATCHv2 5/6] gdb/configure: use AC_MSG_NOTICE not a direct echo call Andrew Burgess
2024-04-08 3:14 ` Simon Marchi
2024-04-08 10:01 ` Andrew Burgess
2024-04-09 15:53 ` Tom Tromey
2024-04-06 17:03 ` [PATCHv2 6/6] gdb/build: apply silent-rules.mk to the data-directory Makefile.in Andrew Burgess
2024-04-08 3:32 ` Simon Marchi
2024-04-08 9:16 ` Andrew Burgess
2024-04-08 3:32 ` [PATCHv2 0/6] gcore and config.status related Makefile changes Simon Marchi
2024-04-08 10:01 ` Andrew Burgess
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20e8e8749d8119823ce18d23dffd2e47f9ad5791.1712422921.git.aburgess@redhat.com \
--to=aburgess@redhat.com \
--cc=gdb-patches@sourceware.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).