GNU Binutils with patches for OS216
Revision | bd810fff78006d38e3c287b7bd241319f4d763be (tree) |
---|---|
Zeit | 2017-11-28 08:53:24 |
Autor | Tom Tromey <tom@trom...> |
Commiter | Tom Tromey |
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.
@@ -1,5 +1,13 @@ | ||
1 | 1 | 2017-11-27 Tom Tromey <tom@tromey.com> |
2 | 2 | |
3 | + * configure: Rebuild. | |
4 | + * configure.ac (CONFIG_OBS): Refer to guile/guile.o. | |
5 | + * Makefile.in (SUBDIR_GUILE_OBS): Redefine. | |
6 | + (CONFIG_SRC_SUBDIR): Add guile. | |
7 | + (%.o): Remove guile rule. | |
8 | + | |
9 | +2017-11-27 Tom Tromey <tom@tromey.com> | |
10 | + | |
3 | 11 | * Makefile.in (SUBDIR_UNITTESTS_OBS): Redefine. |
4 | 12 | (%.o): Remove unittests rule. |
5 | 13 | (CONFIG_SRC_SUBDIR): Add unittests. |
@@ -326,33 +326,6 @@ SUBDIR_GCC_COMPILE_OBS = $(patsubst %.c,%.o,$(filter %.c,$(SUBDIR_GCC_COMPILE_SR | ||
326 | 326 | # |
327 | 327 | # Guile sub directory definitons for guile support. |
328 | 328 | # |
329 | -SUBDIR_GUILE_OBS = \ | |
330 | - guile.o \ | |
331 | - scm-arch.o \ | |
332 | - scm-auto-load.o \ | |
333 | - scm-block.o \ | |
334 | - scm-breakpoint.o \ | |
335 | - scm-cmd.o \ | |
336 | - scm-disasm.o \ | |
337 | - scm-exception.o \ | |
338 | - scm-frame.o \ | |
339 | - scm-gsmob.o \ | |
340 | - scm-iterator.o \ | |
341 | - scm-lazy-string.o \ | |
342 | - scm-math.o \ | |
343 | - scm-objfile.o \ | |
344 | - scm-param.o \ | |
345 | - scm-ports.o \ | |
346 | - scm-pretty-print.o \ | |
347 | - scm-progspace.o \ | |
348 | - scm-safe-call.o \ | |
349 | - scm-string.o \ | |
350 | - scm-symbol.o \ | |
351 | - scm-symtab.o \ | |
352 | - scm-type.o \ | |
353 | - scm-utils.o \ | |
354 | - scm-value.o | |
355 | - | |
356 | 329 | SUBDIR_GUILE_SRCS = \ |
357 | 330 | guile/guile.c \ |
358 | 331 | guile/scm-arch.c \ |
@@ -380,6 +353,8 @@ SUBDIR_GUILE_SRCS = \ | ||
380 | 353 | guile/scm-utils.c \ |
381 | 354 | guile/scm-value.c |
382 | 355 | |
356 | +SUBDIR_GUILE_OBS = $(patsubst %.c,%.o,$(SUBDIR_GUILE_SRCS)) | |
357 | + | |
383 | 358 | SUBDIR_GUILE_DEPS = |
384 | 359 | SUBDIR_GUILE_LDFLAGS = |
385 | 360 | SUBDIR_GUILE_CFLAGS = |
@@ -585,7 +560,7 @@ CONFIG_INSTALL = @CONFIG_INSTALL@ | ||
585 | 560 | CONFIG_UNINSTALL = @CONFIG_UNINSTALL@ |
586 | 561 | HAVE_NATIVE_GCORE_TARGET = @HAVE_NATIVE_GCORE_TARGET@ |
587 | 562 | |
588 | -CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests | |
563 | +CONFIG_SRC_SUBDIR = arch cli mi compile tui unittests guile | |
589 | 564 | CONFIG_DEP_SUBDIR = $(addsuffix /$(DEPDIR),$(CONFIG_SRC_SUBDIR)) |
590 | 565 | |
591 | 566 | # -I. for config files. |
@@ -1884,10 +1859,6 @@ $(CONFIG_DEP_SUBDIR): | ||
1884 | 1859 | $(COMPILE) $(all_gdbtk_cflags) $< |
1885 | 1860 | $(POSTCOMPILE) |
1886 | 1861 | |
1887 | -%.o: $(srcdir)/guile/%.c | |
1888 | - $(COMPILE) $< | |
1889 | - $(POSTCOMPILE) | |
1890 | - | |
1891 | 1862 | %.o: ${srcdir}/nat/%.c |
1892 | 1863 | $(COMPILE) $< |
1893 | 1864 | $(POSTCOMPILE) |
@@ -11279,7 +11279,7 @@ done | ||
11279 | 11279 | else |
11280 | 11280 | # Even if Guile support is not compiled in, we need to have these files |
11281 | 11281 | # included. |
11282 | - CONFIG_OBS="$CONFIG_OBS guile.o" | |
11282 | + CONFIG_OBS="$CONFIG_OBS guile/guile.o" | |
11283 | 11283 | CONFIG_SRCS="$CONFIG_SRCS guile/guile.c" |
11284 | 11284 | fi |
11285 | 11285 |
@@ -1227,7 +1227,7 @@ if test "${have_libguile}" != no; then | ||
1227 | 1227 | else |
1228 | 1228 | # Even if Guile support is not compiled in, we need to have these files |
1229 | 1229 | # included. |
1230 | - CONFIG_OBS="$CONFIG_OBS guile.o" | |
1230 | + CONFIG_OBS="$CONFIG_OBS guile/guile.o" | |
1231 | 1231 | CONFIG_SRCS="$CONFIG_SRCS guile/guile.c" |
1232 | 1232 | fi |
1233 | 1233 | AC_SUBST(GUILE_CPPFLAGS) |