GNU Binutils with patches for OS216
修訂 | f06afa533665d88c651617de528b9640eb4e8611 (tree) |
---|---|
時間 | 2017-11-28 08:53:22 |
作者 | Tom Tromey <tom@trom...> |
Commiter | Tom Tromey |
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.
@@ -1,5 +1,11 @@ | ||
1 | 1 | 2017-11-27 Tom Tromey <tom@tromey.com> |
2 | 2 | |
3 | + * Makefile.in (SUBDIR_CLI_OBS): Redefine. | |
4 | + (%.o): Remove cli rule. | |
5 | + (CONFIG_SRC_SUBDIR): Add cli. | |
6 | + | |
7 | +2017-11-27 Tom Tromey <tom@tromey.com> | |
8 | + | |
3 | 9 | * configure.ac (CONFIG_SRC_SUBDIR): Don't subst. |
4 | 10 | * configure: Rebuild. |
5 | 11 | * Makefile.in (CONFIG_SRC_SUBDIR): Redefine. |
@@ -235,16 +235,6 @@ GNULIB_H = $(GNULIB_BUILDDIR)/import/string.h @GNULIB_STDINT_H@ | ||
235 | 235 | # |
236 | 236 | # CLI sub directory definitons |
237 | 237 | # |
238 | -SUBDIR_CLI_OBS = \ | |
239 | - cli-cmds.o \ | |
240 | - cli-decode.o \ | |
241 | - cli-dump.o \ | |
242 | - cli-interp.o \ | |
243 | - cli-logging.o \ | |
244 | - cli-script.o \ | |
245 | - cli-setshow.o \ | |
246 | - cli-utils.o | |
247 | - | |
248 | 238 | SUBDIR_CLI_SRCS = \ |
249 | 239 | cli/cli-cmds.c \ |
250 | 240 | cli/cli-decode.c \ |
@@ -255,6 +245,8 @@ SUBDIR_CLI_SRCS = \ | ||
255 | 245 | cli/cli-setshow.c \ |
256 | 246 | cli/cli-utils.c |
257 | 247 | |
248 | +SUBDIR_CLI_OBS = $(patsubst %.c,%.o,$(SUBDIR_CLI_SRCS)) | |
249 | + | |
258 | 250 | SUBDIR_CLI_DEPS = |
259 | 251 | SUBDIR_CLI_LDFLAGS = |
260 | 252 | SUBDIR_CLI_CFLAGS = |
@@ -647,7 +639,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ | ||
647 | 639 | CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ |
648 | 640 | HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ |
649 | 641 | |
650 | -CONFIG_SRC_SUBDIR = arch | |
642 | +CONFIG_SRC_SUBDIR = arch cli | |
651 | 643 | CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) |
652 | 644 | |
653 | 645 | # -I. for config files. |
@@ -1938,10 +1930,6 @@ $(CONFIG_DEP_SUBDIR): | ||
1938 | 1930 | $(SHELL) $(srcdir)/../mkinstalldirs $@ |
1939 | 1931 | |
1940 | 1932 | # Rules for compiling .c files in the various source subdirectories. |
1941 | -%.o: $(srcdir)/cli/%.c | |
1942 | - $(COMPILE) $< | |
1943 | - $(POSTCOMPILE) | |
1944 | - | |
1945 | 1933 | %.o: ${srcdir}/common/%.c |
1946 | 1934 | $(COMPILE) $< |
1947 | 1935 | $(POSTCOMPILE) |