diff options
| author | Tom Tromey <tom@tromey.com> | 2017-11-21 13:05:26 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-11-27 16:53:24 -0700 |
| commit | bd810fff78006d38e3c287b7bd241319f4d763be (patch) | |
| tree | 92f01250119292d3915ac8fd91f8e6b8c7d9357c | |
| parent | 75787ac19cdf7e8aa9b4c28f9421837ba479cf51 (diff) | |
| download | gdb-bd810fff78006d38e3c287b7bd241319f4d763be.zip gdb-bd810fff78006d38e3c287b7bd241319f4d763be.tar.gz gdb-bd810fff78006d38e3c287b7bd241319f4d763be.tar.bz2 | |
Move guile object files to guile subdirectory
Move the object files corresponding to guile/*.c to the guile
subdirectory in the build tree.
ChangeLog
2017-11-27 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.
| -rw-r--r-- | gdb/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/Makefile.in | 35 | ||||
| -rwxr-xr-x | gdb/configure | 2 | ||||
| -rw-r--r-- | gdb/configure.ac | 2 |
4 files changed, 13 insertions, 34 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 76eaa5f..c91a45b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2017-11-27 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. + +2017-11-27 Tom Tromey <tom@tromey.com> + * Makefile.in (SUBDIR_UNITTESTS_OBS): Redefine. (%.o): Remove unittests rule. (CONFIG_SRC_SUBDIR): Add unittests. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index c70c42c..bcb34cc 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -326,33 +326,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 \ @@ -380,6 +353,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 = @@ -585,7 +560,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. @@ -1884,10 +1859,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 7655b45..f3e0ce6 100755 --- a/gdb/configure +++ b/gdb/configure @@ -11279,7 +11279,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 5ded21a..00a36be 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1227,7 +1227,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) |