public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 03/10] Simplify INIT_FILES
Date: Mon, 02 Jul 2018 20:18:00 -0000	[thread overview]
Message-ID: <20180702201824.15005-4-tom@tromey.com> (raw)
In-Reply-To: <20180702201824.15005-1-tom@tromey.com>

This simplifies the INIT_FILES variable.  COMMON_OBS includes
CONFIG_OBS and SUBDIR_GCC_COMPILE_OBS, so there's no need to reference
CONFIG_OBS or SUBDIR_GCC_COMPILE_SRCS there.  Once this is done, it it
clear that duplicates can't occur, so remove the duplicate-removing
code as well.

2018-07-01  Tom Tromey  <tom@tromey.com>

	* Makefile.in (INIT_FILES): Remove CONFIG_SRCS,
	SUBDIR_GCC_COMPILE_SRCS.
---
 gdb/ChangeLog   |  5 +++++
 gdb/Makefile.in | 14 ++------------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 180f16c7b8d..b35ca2e7aef 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1848,11 +1848,7 @@ test-cp-name-parser$(EXEEXT): test-cp-name-parser.o $(LIBIBERTY)
 # automatically adds the $(srcdir) prefixes when it encounters files
 # in sub-directories such as cli/ and mi/.
 
-# NOTE: cagney/2004-02-08: The ``case "$$fs" in'' eliminates
-# duplicates.  Files in the gdb/ directory can end up appearing in
-# COMMON_OBS (as a .o file) and CONFIG_SRCS (as a .c file).
-
-INIT_FILES = $(COMMON_OBS) $(CONFIG_SRCS) $(SUBDIR_GCC_COMPILE_SRCS)
+INIT_FILES = $(COMMON_OBS)
 init.c: $(INIT_FILES)
 	@$(ECHO_INIT_C) echo "Making init.c"
 	@rm -f init.c-tmp init.l-tmp
@@ -1868,16 +1864,10 @@ init.c: $(INIT_FILES)
 	    -e '/version.[co]$$/d' \
 	    -e '/^[a-z0-9A-Z_]*_[SU].[co]$$/d' \
 	    -e 's/-exp\.o$$/-exp.y/' \
-	    -e 's/\.[co]$$/.c/' \
+	    -e 's/\.o$$/.c/' \
 	    -e 's|^\([^  /][^     ]*\)|$(srcdir)/\1|g' | \
 	while read f; do \
 	    sed -n -e 's/^_initialize_\([a-z_0-9A-Z]*\).*/\1/p' $$f 2>/dev/null; \
-	done | \
-	while read f; do \
-	    case " $$fs " in \
-	        *" $$f "* ) ;; \
-	        * ) echo $$f ; fs="$$fs $$f";; \
-            esac; \
 	done >> init.l-tmp
 	@echo '/* Do not modify this file.  */' >>init.c-tmp
 	@echo '/* It is created automatically by the Makefile.  */'>>init.c-tmp
-- 
2.13.6

  parent reply	other threads:[~2018-07-02 20:18 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-02 20:19 [RFA 00/10] Minor Makefile cleanups Tom Tromey
2018-07-02 20:18 ` [RFA 04/10] Use a stamp file for init.c Tom Tromey
2018-07-02 20:18 ` [RFA 06/10] Remove lint support Tom Tromey
2018-07-02 20:18 ` [RFA 10/10] Don't mention XM_CDEPS or NAT_CLIBS Tom Tromey
2018-07-02 20:18 ` [RFA 07/10] Fix exec.c handling in Makefile Tom Tromey
2018-07-02 20:18 ` [RFA 01/10] Remove TSOBS from gdb/Makefile.in Tom Tromey
2018-07-02 21:26   ` Simon Marchi
2018-07-02 22:04     ` Tom Tromey
2018-07-02 20:18 ` Tom Tromey [this message]
2018-07-02 20:18 ` [RFA 08/10] Minimize yacc and lex output Tom Tromey
2018-07-02 20:18 ` [RFA 09/10] Remove ADD_FILES and ADD_DEPS from Makefile.in Tom Tromey
2018-07-02 20:18 ` [RFA 05/10] Use a stamp file for version.c Tom Tromey
2018-07-02 20:18 ` [RFA 02/10] Remove some unused code from init.c build rule Tom Tromey
2018-07-02 21:47 ` [RFA 00/10] Minor Makefile cleanups 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=20180702201824.15005-4-tom@tromey.com \
    --to=tom@tromey.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).