From: Iain Buclaw Date: Fri, 12 Apr 2019 21:50:42 +0000 (+0000) Subject: libphobos: Add subdir-objects to configure script. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d7e418a1d8664c7b1516e16fae65efe4802cd050;p=gcc.git libphobos: Add subdir-objects to configure script. Running autoreconf regenerates all files cleanly with autoconf2.69. libphobos/ChangeLog: 2019-04-12 Iain Buclaw * configure.ac (AM_INIT_AUTOMAKE): Add subdir-objects. * configure: Regenerate. * libdruntime/Makefile.in: Regenerate. From-SVN: r270330 --- diff --git a/libphobos/ChangeLog b/libphobos/ChangeLog index e79b69726c0..3220b1ec35f 100644 --- a/libphobos/ChangeLog +++ b/libphobos/ChangeLog @@ -1,3 +1,9 @@ +2019-04-12 Iain Buclaw + + * configure.ac (AM_INIT_AUTOMAKE): Add subdir-objects. + * configure: Regenerate. + * libdruntime/Makefile.in: Regenerate. + 2019-04-12 Iain Buclaw * m4/druntime/libraries.m4 (DRUNTIME_LIBRARIES_ZLIB): Use @@ -11,7 +17,6 @@ 2019-04-12 Iain Buclaw - * testsuite/Makefile.am: * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Remove dejagnu. (RUNTEST): Remove variable. (RUNTESTDEFAULTFLAGS, check_p_subno, check_p_numbers0, @@ -25,6 +30,7 @@ 2019-04-12 Iain Buclaw + PR d/89255 * configure.ac (ENABLE_SHARED, ENABLE_STATIC): Remove conditionals. * configure: Regenerate. * d_rules.am (%.t.lo, %.t.o): Remove rules. diff --git a/libphobos/configure b/libphobos/configure index ead96d11bb4..48b78eb56dd 100755 --- a/libphobos/configure +++ b/libphobos/configure @@ -2554,6 +2554,7 @@ target_alias=${target_alias-$target} # no-dependencies: Don't generate automatic dependencies. # (because it breaks when using bootstrap-lean, since some of the # headers are gone at "make install" time). +# subdir-objects: Build objects in sub-directories. # -Wall: Issue all automake warnings. # -Wno-portability: Don't warn about constructs supported by GNU make. # (because GCC requires GNU make anyhow). @@ -11494,7 +11495,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11497 "configure" +#line 11498 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11600,7 +11601,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11603 "configure" +#line 11604 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/libphobos/configure.ac b/libphobos/configure.ac index 362f7537ffb..f1ab556bec0 100644 --- a/libphobos/configure.ac +++ b/libphobos/configure.ac @@ -42,11 +42,12 @@ AC_SUBST(target_alias) # no-dependencies: Don't generate automatic dependencies. # (because it breaks when using bootstrap-lean, since some of the # headers are gone at "make install" time). +# subdir-objects: Build objects in sub-directories. # -Wall: Issue all automake warnings. # -Wno-portability: Don't warn about constructs supported by GNU make. # (because GCC requires GNU make anyhow). # -Wno-override: Overrides used in testsuite. -AM_INIT_AUTOMAKE([1.11.1 foreign no-dist no-define no-dependencies -Wall -Wno-portability -Wno-override]) +AM_INIT_AUTOMAKE([1.11.1 foreign no-dist no-define no-dependencies subdir-objects -Wall -Wno-portability -Wno-override]) m4_rename([_AC_ARG_VAR_PRECIOUS],[glibd_PRECIOUS]) m4_define([_AC_ARG_VAR_PRECIOUS],[]) diff --git a/libphobos/libdruntime/Makefile.in b/libphobos/libdruntime/Makefile.in index fe95436c118..4bfd04c3db5 100644 --- a/libphobos/libdruntime/Makefile.in +++ b/libphobos/libdruntime/Makefile.in @@ -425,9 +425,9 @@ am__objects_27 = $(am__objects_1) $(am__objects_3) $(am__objects_5) \ $(am__objects_13) $(am__objects_15) $(am__objects_17) \ $(am__objects_19) $(am__objects_21) $(am__objects_23) \ $(am__objects_25) $(am__objects_26) -am__objects_28 = libgdruntime_la-errno_.lo \ - libgdruntime_la-bss_section.lo -am__objects_29 = libgdruntime_la-threadasm.lo +am__objects_28 = core/stdc/libgdruntime_la-errno_.lo \ + rt/libgdruntime_la-bss_section.lo +am__objects_29 = core/libgdruntime_la-threadasm.lo am__objects_30 = $(am__objects_27) $(am__objects_28) $(am__objects_29) am_libgdruntime_la_OBJECTS = $(am__objects_30) libgdruntime_la_OBJECTS = $(am_libgdruntime_la_OBJECTS) @@ -1626,6 +1626,9 @@ core/sys/solaris/sys/types.lo: core/sys/solaris/sys/$(am__dirstamp) core/sys/solaris/time.lo: core/sys/solaris/$(am__dirstamp) gcc/config.lo: gcc/$(am__dirstamp) gcc/libbacktrace.lo: gcc/$(am__dirstamp) +core/stdc/libgdruntime_la-errno_.lo: core/stdc/$(am__dirstamp) +rt/libgdruntime_la-bss_section.lo: rt/$(am__dirstamp) +core/libgdruntime_la-threadasm.lo: core/$(am__dirstamp) libgdruntime.la: $(libgdruntime_la_OBJECTS) $(libgdruntime_la_DEPENDENCIES) $(EXTRA_libgdruntime_la_DEPENDENCIES) $(AM_V_GEN)$(libgdruntime_la_LINK) -rpath $(toolexeclibdir) $(libgdruntime_la_OBJECTS) $(libgdruntime_la_LIBADD) $(LIBS) @@ -1725,8 +1728,8 @@ distclean-compile: .S.lo: $(AM_V_CPPAS)$(LTCPPASCOMPILE) -c -o $@ $< -libgdruntime_la-threadasm.lo: core/threadasm.S - $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o libgdruntime_la-threadasm.lo `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S +core/libgdruntime_la-threadasm.lo: core/threadasm.S + $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o core/libgdruntime_la-threadasm.lo `test -f 'core/threadasm.S' || echo '$(srcdir)/'`core/threadasm.S .c.o: $(AM_V_CC)$(COMPILE) -c -o $@ $< @@ -1737,11 +1740,11 @@ libgdruntime_la-threadasm.lo: core/threadasm.S .c.lo: $(AM_V_CC)$(LTCOMPILE) -c -o $@ $< -libgdruntime_la-errno_.lo: core/stdc/errno_.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_la-errno_.lo `test -f 'core/stdc/errno_.c' || echo '$(srcdir)/'`core/stdc/errno_.c +core/stdc/libgdruntime_la-errno_.lo: core/stdc/errno_.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o core/stdc/libgdruntime_la-errno_.lo `test -f 'core/stdc/errno_.c' || echo '$(srcdir)/'`core/stdc/errno_.c -libgdruntime_la-bss_section.lo: rt/bss_section.c - $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libgdruntime_la-bss_section.lo `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c +rt/libgdruntime_la-bss_section.lo: rt/bss_section.c + $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(libgdruntime_la_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o rt/libgdruntime_la-bss_section.lo `test -f 'rt/bss_section.c' || echo '$(srcdir)/'`rt/bss_section.c mostlyclean-libtool: -rm -f *.lo