From 6f3cdf9a3bfa2c0a22fa9dc40b45578e2ea7957d Mon Sep 17 00:00:00 2001
From: Tom Tromey <tom@tromey.com>
Date: Tue, 21 Nov 2017 12:26:11 -0700
Subject: [PATCH] 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
---
 gdb/ChangeLog   |  7 +++++++
 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,3 +1,10 @@
+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.
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)
-- 
2.30.2