From 97a34db94284f42829e5e5c9c4fa65b216739bcb Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sun, 1 Jul 2018 17:34:51 -0600 Subject: [PATCH] Remove TSOBS from gdb/Makefile.in The TSOBS variable doesn't seem to serve a useful purpose in gdb/Makefile.in, so remove it. gdb/ChangeLog 2018-07-09 Tom Tromey * 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(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index eb65f914887..b0a56ab9da6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2018-07-09 Tom Tromey + + * Makefile.in (TSOBS): Remove. + (INIT_FILES): Update. + (LIBGDB_OBS): Update. + (COMMON_SFILES): Add inflow.c. + (SFILES): Remove inflow.c. + 2018-07-07 Jan Kratochvil * contrib/gdb-add-index.sh ($dwarf5): New, use it. 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) -- 2.30.2