From patchwork Tue Nov 21 22:10:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 24431 Received: (qmail 49960 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 49826 invoked by uid 89); 21 Nov 2017 22:12:28 -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 cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 884E912339 for ; Tue, 21 Nov 2017 16:10:27 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id HGkNeetweDL8rHGkNeQrjl; 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-BC; Tue, 21 Nov 2017 16:10:27 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 07/13] Move guile object files to guile subdirectory Date: Tue, 21 Nov 2017 15:10:17 -0700 Message-Id: <20171121221023.23992-8-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-BC 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: 8 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes Move the object files corresponding to guile/*.c to the guile subdirectory in the build tree. ChangeLog 2017-11-21 Tom Tromey * configure: Rebuild. * configure.ac (CONFIG_OBS): Refer to guile/guile.o. * Makefile.in (SUBDIR_GUILE_OBS): Redefine. (CONFIG_SRC_SUBDIR): Add guile. (%.o): Remove guile rule. --- gdb/ChangeLog | 8 ++++++++ gdb/Makefile.in | 35 +++-------------------------------- gdb/configure | 2 +- gdb/configure.ac | 2 +- 4 files changed, 13 insertions(+), 34 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index aef015d9cf..aab3a38588 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -323,33 +323,6 @@ SUBDIR_GCC_COMPILE_OBS = $(patsubst %.c,%.o,$(filter %.c,$(SUBDIR_GCC_COMPILE_SR # # Guile sub directory definitons for guile support. # -SUBDIR_GUILE_OBS = \ - guile.o \ - scm-arch.o \ - scm-auto-load.o \ - scm-block.o \ - scm-breakpoint.o \ - scm-cmd.o \ - scm-disasm.o \ - scm-exception.o \ - scm-frame.o \ - scm-gsmob.o \ - scm-iterator.o \ - scm-lazy-string.o \ - scm-math.o \ - scm-objfile.o \ - scm-param.o \ - scm-ports.o \ - scm-pretty-print.o \ - scm-progspace.o \ - scm-safe-call.o \ - scm-string.o \ - scm-symbol.o \ - scm-symtab.o \ - scm-type.o \ - scm-utils.o \ - scm-value.o - SUBDIR_GUILE_SRCS = \ guile/guile.c \ guile/scm-arch.c \ @@ -377,6 +350,8 @@ SUBDIR_GUILE_SRCS = \ guile/scm-utils.c \ guile/scm-value.c +SUBDIR_GUILE_OBS = $(patsubst %.c,%.o,$(SUBDIR_GUILE_SRCS)) + SUBDIR_GUILE_DEPS = SUBDIR_GUILE_LDFLAGS = SUBDIR_GUILE_CFLAGS = @@ -581,7 +556,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 +CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) # -I. for config files. @@ -1878,10 +1853,6 @@ $(CONFIG_DEP_SUBDIR): $(COMPILE) $(all_gdbtk_cflags) $< $(POSTCOMPILE) -%.o: $(srcdir)/guile/%.c - $(COMPILE) $< - $(POSTCOMPILE) - %.o: ${srcdir}/nat/%.c $(COMPILE) $< $(POSTCOMPILE) diff --git a/gdb/configure b/gdb/configure index e30a68c243..e5a5b7c34f 100755 --- a/gdb/configure +++ b/gdb/configure @@ -10780,7 +10780,7 @@ done else # Even if Guile support is not compiled in, we need to have these files # included. - CONFIG_OBS="$CONFIG_OBS guile.o" + CONFIG_OBS="$CONFIG_OBS guile/guile.o" CONFIG_SRCS="$CONFIG_SRCS guile/guile.c" fi diff --git a/gdb/configure.ac b/gdb/configure.ac index 92f04316f9..b9d456bc7c 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1205,7 +1205,7 @@ if test "${have_libguile}" != no; then else # Even if Guile support is not compiled in, we need to have these files # included. - CONFIG_OBS="$CONFIG_OBS guile.o" + CONFIG_OBS="$CONFIG_OBS guile/guile.o" CONFIG_SRCS="$CONFIG_SRCS guile/guile.c" fi AC_SUBST(GUILE_CPPFLAGS)