[RFA,03/13] Move mi objects to mi subdirectory
Commit Message
Move object files corresponding to mi/*.c to a subdirectory in the
build tree.
ChangeLog
2017-11-21 Tom Tromey <tom@tromey.com>
* Makefile.in (SUBDIR_MI_OBS): Redefine.
(%.o): Remove mi rule.
(CONFIG_SRC_SUBDIR): Add mi.
(COMMON_OBS): Use mi/mi-common.o
---
gdb/ChangeLog | 7 +++++++
gdb/Makefile.in | 29 ++++-------------------------
2 files changed, 11 insertions(+), 25 deletions(-)
@@ -251,25 +251,6 @@ SUBDIR_CLI_CFLAGS =
#
# MI sub directory definitons
#
-SUBDIR_MI_OBS = \
- mi-cmd-break.o \
- mi-cmd-catch.o \
- mi-cmd-disas.o \
- mi-cmd-env.o \
- mi-cmd-file.o \
- mi-cmd-info.o \
- mi-cmd-stack.o \
- mi-cmd-target.o \
- mi-cmd-var.o \
- mi-cmds.o \
- mi-console.o \
- mi-getopt.o \
- mi-interp.o \
- mi-main.o \
- mi-out.o \
- mi-parse.o \
- mi-symbol-cmds.o
-
SUBDIR_MI_SRCS = \
mi/mi-cmd-break.c \
mi/mi-cmd-catch.c \
@@ -289,6 +270,8 @@ SUBDIR_MI_SRCS = \
mi/mi-parse.c \
mi/mi-symbol-cmds.c
+SUBDIR_MI_OBS = $(patsubst %.c,%.o,$(SUBDIR_MI_SRCS))
+
SUBDIR_MI_DEPS =
SUBDIR_MI_LDFLAGS =
SUBDIR_MI_CFLAGS =
@@ -634,7 +617,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
-CONFIG_SRC_SUBDIR = arch cli
+CONFIG_SRC_SUBDIR = arch cli mi
CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
# -I. for config files.
@@ -1772,7 +1755,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
memattr.o \
memory-map.o \
memrange.o \
- mi-common.o \
+ mi/mi-common.o \
minidebug.o \
minsyms.o \
mipsread.o \
@@ -1939,10 +1922,6 @@ $(CONFIG_DEP_SUBDIR):
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: $(srcdir)/mi/%.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
%.o: ${srcdir}/nat/%.c
$(COMPILE) $<
$(POSTCOMPILE)