From 31278b5193ea6025c09110aef2d67d81a952ebcc Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 2 Jul 2018 07:32:10 -0600 Subject: [PATCH] Remove ADD_FILES and ADD_DEPS from Makefile.in Nothing defines XM_ADD_FILES, TM_ADD_FILES, or NAT_ADD_FILES any more, so consequently ADD_FILES and ADD_DEPS are no longer needed. So, this removes them. gdb/ChangeLog 2018-07-09 Tom Tromey * Makefile.in (ADD_FILES, ADD_DEPS): Remove. (LIBGDB_OBS, clean mostlyclean): Update. (gdb$(EXEEXT), insight$(EXEEXT)): Update. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 12 ++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d0902c7..eee6b5b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2018-07-09 Tom Tromey + * Makefile.in (ADD_FILES, ADD_DEPS): Remove. + (LIBGDB_OBS, clean mostlyclean): Update. + (gdb$(EXEEXT), insight$(EXEEXT)): Update. + +2018-07-09 Tom Tromey + * Makefile.in (%.c: %.y): Use ECHO_YACC. (%.c: %.l): Use ECHO_LEX. Just fail if flex not available. * silent-rules.mk (ECHO_YACC, ECHO_LEX): New variables. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 36d2c44..a140fc2 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -603,9 +603,6 @@ CLIBS = $(SIM) $(READLINE) $(OPCODES) $(BFD) $(ZLIB) $(INTL) $(LIBIBERTY) $(LIBD CDEPS = $(XM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \ $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS) $(LIBGNU) -ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) -ADD_DEPS = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES) - DIST = gdb RUNTEST = runtest @@ -1882,14 +1879,14 @@ stamp-init: $(INIT_FILES) # against that. # # init.o is very important. It pulls in the rest of GDB. -LIBGDB_OBS = $(COMMON_OBS) $(ADD_FILES) init.o +LIBGDB_OBS = $(COMMON_OBS) init.o libgdb.a: $(LIBGDB_OBS) -rm -f libgdb.a $(AR) q libgdb.a $(LIBGDB_OBS) $(RANLIB) libgdb.a # Removing the old gdb first works better if it is running, at least on SunOS. -gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(ADD_DEPS) $(CDEPS) $(TDEPLIBS) +gdb$(EXEEXT): gdb.o $(LIBGDB_OBS) $(CDEPS) $(TDEPLIBS) $(SILENCE) rm -f gdb$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ -o gdb$(EXEEXT) gdb.o $(LIBGDB_OBS) \ @@ -1940,7 +1937,7 @@ tags: TAGS clean mostlyclean: $(CONFIG_CLEAN) @$(MAKE) $(FLAGS_TO_PASS) DO=clean "DODIRS=$(CLEANDIRS)" subdir_do - rm -f *.o *.a $(ADD_FILES) *~ init.c-tmp init.l-tmp version.c-tmp + rm -f *.o *.a *~ init.c-tmp init.l-tmp version.c-tmp rm -f init.c stamp-init version.c stamp-version rm -f gdb$(EXEEXT) core make.log rm -f gdb[0-9]$(EXEEXT) @@ -2572,8 +2569,7 @@ clean-gdbtk: rm -f insight$(EXEEXT) # Removing the old gdb first works better if it is running, at least on SunOS. -insight$(EXEEXT): gdbtk-main.o libgdb.a $(ADD_DEPS) \ - $(CDEPS) $(TDEPLIBS) +insight$(EXEEXT): gdbtk-main.o libgdb.a $(CDEPS) $(TDEPLIBS) rm -f insight$(EXEEXT) $(ECHO_CXXLD) $(CC_LD) $(INTERNAL_LDFLAGS) $(WIN32LDAPP) \ -o insight$(EXEEXT) gdbtk-main.o libgdb.a \ -- 2.7.4