From patchwork Tue Nov 21 22:10:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24430 Received: (qmail 49890 invoked by alias); 21 Nov 2017 22:12:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 49820 invoked by uid 89); 21 Nov 2017 22:12:27 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KB_WAM_FROM_NAME_SINGLEWORD, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy= X-HELO: gateway23.websitewelcome.com Received: from gateway23.websitewelcome.com (HELO gateway23.websitewelcome.com) (192.185.49.60) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Nov 2017 22:12:26 +0000 Received: from cm15.websitewelcome.com (cm15.websitewelcome.com [100.42.49.9]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 37BC71271A for ; Tue, 21 Nov 2017 16:10:29 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HGkPexowq5b6THGkPe9LZQ; Tue, 21 Nov 2017 16:10:29 -0600 Received: from 71-218-90-63.hlrn.qwest.net ([71.218.90.63]:35604 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89) (envelope-from ) id 1eHGkO-0048Hi-VN; Tue, 21 Nov 2017 16:10:29 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 12/13] Move target object files to target subdirectory Date: Tue, 21 Nov 2017 15:10:22 -0700 Message-Id: <20171121221023.23992-13-tom@tromey.com> In-Reply-To: <20171121221023.23992-1-tom@tromey.com> References: <20171121221023.23992-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1eHGkO-0048Hi-VN X-Source-Sender: 71-218-90-63.hlrn.qwest.net (bapiya.Home) [71.218.90.63]:35604 X-Source-Auth: tom+tromey.com X-Email-Count: 13 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes Move the object files corresponding to target/*.c to the target subdirectory in the build tree. ChangeLog 2017-11-21 Tom Tromey * 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