From patchwork Tue Nov 21 22:10:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24429 Received: (qmail 49865 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 49817 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=2516, Hx-languages-length:1881 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 3C65611B02 for ; Tue, 21 Nov 2017 16:10:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HGkMeAHtRRtUXHGkMeIrlg; Tue, 21 Nov 2017 16:10:26 -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 1eHGkM-0048Hi-1q; Tue, 21 Nov 2017 16:10:26 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 03/13] Move mi objects to mi subdirectory Date: Tue, 21 Nov 2017 15:10:13 -0700 Message-Id: <20171121221023.23992-4-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: 1eHGkM-0048Hi-1q 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: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes Move object files corresponding to mi/*.c to a subdirectory in the build tree. ChangeLog 2017-11-21 Tom Tromey * Makefile.in (SUBDIR_MI_OBS): Redefine. (%.o): Remove mi rule. (CONFIG_SRC_SUBDIR): Add mi. (COMMON_OBS): Use mi/mi-common.o --- gdb/ChangeLog | 7 +++++++ gdb/Makefile.in | 29 ++++------------------------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c65816be26..aade0bd995 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -251,25 +251,6 @@ SUBDIR_CLI_CFLAGS = # # MI sub directory definitons # -SUBDIR_MI_OBS = \ - mi-cmd-break.o \ - mi-cmd-catch.o \ - mi-cmd-disas.o \ - mi-cmd-env.o \ - mi-cmd-file.o \ - mi-cmd-info.o \ - mi-cmd-stack.o \ - mi-cmd-target.o \ - mi-cmd-var.o \ - mi-cmds.o \ - mi-console.o \ - mi-getopt.o \ - mi-interp.o \ - mi-main.o \ - mi-out.o \ - mi-parse.o \ - mi-symbol-cmds.o - SUBDIR_MI_SRCS = \ mi/mi-cmd-break.c \ mi/mi-cmd-catch.c \ @@ -289,6 +270,8 @@ SUBDIR_MI_SRCS = \ mi/mi-parse.c \ mi/mi-symbol-cmds.c +SUBDIR_MI_OBS = $(patsubst %.c,%.o,$(SUBDIR_MI_SRCS)) + SUBDIR_MI_DEPS = SUBDIR_MI_LDFLAGS = SUBDIR_MI_CFLAGS = @@ -634,7 +617,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ -CONFIG_SRC_SUBDIR = arch cli +CONFIG_SRC_SUBDIR = arch cli mi CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1772,7 +1755,7 @@ COMMON_OBS = $(DEPFILES) $(CONFIG_OBS) $(YYOBJ) \ memattr.o \ memory-map.o \ memrange.o \ - mi-common.o \ + mi/mi-common.o \ minidebug.o \ minsyms.o \ mipsread.o \ @@ -1939,10 +1922,6 @@ $(CONFIG_DEP_SUBDIR): $(COMPILE) $< $(POSTCOMPILE) -%.o: $(srcdir)/mi/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: ${srcdir}/nat/%.c $(COMPILE) $< $(POSTCOMPILE)