From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFA 12/13] Move target object files to target subdirectory
Date: Tue, 21 Nov 2017 22:12:00 -0000 [thread overview]
Message-ID: <20171121221023.23992-13-tom@tromey.com> (raw)
In-Reply-To: <20171121221023.23992-1-tom@tromey.com>
Move the object files corresponding to target/*.c to the target
subdirectory in the build tree.
ChangeLog
2017-11-21 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.
---
gdb/ChangeLog | 9 +++++++++
gdb/Makefile.in | 14 +++++++-------
2 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 69369cca8a..6442b11103 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -425,6 +425,10 @@ 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
# opcode library, typically ../opcodes, or they are in a header file
# in INCLUDE_DIR.
@@ -514,7 +518,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@
CONFIG_UNINSTALL = @CONFIG_UNINSTALL@
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))
# -I. for config files.
@@ -1147,7 +1151,7 @@ SFILES = \
common/vec.c \
common/xml-utils.c \
mi/mi-common.c \
- target/waitstatus.c \
+ $(SUBDIR_TARGET_SRCS) \
$(COMMON_SFILES) \
$(SUBDIR_GCC_COMPILE_SRCS)
@@ -1561,10 +1565,10 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \
signals-state-save-restore.o \
vec.o \
version.o \
- waitstatus.o \
xml-builtin.o \
xml-utils.o \
$(patsubst %.c,%.o,$(COMMON_SFILES)) \
+ $(SUBDIR_TARGET_OBS) \
$(SUBDIR_GCC_COMPILE_OBS)
TSOBS = inflow.o
@@ -1642,10 +1646,6 @@ python/%.o: INTERNAL_CFLAGS += $(PYTHON_CFLAGS)
$(COMPILE) $<
$(POSTCOMPILE)
-%.o: ${srcdir}/target/%.c
- $(COMPILE) $<
- $(POSTCOMPILE)
-
# Specify an explicit rule for gdb/common/agent.c, to avoid a clash with the
# object file generate by gdb/agent.c.
common-agent.o: $(srcdir)/common/agent.c
--
2.13.6
next prev parent reply other threads:[~2017-11-21 22:12 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 22:10 [RFA 00/13] Makefile simplifications and subdirification Tom Tromey
2017-11-21 22:10 ` [RFA 09/13] Define YYOBJ in terms of YYFILES Tom Tromey
2017-11-21 22:10 ` [RFA 13/13] Redefine REMOTE_OBS in terms of a list of sources Tom Tromey
2017-11-22 11:12 ` Pedro Alves
2017-11-23 4:01 ` Tom Tromey
2017-11-23 13:25 ` Pedro Alves
2017-11-21 22:10 ` [RFA 08/13] Move python object files to python subdirectory Tom Tromey
2017-11-21 22:10 ` [RFA 06/13] Move unittests object files to unittests subdirectory Tom Tromey
2017-11-21 22:10 ` [RFA 10/13] Simplify COMMON_OBS by using list of sources Tom Tromey
2017-11-22 11:06 ` Pedro Alves
2017-11-23 3:44 ` Tom Tromey
2017-11-21 22:10 ` [RFA 02/13] Move cli object files to cli subdirectory Tom Tromey
2017-11-21 22:10 ` [RFA 04/13] Move compile object files to compile subdirectory Tom Tromey
2017-11-21 22:10 ` [RFA 01/13] A simpler way to make the "arch" build directory Tom Tromey
2017-11-21 22:10 ` [RFA 11/13] Add missing files to COMMON_SFILES Tom Tromey
2017-11-21 22:10 ` [RFA 05/13] Move tui object files to tui subdirectory Tom Tromey
2017-11-21 22:12 ` [RFA 07/13] Move guile object files to guile subdirectory Tom Tromey
2017-11-21 22:12 ` Tom Tromey [this message]
2017-11-21 22:12 ` [RFA 03/13] Move mi objects to mi subdirectory Tom Tromey
2017-11-22 11:14 ` [RFA 00/13] Makefile simplifications and subdirification Pedro Alves
2017-11-27 23:57 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171121221023.23992-13-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).