Move target object files to target subdirectory

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

ChangeLog
2017-11-27  Tom Tromey  <tom@tromey.com>

	* Makefile.in (SUBDIR_TARGET_SRCS, SUBDIR_TARGET_OBS): New
	variables.
	(SFILES): Use SUBDIR_TARGET_SRCS.
	(COMMON_OBS): Use SUBDIR_TARGET_OBS.  Remove waitstatus.o.
	(CONFIG_SRC_SUBDIR): Add target.
	(%.o): Remove target rule.
This commit is contained in:
Tom Tromey 2017-11-21 14:29:59 -07:00
parent 4f04fba813
commit 66599a7dc0
2 changed files with 16 additions and 7 deletions

View File

@ -1,3 +1,12 @@
2017-11-27 Tom Tromey <tom@tromey.com>
* Makefile.in (SUBDIR_TARGET_SRCS, SUBDIR_TARGET_OBS): New
variables.
(SFILES): Use SUBDIR_TARGET_SRCS.
(COMMON_OBS): Use SUBDIR_TARGET_OBS. Remove waitstatus.o.
(CONFIG_SRC_SUBDIR): Add target.
(%.o): Remove target rule.
2017-11-27 Tom Tromey <tom@tromey.com> 2017-11-27 Tom Tromey <tom@tromey.com>
* Makefile.in (COMMON_OBS): Remove filename-seen-cache.o, * Makefile.in (COMMON_OBS): Remove filename-seen-cache.o,

View File

@ -429,6 +429,10 @@ SUBDIR_UNITTESTS_SRCS = \
SUBDIR_UNITTESTS_OBS = $(patsubst %.c,%.o,$(SUBDIR_UNITTESTS_SRCS)) SUBDIR_UNITTESTS_OBS = $(patsubst %.c,%.o,$(SUBDIR_UNITTESTS_SRCS))
SUBDIR_TARGET_SRCS = target/waitstatus.c
SUBDIR_TARGET_OBS = $(patsubst %.c,%.o,$(SUBDIR_TARGET_SRCS))
# Opcodes currently live in one of two places. Either they are in the # Opcodes currently live in one of two places. Either they are in the
# opcode library, typically ../opcodes, or they are in a header file # opcode library, typically ../opcodes, or they are in a header file
# in INCLUDE_DIR. # in INCLUDE_DIR.
@ -518,7 +522,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@
CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile python target
CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR))
# -I. for config files. # -I. for config files.
@ -1152,7 +1156,7 @@ SFILES = \
common/vec.c \ common/vec.c \
common/xml-utils.c \ common/xml-utils.c \
mi/mi-common.c \ mi/mi-common.c \
target/waitstatus.c \ $(SUBDIR_TARGET_SRCS) \
$(COMMON_SFILES) \ $(COMMON_SFILES) \
$(SUBDIR_GCC_COMPILE_SRCS) $(SUBDIR_GCC_COMPILE_SRCS)
@ -1567,10 +1571,10 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
signals-state-save-restore.o \ signals-state-save-restore.o \
vec.o \ vec.o \
version.o \ version.o \
waitstatus.o \
xml-builtin.o \ xml-builtin.o \
xml-utils.o \ xml-utils.o \
$(patsubst %.c,%.o,$(COMMON_SFILES)) \ $(patsubst %.c,%.o,$(COMMON_SFILES)) \
$(SUBDIR_TARGET_OBS) \
$(SUBDIR_GCC_COMPILE_OBS) $(SUBDIR_GCC_COMPILE_OBS)
TSOBS = inflow.o TSOBS = inflow.o
@ -1648,10 +1652,6 @@ python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS)
$(COMPILE) $< $(COMPILE) $<
$(POSTCOMPILE) $(POSTCOMPILE)
%.o: ${srcdir}/target/%.c
$(COMPILE) $<
$(POSTCOMPILE)
# Specify an explicit rule for gdb/common/agent.c, to avoid a clash with the # Specify an explicit rule for gdb/common/agent.c, to avoid a clash with the
# object file generate by gdb/agent.c. # object file generate by gdb/agent.c.
common-agent.o: $(srcdir)/common/agent.c common-agent.o: $(srcdir)/common/agent.c