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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 51d255cf103e3453eeb7350c7222e37f51b4ff6f..1b3ae40ddd489e05e4d6a9551065b9bb2a23f7ee 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 626dc9158270f23cc2691cd87ae5770c23e33e57..9b803ea3dc9a27bd9ee1169a5467ec381007ca38 100644 (file)
--- 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)