Simplify INIT_FILES

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.

gdb/ChangeLog
2018-07-09  Tom Tromey  <tom@tromey.com>

	* Makefile.in (INIT_FILES): Remove CONFIG_SRCS,
	SUBDIR_GCC_COMPILE_SRCS.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 24bc1f97314b5b8e37cc509f6dd5555667d3394a..93f972b36aa6f53369630142eaf8511ff0879163 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-09  Tom Tromey  <tom@tromey.com>
+
+       * Makefile.in (INIT_FILES): Remove CONFIG_SRCS,
+       SUBDIR_GCC_COMPILE_SRCS.
+
 2018-07-09  Tom Tromey  <tom@tromey.com>
 
        * Makefile.in (init.c): Remove some unused sed rules.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 180f16c7b8d21e0b34306239986ef3fb7120654f..b35ca2e7aefa06625bc8339ab62ce217867bd7da 100644 (file)
--- 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