diff options
| author | Tom Tromey <tom@tromey.com> | 2017-11-21 12:22:11 -0700 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2017-11-27 16:53:22 -0700 |
| commit | f06afa533665d88c651617de528b9640eb4e8611 (patch) | |
| tree | 3ff6f02aef85d4d4f1691e1db6a048b2d67229d9 /gdb | |
| parent | b22c88c2ca013cc25d7a8fcbc748122bb1a349bb (diff) | |
| download | gdb-f06afa533665d88c651617de528b9640eb4e8611.zip gdb-f06afa533665d88c651617de528b9640eb4e8611.tar.gz gdb-f06afa533665d88c651617de528b9640eb4e8611.tar.bz2 | |
Move cli object files to cli subdirectory
Following the "arch" move, this moves the object files corresponding
to the cli/*.c source files to the "cli" build directory.
ChangeLog
2017-11-27 Tom Tromey <tom@tromey.com>
* Makefile.in (SUBDIR_CLI_OBS): Redefine.
(%.o): Remove cli rule.
(CONFIG_SRC_SUBDIR): Add cli.
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/Makefile.in | 18 |
2 files changed, 9 insertions, 15 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e3c5063..c732c2d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2017-11-27 Tom Tromey <tom@tromey.com> + * Makefile.in (SUBDIR_CLI_OBS): Redefine. + (%.o): Remove cli rule. + (CONFIG_SRC_SUBDIR): Add cli. + +2017-11-27 Tom Tromey <tom@tromey.com> + * configure.ac (CONFIG_SRC_SUBDIR): Don't subst. * configure: Rebuild. * Makefile.in (CONFIG_SRC_SUBDIR): Redefine. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index bbe4287..b9e1e40 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -235,16 +235,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 \ @@ -255,6 +245,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 = @@ -647,7 +639,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. @@ -1938,10 +1930,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) |