Move compile object files to compile subdirectory

Move the object files corresponding to compile/*.c to the compile
subdirectory in the build tree.

ChangeLog
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/ChangeLog b/gdb/ChangeLog
index 4fbf4196d7a7b41ae26628f2eb0cc6826c0698b7..51d255cf103e3453eeb7350c7222e37f51b4ff6f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-11-27  Tom Tromey  <tom@tromey.com>
+
+       * Makefile.in (SUBDIR_GCC_COMPILE_OBS): Redefine.
+       (%.o): Remove compile rule.
+       (CONFIG_SRC_SUBDIR): Add compile.
+
 2017-11-27  Tom Tromey  <tom@tromey.com>
 
        * Makefile.in (SUBDIR_MI_OBS): Redefine.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index d9c292f73559945c2f1349935950617ca776f55d..626dc9158270f23cc2691cd87ae5770c23e33e57 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -327,15 +327,6 @@ SUBDIR_TUI_CFLAGS = -DTUI=1
 #
 # GCC Compile support sub-directory definitions
 #
-SUBDIR_GCC_COMPILE_OBS = \
-       compile.o \
-       compile-c-support.o \
-       compile-c-symbols.o \
-       compile-c-types.o \
-       compile-loc2c.o \
-       compile-object-load.o \
-       compile-object-run.o
-
 SUBDIR_GCC_COMPILE_SRCS = \
        compile/compile.c \
        compile/compile-c-support.c \
@@ -347,6 +338,8 @@ SUBDIR_GCC_COMPILE_SRCS = \
        compile/compile-object-run.c \
        compile/compile-object-run.h
 
+SUBDIR_GCC_COMPILE_OBS = $(patsubst %.c,%.o,$(filter %.c,$(SUBDIR_GCC_COMPILE_SRCS)))
+
 #
 # Guile sub directory definitons for guile support.
 #
@@ -622,7 +615,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
 CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
 HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
 
-CONFIG_SRC_SUBDIR = arch cli mi
+CONFIG_SRC_SUBDIR = arch cli mi compile
 CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
 
 # -I. for config files.
@@ -1917,10 +1910,6 @@ $(CONFIG_DEP_SUBDIR):
        $(COMPILE) $<
        $(POSTCOMPILE)
 
-%.o: $(srcdir)/compile/%.c
-       $(COMPILE) $<
-       $(POSTCOMPILE)
-
 %.o: $(srcdir)/gdbtk/generic/%.c
        $(COMPILE) $(all_gdbtk_cflags) $<
        $(POSTCOMPILE)