From: Simon Marchi <simon.marchi@ericsson.com>
To: <gdb-patches@sourceware.org>
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 3/4] Makefile: Replace old suffix rules with pattern rules
Date: Wed, 16 Nov 2016 16:12:00 -0000 [thread overview]
Message-ID: <20161116160808.12830-4-simon.marchi@ericsson.com> (raw)
In-Reply-To: <20161116160808.12830-1-simon.marchi@ericsson.com>
From: Simon Marchi <simon.marchi@polymtl.ca>
As mentioned here [1], suffix rules are obsolete and have been
superseeded with pattern rules. People (myself included, before writing
this patch) are more likely to know what pattern rules are than suffix
rules.
AFAIK, .SUFFIXES targets are only used for those rules, and can be
removed as well.
New in v2:
- Replace rule in gdbserver/Makefile.in as well.
[1] https://www.gnu.org/software/make/manual/html_node/Suffix-Rules.html
gdb/ChangeLog:
* Makefile.in (.c.o): Replace rule with ...
(%.o: %.c): ... this one.
(.po.gmo): Replace rule with ...
(%.gmo: %.po): ... this one.
(.po.pox): Replace rule with ...
(%.pox: %.po): ... this one.
(.y.c): Replace rule with ...
(%.c: %.y): ... this one.
(.l.c): Replace rule with ...
(%.c: %.l): ... this one.
(.SUFFIXES): Remove all instances.
gdb/gdbserver/ChangeLog:
* Makefile.in (.c.o): Replace rule with ...
(%.o: %.c): ... this one.
---
gdb/Makefile.in | 12 +++++-------
gdb/gdbserver/Makefile.in | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index f53b121..fe10a8d 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1122,7 +1122,7 @@ DISTSTUFF = $(YYFILES)
generated_files = config.h observer.h observer.inc ada-lex.c jit-reader.h \
$(GNULIB_H) $(NAT_GENERATED_FILES) gcore
-.c.o:
+%.o: %.c
$(COMPILE) $<
$(POSTCOMPILE)
@@ -1801,7 +1801,6 @@ ada-exp.o: ada-exp.c
# Rules for generating translated message descriptions. Disabled by
# autoconf if the tools are not available.
-.SUFFIXES: .po .gmo .pox .pot
.PHONY: all-po install-po uninstall-po clean-po update-po $(PACKAGE).pot
all-po: $(CATALOGS)
@@ -1812,14 +1811,14 @@ update-po: $(CATALOGS:.gmo=.pox)
# N.B. We do not attempt to copy these into $(srcdir). The snapshot
# script does that.
-.po.gmo:
+%.gmo: %.po
-test -d po || mkdir po
$(GMSGFMT) --statistics -o $@ $<
# The new .po has to be gone over by hand, so we deposit it into
# build/po with a different extension. If build/po/$(PACKAGE).pot
# exists, use it (it was just created), else use the one in srcdir.
-.po.pox:
+%.pox: %.po
-test -d po || mkdir po
$(MSGMERGE) $< `if test -f po/$(PACKAGE).pot; \
then echo po/$(PACKAGE).pot; \
@@ -1880,8 +1879,7 @@ po/$(PACKAGE).pot: force
# Strictly speaking c-exp.c should therefore depend on
# Makefile.in, but that was a pretty big annoyance.
-.SUFFIXES: .y .l
-.y.c:
+%.c: %.y
rm -f $@ $@.tmp
$(SHELL) $(YLWRAP) $< y.tab.c $@ -- $(YACC) $(YFLAGS) && mv $@ $@.tmp \
|| (rm -f $@; false)
@@ -1897,7 +1895,7 @@ po/$(PACKAGE).pot: force
-e 's/YY_NULL/YY_NULLPTR/g' \
< $@.tmp > $@
rm -f $@.tmp
-.l.c:
+%.c: %.l
if [ "$(FLEX)" ] && $(FLEX) --version >/dev/null 2>&1; then \
$(FLEX) -o$@ $< && \
rm -f $@.new && \
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index a1f4675..c25d21e 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -256,7 +256,7 @@ FLAGS_TO_PASS = \
# All generated files which can be included by another file.
generated_files = config.h $(GNULIB_H)
-.c.o:
+%.o: %.c
$(COMPILE) $<
$(POSTCOMPILE)
--
2.10.2
next prev parent reply other threads:[~2016-11-16 16:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 16:11 [PATCH 0/4] Require GNU make Simon Marchi
2016-11-16 16:10 ` [PATCH 4/4] Makefile: Replace explicit subdir rules with pattern rules Simon Marchi
2016-11-16 17:11 ` Pedro Alves
2016-11-16 16:12 ` [PATCH 2/4] Remove code that checks for GNU/non-GNU make Simon Marchi
2016-11-16 16:32 ` Eli Zaretskii
2016-11-16 16:39 ` Andreas Schwab
2016-11-16 17:12 ` Simon Marchi
2016-11-16 17:12 ` Pedro Alves
2016-11-16 17:09 ` Pedro Alves
2016-11-16 16:12 ` [PATCH 1/4] Document new hard requirement on GNU make Simon Marchi
2016-11-16 16:29 ` Eli Zaretskii
2016-11-16 17:05 ` Simon Marchi
2016-11-16 17:23 ` Eli Zaretskii
2016-11-16 22:05 ` Simon Marchi
2016-11-16 23:34 ` Pedro Alves
2016-11-17 12:39 ` Pedro Alves
2016-11-17 13:39 ` Simon Marchi
2016-11-17 16:10 ` Eli Zaretskii
2016-11-17 3:35 ` Eli Zaretskii
2016-11-17 10:06 ` Jonas Maebe
2016-11-17 12:43 ` Pedro Alves
2016-11-16 16:12 ` Simon Marchi [this message]
2016-11-16 16:35 ` [PATCH 3/4] Makefile: Replace old suffix rules with pattern rules Eli Zaretskii
2016-11-16 16:56 ` Pedro Alves
2016-11-16 17:14 ` Eli Zaretskii
2016-11-16 17:32 ` Pedro Alves
2016-11-16 17:49 ` Eli Zaretskii
2016-11-16 17:58 ` Pedro Alves
2016-11-16 19:38 ` Simon Marchi
2016-11-16 19:58 ` Pedro Alves
2016-11-16 20:18 ` Simon Marchi
2016-11-16 19:11 ` Pedro Alves
2016-11-17 16:52 ` Simon Marchi
2016-11-17 16:57 ` Pedro Alves
2016-11-17 17:05 ` [PATCH 0/4] Require GNU make Simon Marchi
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=20161116160808.12830-4-simon.marchi@ericsson.com \
--to=simon.marchi@ericsson.com \
--cc=gdb-patches@sourceware.org \
--cc=simon.marchi@polymtl.ca \
/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