From patchwork Tue Nov 21 22:10:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24428 Received: (qmail 43323 invoked by alias); 21 Nov 2017 22:10:56 -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 43287 invoked by uid 89); 21 Nov 2017 22:10:55 -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: gateway24.websitewelcome.com Received: from gateway24.websitewelcome.com (HELO gateway24.websitewelcome.com) (192.185.51.228) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Nov 2017 22:10:54 +0000 Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 3700C1BD56 for ; Tue, 21 Nov 2017 16:10:27 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HGkNeq755HEImHGkNesdh3; Tue, 21 Nov 2017 16:10:27 -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 1eHGkN-0048Hi-0M; Tue, 21 Nov 2017 16:10:27 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 06/13] Move unittests object files to unittests subdirectory Date: Tue, 21 Nov 2017 15:10:16 -0700 Message-Id: <20171121221023.23992-7-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: 1eHGkN-0048Hi-0M 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: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes Move the object files corresponding to unittests/*.c to the unittests subdirectory in the build tree. ChangeLog 2017-11-21 Tom Tromey * Makefile.in (SUBDIR_UNITTESTS_OBS): Redefine. (%.o): Remove unittests rule. (CONFIG_SRC_SUBDIR): Add unittests. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 20 ++------------------ 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 77821d356e..aef015d9cf 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -490,19 +490,7 @@ SUBDIR_UNITTESTS_SRCS = \ unittests/scoped_restore-selftests.c \ unittests/xml-utils-selftests.c -SUBDIR_UNITTESTS_OBS = \ - array-view-selftests.o \ - common-utils-selftests.o \ - environ-selftests.o \ - function-view-selftests.o \ - lookup_name_info-selftests.o \ - memory-map-selftests.o \ - memrange-selftests.o \ - offset-type-selftests.o \ - optional-selftests.o \ - ptid-selftests.o \ - scoped_restore-selftests.o \ - xml-utils-selftests.o +SUBDIR_UNITTESTS_OBS = $(patsubst %.c,%.o,$(SUBDIR_UNITTESTS_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 @@ -593,7 +581,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 +CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1906,10 +1894,6 @@ $(CONFIG_DEP_SUBDIR): $(COMPILE) $< $(POSTCOMPILE) -%.o: ${srcdir}/unittests/%.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