This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 07/13] Move guile object files to guile subdirectory
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Tue, 21 Nov 2017 15:10:17 -0700
- Subject: [RFA 07/13] Move guile object files to guile subdirectory
- Authentication-results: sourceware.org; auth=none
- References: <20171121221023.23992-1-tom@tromey.com>
Move the object files corresponding to guile/*.c to the guile
subdirectory in the build tree.
ChangeLog
2017-11-21 Tom Tromey <tom@tromey.com>
* 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)
--
2.13.6