From patchwork Tue Nov 21 22:10:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24419 Received: (qmail 39986 invoked by alias); 21 Nov 2017 22:10:30 -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 39940 invoked by uid 89); 21 Nov 2017 22:10:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.3 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=HX-HELO:sk:gateway, H*r:cmsmtp, H*RU:cmsmtp, Hx-spam-relays-external:cmsmtp X-HELO: gateway22.websitewelcome.com Received: from gateway22.websitewelcome.com (HELO gateway22.websitewelcome.com) (192.185.46.187) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Nov 2017 22:10:28 +0000 Received: from cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id DCFF29C3A for ; Tue, 21 Nov 2017 16:10:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HGkMeAHu1RtUXHGkMeIrmF; 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-MS; Tue, 21 Nov 2017 16:10:26 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 05/13] Move tui object files to tui subdirectory Date: Tue, 21 Nov 2017 15:10:15 -0700 Message-Id: <20171121221023.23992-6-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-MS 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: 6 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes Move the object files corresponding to tui/*.c to the tui subdirectory in the build tree. ChangeLog 2017-11-21 Tom Tromey * Makefile.in (SUBDIR_TUI_OBS): Redefine. (CONFIG_SRC_SUBDIR): Add tui. (%.o): Remove tui rule. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 27 +++------------------------ 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f8b8cfdd39..77821d356e 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -279,25 +279,6 @@ SUBDIR_MI_CFLAGS = # # TUI sub directory definitions # -SUBDIR_TUI_OBS = \ - tui.o \ - tui-command.o \ - tui-data.o \ - tui-disasm.o \ - tui-file.o \ - tui-hooks.o \ - tui-interp.o \ - tui-io.o \ - tui-layout.o \ - tui-out.o \ - tui-regs.o \ - tui-source.o \ - tui-stack.o \ - tui-win.o \ - tui-windata.o \ - tui-wingeneral.o \ - tui-winsource.o - SUBDIR_TUI_SRCS = \ tui/tui.c \ tui/tui-command.c \ @@ -317,6 +298,8 @@ SUBDIR_TUI_SRCS = \ tui/tui-wingeneral.c \ tui/tui-winsource.c +SUBDIR_TUI_OBS = $(patsubst %.c,%.o,$(SUBDIR_TUI_SRCS)) + SUBDIR_TUI_DEPS = SUBDIR_TUI_LDFLAGS = SUBDIR_TUI_CFLAGS = -DTUI=1 @@ -610,7 +593,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ -CONFIG_SRC_SUBDIR = arch cli mi compile +CONFIG_SRC_SUBDIR = arch cli mi compile tui CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1923,10 +1906,6 @@ $(CONFIG_DEP_SUBDIR): $(COMPILE) $< $(POSTCOMPILE) -%.o: $(srcdir)/tui/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: ${srcdir}/unittests/%.c $(COMPILE) $< $(POSTCOMPILE)