[RFA,01/10] Remove TSOBS from gdb/Makefile.in

Message ID 20180702201824.15005-2-tom@tromey.com
State New, archived
Headers

Commit Message

Tom Tromey July 2, 2018, 8:18 p.m. UTC
  The TSOBS variable doesn't seem to serve a useful purpose in
gdb/Makefile.in, so remove it.

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

	* Makefile.in (TSOBS): Remove.
	(INIT_FILES): Update.
	(LIBGDB_OBS): Update.
	(COMMON_SFILES): Add inflow.c.
	(SFILES): Remove inflow.c.
---
 gdb/ChangeLog   | 8 ++++++++
 gdb/Makefile.in | 8 +++-----
 2 files changed, 11 insertions(+), 5 deletions(-)
  

Comments

Simon Marchi July 2, 2018, 9:25 p.m. UTC | #1
On 2018-07-02 04:18 PM, Tom Tromey wrote:
> The TSOBS variable doesn't seem to serve a useful purpose in
> gdb/Makefile.in, so remove it.

Do you have a clue why inflow.c was treated specially?  If there's
no real reason, then this patch LGTM.

Simon
  
Tom Tromey July 2, 2018, 10:03 p.m. UTC | #2
>>>>> "Simon" == Simon Marchi <simark@simark.ca> writes:

Simon> On 2018-07-02 04:18 PM, Tom Tromey wrote:
>> The TSOBS variable doesn't seem to serve a useful purpose in
>> gdb/Makefile.in, so remove it.

Simon> Do you have a clue why inflow.c was treated specially?  If there's
Simon> no real reason, then this patch LGTM.

I have no idea, and git annotate just says that this dates back to the
creation of the sourceware repository.

Tom
  

Patch

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 13627e07e0a..423b681c905 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -1042,6 +1042,7 @@  COMMON_SFILES = \
 	infcall.c \
 	infcmd.c \
 	inferior.c \
+	inflow.c \
 	infrun.c \
 	inline-frame.c \
 	interps.c \
@@ -1151,7 +1152,6 @@  SFILES = \
 	f-exp.y \
 	gdb.c \
 	go-exp.y \
-	inflow.c \
 	m2-exp.y \
 	p-exp.y \
 	proc-service.list \
@@ -1566,8 +1566,6 @@  COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
 	$(SUBDIR_TARGET_OBS) \
 	$(SUBDIR_GCC_COMPILE_OBS)
 
-TSOBS = inflow.o
-
 SUBDIRS = doc @subdirs@ data-directory $(GNULIB_BUILDDIR)
 CLEANDIRS = $(SUBDIRS)
 
@@ -1854,7 +1852,7 @@  test-cp-name-parser$(EXEEXT): test-cp-name-parser.o $(LIBIBERTY)
 # 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) $(TSOBS) $(CONFIG_SRCS) $(SUBDIR_GCC_COMPILE_SRCS)
+INIT_FILES = $(COMMON_OBS) $(CONFIG_SRCS) $(SUBDIR_GCC_COMPILE_SRCS)
 init.c: $(INIT_FILES)
 	@$(ECHO_INIT_C) echo "Making init.c"
 	@rm -f init.c-tmp init.l-tmp
@@ -1908,7 +1906,7 @@  init.c: $(INIT_FILES)
 # against that.
 #
 # init.o is very important.  It pulls in the rest of GDB.
-LIBGDB_OBS = $(COMMON_OBS) $(TSOBS) $(ADD_FILES) init.o
+LIBGDB_OBS = $(COMMON_OBS) $(ADD_FILES) init.o
 libgdb.a: $(LIBGDB_OBS)
 	-rm -f libgdb.a
 	$(AR) q libgdb.a $(LIBGDB_OBS)