From patchwork Tue Nov 21 22:10:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24426 Received: (qmail 42006 invoked by alias); 21 Nov 2017 22:10:45 -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 41836 invoked by uid 89); 21 Nov 2017 22:10:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 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=1931, 10, 193110 X-HELO: gateway33.websitewelcome.com Received: from gateway33.websitewelcome.com (HELO gateway33.websitewelcome.com) (192.185.146.80) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 21 Nov 2017 22:10:42 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 8488914CBD17 for ; Tue, 21 Nov 2017 16:10:25 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HGkLewOrNrWstHGkLecRMV; Tue, 21 Nov 2017 16:10:25 -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 1eHGkL-0048Hi-Lx; Tue, 21 Nov 2017 16:10:25 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 02/13] Move cli object files to cli subdirectory Date: Tue, 21 Nov 2017 15:10:12 -0700 Message-Id: <20171121221023.23992-3-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: 1eHGkL-0048Hi-Lx 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: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes Following the "arch" move, this moves the object files corresponding to the cli/*.c source files to the "cli" build directory. ChangeLog 2017-11-21 Tom Tromey * Makefile.in (SUBDIR_CLI_OBS): Redefine. (%.o): Remove cli rule. (CONFIG_SRC_SUBDIR): Add cli. --- gdb/ChangeLog | 6 ++++++ gdb/Makefile.in | 18 +++--------------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 31bf8db30f..c65816be26 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -232,16 +232,6 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@ # # CLI sub directory definitons # -SUBDIR_CLI_OBS = \ - cli-cmds.o \ - cli-decode.o \ - cli-dump.o \ - cli-interp.o \ - cli-logging.o \ - cli-script.o \ - cli-setshow.o \ - cli-utils.o - SUBDIR_CLI_SRCS = \ cli/cli-cmds.c \ cli/cli-decode.c \ @@ -252,6 +242,8 @@ SUBDIR_CLI_SRCS = \ cli/cli-setshow.c \ cli/cli-utils.c +SUBDIR_CLI_OBS = $(patsubst %.c,%.o,$(SUBDIR_CLI_SRCS)) + SUBDIR_CLI_DEPS = SUBDIR_CLI_LDFLAGS = SUBDIR_CLI_CFLAGS = @@ -642,7 +634,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ -CONFIG_SRC_SUBDIR = arch +CONFIG_SRC_SUBDIR = arch cli CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1931,10 +1923,6 @@ $(CONFIG_DEP_SUBDIR): $(SHELL) $(srcdir)/../mkinstalldirs $@ # Rules for compiling .c files in the various source subdirectories. -%.o: $(srcdir)/cli/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: ${srcdir}/common/%.c $(COMPILE) $< $(POSTCOMPILE)