aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-11-21 12:42:33 -0700
committerTom Tromey <tom@tromey.com>2017-11-27 16:53:23 -0700
commit5c8a943144f6972dc0854f2d01d7cb365b06fceb (patch)
tree916fe91a4e50a08461c319615034b065fce1c5ae
parenta26aa30cc535c9bde457cdd00daf0c82f25da0af (diff)
downloadgdb-5c8a943144f6972dc0854f2d01d7cb365b06fceb.zip
gdb-5c8a943144f6972dc0854f2d01d7cb365b06fceb.tar.gz
gdb-5c8a943144f6972dc0854f2d01d7cb365b06fceb.tar.bz2
Move tui object files to tui subdirectory
Move the object files corresponding to tui/*.c to the tui subdirectory in the build tree. ChangeLog 2017-11-27 Tom Tromey <tom@tromey.com> * Makefile.in (SUBDIR_TUI_OBS): Redefine. (CONFIG_SRC_SUBDIR): Add tui. (%.o): Remove tui rule.
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/Makefile.in27
2 files changed, 9 insertions, 24 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51d255c..1b3ae40 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2017-11-27 Tom Tromey <tom@tromey.com>
+ * Makefile.in (SUBDIR_TUI_OBS): Redefine.
+ (CONFIG_SRC_SUBDIR): Add tui.
+ (%.o): Remove tui rule.
+
+2017-11-27 Tom Tromey <tom@tromey.com>
+
* Makefile.in (SUBDIR_GCC_COMPILE_OBS): Redefine.
(%.o): Remove compile rule.
(CONFIG_SRC_SUBDIR): Add compile.
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 626dc91..9b803ea 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -282,25 +282,6 @@ SUBDIR_MI_CFLAGS =
#
# TUI sub directory definitions
#
-SUBDIR_TUI_OBS = \
- tui.o \
- tui-command.o \
- tui-data.o \
- tui-disasm.o \
- tui-file.o \
- tui-hooks.o \
- tui-interp.o \
- tui-io.o \
- tui-layout.o \
- tui-out.o \
- tui-regs.o \
- tui-source.o \
- tui-stack.o \
- tui-win.o \
- tui-windata.o \
- tui-wingeneral.o \
- tui-winsource.o
-
SUBDIR_TUI_SRCS = \
tui/tui.c \
tui/tui-command.c \
@@ -320,6 +301,8 @@ SUBDIR_TUI_SRCS = \
tui/tui-wingeneral.c \
tui/tui-winsource.c
+SUBDIR_TUI_OBS = $(patsubst %.c,%.o,$(SUBDIR_TUI_SRCS))
+
SUBDIR_TUI_DEPS =
SUBDIR_TUI_LDFLAGS =
SUBDIR_TUI_CFLAGS = -DTUI=1
@@ -615,7 +598,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
-CONFIG_SRC_SUBDIR = arch cli mi compile
+CONFIG_SRC_SUBDIR = arch cli mi compile tui
CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
# -I. for config files.
@@ -1930,10 +1913,6 @@ $(CONFIG_DEP_SUBDIR):
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: $(srcdir)/tui/%.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
%.o: ${srcdir}/unittests/%.c
$(COMPILE) $<
$(POSTCOMPILE)