diff options
| author | Tom Tromey <tom@tromey.com> | 2017-11-21 12:26:11 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-11-27 16:53:22 -0700 |
| commit | 6f3cdf9a3bfa2c0a22fa9dc40b45578e2ea7957d (patch) | |
| tree | 4df08f706bfd6ce7c2003f5196361c3f6b28892a | |
| parent | f06afa533665d88c651617de528b9640eb4e8611 (diff) | |
| download | binutils-gdb-6f3cdf9a3bfa2c0a22fa9dc40b45578e2ea7957d.tar.gz | |
Move mi objects to mi subdirectory
Move object files corresponding to mi/*.c to a subdirectory in the
build tree.
ChangeLog
2017-11-27 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
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/Makefile.in | 29 |
2 files changed, 11 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c732c2da6f7..4fbf4196d7a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2017-11-27 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 + +2017-11-27 Tom Tromey <tom@tromey.com> + * Makefile.in (SUBDIR_CLI_OBS): Redefine. (%.o): Remove cli rule. (CONFIG_SRC_SUBDIR): Add cli. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index b9e1e405964..d9c292f7355 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -254,25 +254,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 \ @@ -292,6 +273,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 = @@ -639,7 +622,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. @@ -1779,7 +1762,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 \ @@ -1946,10 +1929,6 @@ $(CONFIG_DEP_SUBDIR): $(COMPILE) $< $(POSTCOMPILE) -%.o: $(srcdir)/mi/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: ${srcdir}/nat/%.c $(COMPILE) $< $(POSTCOMPILE) |