X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.in;h=7ae2a40d4e3adb9f78e4c5afba23b9821590807a;hb=da0bfb866eaa5ae5888e8815ec75878a43892dfb;hp=ba5e041c0dba96d6414e0cc6160062323808f93b;hpb=d89da9dbda394765582ae97fdd604ecde24f1186;p=thirdparty%2Fgcc.git diff --git a/Makefile.in b/Makefile.in index ba5e041c0dba..7ae2a40d4e3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -166,7 +166,7 @@ BUILD_EXPORTS = \ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC; # These variables must be set on the make command line for directories -# built for the build system to override those in BASE_FLAGS_TO_PASSS. +# built for the build system to override those in BASE_FLAGS_TO_PASS. EXTRA_BUILD_FLAGS = \ CFLAGS="$(CFLAGS_FOR_BUILD)" \ LDFLAGS="$(LDFLAGS_FOR_BUILD)" @@ -213,17 +213,17 @@ HOST_EXPORTS = \ LD_FOR_TARGET="$(LD_FOR_TARGET)"; export LD_FOR_TARGET; \ NM_FOR_TARGET="$(NM_FOR_TARGET)"; export NM_FOR_TARGET; \ OBJDUMP_FOR_TARGET="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP_FOR_TARGET; \ + OBJCOPY_FOR_TARGET="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY_FOR_TARGET; \ RANLIB_FOR_TARGET="$(RANLIB_FOR_TARGET)"; export RANLIB_FOR_TARGET; \ READELF_FOR_TARGET="$(READELF_FOR_TARGET)"; export READELF_FOR_TARGET; \ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ HOST_LIBS="$(STAGE1_LIBS)"; export HOST_LIBS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ GMPINC="$(HOST_GMPINC)"; export GMPINC; \ + ISLLIBS="$(HOST_ISLLIBS)"; export ISLLIBS; \ ISLINC="$(HOST_ISLINC)"; export ISLINC; \ - CLOOGLIBS="$(HOST_CLOOGLIBS)"; export CLOOGLIBS; \ - CLOOGINC="$(HOST_CLOOGINC)"; export CLOOGINC; \ - LIBELFLIBS="$(HOST_LIBELFLIBS)" ; export LIBELFLIBS; \ - LIBELFINC="$(HOST_LIBELFINC)" ; export LIBELFINC; \ + LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ + LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ @if gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap @@ -239,9 +239,9 @@ POSTSTAGE1_CXX_EXPORT = \ -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/ -nostdinc++ \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -B$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ - -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \ - -I$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \ - -I$$s/libstdc++-v3/libsupc++ \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include/$(TARGET_SUBDIR) \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/include \ + `if $(LEAN); then echo ' -isystem '; else echo ' -I'; fi`$$s/libstdc++-v3/libsupc++ \ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ -L$$r/prev-$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs"; \ export CXX; \ @@ -256,6 +256,7 @@ POSTSTAGE1_HOST_EXPORTS = \ $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \ CC_FOR_BUILD="$$CC"; export CC_FOR_BUILD; \ $(POSTSTAGE1_CXX_EXPORT) \ + $(LTO_EXPORTS) \ GNATBIND="$$r/$(HOST_SUBDIR)/prev-gcc/gnatbind"; export GNATBIND; \ LDFLAGS="$(POSTSTAGE1_LDFLAGS) $(BOOT_LDFLAGS)"; export LDFLAGS; \ HOST_LIBS="$(POSTSTAGE1_LIBS)"; export HOST_LIBS; @@ -285,6 +286,7 @@ BASE_TARGET_EXPORTS = \ LIPO="$(LIPO_FOR_TARGET)"; export LIPO; \ NM="$(COMPILER_NM_FOR_TARGET)"; export NM; \ OBJDUMP="$(OBJDUMP_FOR_TARGET)"; export OBJDUMP; \ + OBJCOPY="$(OBJCOPY_FOR_TARGET)"; export OBJCOPY; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ READELF="$(READELF_FOR_TARGET)"; export READELF; \ STRIP="$(STRIP_FOR_TARGET)"; export STRIP; \ @@ -310,12 +312,9 @@ HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ # Where to find ISL +HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ -# Where to find CLOOG -HOST_CLOOGLIBS = @clooglibs@ -HOST_CLOOGINC = @clooginc@ - # Where to find libelf HOST_LIBELFLIBS = @libelflibs@ HOST_LIBELFINC = @libelfinc@ @@ -364,7 +363,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # here so that they can be overridden by Makefile fragments. BOOT_CFLAGS= -g -O2 BOOT_LDFLAGS= -BOOT_ADAFLAGS=-gnatpg -gnata +BOOT_ADAFLAGS= -gnatpg AWK = @AWK@ SED = @SED@ @@ -483,13 +482,12 @@ STAGEfeedback_TFLAGS = $(STAGE_TFLAGS) STAGEfeedback_CONFIGURE_FLAGS = $(STAGE_CONFIGURE_FLAGS) -# Only build the C compiler for stage1, because that is the only one that -# we can guarantee will build with the native compiler, and also it is the -# only thing useful for building stage2. STAGE1_CFLAGS (via CFLAGS), -# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them -# overrideable (for a bootstrap build stage1 also builds gcc.info). +# By default, C and C++ are the only stage1 languages, because they are the +# only ones we require to build with the bootstrap compiler, and also the +# only ones useful for building stage2. STAGE1_CFLAGS = @stage1_cflags@ +STAGE1_CXXFLAGS = @stage1_cxxflags@ STAGE1_CHECKING = @stage1_checking@ STAGE1_LANGUAGES = @stage1_languages@ # * We force-disable intermodule optimizations, even if @@ -498,8 +496,10 @@ STAGE1_LANGUAGES = @stage1_languages@ # the last argument when conflicting --enable arguments are passed. # * Likewise, we force-disable coverage flags, since the installed # compiler probably has never heard of them. +# * We also disable -Wformat, since older GCCs don't understand newer %s. STAGE1_CONFIGURE_FLAGS = --disable-intermodule $(STAGE1_CHECKING) \ - --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" + --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" \ + --disable-build-format-warnings STAGEprofile_CFLAGS = $(STAGE2_CFLAGS) -fprofile-generate STAGEprofile_TFLAGS = $(STAGE2_TFLAGS) @@ -534,6 +534,7 @@ LD_FOR_TARGET=@LD_FOR_TARGET@ LIPO_FOR_TARGET=@LIPO_FOR_TARGET@ NM_FOR_TARGET=@NM_FOR_TARGET@ OBJDUMP_FOR_TARGET=@OBJDUMP_FOR_TARGET@ +OBJCOPY_FOR_TARGET=@OBJCOPY_FOR_TARGET@ RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ READELF_FOR_TARGET=@READELF_FOR_TARGET@ STRIP_FOR_TARGET=@STRIP_FOR_TARGET@ @@ -575,20 +576,32 @@ all: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the target machine work. -TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc) +TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libsanitizer)$(TARGET_LIB_PATH_libmpx)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(TARGET_LIB_PATH_liboffloadmic)$(TARGET_LIB_PATH_libssp)$(TARGET_LIB_PATH_libgomp)$(TARGET_LIB_PATH_libitm)$(TARGET_LIB_PATH_libatomic)$(HOST_LIB_PATH_gcc) @if target-libstdc++-v3 TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: @endif target-libstdc++-v3 -@if target-libmudflap -TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs: -@endif target-libmudflap - @if target-libsanitizer TARGET_LIB_PATH_libsanitizer = $$r/$(TARGET_SUBDIR)/libsanitizer/.libs: @endif target-libsanitizer +@if target-libmpx +TARGET_LIB_PATH_libmpx = $$r/$(TARGET_SUBDIR)/libmpx/.libs: +@endif target-libmpx + +@if target-libvtv +TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs: +@endif target-libvtv + +@if target-libcilkrts +TARGET_LIB_PATH_libcilkrts = $$r/$(TARGET_SUBDIR)/libcilkrts/.libs: +@endif target-libcilkrts + +@if target-liboffloadmic +TARGET_LIB_PATH_liboffloadmic = $$r/$(TARGET_SUBDIR)/liboffloadmic/.libs: +@endif target-liboffloadmic + @if target-libssp TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs: @endif target-libssp @@ -609,7 +622,7 @@ TARGET_LIB_PATH_libatomic = $$r/$(TARGET_SUBDIR)/libatomic/.libs: # This is the list of directories that may be needed in RPATH_ENVVAR # so that programs built for the host machine work. -HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_cloog)$(HOST_LIB_PATH_libelf) +HOST_LIB_PATH = $(HOST_LIB_PATH_gmp)$(HOST_LIB_PATH_mpfr)$(HOST_LIB_PATH_mpc)$(HOST_LIB_PATH_isl)$(HOST_LIB_PATH_libelf) # Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch @if gcc @@ -637,11 +650,6 @@ HOST_LIB_PATH_isl = \ $$r/$(HOST_SUBDIR)/isl/.libs:$$r/$(HOST_SUBDIR)/prev-isl/.libs: @endif isl -@if cloog -HOST_LIB_PATH_cloog = \ - $$r/$(HOST_SUBDIR)/cloog/.libs:$$r/$(HOST_SUBDIR)/prev-cloog/.libs: -@endif cloog - @if libelf HOST_LIB_PATH_libelf = \ $$r/$(HOST_SUBDIR)/libelf/.libs:$$r/$(HOST_SUBDIR)/prev-libelf/.libs: @@ -668,7 +676,9 @@ CXX_FOR_TARGET_FLAG_TO_PASS = \ $(shell if echo "$(CXX_FOR_TARGET)" | grep " -funconfigured-" > /dev/null; then :; else echo '"CXX_FOR_TARGET=$(CXX_FOR_TARGET)"'; fi) @endif target-libstdc++-v3 -# Flags to pass down to all sub-makes. +# Flags to pass down to all sub-makes. STAGE*FLAGS, +# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them +# overrideable (for a bootstrap build stage1 also builds gcc.info). BASE_FLAGS_TO_PASS = \ "DESTDIR=$(DESTDIR)" \ "RPATH_ENVVAR=$(RPATH_ENVVAR)" \ @@ -749,6 +759,7 @@ BASE_FLAGS_TO_PASS = \ "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ "OBJDUMP_FOR_TARGET=$(OBJDUMP_FOR_TARGET)" \ + "OBJCOPY_FOR_TARGET=$(OBJCOPY_FOR_TARGET)" \ "RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \ "READELF_FOR_TARGET=$(READELF_FOR_TARGET)" \ "STRIP_FOR_TARGET=$(STRIP_FOR_TARGET)" \ @@ -820,8 +831,17 @@ POSTSTAGE1_FLAGS_TO_PASS = \ GNATBIND="$${GNATBIND}" \ LDFLAGS="$${LDFLAGS}" \ HOST_LIBS="$${HOST_LIBS}" \ + $(LTO_FLAGS_TO_PASS) \ "`echo 'ADAFLAGS=$(BOOT_ADAFLAGS)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" +@if gcc-bootstrap +EXTRA_HOST_EXPORTS = if [ $(current_stage) != stage1 ]; then \ + $(POSTSTAGE1_HOST_EXPORTS) \ + fi; + +EXTRA_BOOTSTRAP_FLAGS = CC="$$CC" CXX="$$CXX" LDFLAGS="$$LDFLAGS" +@endif gcc-bootstrap + # Flags to pass down to makes which are built with the target environment. # The double $ decreases the length of the command line; those variables # are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The @@ -832,7 +852,9 @@ EXTRA_TARGET_FLAGS = \ 'AS=$(COMPILER_AS_FOR_TARGET)' \ 'CC=$$(CC_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'CFLAGS=$$(CFLAGS_FOR_TARGET)' \ - 'CXX=$$(CXX_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ + 'CXX=$$(CXX_FOR_TARGET) -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/src/.libs \ + -B$$r/$$(TARGET_SUBDIR)/libstdc++-v3/libsupc++/.libs \ + $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'GCJ=$$(GCJ_FOR_TARGET) $$(XGCC_FLAGS_FOR_TARGET) $$(TFLAGS)' \ @@ -845,11 +867,14 @@ EXTRA_TARGET_FLAGS = \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$(COMPILER_NM_FOR_TARGET)' \ 'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \ + 'OBJCOPY=$$(OBJCOPY_FOR_TARGET)' \ 'RANLIB=$$(RANLIB_FOR_TARGET)' \ 'READELF=$$(READELF_FOR_TARGET)' \ 'WINDRES=$$(WINDRES_FOR_TARGET)' \ 'WINDMC=$$(WINDMC_FOR_TARGET)' \ 'XGCC_FLAGS_FOR_TARGET=$(XGCC_FLAGS_FOR_TARGET)' \ + 'STAGE1_LDFLAGS=$$(POSTSTAGE1_LDFLAGS)' \ + 'STAGE1_LIBS=$$(POSTSTAGE1_LIBS)' \ "TFLAGS=$$TFLAGS" TARGET_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) @@ -892,7 +917,6 @@ configure-host: \ maybe-configure-mpfr \ maybe-configure-mpc \ maybe-configure-isl \ - maybe-configure-cloog \ maybe-configure-libelf \ maybe-configure-gold \ maybe-configure-gprof \ @@ -905,6 +929,7 @@ configure-host: \ maybe-configure-libdecnumber \ maybe-configure-libgui \ maybe-configure-libiberty \ + maybe-configure-libiberty-linker-plugin \ maybe-configure-libiconv \ maybe-configure-m4 \ maybe-configure-readline \ @@ -919,12 +944,17 @@ configure-host: \ maybe-configure-libtermcap \ maybe-configure-utils \ maybe-configure-gnattools \ - maybe-configure-lto-plugin + maybe-configure-lto-plugin \ + maybe-configure-libcc1 \ + maybe-configure-gotools .PHONY: configure-target configure-target: \ maybe-configure-target-libstdc++-v3 \ - maybe-configure-target-libmudflap \ maybe-configure-target-libsanitizer \ + maybe-configure-target-libmpx \ + maybe-configure-target-libvtv \ + maybe-configure-target-libcilkrts \ + maybe-configure-target-liboffloadmic \ maybe-configure-target-libssp \ maybe-configure-target-newlib \ maybe-configure-target-libgcc \ @@ -979,6 +1009,7 @@ all-build: maybe-all-build-flex all-build: maybe-all-build-m4 all-build: maybe-all-build-texinfo all-build: maybe-all-build-fixincludes +all-build: maybe-all-build-libcpp .PHONY: all-host @@ -996,7 +1027,9 @@ all-host: maybe-all-cgen all-host: maybe-all-dejagnu all-host: maybe-all-etc all-host: maybe-all-fastjar +@if fixincludes-no-bootstrap all-host: maybe-all-fixincludes +@endif fixincludes-no-bootstrap all-host: maybe-all-flex @if gas-no-bootstrap all-host: maybe-all-gas @@ -1016,9 +1049,6 @@ all-host: maybe-all-mpc @if isl-no-bootstrap all-host: maybe-all-isl @endif isl-no-bootstrap -@if cloog-no-bootstrap -all-host: maybe-all-cloog -@endif cloog-no-bootstrap @if libelf-no-bootstrap all-host: maybe-all-libelf @endif libelf-no-bootstrap @@ -1047,6 +1077,9 @@ all-host: maybe-all-libgui @if libiberty-no-bootstrap all-host: maybe-all-libiberty @endif libiberty-no-bootstrap +@if libiberty-linker-plugin-no-bootstrap +all-host: maybe-all-libiberty-linker-plugin +@endif libiberty-linker-plugin-no-bootstrap all-host: maybe-all-libiconv all-host: maybe-all-m4 all-host: maybe-all-readline @@ -1066,16 +1099,25 @@ all-host: maybe-all-gnattools @if lto-plugin-no-bootstrap all-host: maybe-all-lto-plugin @endif lto-plugin-no-bootstrap +all-host: maybe-all-libcc1 +all-host: maybe-all-gotools .PHONY: all-target @if target-libstdc++-v3-no-bootstrap all-target: maybe-all-target-libstdc++-v3 @endif target-libstdc++-v3-no-bootstrap -all-target: maybe-all-target-libmudflap @if target-libsanitizer-no-bootstrap all-target: maybe-all-target-libsanitizer @endif target-libsanitizer-no-bootstrap +@if target-libmpx-no-bootstrap +all-target: maybe-all-target-libmpx +@endif target-libmpx-no-bootstrap +@if target-libvtv-no-bootstrap +all-target: maybe-all-target-libvtv +@endif target-libvtv-no-bootstrap +all-target: maybe-all-target-libcilkrts +all-target: maybe-all-target-liboffloadmic all-target: maybe-all-target-libssp all-target: maybe-all-target-newlib @if target-libgcc-no-bootstrap @@ -1133,7 +1175,6 @@ info-host: maybe-info-gmp info-host: maybe-info-mpfr info-host: maybe-info-mpc info-host: maybe-info-isl -info-host: maybe-info-cloog info-host: maybe-info-libelf info-host: maybe-info-gold info-host: maybe-info-gprof @@ -1146,6 +1187,7 @@ info-host: maybe-info-libcpp info-host: maybe-info-libdecnumber info-host: maybe-info-libgui info-host: maybe-info-libiberty +info-host: maybe-info-libiberty-linker-plugin info-host: maybe-info-libiconv info-host: maybe-info-m4 info-host: maybe-info-readline @@ -1161,12 +1203,17 @@ info-host: maybe-info-libtermcap info-host: maybe-info-utils info-host: maybe-info-gnattools info-host: maybe-info-lto-plugin +info-host: maybe-info-libcc1 +info-host: maybe-info-gotools .PHONY: info-target info-target: maybe-info-target-libstdc++-v3 -info-target: maybe-info-target-libmudflap info-target: maybe-info-target-libsanitizer +info-target: maybe-info-target-libmpx +info-target: maybe-info-target-libvtv +info-target: maybe-info-target-libcilkrts +info-target: maybe-info-target-liboffloadmic info-target: maybe-info-target-libssp info-target: maybe-info-target-newlib info-target: maybe-info-target-libgcc @@ -1215,7 +1262,6 @@ dvi-host: maybe-dvi-gmp dvi-host: maybe-dvi-mpfr dvi-host: maybe-dvi-mpc dvi-host: maybe-dvi-isl -dvi-host: maybe-dvi-cloog dvi-host: maybe-dvi-libelf dvi-host: maybe-dvi-gold dvi-host: maybe-dvi-gprof @@ -1228,6 +1274,7 @@ dvi-host: maybe-dvi-libcpp dvi-host: maybe-dvi-libdecnumber dvi-host: maybe-dvi-libgui dvi-host: maybe-dvi-libiberty +dvi-host: maybe-dvi-libiberty-linker-plugin dvi-host: maybe-dvi-libiconv dvi-host: maybe-dvi-m4 dvi-host: maybe-dvi-readline @@ -1243,12 +1290,17 @@ dvi-host: maybe-dvi-libtermcap dvi-host: maybe-dvi-utils dvi-host: maybe-dvi-gnattools dvi-host: maybe-dvi-lto-plugin +dvi-host: maybe-dvi-libcc1 +dvi-host: maybe-dvi-gotools .PHONY: dvi-target dvi-target: maybe-dvi-target-libstdc++-v3 -dvi-target: maybe-dvi-target-libmudflap dvi-target: maybe-dvi-target-libsanitizer +dvi-target: maybe-dvi-target-libmpx +dvi-target: maybe-dvi-target-libvtv +dvi-target: maybe-dvi-target-libcilkrts +dvi-target: maybe-dvi-target-liboffloadmic dvi-target: maybe-dvi-target-libssp dvi-target: maybe-dvi-target-newlib dvi-target: maybe-dvi-target-libgcc @@ -1297,7 +1349,6 @@ pdf-host: maybe-pdf-gmp pdf-host: maybe-pdf-mpfr pdf-host: maybe-pdf-mpc pdf-host: maybe-pdf-isl -pdf-host: maybe-pdf-cloog pdf-host: maybe-pdf-libelf pdf-host: maybe-pdf-gold pdf-host: maybe-pdf-gprof @@ -1310,6 +1361,7 @@ pdf-host: maybe-pdf-libcpp pdf-host: maybe-pdf-libdecnumber pdf-host: maybe-pdf-libgui pdf-host: maybe-pdf-libiberty +pdf-host: maybe-pdf-libiberty-linker-plugin pdf-host: maybe-pdf-libiconv pdf-host: maybe-pdf-m4 pdf-host: maybe-pdf-readline @@ -1325,12 +1377,17 @@ pdf-host: maybe-pdf-libtermcap pdf-host: maybe-pdf-utils pdf-host: maybe-pdf-gnattools pdf-host: maybe-pdf-lto-plugin +pdf-host: maybe-pdf-libcc1 +pdf-host: maybe-pdf-gotools .PHONY: pdf-target pdf-target: maybe-pdf-target-libstdc++-v3 -pdf-target: maybe-pdf-target-libmudflap pdf-target: maybe-pdf-target-libsanitizer +pdf-target: maybe-pdf-target-libmpx +pdf-target: maybe-pdf-target-libvtv +pdf-target: maybe-pdf-target-libcilkrts +pdf-target: maybe-pdf-target-liboffloadmic pdf-target: maybe-pdf-target-libssp pdf-target: maybe-pdf-target-newlib pdf-target: maybe-pdf-target-libgcc @@ -1379,7 +1436,6 @@ html-host: maybe-html-gmp html-host: maybe-html-mpfr html-host: maybe-html-mpc html-host: maybe-html-isl -html-host: maybe-html-cloog html-host: maybe-html-libelf html-host: maybe-html-gold html-host: maybe-html-gprof @@ -1392,6 +1448,7 @@ html-host: maybe-html-libcpp html-host: maybe-html-libdecnumber html-host: maybe-html-libgui html-host: maybe-html-libiberty +html-host: maybe-html-libiberty-linker-plugin html-host: maybe-html-libiconv html-host: maybe-html-m4 html-host: maybe-html-readline @@ -1407,12 +1464,17 @@ html-host: maybe-html-libtermcap html-host: maybe-html-utils html-host: maybe-html-gnattools html-host: maybe-html-lto-plugin +html-host: maybe-html-libcc1 +html-host: maybe-html-gotools .PHONY: html-target html-target: maybe-html-target-libstdc++-v3 -html-target: maybe-html-target-libmudflap html-target: maybe-html-target-libsanitizer +html-target: maybe-html-target-libmpx +html-target: maybe-html-target-libvtv +html-target: maybe-html-target-libcilkrts +html-target: maybe-html-target-liboffloadmic html-target: maybe-html-target-libssp html-target: maybe-html-target-newlib html-target: maybe-html-target-libgcc @@ -1461,7 +1523,6 @@ TAGS-host: maybe-TAGS-gmp TAGS-host: maybe-TAGS-mpfr TAGS-host: maybe-TAGS-mpc TAGS-host: maybe-TAGS-isl -TAGS-host: maybe-TAGS-cloog TAGS-host: maybe-TAGS-libelf TAGS-host: maybe-TAGS-gold TAGS-host: maybe-TAGS-gprof @@ -1474,6 +1535,7 @@ TAGS-host: maybe-TAGS-libcpp TAGS-host: maybe-TAGS-libdecnumber TAGS-host: maybe-TAGS-libgui TAGS-host: maybe-TAGS-libiberty +TAGS-host: maybe-TAGS-libiberty-linker-plugin TAGS-host: maybe-TAGS-libiconv TAGS-host: maybe-TAGS-m4 TAGS-host: maybe-TAGS-readline @@ -1489,12 +1551,17 @@ TAGS-host: maybe-TAGS-libtermcap TAGS-host: maybe-TAGS-utils TAGS-host: maybe-TAGS-gnattools TAGS-host: maybe-TAGS-lto-plugin +TAGS-host: maybe-TAGS-libcc1 +TAGS-host: maybe-TAGS-gotools .PHONY: TAGS-target TAGS-target: maybe-TAGS-target-libstdc++-v3 -TAGS-target: maybe-TAGS-target-libmudflap TAGS-target: maybe-TAGS-target-libsanitizer +TAGS-target: maybe-TAGS-target-libmpx +TAGS-target: maybe-TAGS-target-libvtv +TAGS-target: maybe-TAGS-target-libcilkrts +TAGS-target: maybe-TAGS-target-liboffloadmic TAGS-target: maybe-TAGS-target-libssp TAGS-target: maybe-TAGS-target-newlib TAGS-target: maybe-TAGS-target-libgcc @@ -1543,7 +1610,6 @@ install-info-host: maybe-install-info-gmp install-info-host: maybe-install-info-mpfr install-info-host: maybe-install-info-mpc install-info-host: maybe-install-info-isl -install-info-host: maybe-install-info-cloog install-info-host: maybe-install-info-libelf install-info-host: maybe-install-info-gold install-info-host: maybe-install-info-gprof @@ -1556,6 +1622,7 @@ install-info-host: maybe-install-info-libcpp install-info-host: maybe-install-info-libdecnumber install-info-host: maybe-install-info-libgui install-info-host: maybe-install-info-libiberty +install-info-host: maybe-install-info-libiberty-linker-plugin install-info-host: maybe-install-info-libiconv install-info-host: maybe-install-info-m4 install-info-host: maybe-install-info-readline @@ -1571,12 +1638,17 @@ install-info-host: maybe-install-info-libtermcap install-info-host: maybe-install-info-utils install-info-host: maybe-install-info-gnattools install-info-host: maybe-install-info-lto-plugin +install-info-host: maybe-install-info-libcc1 +install-info-host: maybe-install-info-gotools .PHONY: install-info-target install-info-target: maybe-install-info-target-libstdc++-v3 -install-info-target: maybe-install-info-target-libmudflap install-info-target: maybe-install-info-target-libsanitizer +install-info-target: maybe-install-info-target-libmpx +install-info-target: maybe-install-info-target-libvtv +install-info-target: maybe-install-info-target-libcilkrts +install-info-target: maybe-install-info-target-liboffloadmic install-info-target: maybe-install-info-target-libssp install-info-target: maybe-install-info-target-newlib install-info-target: maybe-install-info-target-libgcc @@ -1625,7 +1697,6 @@ install-pdf-host: maybe-install-pdf-gmp install-pdf-host: maybe-install-pdf-mpfr install-pdf-host: maybe-install-pdf-mpc install-pdf-host: maybe-install-pdf-isl -install-pdf-host: maybe-install-pdf-cloog install-pdf-host: maybe-install-pdf-libelf install-pdf-host: maybe-install-pdf-gold install-pdf-host: maybe-install-pdf-gprof @@ -1638,6 +1709,7 @@ install-pdf-host: maybe-install-pdf-libcpp install-pdf-host: maybe-install-pdf-libdecnumber install-pdf-host: maybe-install-pdf-libgui install-pdf-host: maybe-install-pdf-libiberty +install-pdf-host: maybe-install-pdf-libiberty-linker-plugin install-pdf-host: maybe-install-pdf-libiconv install-pdf-host: maybe-install-pdf-m4 install-pdf-host: maybe-install-pdf-readline @@ -1653,12 +1725,17 @@ install-pdf-host: maybe-install-pdf-libtermcap install-pdf-host: maybe-install-pdf-utils install-pdf-host: maybe-install-pdf-gnattools install-pdf-host: maybe-install-pdf-lto-plugin +install-pdf-host: maybe-install-pdf-libcc1 +install-pdf-host: maybe-install-pdf-gotools .PHONY: install-pdf-target install-pdf-target: maybe-install-pdf-target-libstdc++-v3 -install-pdf-target: maybe-install-pdf-target-libmudflap install-pdf-target: maybe-install-pdf-target-libsanitizer +install-pdf-target: maybe-install-pdf-target-libmpx +install-pdf-target: maybe-install-pdf-target-libvtv +install-pdf-target: maybe-install-pdf-target-libcilkrts +install-pdf-target: maybe-install-pdf-target-liboffloadmic install-pdf-target: maybe-install-pdf-target-libssp install-pdf-target: maybe-install-pdf-target-newlib install-pdf-target: maybe-install-pdf-target-libgcc @@ -1707,7 +1784,6 @@ install-html-host: maybe-install-html-gmp install-html-host: maybe-install-html-mpfr install-html-host: maybe-install-html-mpc install-html-host: maybe-install-html-isl -install-html-host: maybe-install-html-cloog install-html-host: maybe-install-html-libelf install-html-host: maybe-install-html-gold install-html-host: maybe-install-html-gprof @@ -1720,6 +1796,7 @@ install-html-host: maybe-install-html-libcpp install-html-host: maybe-install-html-libdecnumber install-html-host: maybe-install-html-libgui install-html-host: maybe-install-html-libiberty +install-html-host: maybe-install-html-libiberty-linker-plugin install-html-host: maybe-install-html-libiconv install-html-host: maybe-install-html-m4 install-html-host: maybe-install-html-readline @@ -1735,12 +1812,17 @@ install-html-host: maybe-install-html-libtermcap install-html-host: maybe-install-html-utils install-html-host: maybe-install-html-gnattools install-html-host: maybe-install-html-lto-plugin +install-html-host: maybe-install-html-libcc1 +install-html-host: maybe-install-html-gotools .PHONY: install-html-target install-html-target: maybe-install-html-target-libstdc++-v3 -install-html-target: maybe-install-html-target-libmudflap install-html-target: maybe-install-html-target-libsanitizer +install-html-target: maybe-install-html-target-libmpx +install-html-target: maybe-install-html-target-libvtv +install-html-target: maybe-install-html-target-libcilkrts +install-html-target: maybe-install-html-target-liboffloadmic install-html-target: maybe-install-html-target-libssp install-html-target: maybe-install-html-target-newlib install-html-target: maybe-install-html-target-libgcc @@ -1789,7 +1871,6 @@ installcheck-host: maybe-installcheck-gmp installcheck-host: maybe-installcheck-mpfr installcheck-host: maybe-installcheck-mpc installcheck-host: maybe-installcheck-isl -installcheck-host: maybe-installcheck-cloog installcheck-host: maybe-installcheck-libelf installcheck-host: maybe-installcheck-gold installcheck-host: maybe-installcheck-gprof @@ -1802,6 +1883,7 @@ installcheck-host: maybe-installcheck-libcpp installcheck-host: maybe-installcheck-libdecnumber installcheck-host: maybe-installcheck-libgui installcheck-host: maybe-installcheck-libiberty +installcheck-host: maybe-installcheck-libiberty-linker-plugin installcheck-host: maybe-installcheck-libiconv installcheck-host: maybe-installcheck-m4 installcheck-host: maybe-installcheck-readline @@ -1817,12 +1899,17 @@ installcheck-host: maybe-installcheck-libtermcap installcheck-host: maybe-installcheck-utils installcheck-host: maybe-installcheck-gnattools installcheck-host: maybe-installcheck-lto-plugin +installcheck-host: maybe-installcheck-libcc1 +installcheck-host: maybe-installcheck-gotools .PHONY: installcheck-target installcheck-target: maybe-installcheck-target-libstdc++-v3 -installcheck-target: maybe-installcheck-target-libmudflap installcheck-target: maybe-installcheck-target-libsanitizer +installcheck-target: maybe-installcheck-target-libmpx +installcheck-target: maybe-installcheck-target-libvtv +installcheck-target: maybe-installcheck-target-libcilkrts +installcheck-target: maybe-installcheck-target-liboffloadmic installcheck-target: maybe-installcheck-target-libssp installcheck-target: maybe-installcheck-target-newlib installcheck-target: maybe-installcheck-target-libgcc @@ -1871,7 +1958,6 @@ mostlyclean-host: maybe-mostlyclean-gmp mostlyclean-host: maybe-mostlyclean-mpfr mostlyclean-host: maybe-mostlyclean-mpc mostlyclean-host: maybe-mostlyclean-isl -mostlyclean-host: maybe-mostlyclean-cloog mostlyclean-host: maybe-mostlyclean-libelf mostlyclean-host: maybe-mostlyclean-gold mostlyclean-host: maybe-mostlyclean-gprof @@ -1884,6 +1970,7 @@ mostlyclean-host: maybe-mostlyclean-libcpp mostlyclean-host: maybe-mostlyclean-libdecnumber mostlyclean-host: maybe-mostlyclean-libgui mostlyclean-host: maybe-mostlyclean-libiberty +mostlyclean-host: maybe-mostlyclean-libiberty-linker-plugin mostlyclean-host: maybe-mostlyclean-libiconv mostlyclean-host: maybe-mostlyclean-m4 mostlyclean-host: maybe-mostlyclean-readline @@ -1899,12 +1986,17 @@ mostlyclean-host: maybe-mostlyclean-libtermcap mostlyclean-host: maybe-mostlyclean-utils mostlyclean-host: maybe-mostlyclean-gnattools mostlyclean-host: maybe-mostlyclean-lto-plugin +mostlyclean-host: maybe-mostlyclean-libcc1 +mostlyclean-host: maybe-mostlyclean-gotools .PHONY: mostlyclean-target mostlyclean-target: maybe-mostlyclean-target-libstdc++-v3 -mostlyclean-target: maybe-mostlyclean-target-libmudflap mostlyclean-target: maybe-mostlyclean-target-libsanitizer +mostlyclean-target: maybe-mostlyclean-target-libmpx +mostlyclean-target: maybe-mostlyclean-target-libvtv +mostlyclean-target: maybe-mostlyclean-target-libcilkrts +mostlyclean-target: maybe-mostlyclean-target-liboffloadmic mostlyclean-target: maybe-mostlyclean-target-libssp mostlyclean-target: maybe-mostlyclean-target-newlib mostlyclean-target: maybe-mostlyclean-target-libgcc @@ -1953,7 +2045,6 @@ clean-host: maybe-clean-gmp clean-host: maybe-clean-mpfr clean-host: maybe-clean-mpc clean-host: maybe-clean-isl -clean-host: maybe-clean-cloog clean-host: maybe-clean-libelf clean-host: maybe-clean-gold clean-host: maybe-clean-gprof @@ -1966,6 +2057,7 @@ clean-host: maybe-clean-libcpp clean-host: maybe-clean-libdecnumber clean-host: maybe-clean-libgui clean-host: maybe-clean-libiberty +clean-host: maybe-clean-libiberty-linker-plugin clean-host: maybe-clean-libiconv clean-host: maybe-clean-m4 clean-host: maybe-clean-readline @@ -1981,12 +2073,17 @@ clean-host: maybe-clean-libtermcap clean-host: maybe-clean-utils clean-host: maybe-clean-gnattools clean-host: maybe-clean-lto-plugin +clean-host: maybe-clean-libcc1 +clean-host: maybe-clean-gotools .PHONY: clean-target clean-target: maybe-clean-target-libstdc++-v3 -clean-target: maybe-clean-target-libmudflap clean-target: maybe-clean-target-libsanitizer +clean-target: maybe-clean-target-libmpx +clean-target: maybe-clean-target-libvtv +clean-target: maybe-clean-target-libcilkrts +clean-target: maybe-clean-target-liboffloadmic clean-target: maybe-clean-target-libssp clean-target: maybe-clean-target-newlib clean-target: maybe-clean-target-libgcc @@ -2035,7 +2132,6 @@ distclean-host: maybe-distclean-gmp distclean-host: maybe-distclean-mpfr distclean-host: maybe-distclean-mpc distclean-host: maybe-distclean-isl -distclean-host: maybe-distclean-cloog distclean-host: maybe-distclean-libelf distclean-host: maybe-distclean-gold distclean-host: maybe-distclean-gprof @@ -2048,6 +2144,7 @@ distclean-host: maybe-distclean-libcpp distclean-host: maybe-distclean-libdecnumber distclean-host: maybe-distclean-libgui distclean-host: maybe-distclean-libiberty +distclean-host: maybe-distclean-libiberty-linker-plugin distclean-host: maybe-distclean-libiconv distclean-host: maybe-distclean-m4 distclean-host: maybe-distclean-readline @@ -2063,12 +2160,17 @@ distclean-host: maybe-distclean-libtermcap distclean-host: maybe-distclean-utils distclean-host: maybe-distclean-gnattools distclean-host: maybe-distclean-lto-plugin +distclean-host: maybe-distclean-libcc1 +distclean-host: maybe-distclean-gotools .PHONY: distclean-target distclean-target: maybe-distclean-target-libstdc++-v3 -distclean-target: maybe-distclean-target-libmudflap distclean-target: maybe-distclean-target-libsanitizer +distclean-target: maybe-distclean-target-libmpx +distclean-target: maybe-distclean-target-libvtv +distclean-target: maybe-distclean-target-libcilkrts +distclean-target: maybe-distclean-target-liboffloadmic distclean-target: maybe-distclean-target-libssp distclean-target: maybe-distclean-target-newlib distclean-target: maybe-distclean-target-libgcc @@ -2117,7 +2219,6 @@ maintainer-clean-host: maybe-maintainer-clean-gmp maintainer-clean-host: maybe-maintainer-clean-mpfr maintainer-clean-host: maybe-maintainer-clean-mpc maintainer-clean-host: maybe-maintainer-clean-isl -maintainer-clean-host: maybe-maintainer-clean-cloog maintainer-clean-host: maybe-maintainer-clean-libelf maintainer-clean-host: maybe-maintainer-clean-gold maintainer-clean-host: maybe-maintainer-clean-gprof @@ -2130,6 +2231,7 @@ maintainer-clean-host: maybe-maintainer-clean-libcpp maintainer-clean-host: maybe-maintainer-clean-libdecnumber maintainer-clean-host: maybe-maintainer-clean-libgui maintainer-clean-host: maybe-maintainer-clean-libiberty +maintainer-clean-host: maybe-maintainer-clean-libiberty-linker-plugin maintainer-clean-host: maybe-maintainer-clean-libiconv maintainer-clean-host: maybe-maintainer-clean-m4 maintainer-clean-host: maybe-maintainer-clean-readline @@ -2145,12 +2247,17 @@ maintainer-clean-host: maybe-maintainer-clean-libtermcap maintainer-clean-host: maybe-maintainer-clean-utils maintainer-clean-host: maybe-maintainer-clean-gnattools maintainer-clean-host: maybe-maintainer-clean-lto-plugin +maintainer-clean-host: maybe-maintainer-clean-libcc1 +maintainer-clean-host: maybe-maintainer-clean-gotools .PHONY: maintainer-clean-target maintainer-clean-target: maybe-maintainer-clean-target-libstdc++-v3 -maintainer-clean-target: maybe-maintainer-clean-target-libmudflap maintainer-clean-target: maybe-maintainer-clean-target-libsanitizer +maintainer-clean-target: maybe-maintainer-clean-target-libmpx +maintainer-clean-target: maybe-maintainer-clean-target-libvtv +maintainer-clean-target: maybe-maintainer-clean-target-libcilkrts +maintainer-clean-target: maybe-maintainer-clean-target-liboffloadmic maintainer-clean-target: maybe-maintainer-clean-target-libssp maintainer-clean-target: maybe-maintainer-clean-target-newlib maintainer-clean-target: maybe-maintainer-clean-target-libgcc @@ -2191,9 +2298,9 @@ do-info: maybe-all-texinfo install-info: do-install-info dir.info s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if [ -f dir.info ] ; then \ - $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ - else true ; fi + if [ -f dir.info ]; then \ + $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info; \ + else true; fi install-pdf: do-install-pdf @@ -2254,7 +2361,6 @@ check-host: \ maybe-check-mpfr \ maybe-check-mpc \ maybe-check-isl \ - maybe-check-cloog \ maybe-check-libelf \ maybe-check-gold \ maybe-check-gprof \ @@ -2267,6 +2373,7 @@ check-host: \ maybe-check-libdecnumber \ maybe-check-libgui \ maybe-check-libiberty \ + maybe-check-libiberty-linker-plugin \ maybe-check-libiconv \ maybe-check-m4 \ maybe-check-readline \ @@ -2281,13 +2388,18 @@ check-host: \ maybe-check-libtermcap \ maybe-check-utils \ maybe-check-gnattools \ - maybe-check-lto-plugin + maybe-check-lto-plugin \ + maybe-check-libcc1 \ + maybe-check-gotools .PHONY: check-target check-target: \ maybe-check-target-libstdc++-v3 \ - maybe-check-target-libmudflap \ maybe-check-target-libsanitizer \ + maybe-check-target-libmpx \ + maybe-check-target-libvtv \ + maybe-check-target-libcilkrts \ + maybe-check-target-liboffloadmic \ maybe-check-target-libssp \ maybe-check-target-newlib \ maybe-check-target-libgcc \ @@ -2336,6 +2448,18 @@ mail-report-with-warnings.log: warning.log chmod +x $@ echo If you really want to send e-mail, run ./$@ now +# Local Vim config + +$(srcdir)/.local.vimrc: + $(LN_S) contrib/vimrc $@ + +$(srcdir)/.lvimrc: + $(LN_S) contrib/vimrc $@ + +vimrc: $(srcdir)/.local.vimrc $(srcdir)/.lvimrc + +.PHONY: vimrc + # Installation targets. .PHONY: install uninstall @@ -2362,7 +2486,6 @@ install-host-nogcc: \ maybe-install-mpfr \ maybe-install-mpc \ maybe-install-isl \ - maybe-install-cloog \ maybe-install-libelf \ maybe-install-gold \ maybe-install-gprof \ @@ -2375,6 +2498,7 @@ install-host-nogcc: \ maybe-install-libdecnumber \ maybe-install-libgui \ maybe-install-libiberty \ + maybe-install-libiberty-linker-plugin \ maybe-install-libiconv \ maybe-install-m4 \ maybe-install-readline \ @@ -2389,7 +2513,9 @@ install-host-nogcc: \ maybe-install-libtermcap \ maybe-install-utils \ maybe-install-gnattools \ - maybe-install-lto-plugin + maybe-install-lto-plugin \ + maybe-install-libcc1 \ + maybe-install-gotools .PHONY: install-host install-host: \ @@ -2409,7 +2535,6 @@ install-host: \ maybe-install-mpfr \ maybe-install-mpc \ maybe-install-isl \ - maybe-install-cloog \ maybe-install-libelf \ maybe-install-gold \ maybe-install-gprof \ @@ -2422,6 +2547,7 @@ install-host: \ maybe-install-libdecnumber \ maybe-install-libgui \ maybe-install-libiberty \ + maybe-install-libiberty-linker-plugin \ maybe-install-libiconv \ maybe-install-m4 \ maybe-install-readline \ @@ -2436,13 +2562,18 @@ install-host: \ maybe-install-libtermcap \ maybe-install-utils \ maybe-install-gnattools \ - maybe-install-lto-plugin + maybe-install-lto-plugin \ + maybe-install-libcc1 \ + maybe-install-gotools .PHONY: install-target install-target: \ maybe-install-target-libstdc++-v3 \ - maybe-install-target-libmudflap \ maybe-install-target-libsanitizer \ + maybe-install-target-libmpx \ + maybe-install-target-libvtv \ + maybe-install-target-libcilkrts \ + maybe-install-target-liboffloadmic \ maybe-install-target-libssp \ maybe-install-target-newlib \ maybe-install-target-libgcc \ @@ -2469,14 +2600,14 @@ uninstall: .PHONY: install.all install.all: install-no-fixedincludes - @if [ -f ./gcc/Makefile ] ; then \ - r=`${PWD_COMMAND}` ; export r ; \ + @if [ -f ./gcc/Makefile ]; then \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd ./gcc && \ - $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ + $(MAKE) $(FLAGS_TO_PASS) install-headers); \ else \ - true ; \ + true; \ fi # install-no-fixedincludes is used to allow the elaboration of binary packages @@ -2511,7 +2642,6 @@ install-strip-host: \ maybe-install-strip-mpfr \ maybe-install-strip-mpc \ maybe-install-strip-isl \ - maybe-install-strip-cloog \ maybe-install-strip-libelf \ maybe-install-strip-gold \ maybe-install-strip-gprof \ @@ -2524,6 +2654,7 @@ install-strip-host: \ maybe-install-strip-libdecnumber \ maybe-install-strip-libgui \ maybe-install-strip-libiberty \ + maybe-install-strip-libiberty-linker-plugin \ maybe-install-strip-libiconv \ maybe-install-strip-m4 \ maybe-install-strip-readline \ @@ -2538,13 +2669,18 @@ install-strip-host: \ maybe-install-strip-libtermcap \ maybe-install-strip-utils \ maybe-install-strip-gnattools \ - maybe-install-strip-lto-plugin + maybe-install-strip-lto-plugin \ + maybe-install-strip-libcc1 \ + maybe-install-strip-gotools .PHONY: install-strip-target install-strip-target: \ maybe-install-strip-target-libstdc++-v3 \ - maybe-install-strip-target-libmudflap \ maybe-install-strip-target-libsanitizer \ + maybe-install-strip-target-libmpx \ + maybe-install-strip-target-libvtv \ + maybe-install-strip-target-libcilkrts \ + maybe-install-strip-target-liboffloadmic \ maybe-install-strip-target-libssp \ maybe-install-strip-target-newlib \ maybe-install-strip-target-libgcc \ @@ -2577,10 +2713,10 @@ installdirs: mkinstalldirs $(SHELL) $(srcdir)/mkinstalldirs $(MAKEDIRS) dir.info: do-install-info - if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ - $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ - mv -f dir.info.new dir.info ; \ - else true ; \ + if [ -f $(srcdir)/texinfo/gen-info-dir ]; then \ + $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new; \ + mv -f dir.info.new dir.info; \ + else true; \ fi dist: @@ -2622,7 +2758,7 @@ configure-build-libiberty: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/libiberty; \ cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \ @@ -2631,12 +2767,13 @@ configure-build-libiberty: *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ + module_srcdir=libiberty; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif build-libiberty @@ -2678,7 +2815,7 @@ configure-build-bison: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/bison; \ cd "$(BUILD_SUBDIR)/bison" || exit 1; \ @@ -2687,12 +2824,13 @@ configure-build-bison: *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bison"; \ - libsrcdir="$$s/bison"; \ + module_srcdir=bison; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif build-bison @@ -2734,7 +2872,7 @@ configure-build-flex: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/flex; \ cd "$(BUILD_SUBDIR)/flex" || exit 1; \ @@ -2743,12 +2881,13 @@ configure-build-flex: *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/flex"; \ - libsrcdir="$$s/flex"; \ + module_srcdir=flex; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif build-flex @@ -2790,7 +2929,7 @@ configure-build-m4: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/m4; \ cd "$(BUILD_SUBDIR)/m4" || exit 1; \ @@ -2799,12 +2938,13 @@ configure-build-m4: *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/m4"; \ - libsrcdir="$$s/m4"; \ + module_srcdir=m4; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif build-m4 @@ -2846,7 +2986,7 @@ configure-build-texinfo: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/texinfo; \ cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \ @@ -2855,12 +2995,13 @@ configure-build-texinfo: *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/texinfo"; \ - libsrcdir="$$s/texinfo"; \ + module_srcdir=texinfo; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif build-texinfo @@ -2902,7 +3043,7 @@ configure-build-fixincludes: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ @@ -2911,12 +3052,13 @@ configure-build-fixincludes: *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/fixincludes"; \ - libsrcdir="$$s/fixincludes"; \ + module_srcdir=fixincludes; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif build-fixincludes @@ -2946,6 +3088,63 @@ all-build-fixincludes: configure-build-fixincludes +.PHONY: configure-build-libcpp maybe-configure-build-libcpp +maybe-configure-build-libcpp: +@if gcc-bootstrap +configure-build-libcpp: stage_current +@endif gcc-bootstrap +@if build-libcpp +maybe-configure-build-libcpp: configure-build-libcpp +configure-build-libcpp: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(BUILD_SUBDIR)/libcpp/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libcpp; \ + $(BUILD_EXPORTS) \ + echo Configuring in $(BUILD_SUBDIR)/libcpp; \ + cd "$(BUILD_SUBDIR)/libcpp" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/libcpp/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libcpp; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ + --target=${target_alias} --disable-nls am_cv_func_iconv=no \ + || exit 1 +@endif build-libcpp + + + + + +.PHONY: all-build-libcpp maybe-all-build-libcpp +maybe-all-build-libcpp: +@if gcc-bootstrap +all-build-libcpp: stage_current +@endif gcc-bootstrap +@if build-libcpp +TARGET-build-libcpp=all +maybe-all-build-libcpp: all-build-libcpp +all-build-libcpp: configure-build-libcpp + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(BUILD_EXPORTS) \ + (cd $(BUILD_SUBDIR)/libcpp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \ + $(TARGET-build-libcpp)) +@endif build-libcpp + + + + + # -------------------------------------- # Modules which run on the host machine # -------------------------------------- @@ -2962,7 +3161,7 @@ configure-bfd: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bfd; \ cd "$(HOST_SUBDIR)/bfd" || exit 1; \ @@ -2971,11 +3170,12 @@ configure-bfd: *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif bfd @@ -2996,19 +3196,20 @@ configure-stage1-bfd: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/bfd; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -3028,19 +3229,19 @@ configure-stage2-bfd: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/bfd; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -3061,19 +3262,19 @@ configure-stage3-bfd: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/bfd; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -3094,19 +3295,19 @@ configure-stage4-bfd: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/bfd; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -3127,19 +3328,19 @@ configure-stageprofile-bfd: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/bfd; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -3160,19 +3361,19 @@ configure-stagefeedback-bfd: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/bfd; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd; \ cd $(HOST_SUBDIR)/bfd || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/bfd/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bfd"; \ - libsrcdir="$$s/bfd"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bfd; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif bfd-bootstrap @@ -3459,9 +3660,9 @@ check-bfd: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bfd && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif bfd @@ -3511,7 +3712,7 @@ info-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in bfd" ; \ + echo "Doing info in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3536,7 +3737,7 @@ dvi-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in bfd" ; \ + echo "Doing dvi in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3561,7 +3762,7 @@ pdf-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in bfd" ; \ + echo "Doing pdf in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3586,7 +3787,7 @@ html-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in bfd" ; \ + echo "Doing html in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3611,7 +3812,7 @@ TAGS-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in bfd" ; \ + echo "Doing TAGS in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3637,7 +3838,7 @@ install-info-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in bfd" ; \ + echo "Doing install-info in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3663,7 +3864,7 @@ install-pdf-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in bfd" ; \ + echo "Doing install-pdf in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3689,7 +3890,7 @@ install-html-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in bfd" ; \ + echo "Doing install-html in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3714,7 +3915,7 @@ installcheck-bfd: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in bfd" ; \ + echo "Doing installcheck in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3738,7 +3939,7 @@ mostlyclean-bfd: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in bfd" ; \ + echo "Doing mostlyclean in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3762,7 +3963,7 @@ clean-bfd: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in bfd" ; \ + echo "Doing clean in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3786,7 +3987,7 @@ distclean-bfd: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in bfd" ; \ + echo "Doing distclean in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3810,7 +4011,7 @@ maintainer-clean-bfd: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in bfd" ; \ + echo "Doing maintainer-clean in bfd"; \ (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -3834,7 +4035,7 @@ configure-opcodes: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/opcodes; \ cd "$(HOST_SUBDIR)/opcodes" || exit 1; \ @@ -3843,11 +4044,12 @@ configure-opcodes: *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif opcodes @@ -3868,19 +4070,20 @@ configure-stage1-opcodes: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -3900,19 +4103,19 @@ configure-stage2-opcodes: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -3933,19 +4136,19 @@ configure-stage3-opcodes: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -3966,19 +4169,19 @@ configure-stage4-opcodes: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -3999,19 +4202,19 @@ configure-stageprofile-opcodes: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/opcodes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -4032,19 +4235,19 @@ configure-stagefeedback-opcodes: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes; \ cd $(HOST_SUBDIR)/opcodes || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/opcodes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/opcodes"; \ - libsrcdir="$$s/opcodes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=opcodes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif opcodes-bootstrap @@ -4331,9 +4534,9 @@ check-opcodes: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/opcodes && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif opcodes @@ -4383,7 +4586,7 @@ info-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in opcodes" ; \ + echo "Doing info in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4408,7 +4611,7 @@ dvi-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in opcodes" ; \ + echo "Doing dvi in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4433,7 +4636,7 @@ pdf-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in opcodes" ; \ + echo "Doing pdf in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4458,7 +4661,7 @@ html-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in opcodes" ; \ + echo "Doing html in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4483,7 +4686,7 @@ TAGS-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in opcodes" ; \ + echo "Doing TAGS in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4509,7 +4712,7 @@ install-info-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in opcodes" ; \ + echo "Doing install-info in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4535,7 +4738,7 @@ install-pdf-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in opcodes" ; \ + echo "Doing install-pdf in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4561,7 +4764,7 @@ install-html-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in opcodes" ; \ + echo "Doing install-html in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4586,7 +4789,7 @@ installcheck-opcodes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in opcodes" ; \ + echo "Doing installcheck in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4610,7 +4813,7 @@ mostlyclean-opcodes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in opcodes" ; \ + echo "Doing mostlyclean in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4634,7 +4837,7 @@ clean-opcodes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in opcodes" ; \ + echo "Doing clean in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4658,7 +4861,7 @@ distclean-opcodes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in opcodes" ; \ + echo "Doing distclean in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4682,7 +4885,7 @@ maintainer-clean-opcodes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in opcodes" ; \ + echo "Doing maintainer-clean in opcodes"; \ (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -4706,7 +4909,7 @@ configure-binutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/binutils; \ cd "$(HOST_SUBDIR)/binutils" || exit 1; \ @@ -4715,11 +4918,12 @@ configure-binutils: *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif binutils @@ -4740,19 +4944,20 @@ configure-stage1-binutils: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/binutils; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -4772,19 +4977,19 @@ configure-stage2-binutils: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/binutils; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -4805,19 +5010,19 @@ configure-stage3-binutils: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/binutils; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -4838,19 +5043,19 @@ configure-stage4-binutils: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/binutils; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -4871,19 +5076,19 @@ configure-stageprofile-binutils: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/binutils; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -4904,19 +5109,19 @@ configure-stagefeedback-binutils: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/binutils; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils; \ cd $(HOST_SUBDIR)/binutils || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/binutils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/binutils"; \ - libsrcdir="$$s/binutils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=binutils; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif binutils-bootstrap @@ -5203,9 +5408,9 @@ check-binutils: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/binutils && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif binutils @@ -5255,7 +5460,7 @@ info-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in binutils" ; \ + echo "Doing info in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5280,7 +5485,7 @@ dvi-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in binutils" ; \ + echo "Doing dvi in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5305,7 +5510,7 @@ pdf-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in binutils" ; \ + echo "Doing pdf in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5330,7 +5535,7 @@ html-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in binutils" ; \ + echo "Doing html in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5355,7 +5560,7 @@ TAGS-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in binutils" ; \ + echo "Doing TAGS in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5381,7 +5586,7 @@ install-info-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in binutils" ; \ + echo "Doing install-info in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5407,7 +5612,7 @@ install-pdf-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in binutils" ; \ + echo "Doing install-pdf in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5433,7 +5638,7 @@ install-html-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in binutils" ; \ + echo "Doing install-html in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5458,7 +5663,7 @@ installcheck-binutils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in binutils" ; \ + echo "Doing installcheck in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5482,7 +5687,7 @@ mostlyclean-binutils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in binutils" ; \ + echo "Doing mostlyclean in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5506,7 +5711,7 @@ clean-binutils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in binutils" ; \ + echo "Doing clean in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5530,7 +5735,7 @@ distclean-binutils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in binutils" ; \ + echo "Doing distclean in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5554,7 +5759,7 @@ maintainer-clean-binutils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in binutils" ; \ + echo "Doing maintainer-clean in binutils"; \ (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5579,7 +5784,7 @@ configure-bison: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bison; \ cd "$(HOST_SUBDIR)/bison" || exit 1; \ @@ -5588,11 +5793,12 @@ configure-bison: *) topdir=`echo $(HOST_SUBDIR)/bison/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/bison"; \ - libsrcdir="$$s/bison"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=bison; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif bison @@ -5629,12 +5835,12 @@ maybe-check-bison: check-bison # This module is only tested in a native toolchain. check-bison: @: $(MAKE); $(unstage) - @if [ '$(host)' = '$(target)' ] ; then \ + @if [ '$(host)' = '$(target)' ]; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/bison && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + $(MAKE) $(FLAGS_TO_PASS) check) fi @endif bison @@ -5686,7 +5892,7 @@ info-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in bison" ; \ + echo "Doing info in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5712,7 +5918,7 @@ dvi-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in bison" ; \ + echo "Doing dvi in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5738,7 +5944,7 @@ pdf-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in bison" ; \ + echo "Doing pdf in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5764,7 +5970,7 @@ html-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in bison" ; \ + echo "Doing html in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5790,7 +5996,7 @@ TAGS-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in bison" ; \ + echo "Doing TAGS in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5817,7 +6023,7 @@ install-info-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in bison" ; \ + echo "Doing install-info in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5844,7 +6050,7 @@ install-pdf-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in bison" ; \ + echo "Doing install-pdf in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5871,7 +6077,7 @@ install-html-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in bison" ; \ + echo "Doing install-html in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5897,7 +6103,7 @@ installcheck-bison: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in bison" ; \ + echo "Doing installcheck in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5922,7 +6128,7 @@ mostlyclean-bison: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in bison" ; \ + echo "Doing mostlyclean in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5947,7 +6153,7 @@ clean-bison: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in bison" ; \ + echo "Doing clean in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5972,7 +6178,7 @@ distclean-bison: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in bison" ; \ + echo "Doing distclean in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -5997,7 +6203,7 @@ maintainer-clean-bison: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in bison" ; \ + echo "Doing maintainer-clean in bison"; \ (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6022,7 +6228,7 @@ configure-cgen: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/cgen/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/cgen; \ cd "$(HOST_SUBDIR)/cgen" || exit 1; \ @@ -6031,11 +6237,12 @@ configure-cgen: *) topdir=`echo $(HOST_SUBDIR)/cgen/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/cgen"; \ - libsrcdir="$$s/cgen"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=cgen; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif cgen @@ -6073,7 +6280,7 @@ check-cgen: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -6126,7 +6333,7 @@ info-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in cgen" ; \ + echo "Doing info in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6152,7 +6359,7 @@ dvi-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in cgen" ; \ + echo "Doing dvi in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6178,7 +6385,7 @@ pdf-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in cgen" ; \ + echo "Doing pdf in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6204,7 +6411,7 @@ html-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in cgen" ; \ + echo "Doing html in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6230,7 +6437,7 @@ TAGS-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in cgen" ; \ + echo "Doing TAGS in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6257,7 +6464,7 @@ install-info-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in cgen" ; \ + echo "Doing install-info in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6284,7 +6491,7 @@ install-pdf-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in cgen" ; \ + echo "Doing install-pdf in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6311,7 +6518,7 @@ install-html-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in cgen" ; \ + echo "Doing install-html in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6337,7 +6544,7 @@ installcheck-cgen: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in cgen" ; \ + echo "Doing installcheck in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6362,7 +6569,7 @@ mostlyclean-cgen: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in cgen" ; \ + echo "Doing mostlyclean in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6387,7 +6594,7 @@ clean-cgen: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in cgen" ; \ + echo "Doing clean in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6412,7 +6619,7 @@ distclean-cgen: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in cgen" ; \ + echo "Doing distclean in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6437,7 +6644,7 @@ maintainer-clean-cgen: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in cgen" ; \ + echo "Doing maintainer-clean in cgen"; \ (cd $(HOST_SUBDIR)/cgen && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6462,7 +6669,7 @@ configure-dejagnu: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/dejagnu; \ cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \ @@ -6471,11 +6678,12 @@ configure-dejagnu: *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/dejagnu"; \ - libsrcdir="$$s/dejagnu"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=dejagnu; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif dejagnu @@ -6513,7 +6721,7 @@ check-dejagnu: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -6566,7 +6774,7 @@ info-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in dejagnu" ; \ + echo "Doing info in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6592,7 +6800,7 @@ dvi-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in dejagnu" ; \ + echo "Doing dvi in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6618,7 +6826,7 @@ pdf-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in dejagnu" ; \ + echo "Doing pdf in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6644,7 +6852,7 @@ html-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in dejagnu" ; \ + echo "Doing html in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6670,7 +6878,7 @@ TAGS-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in dejagnu" ; \ + echo "Doing TAGS in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6697,7 +6905,7 @@ install-info-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in dejagnu" ; \ + echo "Doing install-info in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6724,7 +6932,7 @@ install-pdf-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in dejagnu" ; \ + echo "Doing install-pdf in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6751,7 +6959,7 @@ install-html-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in dejagnu" ; \ + echo "Doing install-html in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6777,7 +6985,7 @@ installcheck-dejagnu: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in dejagnu" ; \ + echo "Doing installcheck in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6802,7 +7010,7 @@ mostlyclean-dejagnu: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in dejagnu" ; \ + echo "Doing mostlyclean in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6827,7 +7035,7 @@ clean-dejagnu: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in dejagnu" ; \ + echo "Doing clean in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6852,7 +7060,7 @@ distclean-dejagnu: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in dejagnu" ; \ + echo "Doing distclean in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6877,7 +7085,7 @@ maintainer-clean-dejagnu: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in dejagnu" ; \ + echo "Doing maintainer-clean in dejagnu"; \ (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -6902,7 +7110,7 @@ configure-etc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/etc; \ cd "$(HOST_SUBDIR)/etc" || exit 1; \ @@ -6911,11 +7119,12 @@ configure-etc: *) topdir=`echo $(HOST_SUBDIR)/etc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/etc"; \ - libsrcdir="$$s/etc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=etc; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif etc @@ -6953,7 +7162,7 @@ check-etc: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -7006,7 +7215,7 @@ info-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in etc" ; \ + echo "Doing info in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7032,7 +7241,7 @@ dvi-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in etc" ; \ + echo "Doing dvi in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7058,7 +7267,7 @@ pdf-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in etc" ; \ + echo "Doing pdf in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7084,7 +7293,7 @@ html-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in etc" ; \ + echo "Doing html in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7110,7 +7319,7 @@ TAGS-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in etc" ; \ + echo "Doing TAGS in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7137,7 +7346,7 @@ install-info-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in etc" ; \ + echo "Doing install-info in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7164,7 +7373,7 @@ install-pdf-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in etc" ; \ + echo "Doing install-pdf in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7191,7 +7400,7 @@ install-html-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in etc" ; \ + echo "Doing install-html in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7217,7 +7426,7 @@ installcheck-etc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in etc" ; \ + echo "Doing installcheck in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7242,7 +7451,7 @@ mostlyclean-etc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in etc" ; \ + echo "Doing mostlyclean in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7267,7 +7476,7 @@ clean-etc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in etc" ; \ + echo "Doing clean in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7292,7 +7501,7 @@ distclean-etc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in etc" ; \ + echo "Doing distclean in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7317,7 +7526,7 @@ maintainer-clean-etc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in etc" ; \ + echo "Doing maintainer-clean in etc"; \ (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7342,7 +7551,7 @@ configure-fastjar: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fastjar; \ cd "$(HOST_SUBDIR)/fastjar" || exit 1; \ @@ -7351,11 +7560,12 @@ configure-fastjar: *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/fastjar"; \ - libsrcdir="$$s/fastjar"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=fastjar; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif fastjar @@ -7392,12 +7602,12 @@ maybe-check-fastjar: check-fastjar # This module is only tested in a native toolchain. check-fastjar: @: $(MAKE); $(unstage) - @if [ '$(host)' = '$(target)' ] ; then \ + @if [ '$(host)' = '$(target)' ]; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fastjar && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + $(MAKE) $(FLAGS_TO_PASS) check) fi @endif fastjar @@ -7449,7 +7659,7 @@ info-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in fastjar" ; \ + echo "Doing info in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7475,7 +7685,7 @@ dvi-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in fastjar" ; \ + echo "Doing dvi in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7501,7 +7711,7 @@ pdf-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in fastjar" ; \ + echo "Doing pdf in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7527,7 +7737,7 @@ html-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in fastjar" ; \ + echo "Doing html in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7553,7 +7763,7 @@ TAGS-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in fastjar" ; \ + echo "Doing TAGS in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7580,7 +7790,7 @@ install-info-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in fastjar" ; \ + echo "Doing install-info in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7607,7 +7817,7 @@ install-pdf-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in fastjar" ; \ + echo "Doing install-pdf in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7634,7 +7844,7 @@ install-html-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in fastjar" ; \ + echo "Doing install-html in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7660,7 +7870,7 @@ installcheck-fastjar: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in fastjar" ; \ + echo "Doing installcheck in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7685,7 +7895,7 @@ mostlyclean-fastjar: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in fastjar" ; \ + echo "Doing mostlyclean in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7710,7 +7920,7 @@ clean-fastjar: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in fastjar" ; \ + echo "Doing clean in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7735,7 +7945,7 @@ distclean-fastjar: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in fastjar" ; \ + echo "Doing distclean in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7760,7 +7970,7 @@ maintainer-clean-fastjar: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in fastjar" ; \ + echo "Doing maintainer-clean in fastjar"; \ (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7781,11 +7991,10 @@ configure-fixincludes: stage_current @if fixincludes maybe-configure-fixincludes: configure-fixincludes configure-fixincludes: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fixincludes; \ cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \ @@ -7794,16 +8003,216 @@ configure-fixincludes: *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/fixincludes"; \ - libsrcdir="$$s/fixincludes"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=fixincludes; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif fixincludes +.PHONY: configure-stage1-fixincludes maybe-configure-stage1-fixincludes +maybe-configure-stage1-fixincludes: +@if fixincludes-bootstrap +maybe-configure-stage1-fixincludes: configure-stage1-fixincludes +configure-stage1-fixincludes: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/fixincludes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ + cd $(HOST_SUBDIR)/fixincludes || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=fixincludes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) +@endif fixincludes-bootstrap + +.PHONY: configure-stage2-fixincludes maybe-configure-stage2-fixincludes +maybe-configure-stage2-fixincludes: +@if fixincludes-bootstrap +maybe-configure-stage2-fixincludes: configure-stage2-fixincludes +configure-stage2-fixincludes: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/fixincludes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ + cd $(HOST_SUBDIR)/fixincludes || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=fixincludes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) +@endif fixincludes-bootstrap + +.PHONY: configure-stage3-fixincludes maybe-configure-stage3-fixincludes +maybe-configure-stage3-fixincludes: +@if fixincludes-bootstrap +maybe-configure-stage3-fixincludes: configure-stage3-fixincludes +configure-stage3-fixincludes: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/fixincludes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ + cd $(HOST_SUBDIR)/fixincludes || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=fixincludes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) +@endif fixincludes-bootstrap + +.PHONY: configure-stage4-fixincludes maybe-configure-stage4-fixincludes +maybe-configure-stage4-fixincludes: +@if fixincludes-bootstrap +maybe-configure-stage4-fixincludes: configure-stage4-fixincludes +configure-stage4-fixincludes: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/fixincludes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ + cd $(HOST_SUBDIR)/fixincludes || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=fixincludes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) +@endif fixincludes-bootstrap + +.PHONY: configure-stageprofile-fixincludes maybe-configure-stageprofile-fixincludes +maybe-configure-stageprofile-fixincludes: +@if fixincludes-bootstrap +maybe-configure-stageprofile-fixincludes: configure-stageprofile-fixincludes +configure-stageprofile-fixincludes: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(HOST_SUBDIR)/fixincludes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ + cd $(HOST_SUBDIR)/fixincludes || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=fixincludes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) +@endif fixincludes-bootstrap + +.PHONY: configure-stagefeedback-fixincludes maybe-configure-stagefeedback-fixincludes +maybe-configure-stagefeedback-fixincludes: +@if fixincludes-bootstrap +maybe-configure-stagefeedback-fixincludes: configure-stagefeedback-fixincludes +configure-stagefeedback-fixincludes: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/fixincludes; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes; \ + cd $(HOST_SUBDIR)/fixincludes || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=fixincludes; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif fixincludes-bootstrap + + + .PHONY: all-fixincludes maybe-all-fixincludes @@ -7815,7 +8224,6 @@ all-fixincludes: stage_current TARGET-fixincludes=all maybe-all-fixincludes: all-fixincludes all-fixincludes: configure-fixincludes - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ @@ -7826,6 +8234,255 @@ all-fixincludes: configure-fixincludes +.PHONY: all-stage1-fixincludes maybe-all-stage1-fixincludes +.PHONY: clean-stage1-fixincludes maybe-clean-stage1-fixincludes +maybe-all-stage1-fixincludes: +maybe-clean-stage1-fixincludes: +@if fixincludes-bootstrap +maybe-all-stage1-fixincludes: all-stage1-fixincludes +all-stage1: all-stage1-fixincludes +TARGET-stage1-fixincludes = $(TARGET-fixincludes) +all-stage1-fixincludes: configure-stage1-fixincludes + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" \ + CXXFLAGS="$(STAGE1_CXXFLAGS)" \ + LIBCFLAGS="$(LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) \ + $(STAGE1_FLAGS_TO_PASS) \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-fixincludes) + +maybe-clean-stage1-fixincludes: clean-stage1-fixincludes +clean-stage1: clean-stage1-fixincludes +clean-stage1-fixincludes: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage1-fixincludes/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(STAGE1_FLAGS_TO_PASS) clean +@endif fixincludes-bootstrap + + +.PHONY: all-stage2-fixincludes maybe-all-stage2-fixincludes +.PHONY: clean-stage2-fixincludes maybe-clean-stage2-fixincludes +maybe-all-stage2-fixincludes: +maybe-clean-stage2-fixincludes: +@if fixincludes-bootstrap +maybe-all-stage2-fixincludes: all-stage2-fixincludes +all-stage2: all-stage2-fixincludes +TARGET-stage2-fixincludes = $(TARGET-fixincludes) +all-stage2-fixincludes: configure-stage2-fixincludes + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" \ + CXXFLAGS="$(STAGE2_CXXFLAGS)" \ + LIBCFLAGS="$(STAGE2_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-fixincludes) + +maybe-clean-stage2-fixincludes: clean-stage2-fixincludes +clean-stage2: clean-stage2-fixincludes +clean-stage2-fixincludes: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage2-fixincludes/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif fixincludes-bootstrap + + +.PHONY: all-stage3-fixincludes maybe-all-stage3-fixincludes +.PHONY: clean-stage3-fixincludes maybe-clean-stage3-fixincludes +maybe-all-stage3-fixincludes: +maybe-clean-stage3-fixincludes: +@if fixincludes-bootstrap +maybe-all-stage3-fixincludes: all-stage3-fixincludes +all-stage3: all-stage3-fixincludes +TARGET-stage3-fixincludes = $(TARGET-fixincludes) +all-stage3-fixincludes: configure-stage3-fixincludes + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" \ + CXXFLAGS="$(STAGE3_CXXFLAGS)" \ + LIBCFLAGS="$(STAGE3_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-fixincludes) + +maybe-clean-stage3-fixincludes: clean-stage3-fixincludes +clean-stage3: clean-stage3-fixincludes +clean-stage3-fixincludes: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage3-fixincludes/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif fixincludes-bootstrap + + +.PHONY: all-stage4-fixincludes maybe-all-stage4-fixincludes +.PHONY: clean-stage4-fixincludes maybe-clean-stage4-fixincludes +maybe-all-stage4-fixincludes: +maybe-clean-stage4-fixincludes: +@if fixincludes-bootstrap +maybe-all-stage4-fixincludes: all-stage4-fixincludes +all-stage4: all-stage4-fixincludes +TARGET-stage4-fixincludes = $(TARGET-fixincludes) +all-stage4-fixincludes: configure-stage4-fixincludes + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" \ + CXXFLAGS="$(STAGE4_CXXFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + TFLAGS="$(STAGE4_TFLAGS)" \ + $(TARGET-stage4-fixincludes) + +maybe-clean-stage4-fixincludes: clean-stage4-fixincludes +clean-stage4: clean-stage4-fixincludes +clean-stage4-fixincludes: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage4-fixincludes/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif fixincludes-bootstrap + + +.PHONY: all-stageprofile-fixincludes maybe-all-stageprofile-fixincludes +.PHONY: clean-stageprofile-fixincludes maybe-clean-stageprofile-fixincludes +maybe-all-stageprofile-fixincludes: +maybe-clean-stageprofile-fixincludes: +@if fixincludes-bootstrap +maybe-all-stageprofile-fixincludes: all-stageprofile-fixincludes +all-stageprofile: all-stageprofile-fixincludes +TARGET-stageprofile-fixincludes = $(TARGET-fixincludes) +all-stageprofile-fixincludes: configure-stageprofile-fixincludes + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGEprofile_CFLAGS)" \ + CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + TFLAGS="$(STAGEprofile_TFLAGS)" \ + $(TARGET-stageprofile-fixincludes) + +maybe-clean-stageprofile-fixincludes: clean-stageprofile-fixincludes +clean-stageprofile: clean-stageprofile-fixincludes +clean-stageprofile-fixincludes: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageprofile-fixincludes/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif fixincludes-bootstrap + + +.PHONY: all-stagefeedback-fixincludes maybe-all-stagefeedback-fixincludes +.PHONY: clean-stagefeedback-fixincludes maybe-clean-stagefeedback-fixincludes +maybe-all-stagefeedback-fixincludes: +maybe-clean-stagefeedback-fixincludes: +@if fixincludes-bootstrap +maybe-all-stagefeedback-fixincludes: all-stagefeedback-fixincludes +all-stagefeedback: all-stagefeedback-fixincludes +TARGET-stagefeedback-fixincludes = $(TARGET-fixincludes) +all-stagefeedback-fixincludes: configure-stagefeedback-fixincludes + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)" \ + CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + TFLAGS="$(STAGEfeedback_TFLAGS)" \ + $(TARGET-stagefeedback-fixincludes) + +maybe-clean-stagefeedback-fixincludes: clean-stagefeedback-fixincludes +clean-stagefeedback: clean-stagefeedback-fixincludes +clean-stagefeedback-fixincludes: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(HOST_SUBDIR)/fixincludes/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stagefeedback-fixincludes/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif fixincludes-bootstrap + + + + .PHONY: check-fixincludes maybe-check-fixincludes maybe-check-fixincludes: @@ -7836,9 +8493,9 @@ check-fixincludes: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/fixincludes && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif fixincludes @@ -7881,7 +8538,6 @@ maybe-info-fixincludes: info-fixincludes info-fixincludes: \ configure-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -7889,7 +8545,7 @@ info-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in fixincludes" ; \ + echo "Doing info in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7907,7 +8563,6 @@ maybe-dvi-fixincludes: dvi-fixincludes dvi-fixincludes: \ configure-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -7915,7 +8570,7 @@ dvi-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in fixincludes" ; \ + echo "Doing dvi in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7933,7 +8588,6 @@ maybe-pdf-fixincludes: pdf-fixincludes pdf-fixincludes: \ configure-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -7941,7 +8595,7 @@ pdf-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in fixincludes" ; \ + echo "Doing pdf in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7959,7 +8613,6 @@ maybe-html-fixincludes: html-fixincludes html-fixincludes: \ configure-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -7967,7 +8620,7 @@ html-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in fixincludes" ; \ + echo "Doing html in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -7996,7 +8649,6 @@ maybe-install-info-fixincludes: install-info-fixincludes install-info-fixincludes: \ configure-fixincludes \ info-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8004,7 +8656,7 @@ install-info-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in fixincludes" ; \ + echo "Doing install-info in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8023,7 +8675,6 @@ maybe-install-pdf-fixincludes: install-pdf-fixincludes install-pdf-fixincludes: \ configure-fixincludes \ pdf-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8031,7 +8682,7 @@ install-pdf-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in fixincludes" ; \ + echo "Doing install-pdf in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8050,7 +8701,6 @@ maybe-install-html-fixincludes: install-html-fixincludes install-html-fixincludes: \ configure-fixincludes \ html-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8058,7 +8708,7 @@ install-html-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in fixincludes" ; \ + echo "Doing install-html in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8076,7 +8726,6 @@ maybe-installcheck-fixincludes: installcheck-fixincludes installcheck-fixincludes: \ configure-fixincludes - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8084,7 +8733,7 @@ installcheck-fixincludes: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in fixincludes" ; \ + echo "Doing installcheck in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8101,7 +8750,6 @@ maybe-mostlyclean-fixincludes: maybe-mostlyclean-fixincludes: mostlyclean-fixincludes mostlyclean-fixincludes: - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8109,7 +8757,7 @@ mostlyclean-fixincludes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in fixincludes" ; \ + echo "Doing mostlyclean in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8126,7 +8774,6 @@ maybe-clean-fixincludes: maybe-clean-fixincludes: clean-fixincludes clean-fixincludes: - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8134,7 +8781,7 @@ clean-fixincludes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in fixincludes" ; \ + echo "Doing clean in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8151,7 +8798,6 @@ maybe-distclean-fixincludes: maybe-distclean-fixincludes: distclean-fixincludes distclean-fixincludes: - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8159,7 +8805,7 @@ distclean-fixincludes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in fixincludes" ; \ + echo "Doing distclean in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8176,7 +8822,6 @@ maybe-maintainer-clean-fixincludes: maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes maintainer-clean-fixincludes: - @: $(MAKE); $(unstage) @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -8184,7 +8829,7 @@ maintainer-clean-fixincludes: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in fixincludes" ; \ + echo "Doing maintainer-clean in fixincludes"; \ (cd $(HOST_SUBDIR)/fixincludes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8209,7 +8854,7 @@ configure-flex: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/flex; \ cd "$(HOST_SUBDIR)/flex" || exit 1; \ @@ -8218,11 +8863,12 @@ configure-flex: *) topdir=`echo $(HOST_SUBDIR)/flex/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/flex"; \ - libsrcdir="$$s/flex"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=flex; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif flex @@ -8259,12 +8905,12 @@ maybe-check-flex: check-flex # This module is only tested in a native toolchain. check-flex: @: $(MAKE); $(unstage) - @if [ '$(host)' = '$(target)' ] ; then \ + @if [ '$(host)' = '$(target)' ]; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/flex && \ - $(MAKE) $(FLAGS_TO_PASS) check); \ + $(MAKE) $(FLAGS_TO_PASS) check) fi @endif flex @@ -8316,7 +8962,7 @@ info-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in flex" ; \ + echo "Doing info in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8342,7 +8988,7 @@ dvi-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in flex" ; \ + echo "Doing dvi in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8368,7 +9014,7 @@ pdf-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in flex" ; \ + echo "Doing pdf in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8394,7 +9040,7 @@ html-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in flex" ; \ + echo "Doing html in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8420,7 +9066,7 @@ TAGS-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in flex" ; \ + echo "Doing TAGS in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8447,7 +9093,7 @@ install-info-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in flex" ; \ + echo "Doing install-info in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8474,7 +9120,7 @@ install-pdf-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in flex" ; \ + echo "Doing install-pdf in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8501,7 +9147,7 @@ install-html-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in flex" ; \ + echo "Doing install-html in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8527,7 +9173,7 @@ installcheck-flex: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in flex" ; \ + echo "Doing installcheck in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8552,7 +9198,7 @@ mostlyclean-flex: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in flex" ; \ + echo "Doing mostlyclean in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8577,7 +9223,7 @@ clean-flex: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in flex" ; \ + echo "Doing clean in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8602,7 +9248,7 @@ distclean-flex: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in flex" ; \ + echo "Doing distclean in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8627,7 +9273,7 @@ maintainer-clean-flex: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in flex" ; \ + echo "Doing maintainer-clean in flex"; \ (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -8651,7 +9297,7 @@ configure-gas: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gas; \ cd "$(HOST_SUBDIR)/gas" || exit 1; \ @@ -8660,11 +9306,12 @@ configure-gas: *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif gas @@ -8685,19 +9332,20 @@ configure-stage1-gas: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/gas; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ cd $(HOST_SUBDIR)/gas || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -8717,19 +9365,19 @@ configure-stage2-gas: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/gas; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ cd $(HOST_SUBDIR)/gas || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -8750,19 +9398,19 @@ configure-stage3-gas: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/gas; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ cd $(HOST_SUBDIR)/gas || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -8783,19 +9431,19 @@ configure-stage4-gas: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/gas; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ cd $(HOST_SUBDIR)/gas || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -8816,19 +9464,19 @@ configure-stageprofile-gas: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/gas; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ cd $(HOST_SUBDIR)/gas || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -8849,19 +9497,19 @@ configure-stagefeedback-gas: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/gas; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas; \ cd $(HOST_SUBDIR)/gas || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gas/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gas"; \ - libsrcdir="$$s/gas"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gas; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif gas-bootstrap @@ -9148,9 +9796,9 @@ check-gas: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gas && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif gas @@ -9200,7 +9848,7 @@ info-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gas" ; \ + echo "Doing info in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9225,7 +9873,7 @@ dvi-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gas" ; \ + echo "Doing dvi in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9250,7 +9898,7 @@ pdf-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gas" ; \ + echo "Doing pdf in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9275,7 +9923,7 @@ html-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gas" ; \ + echo "Doing html in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9300,7 +9948,7 @@ TAGS-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gas" ; \ + echo "Doing TAGS in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9326,7 +9974,7 @@ install-info-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gas" ; \ + echo "Doing install-info in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9352,7 +10000,7 @@ install-pdf-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gas" ; \ + echo "Doing install-pdf in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9378,7 +10026,7 @@ install-html-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gas" ; \ + echo "Doing install-html in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9403,7 +10051,7 @@ installcheck-gas: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gas" ; \ + echo "Doing installcheck in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9427,7 +10075,7 @@ mostlyclean-gas: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gas" ; \ + echo "Doing mostlyclean in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9451,7 +10099,7 @@ clean-gas: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gas" ; \ + echo "Doing clean in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9475,7 +10123,7 @@ distclean-gas: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gas" ; \ + echo "Doing distclean in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9499,7 +10147,7 @@ maintainer-clean-gas: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gas" ; \ + echo "Doing maintainer-clean in gas"; \ (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -9523,7 +10171,7 @@ configure-gcc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gcc; \ cd "$(HOST_SUBDIR)/gcc" || exit 1; \ @@ -9532,11 +10180,12 @@ configure-gcc: *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif gcc @@ -9557,19 +10206,20 @@ configure-stage1-gcc: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -9589,19 +10239,19 @@ configure-stage2-gcc: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -9622,19 +10272,19 @@ configure-stage3-gcc: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -9655,19 +10305,19 @@ configure-stage4-gcc: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -9688,19 +10338,19 @@ configure-stageprofile-gcc: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -9721,19 +10371,19 @@ configure-stagefeedback-gcc: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/gcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc; \ cd $(HOST_SUBDIR)/gcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gcc"; \ - libsrcdir="$$s/gcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif gcc-bootstrap @@ -10020,9 +10670,9 @@ check-gcc: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gcc && \ - $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif gcc @@ -10072,7 +10722,7 @@ info-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gcc" ; \ + echo "Doing info in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10097,7 +10747,7 @@ dvi-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gcc" ; \ + echo "Doing dvi in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10122,7 +10772,7 @@ pdf-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gcc" ; \ + echo "Doing pdf in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10147,7 +10797,7 @@ html-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gcc" ; \ + echo "Doing html in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10172,7 +10822,7 @@ TAGS-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gcc" ; \ + echo "Doing TAGS in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10198,7 +10848,7 @@ install-info-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gcc" ; \ + echo "Doing install-info in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10224,7 +10874,7 @@ install-pdf-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gcc" ; \ + echo "Doing install-pdf in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10250,7 +10900,7 @@ install-html-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gcc" ; \ + echo "Doing install-html in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10275,7 +10925,7 @@ installcheck-gcc: \ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gcc" ; \ + echo "Doing installcheck in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10299,7 +10949,7 @@ mostlyclean-gcc: for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gcc" ; \ + echo "Doing mostlyclean in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10323,7 +10973,7 @@ clean-gcc: for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gcc" ; \ + echo "Doing clean in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10347,7 +10997,7 @@ distclean-gcc: for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gcc" ; \ + echo "Doing distclean in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10371,7 +11021,7 @@ maintainer-clean-gcc: for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gcc" ; \ + echo "Doing maintainer-clean in gcc"; \ (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10395,7 +11045,7 @@ configure-gmp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gmp; \ cd "$(HOST_SUBDIR)/gmp" || exit 1; \ @@ -10404,11 +11054,12 @@ configure-gmp: *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \ + --target=none-${host_vendor}-${host_os} --disable-shared LEX="touch lex.yy.c" \ || exit 1 @endif gmp @@ -10429,21 +11080,22 @@ configure-stage1-gmp: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/gmp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --target=none-${host_vendor}-${host_os} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ - --disable-shared + --disable-shared LEX="touch lex.yy.c" @endif gmp-bootstrap .PHONY: configure-stage2-gmp maybe-configure-stage2-gmp @@ -10462,22 +11114,22 @@ configure-stage2-gmp: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/gmp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --target=none-${host_vendor}-${host_os} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ - --disable-shared + --disable-shared LEX="touch lex.yy.c" @endif gmp-bootstrap .PHONY: configure-stage3-gmp maybe-configure-stage3-gmp @@ -10496,22 +11148,22 @@ configure-stage3-gmp: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/gmp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --target=none-${host_vendor}-${host_os} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ - --disable-shared + --disable-shared LEX="touch lex.yy.c" @endif gmp-bootstrap .PHONY: configure-stage4-gmp maybe-configure-stage4-gmp @@ -10530,22 +11182,22 @@ configure-stage4-gmp: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/gmp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --target=none-${host_vendor}-${host_os} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ - --disable-shared + --disable-shared LEX="touch lex.yy.c" @endif gmp-bootstrap .PHONY: configure-stageprofile-gmp maybe-configure-stageprofile-gmp @@ -10564,22 +11216,22 @@ configure-stageprofile-gmp: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/gmp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --target=none-${host_vendor}-${host_os} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ - --disable-shared + --disable-shared LEX="touch lex.yy.c" @endif gmp-bootstrap .PHONY: configure-stagefeedback-gmp maybe-configure-stagefeedback-gmp @@ -10598,22 +11250,22 @@ configure-stagefeedback-gmp: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/gmp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp; \ cd $(HOST_SUBDIR)/gmp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gmp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gmp"; \ - libsrcdir="$$s/gmp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gmp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} \ + --target=none-${host_vendor}-${host_os} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ - --disable-shared + --disable-shared LEX="touch lex.yy.c" @endif gmp-bootstrap @@ -10898,9 +11550,9 @@ check-gmp: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gmp && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif gmp @@ -10938,7 +11590,7 @@ info-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gmp" ; \ + echo "Doing info in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10963,7 +11615,7 @@ dvi-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gmp" ; \ + echo "Doing dvi in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -10988,7 +11640,7 @@ pdf-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gmp" ; \ + echo "Doing pdf in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11013,7 +11665,7 @@ html-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gmp" ; \ + echo "Doing html in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11038,7 +11690,7 @@ TAGS-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gmp" ; \ + echo "Doing TAGS in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11064,7 +11716,7 @@ install-info-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gmp" ; \ + echo "Doing install-info in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11090,7 +11742,7 @@ install-pdf-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gmp" ; \ + echo "Doing install-pdf in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11116,7 +11768,7 @@ install-html-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gmp" ; \ + echo "Doing install-html in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11141,7 +11793,7 @@ installcheck-gmp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gmp" ; \ + echo "Doing installcheck in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11165,7 +11817,7 @@ mostlyclean-gmp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gmp" ; \ + echo "Doing mostlyclean in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11189,7 +11841,7 @@ clean-gmp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gmp" ; \ + echo "Doing clean in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11213,7 +11865,7 @@ distclean-gmp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gmp" ; \ + echo "Doing distclean in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11237,7 +11889,7 @@ maintainer-clean-gmp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gmp" ; \ + echo "Doing maintainer-clean in gmp"; \ (cd $(HOST_SUBDIR)/gmp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11261,7 +11913,7 @@ configure-mpfr: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/mpfr; \ cd "$(HOST_SUBDIR)/mpfr" || exit 1; \ @@ -11270,11 +11922,12 @@ configure-mpfr: *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \ + --target=${target_alias} --disable-shared @extra_mpfr_configure_flags@ \ || exit 1 @endif mpfr @@ -11295,19 +11948,20 @@ configure-stage1-mpfr: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ --disable-shared @extra_mpfr_configure_flags@ @endif mpfr-bootstrap @@ -11328,19 +11982,19 @@ configure-stage2-mpfr: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ --disable-shared @extra_mpfr_configure_flags@ @@ -11362,19 +12016,19 @@ configure-stage3-mpfr: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ --disable-shared @extra_mpfr_configure_flags@ @@ -11396,19 +12050,19 @@ configure-stage4-mpfr: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ --disable-shared @extra_mpfr_configure_flags@ @@ -11430,19 +12084,19 @@ configure-stageprofile-mpfr: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/mpfr; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ --disable-shared @extra_mpfr_configure_flags@ @@ -11464,19 +12118,19 @@ configure-stagefeedback-mpfr: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr; \ cd $(HOST_SUBDIR)/mpfr || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpfr/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpfr"; \ - libsrcdir="$$s/mpfr"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpfr; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ --disable-shared @extra_mpfr_configure_flags@ @@ -11764,9 +12418,9 @@ check-mpfr: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif mpfr @@ -11804,7 +12458,7 @@ info-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in mpfr" ; \ + echo "Doing info in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11829,7 +12483,7 @@ dvi-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in mpfr" ; \ + echo "Doing dvi in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11854,7 +12508,7 @@ pdf-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in mpfr" ; \ + echo "Doing pdf in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11879,7 +12533,7 @@ html-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in mpfr" ; \ + echo "Doing html in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11904,7 +12558,7 @@ TAGS-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in mpfr" ; \ + echo "Doing TAGS in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11930,7 +12584,7 @@ install-info-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in mpfr" ; \ + echo "Doing install-info in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11956,7 +12610,7 @@ install-pdf-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in mpfr" ; \ + echo "Doing install-pdf in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -11982,7 +12636,7 @@ install-html-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in mpfr" ; \ + echo "Doing install-html in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12007,7 +12661,7 @@ installcheck-mpfr: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in mpfr" ; \ + echo "Doing installcheck in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12031,7 +12685,7 @@ mostlyclean-mpfr: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in mpfr" ; \ + echo "Doing mostlyclean in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12055,7 +12709,7 @@ clean-mpfr: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in mpfr" ; \ + echo "Doing clean in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12079,7 +12733,7 @@ distclean-mpfr: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in mpfr" ; \ + echo "Doing distclean in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12103,7 +12757,7 @@ maintainer-clean-mpfr: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in mpfr" ; \ + echo "Doing maintainer-clean in mpfr"; \ (cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12127,7 +12781,7 @@ configure-mpc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/mpc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/mpc; \ cd "$(HOST_SUBDIR)/mpc" || exit 1; \ @@ -12136,11 +12790,12 @@ configure-mpc: *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \ + --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \ || exit 1 @endif mpc @@ -12161,19 +12816,20 @@ configure-stage1-mpc: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/mpc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/mpc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ cd $(HOST_SUBDIR)/mpc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ @endif mpc-bootstrap @@ -12194,19 +12850,19 @@ configure-stage2-mpc: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/mpc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/mpc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ cd $(HOST_SUBDIR)/mpc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ @@ -12228,19 +12884,19 @@ configure-stage3-mpc: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/mpc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/mpc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ cd $(HOST_SUBDIR)/mpc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ @@ -12262,19 +12918,19 @@ configure-stage4-mpc: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/mpc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/mpc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ cd $(HOST_SUBDIR)/mpc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ @@ -12296,19 +12952,19 @@ configure-stageprofile-mpc: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/mpc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/mpc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ cd $(HOST_SUBDIR)/mpc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ @@ -12330,19 +12986,19 @@ configure-stagefeedback-mpc: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/mpc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/mpc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc; \ cd $(HOST_SUBDIR)/mpc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/mpc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/mpc"; \ - libsrcdir="$$s/mpc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=mpc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ @@ -12630,9 +13286,9 @@ check-mpc: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mpc && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif mpc @@ -12670,7 +13326,7 @@ info-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in mpc" ; \ + echo "Doing info in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12695,7 +13351,7 @@ dvi-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in mpc" ; \ + echo "Doing dvi in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12720,7 +13376,7 @@ pdf-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in mpc" ; \ + echo "Doing pdf in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12745,7 +13401,7 @@ html-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in mpc" ; \ + echo "Doing html in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12770,7 +13426,7 @@ TAGS-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in mpc" ; \ + echo "Doing TAGS in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12796,7 +13452,7 @@ install-info-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in mpc" ; \ + echo "Doing install-info in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12822,7 +13478,7 @@ install-pdf-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in mpc" ; \ + echo "Doing install-pdf in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12848,7 +13504,7 @@ install-html-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in mpc" ; \ + echo "Doing install-html in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12873,7 +13529,7 @@ installcheck-mpc: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in mpc" ; \ + echo "Doing installcheck in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12897,7 +13553,7 @@ mostlyclean-mpc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in mpc" ; \ + echo "Doing mostlyclean in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12921,7 +13577,7 @@ clean-mpc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in mpc" ; \ + echo "Doing clean in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12945,7 +13601,7 @@ distclean-mpc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in mpc" ; \ + echo "Doing distclean in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12969,7 +13625,7 @@ maintainer-clean-mpc: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in mpc" ; \ + echo "Doing maintainer-clean in mpc"; \ (cd $(HOST_SUBDIR)/mpc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -12993,7 +13649,7 @@ configure-isl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/isl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/isl; \ cd "$(HOST_SUBDIR)/isl" || exit 1; \ @@ -13002,11 +13658,12 @@ configure-isl: *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared @extra_isl_gmp_configure_flags@ \ + --target=${target_alias} --disable-shared @extra_isl_gmp_configure_flags@ \ || exit 1 @endif isl @@ -13027,19 +13684,20 @@ configure-stage1-isl: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/isl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/isl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ cd $(HOST_SUBDIR)/isl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ --disable-shared @extra_isl_gmp_configure_flags@ @endif isl-bootstrap @@ -13060,19 +13718,19 @@ configure-stage2-isl: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/isl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/isl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ cd $(HOST_SUBDIR)/isl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ --disable-shared @extra_isl_gmp_configure_flags@ @@ -13094,19 +13752,19 @@ configure-stage3-isl: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/isl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/isl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ cd $(HOST_SUBDIR)/isl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ --disable-shared @extra_isl_gmp_configure_flags@ @@ -13128,19 +13786,19 @@ configure-stage4-isl: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/isl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/isl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ cd $(HOST_SUBDIR)/isl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ --disable-shared @extra_isl_gmp_configure_flags@ @@ -13162,19 +13820,19 @@ configure-stageprofile-isl: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/isl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/isl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ cd $(HOST_SUBDIR)/isl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ --disable-shared @extra_isl_gmp_configure_flags@ @@ -13196,19 +13854,19 @@ configure-stagefeedback-isl: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/isl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/isl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl; \ cd $(HOST_SUBDIR)/isl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/isl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/isl"; \ - libsrcdir="$$s/isl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=isl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ --disable-shared @extra_isl_gmp_configure_flags@ @@ -13496,9 +14154,9 @@ check-isl: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/isl && \ - $(MAKE) $(FLAGS_TO_PASS) V=1 check) + $(MAKE) $(FLAGS_TO_PASS) V=1 $(EXTRA_BOOTSTRAP_FLAGS) check) @endif isl @@ -13536,7 +14194,7 @@ info-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in isl" ; \ + echo "Doing info in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13561,7 +14219,7 @@ dvi-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in isl" ; \ + echo "Doing dvi in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13586,7 +14244,7 @@ pdf-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in isl" ; \ + echo "Doing pdf in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13611,7 +14269,7 @@ html-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in isl" ; \ + echo "Doing html in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13636,7 +14294,7 @@ TAGS-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in isl" ; \ + echo "Doing TAGS in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13662,7 +14320,7 @@ install-info-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in isl" ; \ + echo "Doing install-info in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13688,7 +14346,7 @@ install-pdf-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in isl" ; \ + echo "Doing install-pdf in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13714,7 +14372,7 @@ install-html-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in isl" ; \ + echo "Doing install-html in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13739,7 +14397,7 @@ installcheck-isl: \ for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in isl" ; \ + echo "Doing installcheck in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13763,7 +14421,7 @@ mostlyclean-isl: for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in isl" ; \ + echo "Doing mostlyclean in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13787,7 +14445,7 @@ clean-isl: for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in isl" ; \ + echo "Doing clean in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13811,7 +14469,7 @@ distclean-isl: for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in isl" ; \ + echo "Doing distclean in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13835,7 +14493,7 @@ maintainer-clean-isl: for flag in $(EXTRA_HOST_FLAGS) V=1; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in isl" ; \ + echo "Doing maintainer-clean in isl"; \ (cd $(HOST_SUBDIR)/isl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -13848,872 +14506,6 @@ maintainer-clean-isl: -.PHONY: configure-cloog maybe-configure-cloog -maybe-configure-cloog: -@if gcc-bootstrap -configure-cloog: stage_current -@endif gcc-bootstrap -@if cloog -maybe-configure-cloog: configure-cloog -configure-cloog: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring in $(HOST_SUBDIR)/cloog; \ - cd "$(HOST_SUBDIR)/cloog" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \ - || exit 1 -@endif cloog - - - -.PHONY: configure-stage1-cloog maybe-configure-stage1-cloog -maybe-configure-stage1-cloog: -@if cloog-bootstrap -maybe-configure-stage1-cloog: configure-stage1-cloog -configure-stage1-cloog: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/cloog ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - cd $(HOST_SUBDIR)/cloog || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system -@endif cloog-bootstrap - -.PHONY: configure-stage2-cloog maybe-configure-stage2-cloog -maybe-configure-stage2-cloog: -@if cloog-bootstrap -maybe-configure-stage2-cloog: configure-stage2-cloog -configure-stage2-cloog: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/cloog ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - cd $(HOST_SUBDIR)/cloog || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system -@endif cloog-bootstrap - -.PHONY: configure-stage3-cloog maybe-configure-stage3-cloog -maybe-configure-stage3-cloog: -@if cloog-bootstrap -maybe-configure-stage3-cloog: configure-stage3-cloog -configure-stage3-cloog: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/cloog ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - cd $(HOST_SUBDIR)/cloog || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system -@endif cloog-bootstrap - -.PHONY: configure-stage4-cloog maybe-configure-stage4-cloog -maybe-configure-stage4-cloog: -@if cloog-bootstrap -maybe-configure-stage4-cloog: configure-stage4-cloog -configure-stage4-cloog: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/cloog ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - cd $(HOST_SUBDIR)/cloog || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system -@endif cloog-bootstrap - -.PHONY: configure-stageprofile-cloog maybe-configure-stageprofile-cloog -maybe-configure-stageprofile-cloog: -@if cloog-bootstrap -maybe-configure-stageprofile-cloog: configure-stageprofile-cloog -configure-stageprofile-cloog: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/cloog ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - cd $(HOST_SUBDIR)/cloog || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system -@endif cloog-bootstrap - -.PHONY: configure-stagefeedback-cloog maybe-configure-stagefeedback-cloog -maybe-configure-stagefeedback-cloog: -@if cloog-bootstrap -maybe-configure-stagefeedback-cloog: configure-stagefeedback-cloog -configure-stagefeedback-cloog: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/cloog/Makefile || exit 0; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ - CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/cloog ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ - cd $(HOST_SUBDIR)/cloog || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/cloog/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/cloog"; \ - libsrcdir="$$s/cloog"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) \ - --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system -@endif cloog-bootstrap - - - - - -.PHONY: all-cloog maybe-all-cloog -maybe-all-cloog: -@if gcc-bootstrap -all-cloog: stage_current -@endif gcc-bootstrap -@if cloog -TARGET-cloog=all -maybe-all-cloog: all-cloog -all-cloog: configure-cloog - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - $(TARGET-cloog)) -@endif cloog - - - -.PHONY: all-stage1-cloog maybe-all-stage1-cloog -.PHONY: clean-stage1-cloog maybe-clean-stage1-cloog -maybe-all-stage1-cloog: -maybe-clean-stage1-cloog: -@if cloog-bootstrap -maybe-all-stage1-cloog: all-stage1-cloog -all-stage1: all-stage1-cloog -TARGET-stage1-cloog = $(TARGET-cloog) -all-stage1-cloog: configure-stage1-cloog - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ - $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CXXFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-cloog) - -maybe-clean-stage1-cloog: clean-stage1-cloog -clean-stage1: clean-stage1-cloog -clean-stage1-cloog: - @if [ $(current_stage) = stage1 ]; then \ - [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ - else \ - [ -f $(HOST_SUBDIR)/stage1-cloog/Makefile ] || exit 0; \ - $(MAKE) stage1-start; \ - fi; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean -@endif cloog-bootstrap - - -.PHONY: all-stage2-cloog maybe-all-stage2-cloog -.PHONY: clean-stage2-cloog maybe-clean-stage2-cloog -maybe-all-stage2-cloog: -maybe-clean-stage2-cloog: -@if cloog-bootstrap -maybe-all-stage2-cloog: all-stage2-cloog -all-stage2: all-stage2-cloog -TARGET-stage2-cloog = $(TARGET-cloog) -all-stage2-cloog: configure-stage2-cloog - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CXXFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - TFLAGS="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-cloog) - -maybe-clean-stage2-cloog: clean-stage2-cloog -clean-stage2: clean-stage2-cloog -clean-stage2-cloog: - @if [ $(current_stage) = stage2 ]; then \ - [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ - else \ - [ -f $(HOST_SUBDIR)/stage2-cloog/Makefile ] || exit 0; \ - $(MAKE) stage2-start; \ - fi; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean -@endif cloog-bootstrap - - -.PHONY: all-stage3-cloog maybe-all-stage3-cloog -.PHONY: clean-stage3-cloog maybe-clean-stage3-cloog -maybe-all-stage3-cloog: -maybe-clean-stage3-cloog: -@if cloog-bootstrap -maybe-all-stage3-cloog: all-stage3-cloog -all-stage3: all-stage3-cloog -TARGET-stage3-cloog = $(TARGET-cloog) -all-stage3-cloog: configure-stage3-cloog - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CXXFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - TFLAGS="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-cloog) - -maybe-clean-stage3-cloog: clean-stage3-cloog -clean-stage3: clean-stage3-cloog -clean-stage3-cloog: - @if [ $(current_stage) = stage3 ]; then \ - [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ - else \ - [ -f $(HOST_SUBDIR)/stage3-cloog/Makefile ] || exit 0; \ - $(MAKE) stage3-start; \ - fi; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean -@endif cloog-bootstrap - - -.PHONY: all-stage4-cloog maybe-all-stage4-cloog -.PHONY: clean-stage4-cloog maybe-clean-stage4-cloog -maybe-all-stage4-cloog: -maybe-clean-stage4-cloog: -@if cloog-bootstrap -maybe-all-stage4-cloog: all-stage4-cloog -all-stage4: all-stage4-cloog -TARGET-stage4-cloog = $(TARGET-cloog) -all-stage4-cloog: configure-stage4-cloog - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CXXFLAGS)" \ - LIBCFLAGS="$(STAGE4_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - TFLAGS="$(STAGE4_TFLAGS)" \ - $(TARGET-stage4-cloog) - -maybe-clean-stage4-cloog: clean-stage4-cloog -clean-stage4: clean-stage4-cloog -clean-stage4-cloog: - @if [ $(current_stage) = stage4 ]; then \ - [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ - else \ - [ -f $(HOST_SUBDIR)/stage4-cloog/Makefile ] || exit 0; \ - $(MAKE) stage4-start; \ - fi; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean -@endif cloog-bootstrap - - -.PHONY: all-stageprofile-cloog maybe-all-stageprofile-cloog -.PHONY: clean-stageprofile-cloog maybe-clean-stageprofile-cloog -maybe-all-stageprofile-cloog: -maybe-clean-stageprofile-cloog: -@if cloog-bootstrap -maybe-all-stageprofile-cloog: all-stageprofile-cloog -all-stageprofile: all-stageprofile-cloog -TARGET-stageprofile-cloog = $(TARGET-cloog) -all-stageprofile-cloog: configure-stageprofile-cloog - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ - $(TARGET-stageprofile-cloog) - -maybe-clean-stageprofile-cloog: clean-stageprofile-cloog -clean-stageprofile: clean-stageprofile-cloog -clean-stageprofile-cloog: - @if [ $(current_stage) = stageprofile ]; then \ - [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ - else \ - [ -f $(HOST_SUBDIR)/stageprofile-cloog/Makefile ] || exit 0; \ - $(MAKE) stageprofile-start; \ - fi; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean -@endif cloog-bootstrap - - -.PHONY: all-stagefeedback-cloog maybe-all-stagefeedback-cloog -.PHONY: clean-stagefeedback-cloog maybe-clean-stagefeedback-cloog -maybe-all-stagefeedback-cloog: -maybe-clean-stagefeedback-cloog: -@if cloog-bootstrap -maybe-all-stagefeedback-cloog: all-stagefeedback-cloog -all-stagefeedback: all-stagefeedback-cloog -TARGET-stagefeedback-cloog = $(TARGET-cloog) -all-stagefeedback-cloog: configure-stagefeedback-cloog - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ - $(TARGET-stagefeedback-cloog) - -maybe-clean-stagefeedback-cloog: clean-stagefeedback-cloog -clean-stagefeedback: clean-stagefeedback-cloog -clean-stagefeedback-cloog: - @if [ $(current_stage) = stagefeedback ]; then \ - [ -f $(HOST_SUBDIR)/cloog/Makefile ] || exit 0; \ - else \ - [ -f $(HOST_SUBDIR)/stagefeedback-cloog/Makefile ] || exit 0; \ - $(MAKE) stagefeedback-start; \ - fi; \ - cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 clean -@endif cloog-bootstrap - - - - - -.PHONY: check-cloog maybe-check-cloog -maybe-check-cloog: -@if cloog -maybe-check-cloog: check-cloog - -check-cloog: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(FLAGS_TO_PASS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1 check) - -@endif cloog - -.PHONY: install-cloog maybe-install-cloog -maybe-install-cloog: -@if cloog -maybe-install-cloog: install-cloog - -install-cloog: - -@endif cloog - -.PHONY: install-strip-cloog maybe-install-strip-cloog -maybe-install-strip-cloog: -@if cloog -maybe-install-strip-cloog: install-strip-cloog - -install-strip-cloog: - -@endif cloog - -# Other targets (info, dvi, pdf, etc.) - -.PHONY: maybe-info-cloog info-cloog -maybe-info-cloog: -@if cloog -maybe-info-cloog: info-cloog - -info-cloog: \ - configure-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - info) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-dvi-cloog dvi-cloog -maybe-dvi-cloog: -@if cloog -maybe-dvi-cloog: dvi-cloog - -dvi-cloog: \ - configure-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - dvi) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-pdf-cloog pdf-cloog -maybe-pdf-cloog: -@if cloog -maybe-pdf-cloog: pdf-cloog - -pdf-cloog: \ - configure-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing pdf in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - pdf) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-html-cloog html-cloog -maybe-html-cloog: -@if cloog -maybe-html-cloog: html-cloog - -html-cloog: \ - configure-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing html in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - html) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-TAGS-cloog TAGS-cloog -maybe-TAGS-cloog: -@if cloog -maybe-TAGS-cloog: TAGS-cloog - -TAGS-cloog: \ - configure-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - TAGS) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-install-info-cloog install-info-cloog -maybe-install-info-cloog: -@if cloog -maybe-install-info-cloog: install-info-cloog - -install-info-cloog: \ - configure-cloog \ - info-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-info in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-info) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-install-pdf-cloog install-pdf-cloog -maybe-install-pdf-cloog: -@if cloog -maybe-install-pdf-cloog: install-pdf-cloog - -install-pdf-cloog: \ - configure-cloog \ - pdf-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-pdf in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-pdf) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-install-html-cloog install-html-cloog -maybe-install-html-cloog: -@if cloog -maybe-install-html-cloog: install-html-cloog - -install-html-cloog: \ - configure-cloog \ - html-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing install-html in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-html) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-installcheck-cloog installcheck-cloog -maybe-installcheck-cloog: -@if cloog -maybe-installcheck-cloog: installcheck-cloog - -installcheck-cloog: \ - configure-cloog - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - installcheck) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-mostlyclean-cloog mostlyclean-cloog -maybe-mostlyclean-cloog: -@if cloog -maybe-mostlyclean-cloog: mostlyclean-cloog - -mostlyclean-cloog: - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - mostlyclean) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-clean-cloog clean-cloog -maybe-clean-cloog: -@if cloog -maybe-clean-cloog: clean-cloog - -clean-cloog: - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - clean) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-distclean-cloog distclean-cloog -maybe-distclean-cloog: -@if cloog -maybe-distclean-cloog: distclean-cloog - -distclean-cloog: - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - distclean) \ - || exit 1 - -@endif cloog - -.PHONY: maybe-maintainer-clean-cloog maintainer-clean-cloog -maybe-maintainer-clean-cloog: -@if cloog -maybe-maintainer-clean-cloog: maintainer-clean-cloog - -maintainer-clean-cloog: - @[ -f ./cloog/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) CPPFLAGS="$$CPPFLAGS" LDFLAGS="$$LDFLAGS" V=1; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing maintainer-clean in cloog" ; \ - (cd $(HOST_SUBDIR)/cloog && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - maintainer-clean) \ - || exit 1 - -@endif cloog - - - .PHONY: configure-libelf maybe-configure-libelf maybe-configure-libelf: @if gcc-bootstrap @@ -14725,7 +14517,7 @@ configure-libelf: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libelf/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libelf; \ cd "$(HOST_SUBDIR)/libelf" || exit 1; \ @@ -14734,11 +14526,12 @@ configure-libelf: *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared \ + --target=${target_alias} --disable-shared \ || exit 1 @endif libelf @@ -14759,19 +14552,20 @@ configure-stage1-libelf: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libelf ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libelf; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ cd $(HOST_SUBDIR)/libelf || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ --disable-shared @endif libelf-bootstrap @@ -14792,19 +14586,19 @@ configure-stage2-libelf: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libelf ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/libelf; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ cd $(HOST_SUBDIR)/libelf || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ --disable-shared @@ -14826,19 +14620,19 @@ configure-stage3-libelf: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libelf ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/libelf; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ cd $(HOST_SUBDIR)/libelf || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ --disable-shared @@ -14860,19 +14654,19 @@ configure-stage4-libelf: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libelf ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/libelf; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ cd $(HOST_SUBDIR)/libelf || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ --disable-shared @@ -14894,19 +14688,19 @@ configure-stageprofile-libelf: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/libelf ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/libelf; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ cd $(HOST_SUBDIR)/libelf || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ --disable-shared @@ -14928,19 +14722,19 @@ configure-stagefeedback-libelf: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libelf ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/libelf; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf; \ cd $(HOST_SUBDIR)/libelf || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libelf/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libelf"; \ - libsrcdir="$$s/libelf"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libelf; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ --disable-shared @@ -15228,9 +15022,9 @@ check-libelf: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libelf && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif libelf @@ -15268,7 +15062,7 @@ info-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libelf" ; \ + echo "Doing info in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15293,7 +15087,7 @@ dvi-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libelf" ; \ + echo "Doing dvi in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15318,7 +15112,7 @@ pdf-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libelf" ; \ + echo "Doing pdf in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15343,7 +15137,7 @@ html-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libelf" ; \ + echo "Doing html in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15368,7 +15162,7 @@ TAGS-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libelf" ; \ + echo "Doing TAGS in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15394,7 +15188,7 @@ install-info-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libelf" ; \ + echo "Doing install-info in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15420,7 +15214,7 @@ install-pdf-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libelf" ; \ + echo "Doing install-pdf in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15446,7 +15240,7 @@ install-html-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libelf" ; \ + echo "Doing install-html in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15471,7 +15265,7 @@ installcheck-libelf: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libelf" ; \ + echo "Doing installcheck in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15495,7 +15289,7 @@ mostlyclean-libelf: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libelf" ; \ + echo "Doing mostlyclean in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15519,7 +15313,7 @@ clean-libelf: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libelf" ; \ + echo "Doing clean in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15543,7 +15337,7 @@ distclean-libelf: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libelf" ; \ + echo "Doing distclean in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15567,7 +15361,7 @@ maintainer-clean-libelf: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libelf" ; \ + echo "Doing maintainer-clean in libelf"; \ (cd $(HOST_SUBDIR)/libelf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -15591,7 +15385,7 @@ configure-gold: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gold/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gold; \ cd "$(HOST_SUBDIR)/gold" || exit 1; \ @@ -15600,11 +15394,12 @@ configure-gold: *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif gold @@ -15625,19 +15420,20 @@ configure-stage1-gold: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/gold ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/gold; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ cd $(HOST_SUBDIR)/gold || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -15657,19 +15453,19 @@ configure-stage2-gold: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/gold ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/gold; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ cd $(HOST_SUBDIR)/gold || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -15690,19 +15486,19 @@ configure-stage3-gold: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/gold ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/gold; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ cd $(HOST_SUBDIR)/gold || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -15723,19 +15519,19 @@ configure-stage4-gold: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/gold ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/gold; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ cd $(HOST_SUBDIR)/gold || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -15756,19 +15552,19 @@ configure-stageprofile-gold: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/gold ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/gold; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ cd $(HOST_SUBDIR)/gold || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -15789,19 +15585,19 @@ configure-stagefeedback-gold: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/gold ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/gold; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold; \ cd $(HOST_SUBDIR)/gold || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/gold/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gold"; \ - libsrcdir="$$s/gold"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gold; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif gold-bootstrap @@ -16088,9 +15884,9 @@ check-gold: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gold && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif gold @@ -16140,7 +15936,7 @@ info-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gold" ; \ + echo "Doing info in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16165,7 +15961,7 @@ dvi-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gold" ; \ + echo "Doing dvi in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16190,7 +15986,7 @@ pdf-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gold" ; \ + echo "Doing pdf in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16215,7 +16011,7 @@ html-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gold" ; \ + echo "Doing html in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16240,7 +16036,7 @@ TAGS-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gold" ; \ + echo "Doing TAGS in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16266,7 +16062,7 @@ install-info-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gold" ; \ + echo "Doing install-info in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16292,7 +16088,7 @@ install-pdf-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gold" ; \ + echo "Doing install-pdf in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16318,7 +16114,7 @@ install-html-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gold" ; \ + echo "Doing install-html in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16343,7 +16139,7 @@ installcheck-gold: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gold" ; \ + echo "Doing installcheck in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16367,7 +16163,7 @@ mostlyclean-gold: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gold" ; \ + echo "Doing mostlyclean in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16391,7 +16187,7 @@ clean-gold: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gold" ; \ + echo "Doing clean in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16415,7 +16211,7 @@ distclean-gold: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gold" ; \ + echo "Doing distclean in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16439,7 +16235,7 @@ maintainer-clean-gold: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gold" ; \ + echo "Doing maintainer-clean in gold"; \ (cd $(HOST_SUBDIR)/gold && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16464,7 +16260,7 @@ configure-gprof: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gprof; \ cd "$(HOST_SUBDIR)/gprof" || exit 1; \ @@ -16473,11 +16269,12 @@ configure-gprof: *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gprof"; \ - libsrcdir="$$s/gprof"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gprof; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif gprof @@ -16515,7 +16312,7 @@ check-gprof: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -16568,7 +16365,7 @@ info-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gprof" ; \ + echo "Doing info in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16594,7 +16391,7 @@ dvi-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gprof" ; \ + echo "Doing dvi in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16620,7 +16417,7 @@ pdf-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gprof" ; \ + echo "Doing pdf in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16646,7 +16443,7 @@ html-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gprof" ; \ + echo "Doing html in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16672,7 +16469,7 @@ TAGS-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gprof" ; \ + echo "Doing TAGS in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16699,7 +16496,7 @@ install-info-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gprof" ; \ + echo "Doing install-info in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16726,7 +16523,7 @@ install-pdf-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gprof" ; \ + echo "Doing install-pdf in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16753,7 +16550,7 @@ install-html-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gprof" ; \ + echo "Doing install-html in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16779,7 +16576,7 @@ installcheck-gprof: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gprof" ; \ + echo "Doing installcheck in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16804,7 +16601,7 @@ mostlyclean-gprof: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gprof" ; \ + echo "Doing mostlyclean in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16829,7 +16626,7 @@ clean-gprof: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gprof" ; \ + echo "Doing clean in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16854,7 +16651,7 @@ distclean-gprof: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gprof" ; \ + echo "Doing distclean in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16879,7 +16676,7 @@ maintainer-clean-gprof: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gprof" ; \ + echo "Doing maintainer-clean in gprof"; \ (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -16903,7 +16700,7 @@ configure-intl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/intl; \ cd "$(HOST_SUBDIR)/intl" || exit 1; \ @@ -16912,11 +16709,12 @@ configure-intl: *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif intl @@ -16937,19 +16735,20 @@ configure-stage1-intl: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/intl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ cd $(HOST_SUBDIR)/intl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -16969,19 +16768,19 @@ configure-stage2-intl: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/intl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ cd $(HOST_SUBDIR)/intl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -17002,19 +16801,19 @@ configure-stage3-intl: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/intl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ cd $(HOST_SUBDIR)/intl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -17035,19 +16834,19 @@ configure-stage4-intl: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/intl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ cd $(HOST_SUBDIR)/intl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -17068,19 +16867,19 @@ configure-stageprofile-intl: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/intl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ cd $(HOST_SUBDIR)/intl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -17101,19 +16900,19 @@ configure-stagefeedback-intl: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/intl; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl; \ cd $(HOST_SUBDIR)/intl || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/intl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/intl"; \ - libsrcdir="$$s/intl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=intl; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif intl-bootstrap @@ -17400,9 +17199,9 @@ check-intl: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/intl && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif intl @@ -17452,7 +17251,7 @@ info-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in intl" ; \ + echo "Doing info in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17477,7 +17276,7 @@ dvi-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in intl" ; \ + echo "Doing dvi in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17502,7 +17301,7 @@ pdf-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in intl" ; \ + echo "Doing pdf in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17527,7 +17326,7 @@ html-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in intl" ; \ + echo "Doing html in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17552,7 +17351,7 @@ TAGS-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in intl" ; \ + echo "Doing TAGS in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17578,7 +17377,7 @@ install-info-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in intl" ; \ + echo "Doing install-info in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17604,7 +17403,7 @@ install-pdf-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in intl" ; \ + echo "Doing install-pdf in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17630,7 +17429,7 @@ install-html-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in intl" ; \ + echo "Doing install-html in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17655,7 +17454,7 @@ installcheck-intl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in intl" ; \ + echo "Doing installcheck in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17679,7 +17478,7 @@ mostlyclean-intl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in intl" ; \ + echo "Doing mostlyclean in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17703,7 +17502,7 @@ clean-intl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in intl" ; \ + echo "Doing clean in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17727,7 +17526,7 @@ distclean-intl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in intl" ; \ + echo "Doing distclean in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17751,7 +17550,7 @@ maintainer-clean-intl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in intl" ; \ + echo "Doing maintainer-clean in intl"; \ (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17776,7 +17575,7 @@ configure-tcl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tcl; \ cd "$(HOST_SUBDIR)/tcl" || exit 1; \ @@ -17785,11 +17584,12 @@ configure-tcl: *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/tcl"; \ - libsrcdir="$$s/tcl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=tcl; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif tcl @@ -17827,7 +17627,7 @@ check-tcl: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -17880,7 +17680,7 @@ info-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in tcl" ; \ + echo "Doing info in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17906,7 +17706,7 @@ dvi-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in tcl" ; \ + echo "Doing dvi in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17932,7 +17732,7 @@ pdf-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in tcl" ; \ + echo "Doing pdf in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17958,7 +17758,7 @@ html-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in tcl" ; \ + echo "Doing html in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -17984,7 +17784,7 @@ TAGS-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in tcl" ; \ + echo "Doing TAGS in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18011,7 +17811,7 @@ install-info-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in tcl" ; \ + echo "Doing install-info in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18038,7 +17838,7 @@ install-pdf-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in tcl" ; \ + echo "Doing install-pdf in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18065,7 +17865,7 @@ install-html-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in tcl" ; \ + echo "Doing install-html in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18091,7 +17891,7 @@ installcheck-tcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in tcl" ; \ + echo "Doing installcheck in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18126,7 +17926,7 @@ clean-tcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in tcl" ; \ + echo "Doing clean in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18151,7 +17951,7 @@ distclean-tcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in tcl" ; \ + echo "Doing distclean in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18176,7 +17976,7 @@ maintainer-clean-tcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in tcl" ; \ + echo "Doing maintainer-clean in tcl"; \ (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18201,7 +18001,7 @@ configure-itcl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/itcl; \ cd "$(HOST_SUBDIR)/itcl" || exit 1; \ @@ -18210,11 +18010,12 @@ configure-itcl: *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/itcl"; \ - libsrcdir="$$s/itcl"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=itcl; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif itcl @@ -18252,7 +18053,7 @@ check-itcl: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -18305,7 +18106,7 @@ info-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in itcl" ; \ + echo "Doing info in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18331,7 +18132,7 @@ dvi-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in itcl" ; \ + echo "Doing dvi in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18357,7 +18158,7 @@ pdf-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in itcl" ; \ + echo "Doing pdf in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18383,7 +18184,7 @@ html-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in itcl" ; \ + echo "Doing html in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18409,7 +18210,7 @@ TAGS-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in itcl" ; \ + echo "Doing TAGS in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18436,7 +18237,7 @@ install-info-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in itcl" ; \ + echo "Doing install-info in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18463,7 +18264,7 @@ install-pdf-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in itcl" ; \ + echo "Doing install-pdf in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18490,7 +18291,7 @@ install-html-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in itcl" ; \ + echo "Doing install-html in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18516,7 +18317,7 @@ installcheck-itcl: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in itcl" ; \ + echo "Doing installcheck in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18541,7 +18342,7 @@ mostlyclean-itcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in itcl" ; \ + echo "Doing mostlyclean in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18566,7 +18367,7 @@ clean-itcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in itcl" ; \ + echo "Doing clean in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18591,7 +18392,7 @@ distclean-itcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in itcl" ; \ + echo "Doing distclean in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18616,7 +18417,7 @@ maintainer-clean-itcl: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in itcl" ; \ + echo "Doing maintainer-clean in itcl"; \ (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -18640,7 +18441,7 @@ configure-ld: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/ld; \ cd "$(HOST_SUBDIR)/ld" || exit 1; \ @@ -18649,11 +18450,12 @@ configure-ld: *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif ld @@ -18674,19 +18476,20 @@ configure-stage1-ld: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/ld; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ cd $(HOST_SUBDIR)/ld || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -18706,19 +18509,19 @@ configure-stage2-ld: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/ld; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ cd $(HOST_SUBDIR)/ld || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -18739,19 +18542,19 @@ configure-stage3-ld: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/ld; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ cd $(HOST_SUBDIR)/ld || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -18772,19 +18575,19 @@ configure-stage4-ld: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/ld; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ cd $(HOST_SUBDIR)/ld || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -18805,19 +18608,19 @@ configure-stageprofile-ld: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/ld; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ cd $(HOST_SUBDIR)/ld || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -18838,19 +18641,19 @@ configure-stagefeedback-ld: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/ld; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld; \ cd $(HOST_SUBDIR)/ld || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/ld/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/ld"; \ - libsrcdir="$$s/ld"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=ld; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif ld-bootstrap @@ -19137,9 +18940,9 @@ check-ld: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/ld && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif ld @@ -19189,7 +18992,7 @@ info-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in ld" ; \ + echo "Doing info in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19214,7 +19017,7 @@ dvi-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in ld" ; \ + echo "Doing dvi in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19239,7 +19042,7 @@ pdf-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in ld" ; \ + echo "Doing pdf in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19264,7 +19067,7 @@ html-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in ld" ; \ + echo "Doing html in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19289,7 +19092,7 @@ TAGS-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in ld" ; \ + echo "Doing TAGS in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19315,7 +19118,7 @@ install-info-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in ld" ; \ + echo "Doing install-info in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19341,7 +19144,7 @@ install-pdf-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in ld" ; \ + echo "Doing install-pdf in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19367,7 +19170,7 @@ install-html-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in ld" ; \ + echo "Doing install-html in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19392,7 +19195,7 @@ installcheck-ld: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in ld" ; \ + echo "Doing installcheck in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19416,7 +19219,7 @@ mostlyclean-ld: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in ld" ; \ + echo "Doing mostlyclean in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19440,7 +19243,7 @@ clean-ld: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in ld" ; \ + echo "Doing clean in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19464,7 +19267,7 @@ distclean-ld: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in ld" ; \ + echo "Doing distclean in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19488,7 +19291,7 @@ maintainer-clean-ld: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in ld" ; \ + echo "Doing maintainer-clean in ld"; \ (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -19512,7 +19315,7 @@ configure-libbacktrace: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libbacktrace/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libbacktrace; \ cd "$(HOST_SUBDIR)/libbacktrace" || exit 1; \ @@ -19521,11 +19324,12 @@ configure-libbacktrace: *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif libbacktrace @@ -19546,19 +19350,20 @@ configure-stage1-libbacktrace: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libbacktrace ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libbacktrace; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ cd $(HOST_SUBDIR)/libbacktrace || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif libbacktrace-bootstrap @@ -19578,19 +19383,19 @@ configure-stage2-libbacktrace: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libbacktrace ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/libbacktrace; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ cd $(HOST_SUBDIR)/libbacktrace || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif libbacktrace-bootstrap @@ -19611,19 +19416,19 @@ configure-stage3-libbacktrace: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libbacktrace ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/libbacktrace; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ cd $(HOST_SUBDIR)/libbacktrace || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif libbacktrace-bootstrap @@ -19644,19 +19449,19 @@ configure-stage4-libbacktrace: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libbacktrace ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/libbacktrace; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ cd $(HOST_SUBDIR)/libbacktrace || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif libbacktrace-bootstrap @@ -19677,19 +19482,19 @@ configure-stageprofile-libbacktrace: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/libbacktrace ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/libbacktrace; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ cd $(HOST_SUBDIR)/libbacktrace || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif libbacktrace-bootstrap @@ -19710,19 +19515,19 @@ configure-stagefeedback-libbacktrace: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libbacktrace ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/libbacktrace; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace; \ cd $(HOST_SUBDIR)/libbacktrace || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libbacktrace; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif libbacktrace-bootstrap @@ -20009,9 +19814,9 @@ check-libbacktrace: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libbacktrace && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif libbacktrace @@ -20061,7 +19866,7 @@ info-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libbacktrace" ; \ + echo "Doing info in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20086,7 +19891,7 @@ dvi-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libbacktrace" ; \ + echo "Doing dvi in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20111,7 +19916,7 @@ pdf-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libbacktrace" ; \ + echo "Doing pdf in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20136,7 +19941,7 @@ html-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libbacktrace" ; \ + echo "Doing html in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20161,7 +19966,7 @@ TAGS-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libbacktrace" ; \ + echo "Doing TAGS in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20187,7 +19992,7 @@ install-info-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libbacktrace" ; \ + echo "Doing install-info in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20213,7 +20018,7 @@ install-pdf-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libbacktrace" ; \ + echo "Doing install-pdf in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20239,7 +20044,7 @@ install-html-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libbacktrace" ; \ + echo "Doing install-html in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20264,7 +20069,7 @@ installcheck-libbacktrace: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libbacktrace" ; \ + echo "Doing installcheck in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20288,7 +20093,7 @@ mostlyclean-libbacktrace: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libbacktrace" ; \ + echo "Doing mostlyclean in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20312,7 +20117,7 @@ clean-libbacktrace: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libbacktrace" ; \ + echo "Doing clean in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20336,7 +20141,7 @@ distclean-libbacktrace: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libbacktrace" ; \ + echo "Doing distclean in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20360,7 +20165,7 @@ maintainer-clean-libbacktrace: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libbacktrace" ; \ + echo "Doing maintainer-clean in libbacktrace"; \ (cd $(HOST_SUBDIR)/libbacktrace && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20384,7 +20189,7 @@ configure-libcpp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libcpp; \ cd "$(HOST_SUBDIR)/libcpp" || exit 1; \ @@ -20393,11 +20198,12 @@ configure-libcpp: *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif libcpp @@ -20418,19 +20224,20 @@ configure-stage1-libcpp: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -20450,19 +20257,19 @@ configure-stage2-libcpp: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -20483,19 +20290,19 @@ configure-stage3-libcpp: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -20516,19 +20323,19 @@ configure-stage4-libcpp: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -20549,19 +20356,19 @@ configure-stageprofile-libcpp: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/libcpp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -20582,19 +20389,19 @@ configure-stagefeedback-libcpp: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp; \ cd $(HOST_SUBDIR)/libcpp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libcpp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcpp"; \ - libsrcdir="$$s/libcpp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcpp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif libcpp-bootstrap @@ -20881,9 +20688,9 @@ check-libcpp: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libcpp && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif libcpp @@ -20933,7 +20740,7 @@ info-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libcpp" ; \ + echo "Doing info in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20958,7 +20765,7 @@ dvi-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libcpp" ; \ + echo "Doing dvi in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -20983,7 +20790,7 @@ pdf-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libcpp" ; \ + echo "Doing pdf in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21008,7 +20815,7 @@ html-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libcpp" ; \ + echo "Doing html in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21033,7 +20840,7 @@ TAGS-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libcpp" ; \ + echo "Doing TAGS in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21059,7 +20866,7 @@ install-info-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libcpp" ; \ + echo "Doing install-info in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21085,7 +20892,7 @@ install-pdf-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libcpp" ; \ + echo "Doing install-pdf in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21111,7 +20918,7 @@ install-html-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libcpp" ; \ + echo "Doing install-html in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21136,7 +20943,7 @@ installcheck-libcpp: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libcpp" ; \ + echo "Doing installcheck in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21160,7 +20967,7 @@ mostlyclean-libcpp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libcpp" ; \ + echo "Doing mostlyclean in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21184,7 +20991,7 @@ clean-libcpp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libcpp" ; \ + echo "Doing clean in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21208,7 +21015,7 @@ distclean-libcpp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libcpp" ; \ + echo "Doing distclean in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21232,7 +21039,7 @@ maintainer-clean-libcpp: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libcpp" ; \ + echo "Doing maintainer-clean in libcpp"; \ (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21256,7 +21063,7 @@ configure-libdecnumber: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libdecnumber; \ cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \ @@ -21265,11 +21072,12 @@ configure-libdecnumber: *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif libdecnumber @@ -21290,19 +21098,20 @@ configure-stage1-libdecnumber: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -21322,19 +21131,19 @@ configure-stage2-libdecnumber: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -21355,19 +21164,19 @@ configure-stage3-libdecnumber: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -21388,19 +21197,19 @@ configure-stage4-libdecnumber: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -21421,19 +21230,19 @@ configure-stageprofile-libdecnumber: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -21454,19 +21263,19 @@ configure-stagefeedback-libdecnumber: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber; \ cd $(HOST_SUBDIR)/libdecnumber || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libdecnumber/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libdecnumber"; \ - libsrcdir="$$s/libdecnumber"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libdecnumber; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif libdecnumber-bootstrap @@ -21753,9 +21562,9 @@ check-libdecnumber: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libdecnumber && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif libdecnumber @@ -21805,7 +21614,7 @@ info-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libdecnumber" ; \ + echo "Doing info in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21830,7 +21639,7 @@ dvi-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libdecnumber" ; \ + echo "Doing dvi in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21855,7 +21664,7 @@ pdf-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libdecnumber" ; \ + echo "Doing pdf in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21880,7 +21689,7 @@ html-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libdecnumber" ; \ + echo "Doing html in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21905,7 +21714,7 @@ TAGS-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libdecnumber" ; \ + echo "Doing TAGS in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21931,7 +21740,7 @@ install-info-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libdecnumber" ; \ + echo "Doing install-info in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21957,7 +21766,7 @@ install-pdf-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libdecnumber" ; \ + echo "Doing install-pdf in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -21983,7 +21792,7 @@ install-html-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libdecnumber" ; \ + echo "Doing install-html in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22008,7 +21817,7 @@ installcheck-libdecnumber: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libdecnumber" ; \ + echo "Doing installcheck in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22032,7 +21841,7 @@ mostlyclean-libdecnumber: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libdecnumber" ; \ + echo "Doing mostlyclean in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22056,7 +21865,7 @@ clean-libdecnumber: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libdecnumber" ; \ + echo "Doing clean in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22080,7 +21889,7 @@ distclean-libdecnumber: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libdecnumber" ; \ + echo "Doing distclean in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22104,7 +21913,7 @@ maintainer-clean-libdecnumber: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libdecnumber" ; \ + echo "Doing maintainer-clean in libdecnumber"; \ (cd $(HOST_SUBDIR)/libdecnumber && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22129,7 +21938,7 @@ configure-libgui: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libgui; \ cd "$(HOST_SUBDIR)/libgui" || exit 1; \ @@ -22138,11 +21947,12 @@ configure-libgui: *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgui"; \ - libsrcdir="$$s/libgui"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgui; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif libgui @@ -22180,7 +21990,7 @@ check-libgui: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -22233,7 +22043,7 @@ info-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libgui" ; \ + echo "Doing info in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22259,7 +22069,7 @@ dvi-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libgui" ; \ + echo "Doing dvi in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22285,7 +22095,7 @@ pdf-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libgui" ; \ + echo "Doing pdf in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22311,7 +22121,7 @@ html-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libgui" ; \ + echo "Doing html in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22337,7 +22147,7 @@ TAGS-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libgui" ; \ + echo "Doing TAGS in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22364,7 +22174,7 @@ install-info-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libgui" ; \ + echo "Doing install-info in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22391,7 +22201,7 @@ install-pdf-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libgui" ; \ + echo "Doing install-pdf in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22418,7 +22228,7 @@ install-html-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libgui" ; \ + echo "Doing install-html in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22444,7 +22254,7 @@ installcheck-libgui: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libgui" ; \ + echo "Doing installcheck in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22469,7 +22279,7 @@ mostlyclean-libgui: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libgui" ; \ + echo "Doing mostlyclean in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22494,7 +22304,7 @@ clean-libgui: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libgui" ; \ + echo "Doing clean in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22519,7 +22329,7 @@ distclean-libgui: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libgui" ; \ + echo "Doing distclean in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22544,7 +22354,7 @@ maintainer-clean-libgui: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libgui" ; \ + echo "Doing maintainer-clean in libgui"; \ (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -22568,7 +22378,7 @@ configure-libiberty: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libiberty; \ cd "$(HOST_SUBDIR)/libiberty" || exit 1; \ @@ -22577,11 +22387,12 @@ configure-libiberty: *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \ + --target=${target_alias} @extra_host_libiberty_configure_flags@ \ || exit 1 @endif libiberty @@ -22602,19 +22413,20 @@ configure-stage1-libiberty: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ @extra_host_libiberty_configure_flags@ @endif libiberty-bootstrap @@ -22635,19 +22447,19 @@ configure-stage2-libiberty: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ @extra_host_libiberty_configure_flags@ @@ -22669,19 +22481,19 @@ configure-stage3-libiberty: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ @extra_host_libiberty_configure_flags@ @@ -22703,19 +22515,19 @@ configure-stage4-libiberty: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ @extra_host_libiberty_configure_flags@ @@ -22737,19 +22549,19 @@ configure-stageprofile-libiberty: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/libiberty; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ @extra_host_libiberty_configure_flags@ @@ -22771,19 +22583,19 @@ configure-stagefeedback-libiberty: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty; \ cd $(HOST_SUBDIR)/libiberty || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/libiberty/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ @extra_host_libiberty_configure_flags@ @@ -23071,9 +22883,9 @@ check-libiberty: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libiberty && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) @endif libiberty @@ -23123,7 +22935,7 @@ info-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libiberty" ; \ + echo "Doing info in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23148,7 +22960,7 @@ dvi-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libiberty" ; \ + echo "Doing dvi in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23173,7 +22985,7 @@ pdf-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libiberty" ; \ + echo "Doing pdf in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23198,7 +23010,7 @@ html-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libiberty" ; \ + echo "Doing html in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23223,7 +23035,7 @@ TAGS-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libiberty" ; \ + echo "Doing TAGS in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23249,7 +23061,7 @@ install-info-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libiberty" ; \ + echo "Doing install-info in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23275,7 +23087,7 @@ install-pdf-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libiberty" ; \ + echo "Doing install-pdf in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23301,7 +23113,7 @@ install-html-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libiberty" ; \ + echo "Doing install-html in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23326,7 +23138,7 @@ installcheck-libiberty: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libiberty" ; \ + echo "Doing installcheck in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23350,7 +23162,7 @@ mostlyclean-libiberty: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libiberty" ; \ + echo "Doing mostlyclean in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23374,7 +23186,7 @@ clean-libiberty: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libiberty" ; \ + echo "Doing clean in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23398,7 +23210,7 @@ distclean-libiberty: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libiberty" ; \ + echo "Doing distclean in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23422,7 +23234,7 @@ maintainer-clean-libiberty: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libiberty" ; \ + echo "Doing maintainer-clean in libiberty"; \ (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23435,6 +23247,886 @@ maintainer-clean-libiberty: +.PHONY: configure-libiberty-linker-plugin maybe-configure-libiberty-linker-plugin +maybe-configure-libiberty-linker-plugin: +@if gcc-bootstrap +configure-libiberty-linker-plugin: stage_current +@endif gcc-bootstrap +@if libiberty-linker-plugin +maybe-configure-libiberty-linker-plugin: configure-libiberty-linker-plugin +configure-libiberty-linker-plugin: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd "$(HOST_SUBDIR)/libiberty-linker-plugin" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \ + || exit 1 +@endif libiberty-linker-plugin + + + +.PHONY: configure-stage1-libiberty-linker-plugin maybe-configure-stage1-libiberty-linker-plugin +maybe-configure-stage1-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-configure-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin +configure-stage1-libiberty-linker-plugin: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) \ + @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif libiberty-linker-plugin-bootstrap + +.PHONY: configure-stage2-libiberty-linker-plugin maybe-configure-stage2-libiberty-linker-plugin +maybe-configure-stage2-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-configure-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin +configure-stage2-libiberty-linker-plugin: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) \ + @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif libiberty-linker-plugin-bootstrap + +.PHONY: configure-stage3-libiberty-linker-plugin maybe-configure-stage3-libiberty-linker-plugin +maybe-configure-stage3-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-configure-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin +configure-stage3-libiberty-linker-plugin: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) \ + @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif libiberty-linker-plugin-bootstrap + +.PHONY: configure-stage4-libiberty-linker-plugin maybe-configure-stage4-libiberty-linker-plugin +maybe-configure-stage4-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-configure-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin +configure-stage4-libiberty-linker-plugin: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) \ + @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif libiberty-linker-plugin-bootstrap + +.PHONY: configure-stageprofile-libiberty-linker-plugin maybe-configure-stageprofile-libiberty-linker-plugin +maybe-configure-stageprofile-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-configure-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin +configure-stageprofile-libiberty-linker-plugin: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) \ + @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif libiberty-linker-plugin-bootstrap + +.PHONY: configure-stagefeedback-libiberty-linker-plugin maybe-configure-stagefeedback-libiberty-linker-plugin +maybe-configure-stagefeedback-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-configure-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin +configure-stagefeedback-libiberty-linker-plugin: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile || exit 0; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty-linker-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiberty; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) \ + @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif libiberty-linker-plugin-bootstrap + + + + + +.PHONY: all-libiberty-linker-plugin maybe-all-libiberty-linker-plugin +maybe-all-libiberty-linker-plugin: +@if gcc-bootstrap +all-libiberty-linker-plugin: stage_current +@endif gcc-bootstrap +@if libiberty-linker-plugin +TARGET-libiberty-linker-plugin=all +maybe-all-libiberty-linker-plugin: all-libiberty-linker-plugin +all-libiberty-linker-plugin: configure-libiberty-linker-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + $(TARGET-libiberty-linker-plugin)) +@endif libiberty-linker-plugin + + + +.PHONY: all-stage1-libiberty-linker-plugin maybe-all-stage1-libiberty-linker-plugin +.PHONY: clean-stage1-libiberty-linker-plugin maybe-clean-stage1-libiberty-linker-plugin +maybe-all-stage1-libiberty-linker-plugin: +maybe-clean-stage1-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-all-stage1-libiberty-linker-plugin: all-stage1-libiberty-linker-plugin +all-stage1: all-stage1-libiberty-linker-plugin +TARGET-stage1-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin) +all-stage1-libiberty-linker-plugin: configure-stage1-libiberty-linker-plugin + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" \ + CXXFLAGS="$(STAGE1_CXXFLAGS)" \ + LIBCFLAGS="$(LIBCFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) \ + $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-libiberty-linker-plugin) + +maybe-clean-stage1-libiberty-linker-plugin: clean-stage1-libiberty-linker-plugin +clean-stage1: clean-stage1-libiberty-linker-plugin +clean-stage1-libiberty-linker-plugin: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage1-libiberty-linker-plugin/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif libiberty-linker-plugin-bootstrap + + +.PHONY: all-stage2-libiberty-linker-plugin maybe-all-stage2-libiberty-linker-plugin +.PHONY: clean-stage2-libiberty-linker-plugin maybe-clean-stage2-libiberty-linker-plugin +maybe-all-stage2-libiberty-linker-plugin: +maybe-clean-stage2-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-all-stage2-libiberty-linker-plugin: all-stage2-libiberty-linker-plugin +all-stage2: all-stage2-libiberty-linker-plugin +TARGET-stage2-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin) +all-stage2-libiberty-linker-plugin: configure-stage2-libiberty-linker-plugin + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE2_CFLAGS)" \ + CXXFLAGS="$(STAGE2_CXXFLAGS)" \ + LIBCFLAGS="$(STAGE2_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-libiberty-linker-plugin) + +maybe-clean-stage2-libiberty-linker-plugin: clean-stage2-libiberty-linker-plugin +clean-stage2: clean-stage2-libiberty-linker-plugin +clean-stage2-libiberty-linker-plugin: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage2-libiberty-linker-plugin/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif libiberty-linker-plugin-bootstrap + + +.PHONY: all-stage3-libiberty-linker-plugin maybe-all-stage3-libiberty-linker-plugin +.PHONY: clean-stage3-libiberty-linker-plugin maybe-clean-stage3-libiberty-linker-plugin +maybe-all-stage3-libiberty-linker-plugin: +maybe-clean-stage3-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-all-stage3-libiberty-linker-plugin: all-stage3-libiberty-linker-plugin +all-stage3: all-stage3-libiberty-linker-plugin +TARGET-stage3-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin) +all-stage3-libiberty-linker-plugin: configure-stage3-libiberty-linker-plugin + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE3_CFLAGS)" \ + CXXFLAGS="$(STAGE3_CXXFLAGS)" \ + LIBCFLAGS="$(STAGE3_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-libiberty-linker-plugin) + +maybe-clean-stage3-libiberty-linker-plugin: clean-stage3-libiberty-linker-plugin +clean-stage3: clean-stage3-libiberty-linker-plugin +clean-stage3-libiberty-linker-plugin: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage3-libiberty-linker-plugin/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif libiberty-linker-plugin-bootstrap + + +.PHONY: all-stage4-libiberty-linker-plugin maybe-all-stage4-libiberty-linker-plugin +.PHONY: clean-stage4-libiberty-linker-plugin maybe-clean-stage4-libiberty-linker-plugin +maybe-all-stage4-libiberty-linker-plugin: +maybe-clean-stage4-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-all-stage4-libiberty-linker-plugin: all-stage4-libiberty-linker-plugin +all-stage4: all-stage4-libiberty-linker-plugin +TARGET-stage4-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin) +all-stage4-libiberty-linker-plugin: configure-stage4-libiberty-linker-plugin + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGE4_CFLAGS)" \ + CXXFLAGS="$(STAGE4_CXXFLAGS)" \ + LIBCFLAGS="$(STAGE4_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + TFLAGS="$(STAGE4_TFLAGS)" \ + $(TARGET-stage4-libiberty-linker-plugin) + +maybe-clean-stage4-libiberty-linker-plugin: clean-stage4-libiberty-linker-plugin +clean-stage4: clean-stage4-libiberty-linker-plugin +clean-stage4-libiberty-linker-plugin: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage4-libiberty-linker-plugin/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif libiberty-linker-plugin-bootstrap + + +.PHONY: all-stageprofile-libiberty-linker-plugin maybe-all-stageprofile-libiberty-linker-plugin +.PHONY: clean-stageprofile-libiberty-linker-plugin maybe-clean-stageprofile-libiberty-linker-plugin +maybe-all-stageprofile-libiberty-linker-plugin: +maybe-clean-stageprofile-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-all-stageprofile-libiberty-linker-plugin: all-stageprofile-libiberty-linker-plugin +all-stageprofile: all-stageprofile-libiberty-linker-plugin +TARGET-stageprofile-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin) +all-stageprofile-libiberty-linker-plugin: configure-stageprofile-libiberty-linker-plugin + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGEprofile_CFLAGS)" \ + CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \ + LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + TFLAGS="$(STAGEprofile_TFLAGS)" \ + $(TARGET-stageprofile-libiberty-linker-plugin) + +maybe-clean-stageprofile-libiberty-linker-plugin: clean-stageprofile-libiberty-linker-plugin +clean-stageprofile: clean-stageprofile-libiberty-linker-plugin +clean-stageprofile-libiberty-linker-plugin: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageprofile-libiberty-linker-plugin/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif libiberty-linker-plugin-bootstrap + + +.PHONY: all-stagefeedback-libiberty-linker-plugin maybe-all-stagefeedback-libiberty-linker-plugin +.PHONY: clean-stagefeedback-libiberty-linker-plugin maybe-clean-stagefeedback-libiberty-linker-plugin +maybe-all-stagefeedback-libiberty-linker-plugin: +maybe-clean-stagefeedback-libiberty-linker-plugin: +@if libiberty-linker-plugin-bootstrap +maybe-all-stagefeedback-libiberty-linker-plugin: all-stagefeedback-libiberty-linker-plugin +all-stagefeedback: all-stagefeedback-libiberty-linker-plugin +TARGET-stagefeedback-libiberty-linker-plugin = $(TARGET-libiberty-linker-plugin) +all-stagefeedback-libiberty-linker-plugin: configure-stagefeedback-libiberty-linker-plugin + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(STAGEfeedback_CFLAGS)" \ + CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \ + LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ + TFLAGS="$(STAGEfeedback_TFLAGS)" \ + $(TARGET-stagefeedback-libiberty-linker-plugin) + +maybe-clean-stagefeedback-libiberty-linker-plugin: clean-stagefeedback-libiberty-linker-plugin +clean-stagefeedback: clean-stagefeedback-libiberty-linker-plugin +clean-stagefeedback-libiberty-linker-plugin: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(HOST_SUBDIR)/libiberty-linker-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stagefeedback-libiberty-linker-plugin/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif libiberty-linker-plugin-bootstrap + + + + + +.PHONY: check-libiberty-linker-plugin maybe-check-libiberty-linker-plugin +maybe-check-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-check-libiberty-linker-plugin: check-libiberty-linker-plugin + +check-libiberty-linker-plugin: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check) + +@endif libiberty-linker-plugin + +.PHONY: install-libiberty-linker-plugin maybe-install-libiberty-linker-plugin +maybe-install-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-install-libiberty-linker-plugin: install-libiberty-linker-plugin + +install-libiberty-linker-plugin: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install) + +@endif libiberty-linker-plugin + +.PHONY: install-strip-libiberty-linker-plugin maybe-install-strip-libiberty-linker-plugin +maybe-install-strip-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-install-strip-libiberty-linker-plugin: install-strip-libiberty-linker-plugin + +install-strip-libiberty-linker-plugin: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip) + +@endif libiberty-linker-plugin + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-libiberty-linker-plugin info-libiberty-linker-plugin +maybe-info-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-info-libiberty-linker-plugin: info-libiberty-linker-plugin + +info-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing info in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-dvi-libiberty-linker-plugin dvi-libiberty-linker-plugin +maybe-dvi-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-dvi-libiberty-linker-plugin: dvi-libiberty-linker-plugin + +dvi-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing dvi in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-pdf-libiberty-linker-plugin pdf-libiberty-linker-plugin +maybe-pdf-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-pdf-libiberty-linker-plugin: pdf-libiberty-linker-plugin + +pdf-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing pdf in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-html-libiberty-linker-plugin html-libiberty-linker-plugin +maybe-html-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-html-libiberty-linker-plugin: html-libiberty-linker-plugin + +html-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing html in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-TAGS-libiberty-linker-plugin TAGS-libiberty-linker-plugin +maybe-TAGS-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-TAGS-libiberty-linker-plugin: TAGS-libiberty-linker-plugin + +TAGS-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing TAGS in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-install-info-libiberty-linker-plugin install-info-libiberty-linker-plugin +maybe-install-info-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-install-info-libiberty-linker-plugin: install-info-libiberty-linker-plugin + +install-info-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin \ + info-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-info in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-install-pdf-libiberty-linker-plugin install-pdf-libiberty-linker-plugin +maybe-install-pdf-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-install-pdf-libiberty-linker-plugin: install-pdf-libiberty-linker-plugin + +install-pdf-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin \ + pdf-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-pdf in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-install-html-libiberty-linker-plugin install-html-libiberty-linker-plugin +maybe-install-html-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-install-html-libiberty-linker-plugin: install-html-libiberty-linker-plugin + +install-html-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin \ + html-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-html in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-installcheck-libiberty-linker-plugin installcheck-libiberty-linker-plugin +maybe-installcheck-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-installcheck-libiberty-linker-plugin: installcheck-libiberty-linker-plugin + +installcheck-libiberty-linker-plugin: \ + configure-libiberty-linker-plugin + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing installcheck in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-mostlyclean-libiberty-linker-plugin mostlyclean-libiberty-linker-plugin +maybe-mostlyclean-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-mostlyclean-libiberty-linker-plugin: mostlyclean-libiberty-linker-plugin + +mostlyclean-libiberty-linker-plugin: + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing mostlyclean in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-clean-libiberty-linker-plugin clean-libiberty-linker-plugin +maybe-clean-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-clean-libiberty-linker-plugin: clean-libiberty-linker-plugin + +clean-libiberty-linker-plugin: + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing clean in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-distclean-libiberty-linker-plugin distclean-libiberty-linker-plugin +maybe-distclean-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-distclean-libiberty-linker-plugin: distclean-libiberty-linker-plugin + +distclean-libiberty-linker-plugin: + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing distclean in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif libiberty-linker-plugin + +.PHONY: maybe-maintainer-clean-libiberty-linker-plugin maintainer-clean-libiberty-linker-plugin +maybe-maintainer-clean-libiberty-linker-plugin: +@if libiberty-linker-plugin +maybe-maintainer-clean-libiberty-linker-plugin: maintainer-clean-libiberty-linker-plugin + +maintainer-clean-libiberty-linker-plugin: + @[ -f ./libiberty-linker-plugin/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing maintainer-clean in libiberty-linker-plugin"; \ + (cd $(HOST_SUBDIR)/libiberty-linker-plugin && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif libiberty-linker-plugin + + + .PHONY: configure-libiconv maybe-configure-libiconv maybe-configure-libiconv: @if gcc-bootstrap @@ -23447,7 +24139,7 @@ configure-libiconv: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libiconv; \ cd "$(HOST_SUBDIR)/libiconv" || exit 1; \ @@ -23456,11 +24148,12 @@ configure-libiconv: *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiconv"; \ - libsrcdir="$$s/libiconv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libiconv; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared \ + --target=${target_alias} --disable-shared \ || exit 1 @endif libiconv @@ -23498,7 +24191,7 @@ check-libiconv: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -23539,7 +24232,7 @@ info-libiconv: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libiconv" ; \ + echo "Doing info in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23565,7 +24258,7 @@ dvi-libiconv: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libiconv" ; \ + echo "Doing dvi in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23591,7 +24284,7 @@ pdf-libiconv: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libiconv" ; \ + echo "Doing pdf in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23617,7 +24310,7 @@ html-libiconv: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libiconv" ; \ + echo "Doing html in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23643,7 +24336,7 @@ TAGS-libiconv: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libiconv" ; \ + echo "Doing TAGS in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23699,7 +24392,7 @@ installcheck-libiconv: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libiconv" ; \ + echo "Doing installcheck in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23724,7 +24417,7 @@ mostlyclean-libiconv: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in libiconv" ; \ + echo "Doing mostlyclean in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23749,7 +24442,7 @@ clean-libiconv: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in libiconv" ; \ + echo "Doing clean in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23774,7 +24467,7 @@ distclean-libiconv: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in libiconv" ; \ + echo "Doing distclean in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23799,7 +24492,7 @@ maintainer-clean-libiconv: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in libiconv" ; \ + echo "Doing maintainer-clean in libiconv"; \ (cd $(HOST_SUBDIR)/libiconv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23824,7 +24517,7 @@ configure-m4: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/m4; \ cd "$(HOST_SUBDIR)/m4" || exit 1; \ @@ -23833,11 +24526,12 @@ configure-m4: *) topdir=`echo $(HOST_SUBDIR)/m4/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/m4"; \ - libsrcdir="$$s/m4"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=m4; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif m4 @@ -23875,7 +24569,7 @@ check-m4: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -23928,7 +24622,7 @@ info-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in m4" ; \ + echo "Doing info in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23954,7 +24648,7 @@ dvi-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in m4" ; \ + echo "Doing dvi in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -23980,7 +24674,7 @@ pdf-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in m4" ; \ + echo "Doing pdf in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24006,7 +24700,7 @@ html-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in m4" ; \ + echo "Doing html in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24032,7 +24726,7 @@ TAGS-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in m4" ; \ + echo "Doing TAGS in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24059,7 +24753,7 @@ install-info-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in m4" ; \ + echo "Doing install-info in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24086,7 +24780,7 @@ install-pdf-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in m4" ; \ + echo "Doing install-pdf in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24113,7 +24807,7 @@ install-html-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in m4" ; \ + echo "Doing install-html in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24139,7 +24833,7 @@ installcheck-m4: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in m4" ; \ + echo "Doing installcheck in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24164,7 +24858,7 @@ mostlyclean-m4: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in m4" ; \ + echo "Doing mostlyclean in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24189,7 +24883,7 @@ clean-m4: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in m4" ; \ + echo "Doing clean in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24214,7 +24908,7 @@ distclean-m4: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in m4" ; \ + echo "Doing distclean in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24239,7 +24933,7 @@ maintainer-clean-m4: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in m4" ; \ + echo "Doing maintainer-clean in m4"; \ (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24264,7 +24958,7 @@ configure-readline: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/readline; \ cd "$(HOST_SUBDIR)/readline" || exit 1; \ @@ -24273,11 +24967,12 @@ configure-readline: *) topdir=`echo $(HOST_SUBDIR)/readline/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/readline"; \ - libsrcdir="$$s/readline"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=readline; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif readline @@ -24315,7 +25010,7 @@ check-readline: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -24368,7 +25063,7 @@ info-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in readline" ; \ + echo "Doing info in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24394,7 +25089,7 @@ dvi-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in readline" ; \ + echo "Doing dvi in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24420,7 +25115,7 @@ pdf-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in readline" ; \ + echo "Doing pdf in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24446,7 +25141,7 @@ html-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in readline" ; \ + echo "Doing html in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24472,7 +25167,7 @@ TAGS-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in readline" ; \ + echo "Doing TAGS in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24499,7 +25194,7 @@ install-info-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in readline" ; \ + echo "Doing install-info in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24526,7 +25221,7 @@ install-pdf-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in readline" ; \ + echo "Doing install-pdf in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24553,7 +25248,7 @@ install-html-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in readline" ; \ + echo "Doing install-html in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24579,7 +25274,7 @@ installcheck-readline: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in readline" ; \ + echo "Doing installcheck in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24604,7 +25299,7 @@ mostlyclean-readline: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in readline" ; \ + echo "Doing mostlyclean in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24629,7 +25324,7 @@ clean-readline: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in readline" ; \ + echo "Doing clean in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24654,7 +25349,7 @@ distclean-readline: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in readline" ; \ + echo "Doing distclean in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24679,7 +25374,7 @@ maintainer-clean-readline: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in readline" ; \ + echo "Doing maintainer-clean in readline"; \ (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24704,7 +25399,7 @@ configure-sid: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sid; \ cd "$(HOST_SUBDIR)/sid" || exit 1; \ @@ -24713,11 +25408,12 @@ configure-sid: *) topdir=`echo $(HOST_SUBDIR)/sid/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/sid"; \ - libsrcdir="$$s/sid"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=sid; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif sid @@ -24755,7 +25451,7 @@ check-sid: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -24808,7 +25504,7 @@ info-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in sid" ; \ + echo "Doing info in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24834,7 +25530,7 @@ dvi-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in sid" ; \ + echo "Doing dvi in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24860,7 +25556,7 @@ pdf-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in sid" ; \ + echo "Doing pdf in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24886,7 +25582,7 @@ html-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in sid" ; \ + echo "Doing html in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24912,7 +25608,7 @@ TAGS-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in sid" ; \ + echo "Doing TAGS in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24939,7 +25635,7 @@ install-info-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in sid" ; \ + echo "Doing install-info in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24966,7 +25662,7 @@ install-pdf-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in sid" ; \ + echo "Doing install-pdf in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -24993,7 +25689,7 @@ install-html-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in sid" ; \ + echo "Doing install-html in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25019,7 +25715,7 @@ installcheck-sid: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in sid" ; \ + echo "Doing installcheck in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25044,7 +25740,7 @@ mostlyclean-sid: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in sid" ; \ + echo "Doing mostlyclean in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25069,7 +25765,7 @@ clean-sid: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in sid" ; \ + echo "Doing clean in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25094,7 +25790,7 @@ distclean-sid: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in sid" ; \ + echo "Doing distclean in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25119,7 +25815,7 @@ maintainer-clean-sid: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in sid" ; \ + echo "Doing maintainer-clean in sid"; \ (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25144,7 +25840,7 @@ configure-sim: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sim; \ cd "$(HOST_SUBDIR)/sim" || exit 1; \ @@ -25153,11 +25849,12 @@ configure-sim: *) topdir=`echo $(HOST_SUBDIR)/sim/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/sim"; \ - libsrcdir="$$s/sim"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=sim; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif sim @@ -25195,7 +25892,7 @@ check-sim: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -25248,7 +25945,7 @@ info-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in sim" ; \ + echo "Doing info in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25274,7 +25971,7 @@ dvi-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in sim" ; \ + echo "Doing dvi in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25300,7 +25997,7 @@ pdf-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in sim" ; \ + echo "Doing pdf in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25326,7 +26023,7 @@ html-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in sim" ; \ + echo "Doing html in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25352,7 +26049,7 @@ TAGS-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in sim" ; \ + echo "Doing TAGS in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25379,7 +26076,7 @@ install-info-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in sim" ; \ + echo "Doing install-info in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25406,7 +26103,7 @@ install-pdf-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in sim" ; \ + echo "Doing install-pdf in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25433,7 +26130,7 @@ install-html-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in sim" ; \ + echo "Doing install-html in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25459,7 +26156,7 @@ installcheck-sim: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in sim" ; \ + echo "Doing installcheck in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25484,7 +26181,7 @@ mostlyclean-sim: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in sim" ; \ + echo "Doing mostlyclean in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25509,7 +26206,7 @@ clean-sim: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in sim" ; \ + echo "Doing clean in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25534,7 +26231,7 @@ distclean-sim: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in sim" ; \ + echo "Doing distclean in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25559,7 +26256,7 @@ maintainer-clean-sim: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in sim" ; \ + echo "Doing maintainer-clean in sim"; \ (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25584,7 +26281,7 @@ configure-texinfo: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/texinfo; \ cd "$(HOST_SUBDIR)/texinfo" || exit 1; \ @@ -25593,11 +26290,12 @@ configure-texinfo: *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/texinfo"; \ - libsrcdir="$$s/texinfo"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=texinfo; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif texinfo @@ -25635,7 +26333,7 @@ check-texinfo: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -25676,7 +26374,7 @@ info-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in texinfo" ; \ + echo "Doing info in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25702,7 +26400,7 @@ dvi-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in texinfo" ; \ + echo "Doing dvi in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25728,7 +26426,7 @@ pdf-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in texinfo" ; \ + echo "Doing pdf in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25754,7 +26452,7 @@ html-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in texinfo" ; \ + echo "Doing html in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25780,7 +26478,7 @@ TAGS-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in texinfo" ; \ + echo "Doing TAGS in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25807,7 +26505,7 @@ install-info-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in texinfo" ; \ + echo "Doing install-info in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25834,7 +26532,7 @@ install-pdf-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in texinfo" ; \ + echo "Doing install-pdf in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25861,7 +26559,7 @@ install-html-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in texinfo" ; \ + echo "Doing install-html in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25887,7 +26585,7 @@ installcheck-texinfo: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in texinfo" ; \ + echo "Doing installcheck in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25912,7 +26610,7 @@ mostlyclean-texinfo: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in texinfo" ; \ + echo "Doing mostlyclean in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25937,7 +26635,7 @@ clean-texinfo: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in texinfo" ; \ + echo "Doing clean in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25962,7 +26660,7 @@ distclean-texinfo: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in texinfo" ; \ + echo "Doing distclean in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -25987,7 +26685,7 @@ maintainer-clean-texinfo: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in texinfo" ; \ + echo "Doing maintainer-clean in texinfo"; \ (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26011,7 +26709,7 @@ configure-zlib: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/zlib; \ cd "$(HOST_SUBDIR)/zlib" || exit 1; \ @@ -26020,11 +26718,12 @@ configure-zlib: *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif zlib @@ -26045,19 +26744,20 @@ configure-stage1-zlib: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/zlib; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -26077,19 +26777,19 @@ configure-stage2-zlib: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/zlib; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -26110,19 +26810,19 @@ configure-stage3-zlib: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/zlib; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -26143,19 +26843,19 @@ configure-stage4-zlib: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/zlib; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -26176,19 +26876,19 @@ configure-stageprofile-zlib: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/zlib; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -26209,19 +26909,19 @@ configure-stagefeedback-zlib: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/zlib; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib; \ cd $(HOST_SUBDIR)/zlib || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=zlib; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif zlib-bootstrap @@ -26542,7 +27242,7 @@ info-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in zlib" ; \ + echo "Doing info in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26567,7 +27267,7 @@ dvi-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in zlib" ; \ + echo "Doing dvi in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26592,7 +27292,7 @@ pdf-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in zlib" ; \ + echo "Doing pdf in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26617,7 +27317,7 @@ html-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in zlib" ; \ + echo "Doing html in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26642,7 +27342,7 @@ TAGS-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in zlib" ; \ + echo "Doing TAGS in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26668,7 +27368,7 @@ install-info-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in zlib" ; \ + echo "Doing install-info in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26694,7 +27394,7 @@ install-pdf-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in zlib" ; \ + echo "Doing install-pdf in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26720,7 +27420,7 @@ install-html-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in zlib" ; \ + echo "Doing install-html in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26745,7 +27445,7 @@ installcheck-zlib: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in zlib" ; \ + echo "Doing installcheck in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26769,7 +27469,7 @@ mostlyclean-zlib: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in zlib" ; \ + echo "Doing mostlyclean in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26793,7 +27493,7 @@ clean-zlib: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in zlib" ; \ + echo "Doing clean in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26817,7 +27517,7 @@ distclean-zlib: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in zlib" ; \ + echo "Doing distclean in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26841,7 +27541,7 @@ maintainer-clean-zlib: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in zlib" ; \ + echo "Doing maintainer-clean in zlib"; \ (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26866,7 +27566,7 @@ configure-gdb: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gdb; \ cd "$(HOST_SUBDIR)/gdb" || exit 1; \ @@ -26875,11 +27575,12 @@ configure-gdb: *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gdb"; \ - libsrcdir="$$s/gdb"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gdb; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif gdb @@ -26917,7 +27618,7 @@ check-gdb: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -26970,7 +27671,7 @@ info-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gdb" ; \ + echo "Doing info in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -26996,7 +27697,7 @@ dvi-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gdb" ; \ + echo "Doing dvi in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27022,7 +27723,7 @@ pdf-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gdb" ; \ + echo "Doing pdf in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27048,7 +27749,7 @@ html-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gdb" ; \ + echo "Doing html in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27074,7 +27775,7 @@ TAGS-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gdb" ; \ + echo "Doing TAGS in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27101,7 +27802,7 @@ install-info-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gdb" ; \ + echo "Doing install-info in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27128,7 +27829,7 @@ install-pdf-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gdb" ; \ + echo "Doing install-pdf in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27155,7 +27856,7 @@ install-html-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gdb" ; \ + echo "Doing install-html in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27181,7 +27882,7 @@ installcheck-gdb: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gdb" ; \ + echo "Doing installcheck in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27206,7 +27907,7 @@ mostlyclean-gdb: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gdb" ; \ + echo "Doing mostlyclean in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27231,7 +27932,7 @@ clean-gdb: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gdb" ; \ + echo "Doing clean in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27256,7 +27957,7 @@ distclean-gdb: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gdb" ; \ + echo "Doing distclean in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27281,7 +27982,7 @@ maintainer-clean-gdb: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gdb" ; \ + echo "Doing maintainer-clean in gdb"; \ (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27306,7 +28007,7 @@ configure-expect: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/expect; \ cd "$(HOST_SUBDIR)/expect" || exit 1; \ @@ -27315,11 +28016,12 @@ configure-expect: *) topdir=`echo $(HOST_SUBDIR)/expect/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/expect"; \ - libsrcdir="$$s/expect"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=expect; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif expect @@ -27357,7 +28059,7 @@ check-expect: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -27410,7 +28112,7 @@ info-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in expect" ; \ + echo "Doing info in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27436,7 +28138,7 @@ dvi-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in expect" ; \ + echo "Doing dvi in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27462,7 +28164,7 @@ pdf-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in expect" ; \ + echo "Doing pdf in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27488,7 +28190,7 @@ html-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in expect" ; \ + echo "Doing html in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27514,7 +28216,7 @@ TAGS-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in expect" ; \ + echo "Doing TAGS in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27541,7 +28243,7 @@ install-info-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in expect" ; \ + echo "Doing install-info in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27568,7 +28270,7 @@ install-pdf-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in expect" ; \ + echo "Doing install-pdf in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27595,7 +28297,7 @@ install-html-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in expect" ; \ + echo "Doing install-html in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27621,7 +28323,7 @@ installcheck-expect: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in expect" ; \ + echo "Doing installcheck in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27646,7 +28348,7 @@ mostlyclean-expect: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in expect" ; \ + echo "Doing mostlyclean in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27671,7 +28373,7 @@ clean-expect: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in expect" ; \ + echo "Doing clean in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27696,7 +28398,7 @@ distclean-expect: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in expect" ; \ + echo "Doing distclean in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27721,7 +28423,7 @@ maintainer-clean-expect: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in expect" ; \ + echo "Doing maintainer-clean in expect"; \ (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27746,7 +28448,7 @@ configure-guile: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/guile; \ cd "$(HOST_SUBDIR)/guile" || exit 1; \ @@ -27755,11 +28457,12 @@ configure-guile: *) topdir=`echo $(HOST_SUBDIR)/guile/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/guile"; \ - libsrcdir="$$s/guile"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=guile; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif guile @@ -27797,7 +28500,7 @@ check-guile: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -27850,7 +28553,7 @@ info-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in guile" ; \ + echo "Doing info in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27876,7 +28579,7 @@ dvi-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in guile" ; \ + echo "Doing dvi in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27902,7 +28605,7 @@ pdf-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in guile" ; \ + echo "Doing pdf in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27928,7 +28631,7 @@ html-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in guile" ; \ + echo "Doing html in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27954,7 +28657,7 @@ TAGS-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in guile" ; \ + echo "Doing TAGS in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -27981,7 +28684,7 @@ install-info-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in guile" ; \ + echo "Doing install-info in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28008,7 +28711,7 @@ install-pdf-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in guile" ; \ + echo "Doing install-pdf in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28035,7 +28738,7 @@ install-html-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in guile" ; \ + echo "Doing install-html in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28061,7 +28764,7 @@ installcheck-guile: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in guile" ; \ + echo "Doing installcheck in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28086,7 +28789,7 @@ mostlyclean-guile: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in guile" ; \ + echo "Doing mostlyclean in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28111,7 +28814,7 @@ clean-guile: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in guile" ; \ + echo "Doing clean in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28136,7 +28839,7 @@ distclean-guile: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in guile" ; \ + echo "Doing distclean in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28161,7 +28864,7 @@ maintainer-clean-guile: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in guile" ; \ + echo "Doing maintainer-clean in guile"; \ (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28186,7 +28889,7 @@ configure-tk: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tk; \ cd "$(HOST_SUBDIR)/tk" || exit 1; \ @@ -28195,11 +28898,12 @@ configure-tk: *) topdir=`echo $(HOST_SUBDIR)/tk/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/tk"; \ - libsrcdir="$$s/tk"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=tk; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif tk @@ -28237,7 +28941,7 @@ check-tk: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -28290,7 +28994,7 @@ info-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in tk" ; \ + echo "Doing info in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28316,7 +29020,7 @@ dvi-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in tk" ; \ + echo "Doing dvi in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28342,7 +29046,7 @@ pdf-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in tk" ; \ + echo "Doing pdf in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28368,7 +29072,7 @@ html-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in tk" ; \ + echo "Doing html in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28394,7 +29098,7 @@ TAGS-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in tk" ; \ + echo "Doing TAGS in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28421,7 +29125,7 @@ install-info-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in tk" ; \ + echo "Doing install-info in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28448,7 +29152,7 @@ install-pdf-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in tk" ; \ + echo "Doing install-pdf in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28475,7 +29179,7 @@ install-html-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in tk" ; \ + echo "Doing install-html in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28501,7 +29205,7 @@ installcheck-tk: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in tk" ; \ + echo "Doing installcheck in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28526,7 +29230,7 @@ mostlyclean-tk: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in tk" ; \ + echo "Doing mostlyclean in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28551,7 +29255,7 @@ clean-tk: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in tk" ; \ + echo "Doing clean in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28576,7 +29280,7 @@ distclean-tk: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in tk" ; \ + echo "Doing distclean in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28601,7 +29305,7 @@ maintainer-clean-tk: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in tk" ; \ + echo "Doing maintainer-clean in tk"; \ (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28626,7 +29330,7 @@ configure-libtermcap: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libtermcap; \ cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ @@ -28635,11 +29339,12 @@ configure-libtermcap: *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libtermcap"; \ - libsrcdir="$$s/libtermcap"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libtermcap; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif libtermcap @@ -28724,7 +29429,7 @@ info-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in libtermcap" ; \ + echo "Doing info in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28750,7 +29455,7 @@ dvi-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libtermcap" ; \ + echo "Doing dvi in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28776,7 +29481,7 @@ pdf-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in libtermcap" ; \ + echo "Doing pdf in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28802,7 +29507,7 @@ html-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in libtermcap" ; \ + echo "Doing html in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28828,7 +29533,7 @@ TAGS-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in libtermcap" ; \ + echo "Doing TAGS in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28855,7 +29560,7 @@ install-info-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in libtermcap" ; \ + echo "Doing install-info in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28882,7 +29587,7 @@ install-pdf-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in libtermcap" ; \ + echo "Doing install-pdf in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28909,7 +29614,7 @@ install-html-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in libtermcap" ; \ + echo "Doing install-html in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -28935,7 +29640,7 @@ installcheck-libtermcap: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in libtermcap" ; \ + echo "Doing installcheck in libtermcap"; \ (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29000,7 +29705,7 @@ configure-utils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/utils; \ cd "$(HOST_SUBDIR)/utils" || exit 1; \ @@ -29009,11 +29714,12 @@ configure-utils: *) topdir=`echo $(HOST_SUBDIR)/utils/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/utils"; \ - libsrcdir="$$s/utils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=utils; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif utils @@ -29098,7 +29804,7 @@ info-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in utils" ; \ + echo "Doing info in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29124,7 +29830,7 @@ dvi-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in utils" ; \ + echo "Doing dvi in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29150,7 +29856,7 @@ pdf-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in utils" ; \ + echo "Doing pdf in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29176,7 +29882,7 @@ html-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in utils" ; \ + echo "Doing html in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29202,7 +29908,7 @@ TAGS-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in utils" ; \ + echo "Doing TAGS in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29229,7 +29935,7 @@ install-info-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in utils" ; \ + echo "Doing install-info in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29256,7 +29962,7 @@ install-pdf-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in utils" ; \ + echo "Doing install-pdf in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29283,7 +29989,7 @@ install-html-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in utils" ; \ + echo "Doing install-html in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29309,7 +30015,7 @@ installcheck-utils: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in utils" ; \ + echo "Doing installcheck in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29334,7 +30040,7 @@ mostlyclean-utils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in utils" ; \ + echo "Doing mostlyclean in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29359,7 +30065,7 @@ clean-utils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in utils" ; \ + echo "Doing clean in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29384,7 +30090,7 @@ distclean-utils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in utils" ; \ + echo "Doing distclean in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29409,7 +30115,7 @@ maintainer-clean-utils: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in utils" ; \ + echo "Doing maintainer-clean in utils"; \ (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29434,7 +30140,7 @@ configure-gnattools: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gnattools; \ cd "$(HOST_SUBDIR)/gnattools" || exit 1; \ @@ -29443,11 +30149,12 @@ configure-gnattools: *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gnattools"; \ - libsrcdir="$$s/gnattools"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gnattools; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif gnattools @@ -29485,7 +30192,7 @@ check-gnattools: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(FLAGS_TO_PASS) check) @@ -29538,7 +30245,7 @@ info-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in gnattools" ; \ + echo "Doing info in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29564,7 +30271,7 @@ dvi-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in gnattools" ; \ + echo "Doing dvi in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29590,7 +30297,7 @@ pdf-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in gnattools" ; \ + echo "Doing pdf in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29616,7 +30323,7 @@ html-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in gnattools" ; \ + echo "Doing html in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29642,7 +30349,7 @@ TAGS-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in gnattools" ; \ + echo "Doing TAGS in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29669,7 +30376,7 @@ install-info-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in gnattools" ; \ + echo "Doing install-info in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29696,7 +30403,7 @@ install-pdf-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in gnattools" ; \ + echo "Doing install-pdf in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29723,7 +30430,7 @@ install-html-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in gnattools" ; \ + echo "Doing install-html in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29749,7 +30456,7 @@ installcheck-gnattools: \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in gnattools" ; \ + echo "Doing installcheck in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29774,7 +30481,7 @@ mostlyclean-gnattools: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in gnattools" ; \ + echo "Doing mostlyclean in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29799,7 +30506,7 @@ clean-gnattools: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in gnattools" ; \ + echo "Doing clean in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29824,7 +30531,7 @@ distclean-gnattools: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in gnattools" ; \ + echo "Doing distclean in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29849,7 +30556,7 @@ maintainer-clean-gnattools: for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in gnattools" ; \ + echo "Doing maintainer-clean in gnattools"; \ (cd $(HOST_SUBDIR)/gnattools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -29873,7 +30580,7 @@ configure-lto-plugin: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/lto-plugin; \ cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \ @@ -29882,11 +30589,12 @@ configure-lto-plugin: *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --enable-shared \ + --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \ || exit 1 @endif lto-plugin @@ -29907,21 +30615,22 @@ configure-stage1-lto-plugin: CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(HOST_SUBDIR)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/lto-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) \ - --enable-shared + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ @endif lto-plugin-bootstrap .PHONY: configure-stage2-lto-plugin maybe-configure-stage2-lto-plugin @@ -29940,22 +30649,22 @@ configure-stage2-lto-plugin: CFLAGS="$(STAGE2_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE2_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE2_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(HOST_SUBDIR)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + echo Configuring stage 2 in $(HOST_SUBDIR)/lto-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) \ - --enable-shared + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ @endif lto-plugin-bootstrap .PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin @@ -29974,22 +30683,22 @@ configure-stage3-lto-plugin: CFLAGS="$(STAGE3_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE3_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE3_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(HOST_SUBDIR)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + echo Configuring stage 3 in $(HOST_SUBDIR)/lto-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) \ - --enable-shared + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ @endif lto-plugin-bootstrap .PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin @@ -30008,22 +30717,22 @@ configure-stage4-lto-plugin: CFLAGS="$(STAGE4_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGE4_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGE4_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(HOST_SUBDIR)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + echo Configuring stage 4 in $(HOST_SUBDIR)/lto-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) \ - --enable-shared + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ @endif lto-plugin-bootstrap .PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin @@ -30042,22 +30751,22 @@ configure-stageprofile-lto-plugin: CFLAGS="$(STAGEprofile_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEprofile_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEprofile_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(HOST_SUBDIR)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + echo Configuring stage profile in $(HOST_SUBDIR)/lto-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) \ - --enable-shared + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ @endif lto-plugin-bootstrap .PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin @@ -30076,22 +30785,22 @@ configure-stagefeedback-lto-plugin: CFLAGS="$(STAGEfeedback_CFLAGS)"; export CFLAGS; \ CXXFLAGS="$(STAGEfeedback_CXXFLAGS)"; export CXXFLAGS; \ LIBCFLAGS="$(STAGEfeedback_CFLAGS)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(HOST_SUBDIR)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ + echo Configuring stage feedback in $(HOST_SUBDIR)/lto-plugin; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin; \ cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(HOST_SUBDIR)/lto-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) \ - --enable-shared + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ @endif lto-plugin-bootstrap @@ -30111,7 +30820,7 @@ all-lto-plugin: configure-lto-plugin s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ $(TARGET-lto-plugin)) @endif lto-plugin @@ -30140,7 +30849,7 @@ all-stage1-lto-plugin: configure-stage1-lto-plugin CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) \ + $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ TFLAGS="$(STAGE1_TFLAGS)" \ $(TARGET-stage1-lto-plugin) @@ -30155,7 +30864,7 @@ clean-stage1-lto-plugin: fi; \ cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) clean + $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean @endif lto-plugin-bootstrap @@ -30182,7 +30891,7 @@ all-stage2-lto-plugin: configure-stage2-lto-plugin CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ TFLAGS="$(STAGE2_TFLAGS)" \ $(TARGET-stage2-lto-plugin) @@ -30196,7 +30905,7 @@ clean-stage2-lto-plugin: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean @endif lto-plugin-bootstrap @@ -30223,7 +30932,7 @@ all-stage3-lto-plugin: configure-stage3-lto-plugin CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ TFLAGS="$(STAGE3_TFLAGS)" \ $(TARGET-stage3-lto-plugin) @@ -30237,7 +30946,7 @@ clean-stage3-lto-plugin: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean @endif lto-plugin-bootstrap @@ -30264,7 +30973,7 @@ all-stage4-lto-plugin: configure-stage4-lto-plugin CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ TFLAGS="$(STAGE4_TFLAGS)" \ $(TARGET-stage4-lto-plugin) @@ -30278,7 +30987,7 @@ clean-stage4-lto-plugin: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean @endif lto-plugin-bootstrap @@ -30305,7 +31014,7 @@ all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ TFLAGS="$(STAGEprofile_TFLAGS)" \ $(TARGET-stageprofile-lto-plugin) @@ -30319,7 +31028,7 @@ clean-stageprofile-lto-plugin: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean @endif lto-plugin-bootstrap @@ -30346,7 +31055,7 @@ all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ \ TFLAGS="$(STAGEfeedback_TFLAGS)" \ $(TARGET-stagefeedback-lto-plugin) @@ -30360,7 +31069,7 @@ clean-stagefeedback-lto-plugin: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean @endif lto-plugin-bootstrap @@ -30376,9 +31085,9 @@ check-lto-plugin: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check) @endif lto-plugin @@ -30393,7 +31102,7 @@ install-lto-plugin: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(FLAGS_TO_PASS) install) + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install) @endif lto-plugin @@ -30408,7 +31117,7 @@ install-strip-lto-plugin: installdirs s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(FLAGS_TO_PASS) install-strip) + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip) @endif lto-plugin @@ -30425,10 +31134,10 @@ info-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in lto-plugin" ; \ + echo "Doing info in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30450,10 +31159,10 @@ dvi-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in lto-plugin" ; \ + echo "Doing dvi in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30475,10 +31184,10 @@ pdf-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing pdf in lto-plugin" ; \ + echo "Doing pdf in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30500,10 +31209,10 @@ html-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing html in lto-plugin" ; \ + echo "Doing html in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30525,10 +31234,10 @@ TAGS-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in lto-plugin" ; \ + echo "Doing TAGS in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30551,10 +31260,10 @@ install-info-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-info in lto-plugin" ; \ + echo "Doing install-info in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30577,10 +31286,10 @@ install-pdf-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-pdf in lto-plugin" ; \ + echo "Doing install-pdf in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30603,10 +31312,10 @@ install-html-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing install-html in lto-plugin" ; \ + echo "Doing install-html in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30628,10 +31337,10 @@ installcheck-lto-plugin: \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing installcheck in lto-plugin" ; \ + echo "Doing installcheck in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30652,10 +31361,10 @@ mostlyclean-lto-plugin: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing mostlyclean in lto-plugin" ; \ + echo "Doing mostlyclean in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30676,10 +31385,10 @@ clean-lto-plugin: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing clean in lto-plugin" ; \ + echo "Doing clean in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30700,10 +31409,10 @@ distclean-lto-plugin: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing distclean in lto-plugin" ; \ + echo "Doing distclean in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30724,10 +31433,10 @@ maintainer-clean-lto-plugin: r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) @extra_linker_plugin_flags@; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing maintainer-clean in lto-plugin" ; \ + echo "Doing maintainer-clean in lto-plugin"; \ (cd $(HOST_SUBDIR)/lto-plugin && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ @@ -30740,488 +31449,4300 @@ maintainer-clean-lto-plugin: -# --------------------------------------- -# Modules which run on the target machine -# --------------------------------------- - - - - -.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3 -maybe-configure-target-libstdc++-v3: +.PHONY: configure-libcc1 maybe-configure-libcc1 +maybe-configure-libcc1: @if gcc-bootstrap -configure-target-libstdc++-v3: stage_current +configure-libcc1: stage_current @endif gcc-bootstrap -@if target-libstdc++-v3 -maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 -configure-target-libstdc++-v3: +@if libcc1 +maybe-configure-libcc1: configure-libcc1 +configure-libcc1: + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ - cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ + test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/libcc1; \ + cd "$(HOST_SUBDIR)/libcc1" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + module_srcdir=libcc1; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} --enable-shared \ || exit 1 -@endif target-libstdc++-v3 +@endif libcc1 -.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3 -maybe-configure-stage1-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3 -configure-stage1-target-libstdc++-v3: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) -@endif target-libstdc++-v3-bootstrap -.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3 -maybe-configure-stage2-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3 -configure-stage2-target-libstdc++-v3: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) -@endif target-libstdc++-v3-bootstrap -.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3 -maybe-configure-stage3-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3 -configure-stage3-target-libstdc++-v3: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 +.PHONY: all-libcc1 maybe-all-libcc1 +maybe-all-libcc1: +@if gcc-bootstrap +all-libcc1: stage_current +@endif gcc-bootstrap +@if libcc1 +TARGET-libcc1=all +maybe-all-libcc1: all-libcc1 +all-libcc1: configure-libcc1 + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) -@endif target-libstdc++-v3-bootstrap + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-libcc1)) +@endif libcc1 -.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3 -maybe-configure-stage4-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3 -configure-stage4-target-libstdc++-v3: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + + + +.PHONY: check-libcc1 maybe-check-libcc1 +maybe-check-libcc1: +@if libcc1 +maybe-check-libcc1: check-libcc1 + +check-libcc1: + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) -@endif target-libstdc++-v3-bootstrap + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(FLAGS_TO_PASS) check) -.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3 -maybe-configure-stageprofile-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3 -configure-stageprofile-target-libstdc++-v3: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 +@endif libcc1 + +.PHONY: install-libcc1 maybe-install-libcc1 +maybe-install-libcc1: +@if libcc1 +maybe-install-libcc1: install-libcc1 + +install-libcc1: installdirs + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) -@endif target-libstdc++-v3-bootstrap + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(FLAGS_TO_PASS) install) -.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3 -maybe-configure-stagefeedback-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3 -configure-stagefeedback-target-libstdc++-v3: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 +@endif libcc1 + +.PHONY: install-strip-libcc1 maybe-install-strip-libcc1 +maybe-install-strip-libcc1: +@if libcc1 +maybe-install-strip-libcc1: install-strip-libcc1 + +install-strip-libcc1: installdirs + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - echo "Checking multilib configuration for libstdc++-v3..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) -@endif target-libstdc++-v3-bootstrap - + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) +@endif libcc1 +# Other targets (info, dvi, pdf, etc.) +.PHONY: maybe-info-libcc1 info-libcc1 +maybe-info-libcc1: +@if libcc1 +maybe-info-libcc1: info-libcc1 -.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3 -maybe-all-target-libstdc++-v3: -@if gcc-bootstrap -all-target-libstdc++-v3: stage_current -@endif gcc-bootstrap -@if target-libstdc++-v3 -TARGET-target-libstdc++-v3=all -maybe-all-target-libstdc++-v3: all-target-libstdc++-v3 -all-target-libstdc++-v3: configure-target-libstdc++-v3 - @r=`${PWD_COMMAND}`; export r; \ +info-libcc1: \ + configure-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - $(TARGET-target-libstdc++-v3)) -@endif target-libstdc++-v3 + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing info in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 +@endif libcc1 +.PHONY: maybe-dvi-libcc1 dvi-libcc1 +maybe-dvi-libcc1: +@if libcc1 +maybe-dvi-libcc1: dvi-libcc1 -.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3 -.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3 -maybe-all-stage1-target-libstdc++-v3: -maybe-clean-stage1-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3 -all-stage1: all-stage1-target-libstdc++-v3 -TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) -all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3 - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ +dvi-libcc1: \ + configure-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - \ - TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-target-libstdc++-v3) + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing dvi in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 -maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3 -clean-stage1: clean-stage1-target-libstdc++-v3 -clean-stage1-target-libstdc++-v3: - @if [ $(current_stage) = stage1 ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \ - $(MAKE) stage1-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - clean -@endif target-libstdc++-v3-bootstrap +@endif libcc1 +.PHONY: maybe-pdf-libcc1 pdf-libcc1 +maybe-pdf-libcc1: +@if libcc1 +maybe-pdf-libcc1: pdf-libcc1 -.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3 -.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3 -maybe-all-stage2-target-libstdc++-v3: -maybe-clean-stage2-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3 -all-stage2: all-stage2-target-libstdc++-v3 -TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) -all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3 - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ +pdf-libcc1: \ + configure-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-target-libstdc++-v3) + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing pdf in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 -maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3 -clean-stage2: clean-stage2-target-libstdc++-v3 -clean-stage2-target-libstdc++-v3: - @if [ $(current_stage) = stage2 ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \ - $(MAKE) stage2-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif libcc1 +.PHONY: maybe-html-libcc1 html-libcc1 +maybe-html-libcc1: +@if libcc1 +maybe-html-libcc1: html-libcc1 -.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3 -.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3 -maybe-all-stage3-target-libstdc++-v3: -maybe-clean-stage3-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3 -all-stage3: all-stage3-target-libstdc++-v3 -TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) -all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3 - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ +html-libcc1: \ + configure-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-target-libstdc++-v3) + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing html in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 -maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3 -clean-stage3: clean-stage3-target-libstdc++-v3 -clean-stage3-target-libstdc++-v3: - @if [ $(current_stage) = stage3 ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \ - $(MAKE) stage3-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif libcc1 +.PHONY: maybe-TAGS-libcc1 TAGS-libcc1 +maybe-TAGS-libcc1: +@if libcc1 +maybe-TAGS-libcc1: TAGS-libcc1 -.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3 -.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3 -maybe-all-stage4-target-libstdc++-v3: -maybe-clean-stage4-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3 -all-stage4: all-stage4-target-libstdc++-v3 -TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) -all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3 - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ +TAGS-libcc1: \ + configure-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing TAGS in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-install-info-libcc1 install-info-libcc1 +maybe-install-info-libcc1: +@if libcc1 +maybe-install-info-libcc1: install-info-libcc1 + +install-info-libcc1: \ + configure-libcc1 \ + info-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-info in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1 +maybe-install-pdf-libcc1: +@if libcc1 +maybe-install-pdf-libcc1: install-pdf-libcc1 + +install-pdf-libcc1: \ + configure-libcc1 \ + pdf-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-pdf in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-install-html-libcc1 install-html-libcc1 +maybe-install-html-libcc1: +@if libcc1 +maybe-install-html-libcc1: install-html-libcc1 + +install-html-libcc1: \ + configure-libcc1 \ + html-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-html in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-installcheck-libcc1 installcheck-libcc1 +maybe-installcheck-libcc1: +@if libcc1 +maybe-installcheck-libcc1: installcheck-libcc1 + +installcheck-libcc1: \ + configure-libcc1 + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing installcheck in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-mostlyclean-libcc1 mostlyclean-libcc1 +maybe-mostlyclean-libcc1: +@if libcc1 +maybe-mostlyclean-libcc1: mostlyclean-libcc1 + +mostlyclean-libcc1: + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing mostlyclean in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-clean-libcc1 clean-libcc1 +maybe-clean-libcc1: +@if libcc1 +maybe-clean-libcc1: clean-libcc1 + +clean-libcc1: + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing clean in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-distclean-libcc1 distclean-libcc1 +maybe-distclean-libcc1: +@if libcc1 +maybe-distclean-libcc1: distclean-libcc1 + +distclean-libcc1: + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing distclean in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif libcc1 + +.PHONY: maybe-maintainer-clean-libcc1 maintainer-clean-libcc1 +maybe-maintainer-clean-libcc1: +@if libcc1 +maybe-maintainer-clean-libcc1: maintainer-clean-libcc1 + +maintainer-clean-libcc1: + @: $(MAKE); $(unstage) + @[ -f ./libcc1/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing maintainer-clean in libcc1"; \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif libcc1 + + + +.PHONY: configure-gotools maybe-configure-gotools +maybe-configure-gotools: +@if gcc-bootstrap +configure-gotools: stage_current +@endif gcc-bootstrap +@if gotools +maybe-configure-gotools: configure-gotools +configure-gotools: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/gotools/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gotools; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/gotools; \ + cd "$(HOST_SUBDIR)/gotools" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gotools/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=gotools; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + || exit 1 +@endif gotools + + + + + +.PHONY: all-gotools maybe-all-gotools +maybe-all-gotools: +@if gcc-bootstrap +all-gotools: stage_current +@endif gcc-bootstrap +@if gotools +TARGET-gotools=all +maybe-all-gotools: all-gotools +all-gotools: configure-gotools + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-gotools)) +@endif gotools + + + + +.PHONY: check-gotools maybe-check-gotools +maybe-check-gotools: +@if gotools +maybe-check-gotools: check-gotools + +check-gotools: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(FLAGS_TO_PASS) check) + +@endif gotools + +.PHONY: install-gotools maybe-install-gotools +maybe-install-gotools: +@if gotools +maybe-install-gotools: install-gotools + +install-gotools: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif gotools + +.PHONY: install-strip-gotools maybe-install-strip-gotools +maybe-install-strip-gotools: +@if gotools +maybe-install-strip-gotools: install-strip-gotools + +install-strip-gotools: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif gotools + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-gotools info-gotools +maybe-info-gotools: +@if gotools +maybe-info-gotools: info-gotools + +info-gotools: \ + configure-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing info in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-dvi-gotools dvi-gotools +maybe-dvi-gotools: +@if gotools +maybe-dvi-gotools: dvi-gotools + +dvi-gotools: \ + configure-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing dvi in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-pdf-gotools pdf-gotools +maybe-pdf-gotools: +@if gotools +maybe-pdf-gotools: pdf-gotools + +pdf-gotools: \ + configure-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing pdf in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-html-gotools html-gotools +maybe-html-gotools: +@if gotools +maybe-html-gotools: html-gotools + +html-gotools: \ + configure-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing html in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-TAGS-gotools TAGS-gotools +maybe-TAGS-gotools: +@if gotools +maybe-TAGS-gotools: TAGS-gotools + +TAGS-gotools: \ + configure-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing TAGS in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-install-info-gotools install-info-gotools +maybe-install-info-gotools: +@if gotools +maybe-install-info-gotools: install-info-gotools + +install-info-gotools: \ + configure-gotools \ + info-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-info in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-install-pdf-gotools install-pdf-gotools +maybe-install-pdf-gotools: +@if gotools +maybe-install-pdf-gotools: install-pdf-gotools + +install-pdf-gotools: \ + configure-gotools \ + pdf-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-pdf in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-install-html-gotools install-html-gotools +maybe-install-html-gotools: +@if gotools +maybe-install-html-gotools: install-html-gotools + +install-html-gotools: \ + configure-gotools \ + html-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-html in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-installcheck-gotools installcheck-gotools +maybe-installcheck-gotools: +@if gotools +maybe-installcheck-gotools: installcheck-gotools + +installcheck-gotools: \ + configure-gotools + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing installcheck in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-mostlyclean-gotools mostlyclean-gotools +maybe-mostlyclean-gotools: +@if gotools +maybe-mostlyclean-gotools: mostlyclean-gotools + +mostlyclean-gotools: + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing mostlyclean in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-clean-gotools clean-gotools +maybe-clean-gotools: +@if gotools +maybe-clean-gotools: clean-gotools + +clean-gotools: + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing clean in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-distclean-gotools distclean-gotools +maybe-distclean-gotools: +@if gotools +maybe-distclean-gotools: distclean-gotools + +distclean-gotools: + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing distclean in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif gotools + +.PHONY: maybe-maintainer-clean-gotools maintainer-clean-gotools +maybe-maintainer-clean-gotools: +@if gotools +maybe-maintainer-clean-gotools: maintainer-clean-gotools + +maintainer-clean-gotools: + @: $(MAKE); $(unstage) + @[ -f ./gotools/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing maintainer-clean in gotools"; \ + (cd $(HOST_SUBDIR)/gotools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif gotools + + + +# --------------------------------------- +# Modules which run on the target machine +# --------------------------------------- + + + + +.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3 +maybe-configure-target-libstdc++-v3: +@if gcc-bootstrap +configure-target-libstdc++-v3: stage_current +@endif gcc-bootstrap +@if target-libstdc++-v3 +maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 +configure-target-libstdc++-v3: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ + cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + || exit 1 +@endif target-libstdc++-v3 + + + +.PHONY: configure-stage1-target-libstdc++-v3 maybe-configure-stage1-target-libstdc++-v3 +maybe-configure-stage1-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-configure-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3 +configure-stage1-target-libstdc++-v3: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libstdc++-v3; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap + +.PHONY: configure-stage2-target-libstdc++-v3 maybe-configure-stage2-target-libstdc++-v3 +maybe-configure-stage2-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-configure-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3 +configure-stage2-target-libstdc++-v3: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libstdc++-v3; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap + +.PHONY: configure-stage3-target-libstdc++-v3 maybe-configure-stage3-target-libstdc++-v3 +maybe-configure-stage3-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-configure-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3 +configure-stage3-target-libstdc++-v3: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libstdc++-v3; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap + +.PHONY: configure-stage4-target-libstdc++-v3 maybe-configure-stage4-target-libstdc++-v3 +maybe-configure-stage4-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-configure-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3 +configure-stage4-target-libstdc++-v3: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libstdc++-v3; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap + +.PHONY: configure-stageprofile-target-libstdc++-v3 maybe-configure-stageprofile-target-libstdc++-v3 +maybe-configure-stageprofile-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-configure-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3 +configure-stageprofile-target-libstdc++-v3: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libstdc++-v3; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap + +.PHONY: configure-stagefeedback-target-libstdc++-v3 maybe-configure-stagefeedback-target-libstdc++-v3 +maybe-configure-stagefeedback-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-configure-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3 +configure-stagefeedback-target-libstdc++-v3: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + echo "Checking multilib configuration for libstdc++-v3..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile; \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libstdc++-v3; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libstdc++-v3; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap + + + + + +.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3 +maybe-all-target-libstdc++-v3: +@if gcc-bootstrap +all-target-libstdc++-v3: stage_current +@endif gcc-bootstrap +@if target-libstdc++-v3 +TARGET-target-libstdc++-v3=all +maybe-all-target-libstdc++-v3: all-target-libstdc++-v3 +all-target-libstdc++-v3: configure-target-libstdc++-v3 + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + $(TARGET-target-libstdc++-v3)) +@endif target-libstdc++-v3 + + + +.PHONY: all-stage1-target-libstdc++-v3 maybe-all-stage1-target-libstdc++-v3 +.PHONY: clean-stage1-target-libstdc++-v3 maybe-clean-stage1-target-libstdc++-v3 +maybe-all-stage1-target-libstdc++-v3: +maybe-clean-stage1-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-all-stage1-target-libstdc++-v3: all-stage1-target-libstdc++-v3 +all-stage1: all-stage1-target-libstdc++-v3 +TARGET-stage1-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) +all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3 + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-target-libstdc++-v3) + +maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3 +clean-stage1: clean-stage1-target-libstdc++-v3 +clean-stage1-target-libstdc++-v3: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + clean +@endif target-libstdc++-v3-bootstrap + + +.PHONY: all-stage2-target-libstdc++-v3 maybe-all-stage2-target-libstdc++-v3 +.PHONY: clean-stage2-target-libstdc++-v3 maybe-clean-stage2-target-libstdc++-v3 +maybe-all-stage2-target-libstdc++-v3: +maybe-clean-stage2-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-all-stage2-target-libstdc++-v3: all-stage2-target-libstdc++-v3 +all-stage2: all-stage2-target-libstdc++-v3 +TARGET-stage2-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) +all-stage2-target-libstdc++-v3: configure-stage2-target-libstdc++-v3 + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-target-libstdc++-v3) + +maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3 +clean-stage2: clean-stage2-target-libstdc++-v3 +clean-stage2-target-libstdc++-v3: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libstdc++-v3-bootstrap + + +.PHONY: all-stage3-target-libstdc++-v3 maybe-all-stage3-target-libstdc++-v3 +.PHONY: clean-stage3-target-libstdc++-v3 maybe-clean-stage3-target-libstdc++-v3 +maybe-all-stage3-target-libstdc++-v3: +maybe-clean-stage3-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-all-stage3-target-libstdc++-v3: all-stage3-target-libstdc++-v3 +all-stage3: all-stage3-target-libstdc++-v3 +TARGET-stage3-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) +all-stage3-target-libstdc++-v3: configure-stage3-target-libstdc++-v3 + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-target-libstdc++-v3) + +maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3 +clean-stage3: clean-stage3-target-libstdc++-v3 +clean-stage3-target-libstdc++-v3: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libstdc++-v3-bootstrap + + +.PHONY: all-stage4-target-libstdc++-v3 maybe-all-stage4-target-libstdc++-v3 +.PHONY: clean-stage4-target-libstdc++-v3 maybe-clean-stage4-target-libstdc++-v3 +maybe-all-stage4-target-libstdc++-v3: +maybe-clean-stage4-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-all-stage4-target-libstdc++-v3: all-stage4-target-libstdc++-v3 +all-stage4: all-stage4-target-libstdc++-v3 +TARGET-stage4-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) +all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3 + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE4_TFLAGS)" \ + $(TARGET-stage4-target-libstdc++-v3) + +maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3 +clean-stage4: clean-stage4-target-libstdc++-v3 +clean-stage4-target-libstdc++-v3: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libstdc++-v3-bootstrap + + +.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3 +.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3 +maybe-all-stageprofile-target-libstdc++-v3: +maybe-clean-stageprofile-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3 +all-stageprofile: all-stageprofile-target-libstdc++-v3 +TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) +all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3 + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGEprofile_TFLAGS)" \ + $(TARGET-stageprofile-target-libstdc++-v3) + +maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3 +clean-stageprofile: clean-stageprofile-target-libstdc++-v3 +clean-stageprofile-target-libstdc++-v3: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libstdc++-v3-bootstrap + + +.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3 +.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3 +maybe-all-stagefeedback-target-libstdc++-v3: +maybe-clean-stagefeedback-target-libstdc++-v3: +@if target-libstdc++-v3-bootstrap +maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3 +all-stagefeedback: all-stagefeedback-target-libstdc++-v3 +TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) +all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3 + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGEfeedback_TFLAGS)" \ + $(TARGET-stagefeedback-target-libstdc++-v3) + +maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3 +clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3 +clean-stagefeedback-target-libstdc++-v3: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libstdc++-v3-bootstrap + + + + + + +.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3 +maybe-check-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-check-target-libstdc++-v3: check-target-libstdc++-v3 + +check-target-libstdc++-v3: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) + +@endif target-libstdc++-v3 + +.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3 +maybe-install-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-install-target-libstdc++-v3: install-target-libstdc++-v3 + +install-target-libstdc++-v3: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) + +@endif target-libstdc++-v3 + +.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3 +maybe-install-strip-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3 + +install-strip-target-libstdc++-v3: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) + +@endif target-libstdc++-v3 + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3 +maybe-info-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-info-target-libstdc++-v3: info-target-libstdc++-v3 + +info-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3 +maybe-dvi-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3 + +dvi-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3 +maybe-pdf-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3 + +pdf-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3 +maybe-html-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-html-target-libstdc++-v3: html-target-libstdc++-v3 + +html-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3 +maybe-TAGS-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3 + +TAGS-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3 +maybe-install-info-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3 + +install-info-target-libstdc++-v3: \ + configure-target-libstdc++-v3 \ + info-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3 +maybe-install-pdf-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3 + +install-pdf-target-libstdc++-v3: \ + configure-target-libstdc++-v3 \ + pdf-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3 +maybe-install-html-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3 + +install-html-target-libstdc++-v3: \ + configure-target-libstdc++-v3 \ + html-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3 +maybe-installcheck-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3 + +installcheck-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3 +maybe-mostlyclean-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3 + +mostlyclean-target-libstdc++-v3: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3 +maybe-clean-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3 + +clean-target-libstdc++-v3: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3 +maybe-distclean-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3 + +distclean-target-libstdc++-v3: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif target-libstdc++-v3 + +.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3 +maybe-maintainer-clean-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3 + +maintainer-clean-target-libstdc++-v3: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif target-libstdc++-v3 + + + + + +.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer +maybe-configure-target-libsanitizer: +@if gcc-bootstrap +configure-target-libsanitizer: stage_current +@endif gcc-bootstrap +@if target-libsanitizer +maybe-configure-target-libsanitizer: configure-target-libsanitizer +configure-target-libsanitizer: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \ + cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + || exit 1 +@endif target-libsanitizer + + + +.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer +maybe-configure-stage1-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer +configure-stage1-target-libsanitizer: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) +@endif target-libsanitizer-bootstrap + +.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer +maybe-configure-stage2-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer +configure-stage2-target-libsanitizer: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) +@endif target-libsanitizer-bootstrap + +.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer +maybe-configure-stage3-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer +configure-stage3-target-libsanitizer: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) +@endif target-libsanitizer-bootstrap + +.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer +maybe-configure-stage4-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer +configure-stage4-target-libsanitizer: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) +@endif target-libsanitizer-bootstrap + +.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer +maybe-configure-stageprofile-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer +configure-stageprofile-target-libsanitizer: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) +@endif target-libsanitizer-bootstrap + +.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer +maybe-configure-stagefeedback-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer +configure-stagefeedback-target-libsanitizer: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + echo "Checking multilib configuration for libsanitizer..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ + cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libsanitizer; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif target-libsanitizer-bootstrap + + + + + +.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer +maybe-all-target-libsanitizer: +@if gcc-bootstrap +all-target-libsanitizer: stage_current +@endif gcc-bootstrap +@if target-libsanitizer +TARGET-target-libsanitizer=all +maybe-all-target-libsanitizer: all-target-libsanitizer +all-target-libsanitizer: configure-target-libsanitizer + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + $(TARGET-target-libsanitizer)) +@endif target-libsanitizer + + + +.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer +.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer +maybe-all-stage1-target-libsanitizer: +maybe-clean-stage1-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer +all-stage1: all-stage1-target-libsanitizer +TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer) +all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-target-libsanitizer) + +maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer +clean-stage1: clean-stage1-target-libsanitizer +clean-stage1-target-libsanitizer: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + clean +@endif target-libsanitizer-bootstrap + + +.PHONY: all-stage2-target-libsanitizer maybe-all-stage2-target-libsanitizer +.PHONY: clean-stage2-target-libsanitizer maybe-clean-stage2-target-libsanitizer +maybe-all-stage2-target-libsanitizer: +maybe-clean-stage2-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-all-stage2-target-libsanitizer: all-stage2-target-libsanitizer +all-stage2: all-stage2-target-libsanitizer +TARGET-stage2-target-libsanitizer = $(TARGET-target-libsanitizer) +all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-target-libsanitizer) + +maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer +clean-stage2: clean-stage2-target-libsanitizer +clean-stage2-target-libsanitizer: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libsanitizer-bootstrap + + +.PHONY: all-stage3-target-libsanitizer maybe-all-stage3-target-libsanitizer +.PHONY: clean-stage3-target-libsanitizer maybe-clean-stage3-target-libsanitizer +maybe-all-stage3-target-libsanitizer: +maybe-clean-stage3-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-all-stage3-target-libsanitizer: all-stage3-target-libsanitizer +all-stage3: all-stage3-target-libsanitizer +TARGET-stage3-target-libsanitizer = $(TARGET-target-libsanitizer) +all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-target-libsanitizer) + +maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer +clean-stage3: clean-stage3-target-libsanitizer +clean-stage3-target-libsanitizer: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libsanitizer-bootstrap + + +.PHONY: all-stage4-target-libsanitizer maybe-all-stage4-target-libsanitizer +.PHONY: clean-stage4-target-libsanitizer maybe-clean-stage4-target-libsanitizer +maybe-all-stage4-target-libsanitizer: +maybe-clean-stage4-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-all-stage4-target-libsanitizer: all-stage4-target-libsanitizer +all-stage4: all-stage4-target-libsanitizer +TARGET-stage4-target-libsanitizer = $(TARGET-target-libsanitizer) +all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE4_TFLAGS)" \ + $(TARGET-stage4-target-libsanitizer) + +maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer +clean-stage4: clean-stage4-target-libsanitizer +clean-stage4-target-libsanitizer: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libsanitizer-bootstrap + + +.PHONY: all-stageprofile-target-libsanitizer maybe-all-stageprofile-target-libsanitizer +.PHONY: clean-stageprofile-target-libsanitizer maybe-clean-stageprofile-target-libsanitizer +maybe-all-stageprofile-target-libsanitizer: +maybe-clean-stageprofile-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-all-stageprofile-target-libsanitizer: all-stageprofile-target-libsanitizer +all-stageprofile: all-stageprofile-target-libsanitizer +TARGET-stageprofile-target-libsanitizer = $(TARGET-target-libsanitizer) +all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGEprofile_TFLAGS)" \ + $(TARGET-stageprofile-target-libsanitizer) + +maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer +clean-stageprofile: clean-stageprofile-target-libsanitizer +clean-stageprofile-target-libsanitizer: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libsanitizer-bootstrap + + +.PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer +.PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer +maybe-all-stagefeedback-target-libsanitizer: +maybe-clean-stagefeedback-target-libsanitizer: +@if target-libsanitizer-bootstrap +maybe-all-stagefeedback-target-libsanitizer: all-stagefeedback-target-libsanitizer +all-stagefeedback: all-stagefeedback-target-libsanitizer +TARGET-stagefeedback-target-libsanitizer = $(TARGET-target-libsanitizer) +all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGEfeedback_TFLAGS)" \ + $(TARGET-stagefeedback-target-libsanitizer) + +maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer +clean-stagefeedback: clean-stagefeedback-target-libsanitizer +clean-stagefeedback-target-libsanitizer: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libsanitizer-bootstrap + + + + + + +.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer +maybe-check-target-libsanitizer: +@if target-libsanitizer +maybe-check-target-libsanitizer: check-target-libsanitizer + +check-target-libsanitizer: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) + +@endif target-libsanitizer + +.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer +maybe-install-target-libsanitizer: +@if target-libsanitizer +maybe-install-target-libsanitizer: install-target-libsanitizer + +install-target-libsanitizer: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) + +@endif target-libsanitizer + +.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer +maybe-install-strip-target-libsanitizer: +@if target-libsanitizer +maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer + +install-strip-target-libsanitizer: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) + +@endif target-libsanitizer + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer +maybe-info-target-libsanitizer: +@if target-libsanitizer +maybe-info-target-libsanitizer: info-target-libsanitizer + +info-target-libsanitizer: \ + configure-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing info in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer +maybe-dvi-target-libsanitizer: +@if target-libsanitizer +maybe-dvi-target-libsanitizer: dvi-target-libsanitizer + +dvi-target-libsanitizer: \ + configure-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer +maybe-pdf-target-libsanitizer: +@if target-libsanitizer +maybe-pdf-target-libsanitizer: pdf-target-libsanitizer + +pdf-target-libsanitizer: \ + configure-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer +maybe-html-target-libsanitizer: +@if target-libsanitizer +maybe-html-target-libsanitizer: html-target-libsanitizer + +html-target-libsanitizer: \ + configure-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer +maybe-TAGS-target-libsanitizer: +@if target-libsanitizer +maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer + +TAGS-target-libsanitizer: \ + configure-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer +maybe-install-info-target-libsanitizer: +@if target-libsanitizer +maybe-install-info-target-libsanitizer: install-info-target-libsanitizer + +install-info-target-libsanitizer: \ + configure-target-libsanitizer \ + info-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer +maybe-install-pdf-target-libsanitizer: +@if target-libsanitizer +maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer + +install-pdf-target-libsanitizer: \ + configure-target-libsanitizer \ + pdf-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer +maybe-install-html-target-libsanitizer: +@if target-libsanitizer +maybe-install-html-target-libsanitizer: install-html-target-libsanitizer + +install-html-target-libsanitizer: \ + configure-target-libsanitizer \ + html-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer +maybe-installcheck-target-libsanitizer: +@if target-libsanitizer +maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer + +installcheck-target-libsanitizer: \ + configure-target-libsanitizer + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer +maybe-mostlyclean-target-libsanitizer: +@if target-libsanitizer +maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer + +mostlyclean-target-libsanitizer: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer +maybe-clean-target-libsanitizer: +@if target-libsanitizer +maybe-clean-target-libsanitizer: clean-target-libsanitizer + +clean-target-libsanitizer: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer +maybe-distclean-target-libsanitizer: +@if target-libsanitizer +maybe-distclean-target-libsanitizer: distclean-target-libsanitizer + +distclean-target-libsanitizer: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif target-libsanitizer + +.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer +maybe-maintainer-clean-target-libsanitizer: +@if target-libsanitizer +maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer + +maintainer-clean-target-libsanitizer: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif target-libsanitizer + + + + + +.PHONY: configure-target-libmpx maybe-configure-target-libmpx +maybe-configure-target-libmpx: +@if gcc-bootstrap +configure-target-libmpx: stage_current +@endif gcc-bootstrap +@if target-libmpx +maybe-configure-target-libmpx: configure-target-libmpx +configure-target-libmpx: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for libmpx..."; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + $(NORMAL_TARGET_EXPORTS) \ + echo Configuring in $(TARGET_SUBDIR)/libmpx; \ + cd "$(TARGET_SUBDIR)/libmpx" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + || exit 1 +@endif target-libmpx + + + +.PHONY: configure-stage1-target-libmpx maybe-configure-stage1-target-libmpx +maybe-configure-stage1-target-libmpx: +@if target-libmpx-bootstrap +maybe-configure-stage1-target-libmpx: configure-stage1-target-libmpx +configure-stage1-target-libmpx: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + echo "Checking multilib configuration for libmpx..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libmpx; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + cd $(TARGET_SUBDIR)/libmpx || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) +@endif target-libmpx-bootstrap + +.PHONY: configure-stage2-target-libmpx maybe-configure-stage2-target-libmpx +maybe-configure-stage2-target-libmpx: +@if target-libmpx-bootstrap +maybe-configure-stage2-target-libmpx: configure-stage2-target-libmpx +configure-stage2-target-libmpx: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + echo "Checking multilib configuration for libmpx..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libmpx; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + cd $(TARGET_SUBDIR)/libmpx || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) +@endif target-libmpx-bootstrap + +.PHONY: configure-stage3-target-libmpx maybe-configure-stage3-target-libmpx +maybe-configure-stage3-target-libmpx: +@if target-libmpx-bootstrap +maybe-configure-stage3-target-libmpx: configure-stage3-target-libmpx +configure-stage3-target-libmpx: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + echo "Checking multilib configuration for libmpx..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libmpx; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + cd $(TARGET_SUBDIR)/libmpx || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) +@endif target-libmpx-bootstrap + +.PHONY: configure-stage4-target-libmpx maybe-configure-stage4-target-libmpx +maybe-configure-stage4-target-libmpx: +@if target-libmpx-bootstrap +maybe-configure-stage4-target-libmpx: configure-stage4-target-libmpx +configure-stage4-target-libmpx: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + echo "Checking multilib configuration for libmpx..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libmpx; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + cd $(TARGET_SUBDIR)/libmpx || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) +@endif target-libmpx-bootstrap + +.PHONY: configure-stageprofile-target-libmpx maybe-configure-stageprofile-target-libmpx +maybe-configure-stageprofile-target-libmpx: +@if target-libmpx-bootstrap +maybe-configure-stageprofile-target-libmpx: configure-stageprofile-target-libmpx +configure-stageprofile-target-libmpx: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + echo "Checking multilib configuration for libmpx..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libmpx; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + cd $(TARGET_SUBDIR)/libmpx || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) +@endif target-libmpx-bootstrap + +.PHONY: configure-stagefeedback-target-libmpx maybe-configure-stagefeedback-target-libmpx +maybe-configure-stagefeedback-target-libmpx: +@if target-libmpx-bootstrap +maybe-configure-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx +configure-stagefeedback-target-libmpx: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + echo "Checking multilib configuration for libmpx..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmpx/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libmpx/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libmpx/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libmpx; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmpx; \ + cd $(TARGET_SUBDIR)/libmpx || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libmpx; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif target-libmpx-bootstrap + + + + + +.PHONY: all-target-libmpx maybe-all-target-libmpx +maybe-all-target-libmpx: +@if gcc-bootstrap +all-target-libmpx: stage_current +@endif gcc-bootstrap +@if target-libmpx +TARGET-target-libmpx=all +maybe-all-target-libmpx: all-target-libmpx +all-target-libmpx: configure-target-libmpx + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-libmpx)) +@endif target-libmpx + + + +.PHONY: all-stage1-target-libmpx maybe-all-stage1-target-libmpx +.PHONY: clean-stage1-target-libmpx maybe-clean-stage1-target-libmpx +maybe-all-stage1-target-libmpx: +maybe-clean-stage1-target-libmpx: +@if target-libmpx-bootstrap +maybe-all-stage1-target-libmpx: all-stage1-target-libmpx +all-stage1: all-stage1-target-libmpx +TARGET-stage1-target-libmpx = $(TARGET-target-libmpx) +all-stage1-target-libmpx: configure-stage1-target-libmpx + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-target-libmpx) + +maybe-clean-stage1-target-libmpx: clean-stage1-target-libmpx +clean-stage1: clean-stage1-target-libmpx +clean-stage1-target-libmpx: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage1-libmpx/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ + clean +@endif target-libmpx-bootstrap + + +.PHONY: all-stage2-target-libmpx maybe-all-stage2-target-libmpx +.PHONY: clean-stage2-target-libmpx maybe-clean-stage2-target-libmpx +maybe-all-stage2-target-libmpx: +maybe-clean-stage2-target-libmpx: +@if target-libmpx-bootstrap +maybe-all-stage2-target-libmpx: all-stage2-target-libmpx +all-stage2: all-stage2-target-libmpx +TARGET-stage2-target-libmpx = $(TARGET-target-libmpx) +all-stage2-target-libmpx: configure-stage2-target-libmpx + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-target-libmpx) + +maybe-clean-stage2-target-libmpx: clean-stage2-target-libmpx +clean-stage2: clean-stage2-target-libmpx +clean-stage2-target-libmpx: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage2-libmpx/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libmpx-bootstrap + + +.PHONY: all-stage3-target-libmpx maybe-all-stage3-target-libmpx +.PHONY: clean-stage3-target-libmpx maybe-clean-stage3-target-libmpx +maybe-all-stage3-target-libmpx: +maybe-clean-stage3-target-libmpx: +@if target-libmpx-bootstrap +maybe-all-stage3-target-libmpx: all-stage3-target-libmpx +all-stage3: all-stage3-target-libmpx +TARGET-stage3-target-libmpx = $(TARGET-target-libmpx) +all-stage3-target-libmpx: configure-stage3-target-libmpx + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-target-libmpx) + +maybe-clean-stage3-target-libmpx: clean-stage3-target-libmpx +clean-stage3: clean-stage3-target-libmpx +clean-stage3-target-libmpx: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage3-libmpx/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libmpx-bootstrap + + +.PHONY: all-stage4-target-libmpx maybe-all-stage4-target-libmpx +.PHONY: clean-stage4-target-libmpx maybe-clean-stage4-target-libmpx +maybe-all-stage4-target-libmpx: +maybe-clean-stage4-target-libmpx: +@if target-libmpx-bootstrap +maybe-all-stage4-target-libmpx: all-stage4-target-libmpx +all-stage4: all-stage4-target-libmpx +TARGET-stage4-target-libmpx = $(TARGET-target-libmpx) +all-stage4-target-libmpx: configure-stage4-target-libmpx + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGE4_TFLAGS)" \ + $(TARGET-stage4-target-libmpx) + +maybe-clean-stage4-target-libmpx: clean-stage4-target-libmpx +clean-stage4: clean-stage4-target-libmpx +clean-stage4-target-libmpx: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage4-libmpx/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libmpx-bootstrap + + +.PHONY: all-stageprofile-target-libmpx maybe-all-stageprofile-target-libmpx +.PHONY: clean-stageprofile-target-libmpx maybe-clean-stageprofile-target-libmpx +maybe-all-stageprofile-target-libmpx: +maybe-clean-stageprofile-target-libmpx: +@if target-libmpx-bootstrap +maybe-all-stageprofile-target-libmpx: all-stageprofile-target-libmpx +all-stageprofile: all-stageprofile-target-libmpx +TARGET-stageprofile-target-libmpx = $(TARGET-target-libmpx) +all-stageprofile-target-libmpx: configure-stageprofile-target-libmpx + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGEprofile_TFLAGS)" \ + $(TARGET-stageprofile-target-libmpx) + +maybe-clean-stageprofile-target-libmpx: clean-stageprofile-target-libmpx +clean-stageprofile: clean-stageprofile-target-libmpx +clean-stageprofile-target-libmpx: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libmpx-bootstrap + + +.PHONY: all-stagefeedback-target-libmpx maybe-all-stagefeedback-target-libmpx +.PHONY: clean-stagefeedback-target-libmpx maybe-clean-stagefeedback-target-libmpx +maybe-all-stagefeedback-target-libmpx: +maybe-clean-stagefeedback-target-libmpx: +@if target-libmpx-bootstrap +maybe-all-stagefeedback-target-libmpx: all-stagefeedback-target-libmpx +all-stagefeedback: all-stagefeedback-target-libmpx +TARGET-stagefeedback-target-libmpx = $(TARGET-target-libmpx) +all-stagefeedback-target-libmpx: configure-stagefeedback-target-libmpx + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGEfeedback_TFLAGS)" \ + $(TARGET-stagefeedback-target-libmpx) + +maybe-clean-stagefeedback-target-libmpx: clean-stagefeedback-target-libmpx +clean-stagefeedback: clean-stagefeedback-target-libmpx +clean-stagefeedback-target-libmpx: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libmpx/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libmpx-bootstrap + + + + + + +.PHONY: check-target-libmpx maybe-check-target-libmpx +maybe-check-target-libmpx: +@if target-libmpx +maybe-check-target-libmpx: check-target-libmpx + +check-target-libmpx: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) check) + +@endif target-libmpx + +.PHONY: install-target-libmpx maybe-install-target-libmpx +maybe-install-target-libmpx: +@if target-libmpx +maybe-install-target-libmpx: install-target-libmpx + +install-target-libmpx: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) + +@endif target-libmpx + +.PHONY: install-strip-target-libmpx maybe-install-strip-target-libmpx +maybe-install-strip-target-libmpx: +@if target-libmpx +maybe-install-strip-target-libmpx: install-strip-target-libmpx + +install-strip-target-libmpx: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) + +@endif target-libmpx + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-target-libmpx info-target-libmpx +maybe-info-target-libmpx: +@if target-libmpx +maybe-info-target-libmpx: info-target-libmpx + +info-target-libmpx: \ + configure-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing info in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-dvi-target-libmpx dvi-target-libmpx +maybe-dvi-target-libmpx: +@if target-libmpx +maybe-dvi-target-libmpx: dvi-target-libmpx + +dvi-target-libmpx: \ + configure-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing dvi in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-pdf-target-libmpx pdf-target-libmpx +maybe-pdf-target-libmpx: +@if target-libmpx +maybe-pdf-target-libmpx: pdf-target-libmpx + +pdf-target-libmpx: \ + configure-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing pdf in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-html-target-libmpx html-target-libmpx +maybe-html-target-libmpx: +@if target-libmpx +maybe-html-target-libmpx: html-target-libmpx + +html-target-libmpx: \ + configure-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-TAGS-target-libmpx TAGS-target-libmpx +maybe-TAGS-target-libmpx: +@if target-libmpx +maybe-TAGS-target-libmpx: TAGS-target-libmpx + +TAGS-target-libmpx: \ + configure-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-install-info-target-libmpx install-info-target-libmpx +maybe-install-info-target-libmpx: +@if target-libmpx +maybe-install-info-target-libmpx: install-info-target-libmpx + +install-info-target-libmpx: \ + configure-target-libmpx \ + info-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing install-info in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-install-pdf-target-libmpx install-pdf-target-libmpx +maybe-install-pdf-target-libmpx: +@if target-libmpx +maybe-install-pdf-target-libmpx: install-pdf-target-libmpx + +install-pdf-target-libmpx: \ + configure-target-libmpx \ + pdf-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-install-html-target-libmpx install-html-target-libmpx +maybe-install-html-target-libmpx: +@if target-libmpx +maybe-install-html-target-libmpx: install-html-target-libmpx + +install-html-target-libmpx: \ + configure-target-libmpx \ + html-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing install-html in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-installcheck-target-libmpx installcheck-target-libmpx +maybe-installcheck-target-libmpx: +@if target-libmpx +maybe-installcheck-target-libmpx: installcheck-target-libmpx + +installcheck-target-libmpx: \ + configure-target-libmpx + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-mostlyclean-target-libmpx mostlyclean-target-libmpx +maybe-mostlyclean-target-libmpx: +@if target-libmpx +maybe-mostlyclean-target-libmpx: mostlyclean-target-libmpx + +mostlyclean-target-libmpx: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-clean-target-libmpx clean-target-libmpx +maybe-clean-target-libmpx: +@if target-libmpx +maybe-clean-target-libmpx: clean-target-libmpx + +clean-target-libmpx: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing clean in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-distclean-target-libmpx distclean-target-libmpx +maybe-distclean-target-libmpx: +@if target-libmpx +maybe-distclean-target-libmpx: distclean-target-libmpx + +distclean-target-libmpx: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing distclean in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif target-libmpx + +.PHONY: maybe-maintainer-clean-target-libmpx maintainer-clean-target-libmpx +maybe-maintainer-clean-target-libmpx: +@if target-libmpx +maybe-maintainer-clean-target-libmpx: maintainer-clean-target-libmpx + +maintainer-clean-target-libmpx: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmpx"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif target-libmpx + + + + + +.PHONY: configure-target-libvtv maybe-configure-target-libvtv +maybe-configure-target-libvtv: +@if gcc-bootstrap +configure-target-libvtv: stage_current +@endif gcc-bootstrap +@if target-libvtv +maybe-configure-target-libvtv: configure-target-libvtv +configure-target-libvtv: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + echo "Checking multilib configuration for libvtv..."; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo Configuring in $(TARGET_SUBDIR)/libvtv; \ + cd "$(TARGET_SUBDIR)/libvtv" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + || exit 1 +@endif target-libvtv + + + +.PHONY: configure-stage1-target-libvtv maybe-configure-stage1-target-libvtv +maybe-configure-stage1-target-libvtv: +@if target-libvtv-bootstrap +maybe-configure-stage1-target-libvtv: configure-stage1-target-libvtv +configure-stage1-target-libvtv: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + echo "Checking multilib configuration for libvtv..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libvtv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + cd $(TARGET_SUBDIR)/libvtv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) +@endif target-libvtv-bootstrap + +.PHONY: configure-stage2-target-libvtv maybe-configure-stage2-target-libvtv +maybe-configure-stage2-target-libvtv: +@if target-libvtv-bootstrap +maybe-configure-stage2-target-libvtv: configure-stage2-target-libvtv +configure-stage2-target-libvtv: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + echo "Checking multilib configuration for libvtv..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libvtv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + cd $(TARGET_SUBDIR)/libvtv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) +@endif target-libvtv-bootstrap + +.PHONY: configure-stage3-target-libvtv maybe-configure-stage3-target-libvtv +maybe-configure-stage3-target-libvtv: +@if target-libvtv-bootstrap +maybe-configure-stage3-target-libvtv: configure-stage3-target-libvtv +configure-stage3-target-libvtv: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + echo "Checking multilib configuration for libvtv..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libvtv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + cd $(TARGET_SUBDIR)/libvtv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) +@endif target-libvtv-bootstrap + +.PHONY: configure-stage4-target-libvtv maybe-configure-stage4-target-libvtv +maybe-configure-stage4-target-libvtv: +@if target-libvtv-bootstrap +maybe-configure-stage4-target-libvtv: configure-stage4-target-libvtv +configure-stage4-target-libvtv: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + echo "Checking multilib configuration for libvtv..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libvtv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + cd $(TARGET_SUBDIR)/libvtv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) +@endif target-libvtv-bootstrap + +.PHONY: configure-stageprofile-target-libvtv maybe-configure-stageprofile-target-libvtv +maybe-configure-stageprofile-target-libvtv: +@if target-libvtv-bootstrap +maybe-configure-stageprofile-target-libvtv: configure-stageprofile-target-libvtv +configure-stageprofile-target-libvtv: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + echo "Checking multilib configuration for libvtv..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libvtv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + cd $(TARGET_SUBDIR)/libvtv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) +@endif target-libvtv-bootstrap + +.PHONY: configure-stagefeedback-target-libvtv maybe-configure-stagefeedback-target-libvtv +maybe-configure-stagefeedback-target-libvtv: +@if target-libvtv-bootstrap +maybe-configure-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv +configure-stagefeedback-target-libvtv: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + echo "Checking multilib configuration for libvtv..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libvtv/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libvtv/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libvtv/Makefile; \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libvtv/multilib.tmp $(TARGET_SUBDIR)/libvtv/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libvtv/Makefile || exit 0; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libvtv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ + cd $(TARGET_SUBDIR)/libvtv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libvtv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif target-libvtv-bootstrap + + + + + +.PHONY: all-target-libvtv maybe-all-target-libvtv +maybe-all-target-libvtv: +@if gcc-bootstrap +all-target-libvtv: stage_current +@endif gcc-bootstrap +@if target-libvtv +TARGET-target-libvtv=all +maybe-all-target-libvtv: all-target-libvtv +all-target-libvtv: configure-target-libvtv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + $(TARGET-target-libvtv)) +@endif target-libvtv + + + +.PHONY: all-stage1-target-libvtv maybe-all-stage1-target-libvtv +.PHONY: clean-stage1-target-libvtv maybe-clean-stage1-target-libvtv +maybe-all-stage1-target-libvtv: +maybe-clean-stage1-target-libvtv: +@if target-libvtv-bootstrap +maybe-all-stage1-target-libvtv: all-stage1-target-libvtv +all-stage1: all-stage1-target-libvtv +TARGET-stage1-target-libvtv = $(TARGET-target-libvtv) +all-stage1-target-libvtv: configure-stage1-target-libvtv + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-target-libvtv) + +maybe-clean-stage1-target-libvtv: clean-stage1-target-libvtv +clean-stage1: clean-stage1-target-libvtv +clean-stage1-target-libvtv: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage1-libvtv/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + clean +@endif target-libvtv-bootstrap + + +.PHONY: all-stage2-target-libvtv maybe-all-stage2-target-libvtv +.PHONY: clean-stage2-target-libvtv maybe-clean-stage2-target-libvtv +maybe-all-stage2-target-libvtv: +maybe-clean-stage2-target-libvtv: +@if target-libvtv-bootstrap +maybe-all-stage2-target-libvtv: all-stage2-target-libvtv +all-stage2: all-stage2-target-libvtv +TARGET-stage2-target-libvtv = $(TARGET-target-libvtv) +all-stage2-target-libvtv: configure-stage2-target-libvtv + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ $(RAW_CXX_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-target-libvtv) + +maybe-clean-stage2-target-libvtv: clean-stage2-target-libvtv +clean-stage2: clean-stage2-target-libvtv +clean-stage2-target-libvtv: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage2-libvtv/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libvtv-bootstrap + + +.PHONY: all-stage3-target-libvtv maybe-all-stage3-target-libvtv +.PHONY: clean-stage3-target-libvtv maybe-clean-stage3-target-libvtv +maybe-all-stage3-target-libvtv: +maybe-clean-stage3-target-libvtv: +@if target-libvtv-bootstrap +maybe-all-stage3-target-libvtv: all-stage3-target-libvtv +all-stage3: all-stage3-target-libvtv +TARGET-stage3-target-libvtv = $(TARGET-target-libvtv) +all-stage3-target-libvtv: configure-stage3-target-libvtv + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-target-libvtv) + +maybe-clean-stage3-target-libvtv: clean-stage3-target-libvtv +clean-stage3: clean-stage3-target-libvtv +clean-stage3-target-libvtv: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage3-libvtv/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libvtv && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean +@endif target-libvtv-bootstrap + + +.PHONY: all-stage4-target-libvtv maybe-all-stage4-target-libvtv +.PHONY: clean-stage4-target-libvtv maybe-clean-stage4-target-libvtv +maybe-all-stage4-target-libvtv: +maybe-clean-stage4-target-libvtv: +@if target-libvtv-bootstrap +maybe-all-stage4-target-libvtv: all-stage4-target-libvtv +all-stage4: all-stage4-target-libvtv +TARGET-stage4-target-libvtv = $(TARGET-target-libvtv) +all-stage4-target-libvtv: configure-stage4-target-libvtv + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31231,38 +35752,38 @@ all-stage4-target-libstdc++-v3: configure-stage4-target-libstdc++-v3 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGE4_TFLAGS)" \ - $(TARGET-stage4-target-libstdc++-v3) + $(TARGET-stage4-target-libvtv) -maybe-clean-stage4-target-libstdc++-v3: clean-stage4-target-libstdc++-v3 -clean-stage4: clean-stage4-target-libstdc++-v3 -clean-stage4-target-libstdc++-v3: +maybe-clean-stage4-target-libvtv: clean-stage4-target-libvtv +clean-stage4: clean-stage4-target-libvtv +clean-stage4-target-libvtv: @if [ $(current_stage) = stage4 ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage4-libvtv/Makefile ] || exit 0; \ $(MAKE) stage4-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap - - -.PHONY: all-stageprofile-target-libstdc++-v3 maybe-all-stageprofile-target-libstdc++-v3 -.PHONY: clean-stageprofile-target-libstdc++-v3 maybe-clean-stageprofile-target-libstdc++-v3 -maybe-all-stageprofile-target-libstdc++-v3: -maybe-clean-stageprofile-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-all-stageprofile-target-libstdc++-v3: all-stageprofile-target-libstdc++-v3 -all-stageprofile: all-stageprofile-target-libstdc++-v3 -TARGET-stageprofile-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) -all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3 +@endif target-libvtv-bootstrap + + +.PHONY: all-stageprofile-target-libvtv maybe-all-stageprofile-target-libvtv +.PHONY: clean-stageprofile-target-libvtv maybe-clean-stageprofile-target-libvtv +maybe-all-stageprofile-target-libvtv: +maybe-clean-stageprofile-target-libvtv: +@if target-libvtv-bootstrap +maybe-all-stageprofile-target-libvtv: all-stageprofile-target-libvtv +all-stageprofile: all-stageprofile-target-libvtv +TARGET-stageprofile-target-libvtv = $(TARGET-target-libvtv) +all-stageprofile-target-libvtv: configure-stageprofile-target-libvtv @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEprofile_TFLAGS)"; \ $(RAW_CXX_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31272,38 +35793,38 @@ all-stageprofile-target-libstdc++-v3: configure-stageprofile-target-libstdc++-v3 LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGEprofile_TFLAGS)" \ - $(TARGET-stageprofile-target-libstdc++-v3) + $(TARGET-stageprofile-target-libvtv) -maybe-clean-stageprofile-target-libstdc++-v3: clean-stageprofile-target-libstdc++-v3 -clean-stageprofile: clean-stageprofile-target-libstdc++-v3 -clean-stageprofile-target-libstdc++-v3: +maybe-clean-stageprofile-target-libvtv: clean-stageprofile-target-libvtv +clean-stageprofile: clean-stageprofile-target-libvtv +clean-stageprofile-target-libvtv: @if [ $(current_stage) = stageprofile ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stageprofile-libvtv/Makefile ] || exit 0; \ $(MAKE) stageprofile-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap - - -.PHONY: all-stagefeedback-target-libstdc++-v3 maybe-all-stagefeedback-target-libstdc++-v3 -.PHONY: clean-stagefeedback-target-libstdc++-v3 maybe-clean-stagefeedback-target-libstdc++-v3 -maybe-all-stagefeedback-target-libstdc++-v3: -maybe-clean-stagefeedback-target-libstdc++-v3: -@if target-libstdc++-v3-bootstrap -maybe-all-stagefeedback-target-libstdc++-v3: all-stagefeedback-target-libstdc++-v3 -all-stagefeedback: all-stagefeedback-target-libstdc++-v3 -TARGET-stagefeedback-target-libstdc++-v3 = $(TARGET-target-libstdc++-v3) -all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++-v3 +@endif target-libvtv-bootstrap + + +.PHONY: all-stagefeedback-target-libvtv maybe-all-stagefeedback-target-libvtv +.PHONY: clean-stagefeedback-target-libvtv maybe-clean-stagefeedback-target-libvtv +maybe-all-stagefeedback-target-libvtv: +maybe-clean-stagefeedback-target-libvtv: +@if target-libvtv-bootstrap +maybe-all-stagefeedback-target-libvtv: all-stagefeedback-target-libvtv +all-stagefeedback: all-stagefeedback-target-libvtv +TARGET-stagefeedback-target-libvtv = $(TARGET-target-libvtv) +all-stagefeedback-target-libvtv: configure-stagefeedback-target-libvtv @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEfeedback_TFLAGS)"; \ $(RAW_CXX_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31313,90 +35834,90 @@ all-stagefeedback-target-libstdc++-v3: configure-stagefeedback-target-libstdc++- LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGEfeedback_TFLAGS)" \ - $(TARGET-stagefeedback-target-libstdc++-v3) + $(TARGET-stagefeedback-target-libvtv) -maybe-clean-stagefeedback-target-libstdc++-v3: clean-stagefeedback-target-libstdc++-v3 -clean-stagefeedback: clean-stagefeedback-target-libstdc++-v3 -clean-stagefeedback-target-libstdc++-v3: +maybe-clean-stagefeedback-target-libvtv: clean-stagefeedback-target-libvtv +clean-stagefeedback: clean-stagefeedback-target-libvtv +clean-stagefeedback-target-libvtv: @if [ $(current_stage) = stagefeedback ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libvtv/Makefile ] || exit 0; \ $(MAKE) stagefeedback-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif target-libvtv-bootstrap -.PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3 -maybe-check-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-check-target-libstdc++-v3: check-target-libstdc++-v3 +.PHONY: check-target-libvtv maybe-check-target-libvtv +maybe-check-target-libvtv: +@if target-libvtv +maybe-check-target-libvtv: check-target-libvtv -check-target-libstdc++-v3: +check-target-libvtv: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: install-target-libstdc++-v3 maybe-install-target-libstdc++-v3 -maybe-install-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-install-target-libstdc++-v3: install-target-libstdc++-v3 +.PHONY: install-target-libvtv maybe-install-target-libvtv +maybe-install-target-libvtv: +@if target-libvtv +maybe-install-target-libvtv: install-target-libvtv -install-target-libstdc++-v3: installdirs +install-target-libvtv: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: install-strip-target-libstdc++-v3 maybe-install-strip-target-libstdc++-v3 -maybe-install-strip-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-install-strip-target-libstdc++-v3: install-strip-target-libstdc++-v3 +.PHONY: install-strip-target-libvtv maybe-install-strip-target-libvtv +maybe-install-strip-target-libvtv: +@if target-libvtv +maybe-install-strip-target-libvtv: install-strip-target-libvtv -install-strip-target-libstdc++-v3: installdirs +install-strip-target-libvtv: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) -@endif target-libstdc++-v3 +@endif target-libvtv # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-target-libstdc++-v3 info-target-libstdc++-v3 -maybe-info-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-info-target-libstdc++-v3: info-target-libstdc++-v3 +.PHONY: maybe-info-target-libvtv info-target-libvtv +maybe-info-target-libvtv: +@if target-libvtv +maybe-info-target-libvtv: info-target-libvtv -info-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +info-target-libvtv: \ + configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31404,25 +35925,25 @@ info-target-libstdc++-v3: \ info) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-dvi-target-libstdc++-v3 dvi-target-libstdc++-v3 -maybe-dvi-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-dvi-target-libstdc++-v3: dvi-target-libstdc++-v3 +.PHONY: maybe-dvi-target-libvtv dvi-target-libvtv +maybe-dvi-target-libvtv: +@if target-libvtv +maybe-dvi-target-libvtv: dvi-target-libvtv -dvi-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +dvi-target-libvtv: \ + configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31430,25 +35951,25 @@ dvi-target-libstdc++-v3: \ dvi) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-pdf-target-libstdc++-v3 pdf-target-libstdc++-v3 -maybe-pdf-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-pdf-target-libstdc++-v3: pdf-target-libstdc++-v3 +.PHONY: maybe-pdf-target-libvtv pdf-target-libvtv +maybe-pdf-target-libvtv: +@if target-libvtv +maybe-pdf-target-libvtv: pdf-target-libvtv -pdf-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +pdf-target-libvtv: \ + configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31456,25 +35977,25 @@ pdf-target-libstdc++-v3: \ pdf) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3 -maybe-html-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-html-target-libstdc++-v3: html-target-libstdc++-v3 +.PHONY: maybe-html-target-libvtv html-target-libvtv +maybe-html-target-libvtv: +@if target-libvtv +maybe-html-target-libvtv: html-target-libvtv -html-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +html-target-libvtv: \ + configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31482,25 +36003,25 @@ html-target-libstdc++-v3: \ html) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3 -maybe-TAGS-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-TAGS-target-libstdc++-v3: TAGS-target-libstdc++-v3 +.PHONY: maybe-TAGS-target-libvtv TAGS-target-libvtv +maybe-TAGS-target-libvtv: +@if target-libvtv +maybe-TAGS-target-libvtv: TAGS-target-libvtv -TAGS-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +TAGS-target-libvtv: \ + configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31508,26 +36029,26 @@ TAGS-target-libstdc++-v3: \ TAGS) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-install-info-target-libstdc++-v3 install-info-target-libstdc++-v3 -maybe-install-info-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-install-info-target-libstdc++-v3: install-info-target-libstdc++-v3 +.PHONY: maybe-install-info-target-libvtv install-info-target-libvtv +maybe-install-info-target-libvtv: +@if target-libvtv +maybe-install-info-target-libvtv: install-info-target-libvtv -install-info-target-libstdc++-v3: \ - configure-target-libstdc++-v3 \ - info-target-libstdc++-v3 +install-info-target-libvtv: \ + configure-target-libvtv \ + info-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31535,26 +36056,26 @@ install-info-target-libstdc++-v3: \ install-info) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-install-pdf-target-libstdc++-v3 install-pdf-target-libstdc++-v3 -maybe-install-pdf-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-install-pdf-target-libstdc++-v3: install-pdf-target-libstdc++-v3 +.PHONY: maybe-install-pdf-target-libvtv install-pdf-target-libvtv +maybe-install-pdf-target-libvtv: +@if target-libvtv +maybe-install-pdf-target-libvtv: install-pdf-target-libvtv -install-pdf-target-libstdc++-v3: \ - configure-target-libstdc++-v3 \ - pdf-target-libstdc++-v3 +install-pdf-target-libvtv: \ + configure-target-libvtv \ + pdf-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31562,26 +36083,26 @@ install-pdf-target-libstdc++-v3: \ install-pdf) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-install-html-target-libstdc++-v3 install-html-target-libstdc++-v3 -maybe-install-html-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-install-html-target-libstdc++-v3: install-html-target-libstdc++-v3 +.PHONY: maybe-install-html-target-libvtv install-html-target-libvtv +maybe-install-html-target-libvtv: +@if target-libvtv +maybe-install-html-target-libvtv: install-html-target-libvtv -install-html-target-libstdc++-v3: \ - configure-target-libstdc++-v3 \ - html-target-libstdc++-v3 +install-html-target-libvtv: \ + configure-target-libvtv \ + html-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31589,25 +36110,25 @@ install-html-target-libstdc++-v3: \ install-html) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-installcheck-target-libstdc++-v3 installcheck-target-libstdc++-v3 -maybe-installcheck-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-installcheck-target-libstdc++-v3: installcheck-target-libstdc++-v3 +.PHONY: maybe-installcheck-target-libvtv installcheck-target-libvtv +maybe-installcheck-target-libvtv: +@if target-libvtv +maybe-installcheck-target-libvtv: installcheck-target-libvtv -installcheck-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +installcheck-target-libvtv: \ + configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31615,24 +36136,24 @@ installcheck-target-libstdc++-v3: \ installcheck) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-mostlyclean-target-libstdc++-v3 mostlyclean-target-libstdc++-v3 -maybe-mostlyclean-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-mostlyclean-target-libstdc++-v3: mostlyclean-target-libstdc++-v3 +.PHONY: maybe-mostlyclean-target-libvtv mostlyclean-target-libvtv +maybe-mostlyclean-target-libvtv: +@if target-libvtv +maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv -mostlyclean-target-libstdc++-v3: +mostlyclean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31640,24 +36161,24 @@ mostlyclean-target-libstdc++-v3: mostlyclean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-clean-target-libstdc++-v3 clean-target-libstdc++-v3 -maybe-clean-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-clean-target-libstdc++-v3: clean-target-libstdc++-v3 +.PHONY: maybe-clean-target-libvtv clean-target-libvtv +maybe-clean-target-libvtv: +@if target-libvtv +maybe-clean-target-libvtv: clean-target-libvtv -clean-target-libstdc++-v3: +clean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31665,24 +36186,24 @@ clean-target-libstdc++-v3: clean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-distclean-target-libstdc++-v3 distclean-target-libstdc++-v3 -maybe-distclean-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-distclean-target-libstdc++-v3: distclean-target-libstdc++-v3 +.PHONY: maybe-distclean-target-libvtv distclean-target-libvtv +maybe-distclean-target-libvtv: +@if target-libvtv +maybe-distclean-target-libvtv: distclean-target-libvtv -distclean-target-libstdc++-v3: +distclean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31690,24 +36211,24 @@ distclean-target-libstdc++-v3: distclean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: maybe-maintainer-clean-target-libstdc++-v3 maintainer-clean-target-libstdc++-v3 -maybe-maintainer-clean-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-maintainer-clean-target-libstdc++-v3: maintainer-clean-target-libstdc++-v3 +.PHONY: maybe-maintainer-clean-target-libvtv maintainer-clean-target-libvtv +maybe-maintainer-clean-target-libvtv: +@if target-libvtv +maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv -maintainer-clean-target-libstdc++-v3: +maintainer-clean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libvtv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libvtv"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libvtv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31715,145 +36236,146 @@ maintainer-clean-target-libstdc++-v3: maintainer-clean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libvtv -.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap -maybe-configure-target-libmudflap: +.PHONY: configure-target-libcilkrts maybe-configure-target-libcilkrts +maybe-configure-target-libcilkrts: @if gcc-bootstrap -configure-target-libmudflap: stage_current +configure-target-libcilkrts: stage_current @endif gcc-bootstrap -@if target-libmudflap -maybe-configure-target-libmudflap: configure-target-libmudflap -configure-target-libmudflap: +@if target-libcilkrts +maybe-configure-target-libcilkrts: configure-target-libcilkrts +configure-target-libcilkrts: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libmudflap..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libmudflap/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libmudflap/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libmudflap/multilib.tmp; \ + echo "Checking multilib configuration for libcilkrts..."; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libcilkrts/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libcilkrts/multilib.tmp; \ else \ - rm -f $(TARGET_SUBDIR)/libmudflap/Makefile; \ - mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libcilkrts/Makefile; \ + mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libmudflap/multilib.tmp $(TARGET_SUBDIR)/libmudflap/multilib.out; \ + mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ + test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \ $(NORMAL_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libmudflap; \ - cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \ + echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \ + cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libmudflap"; \ - libsrcdir="$$s/libmudflap"; \ + module_srcdir=libcilkrts; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: all-target-libmudflap maybe-all-target-libmudflap -maybe-all-target-libmudflap: +.PHONY: all-target-libcilkrts maybe-all-target-libcilkrts +maybe-all-target-libcilkrts: @if gcc-bootstrap -all-target-libmudflap: stage_current +all-target-libcilkrts: stage_current @endif gcc-bootstrap -@if target-libmudflap -TARGET-target-libmudflap=all -maybe-all-target-libmudflap: all-target-libmudflap -all-target-libmudflap: configure-target-libmudflap +@if target-libcilkrts +TARGET-target-libcilkrts=all +maybe-all-target-libcilkrts: all-target-libcilkrts +all-target-libcilkrts: configure-target-libcilkrts @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ - $(TARGET-target-libmudflap)) -@endif target-libmudflap + $(TARGET-target-libcilkrts)) +@endif target-libcilkrts -.PHONY: check-target-libmudflap maybe-check-target-libmudflap -maybe-check-target-libmudflap: -@if target-libmudflap -maybe-check-target-libmudflap: check-target-libmudflap +.PHONY: check-target-libcilkrts maybe-check-target-libcilkrts +maybe-check-target-libcilkrts: +@if target-libcilkrts +maybe-check-target-libcilkrts: check-target-libcilkrts -check-target-libmudflap: +check-target-libcilkrts: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: install-target-libmudflap maybe-install-target-libmudflap -maybe-install-target-libmudflap: -@if target-libmudflap -maybe-install-target-libmudflap: install-target-libmudflap +.PHONY: install-target-libcilkrts maybe-install-target-libcilkrts +maybe-install-target-libcilkrts: +@if target-libcilkrts +maybe-install-target-libcilkrts: install-target-libcilkrts -install-target-libmudflap: installdirs +install-target-libcilkrts: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: install-strip-target-libmudflap maybe-install-strip-target-libmudflap -maybe-install-strip-target-libmudflap: -@if target-libmudflap -maybe-install-strip-target-libmudflap: install-strip-target-libmudflap +.PHONY: install-strip-target-libcilkrts maybe-install-strip-target-libcilkrts +maybe-install-strip-target-libcilkrts: +@if target-libcilkrts +maybe-install-strip-target-libcilkrts: install-strip-target-libcilkrts -install-strip-target-libmudflap: installdirs +install-strip-target-libcilkrts: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) -@endif target-libmudflap +@endif target-libcilkrts # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-target-libmudflap info-target-libmudflap -maybe-info-target-libmudflap: -@if target-libmudflap -maybe-info-target-libmudflap: info-target-libmudflap +.PHONY: maybe-info-target-libcilkrts info-target-libcilkrts +maybe-info-target-libcilkrts: +@if target-libcilkrts +maybe-info-target-libcilkrts: info-target-libcilkrts -info-target-libmudflap: \ - configure-target-libmudflap +info-target-libcilkrts: \ + configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31861,25 +36383,25 @@ info-target-libmudflap: \ info) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-dvi-target-libmudflap dvi-target-libmudflap -maybe-dvi-target-libmudflap: -@if target-libmudflap -maybe-dvi-target-libmudflap: dvi-target-libmudflap +.PHONY: maybe-dvi-target-libcilkrts dvi-target-libcilkrts +maybe-dvi-target-libcilkrts: +@if target-libcilkrts +maybe-dvi-target-libcilkrts: dvi-target-libcilkrts -dvi-target-libmudflap: \ - configure-target-libmudflap +dvi-target-libcilkrts: \ + configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31887,25 +36409,25 @@ dvi-target-libmudflap: \ dvi) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-pdf-target-libmudflap pdf-target-libmudflap -maybe-pdf-target-libmudflap: -@if target-libmudflap -maybe-pdf-target-libmudflap: pdf-target-libmudflap +.PHONY: maybe-pdf-target-libcilkrts pdf-target-libcilkrts +maybe-pdf-target-libcilkrts: +@if target-libcilkrts +maybe-pdf-target-libcilkrts: pdf-target-libcilkrts -pdf-target-libmudflap: \ - configure-target-libmudflap +pdf-target-libcilkrts: \ + configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31913,25 +36435,25 @@ pdf-target-libmudflap: \ pdf) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-html-target-libmudflap html-target-libmudflap -maybe-html-target-libmudflap: -@if target-libmudflap -maybe-html-target-libmudflap: html-target-libmudflap +.PHONY: maybe-html-target-libcilkrts html-target-libcilkrts +maybe-html-target-libcilkrts: +@if target-libcilkrts +maybe-html-target-libcilkrts: html-target-libcilkrts -html-target-libmudflap: \ - configure-target-libmudflap +html-target-libcilkrts: \ + configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31939,25 +36461,25 @@ html-target-libmudflap: \ html) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap -maybe-TAGS-target-libmudflap: -@if target-libmudflap -maybe-TAGS-target-libmudflap: TAGS-target-libmudflap +.PHONY: maybe-TAGS-target-libcilkrts TAGS-target-libcilkrts +maybe-TAGS-target-libcilkrts: +@if target-libcilkrts +maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts -TAGS-target-libmudflap: \ - configure-target-libmudflap +TAGS-target-libcilkrts: \ + configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31965,26 +36487,26 @@ TAGS-target-libmudflap: \ TAGS) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-install-info-target-libmudflap install-info-target-libmudflap -maybe-install-info-target-libmudflap: -@if target-libmudflap -maybe-install-info-target-libmudflap: install-info-target-libmudflap +.PHONY: maybe-install-info-target-libcilkrts install-info-target-libcilkrts +maybe-install-info-target-libcilkrts: +@if target-libcilkrts +maybe-install-info-target-libcilkrts: install-info-target-libcilkrts -install-info-target-libmudflap: \ - configure-target-libmudflap \ - info-target-libmudflap +install-info-target-libcilkrts: \ + configure-target-libcilkrts \ + info-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31992,26 +36514,26 @@ install-info-target-libmudflap: \ install-info) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-install-pdf-target-libmudflap install-pdf-target-libmudflap -maybe-install-pdf-target-libmudflap: -@if target-libmudflap -maybe-install-pdf-target-libmudflap: install-pdf-target-libmudflap +.PHONY: maybe-install-pdf-target-libcilkrts install-pdf-target-libcilkrts +maybe-install-pdf-target-libcilkrts: +@if target-libcilkrts +maybe-install-pdf-target-libcilkrts: install-pdf-target-libcilkrts -install-pdf-target-libmudflap: \ - configure-target-libmudflap \ - pdf-target-libmudflap +install-pdf-target-libcilkrts: \ + configure-target-libcilkrts \ + pdf-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32019,26 +36541,26 @@ install-pdf-target-libmudflap: \ install-pdf) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-install-html-target-libmudflap install-html-target-libmudflap -maybe-install-html-target-libmudflap: -@if target-libmudflap -maybe-install-html-target-libmudflap: install-html-target-libmudflap +.PHONY: maybe-install-html-target-libcilkrts install-html-target-libcilkrts +maybe-install-html-target-libcilkrts: +@if target-libcilkrts +maybe-install-html-target-libcilkrts: install-html-target-libcilkrts -install-html-target-libmudflap: \ - configure-target-libmudflap \ - html-target-libmudflap +install-html-target-libcilkrts: \ + configure-target-libcilkrts \ + html-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32046,25 +36568,25 @@ install-html-target-libmudflap: \ install-html) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-installcheck-target-libmudflap installcheck-target-libmudflap -maybe-installcheck-target-libmudflap: -@if target-libmudflap -maybe-installcheck-target-libmudflap: installcheck-target-libmudflap +.PHONY: maybe-installcheck-target-libcilkrts installcheck-target-libcilkrts +maybe-installcheck-target-libcilkrts: +@if target-libcilkrts +maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts -installcheck-target-libmudflap: \ - configure-target-libmudflap +installcheck-target-libcilkrts: \ + configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32072,24 +36594,24 @@ installcheck-target-libmudflap: \ installcheck) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-mostlyclean-target-libmudflap mostlyclean-target-libmudflap -maybe-mostlyclean-target-libmudflap: -@if target-libmudflap -maybe-mostlyclean-target-libmudflap: mostlyclean-target-libmudflap +.PHONY: maybe-mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts +maybe-mostlyclean-target-libcilkrts: +@if target-libcilkrts +maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts -mostlyclean-target-libmudflap: +mostlyclean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32097,24 +36619,24 @@ mostlyclean-target-libmudflap: mostlyclean) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-clean-target-libmudflap clean-target-libmudflap -maybe-clean-target-libmudflap: -@if target-libmudflap -maybe-clean-target-libmudflap: clean-target-libmudflap +.PHONY: maybe-clean-target-libcilkrts clean-target-libcilkrts +maybe-clean-target-libcilkrts: +@if target-libcilkrts +maybe-clean-target-libcilkrts: clean-target-libcilkrts -clean-target-libmudflap: +clean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32122,24 +36644,24 @@ clean-target-libmudflap: clean) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-distclean-target-libmudflap distclean-target-libmudflap -maybe-distclean-target-libmudflap: -@if target-libmudflap -maybe-distclean-target-libmudflap: distclean-target-libmudflap +.PHONY: maybe-distclean-target-libcilkrts distclean-target-libcilkrts +maybe-distclean-target-libcilkrts: +@if target-libcilkrts +maybe-distclean-target-libcilkrts: distclean-target-libcilkrts -distclean-target-libmudflap: +distclean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32147,687 +36669,171 @@ distclean-target-libmudflap: distclean) \ || exit 1 -@endif target-libmudflap +@endif target-libcilkrts -.PHONY: maybe-maintainer-clean-target-libmudflap maintainer-clean-target-libmudflap -maybe-maintainer-clean-target-libmudflap: -@if target-libmudflap -maybe-maintainer-clean-target-libmudflap: maintainer-clean-target-libmudflap +.PHONY: maybe-maintainer-clean-target-libcilkrts maintainer-clean-target-libcilkrts +maybe-maintainer-clean-target-libcilkrts: +@if target-libcilkrts +maybe-maintainer-clean-target-libcilkrts: maintainer-clean-target-libcilkrts -maintainer-clean-target-libmudflap: +maintainer-clean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libcilkrts/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libcilkrts"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libmudflap && \ + (cd $(TARGET_SUBDIR)/libcilkrts && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ maintainer-clean) \ - || exit 1 - -@endif target-libmudflap - - - - - -.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer -maybe-configure-target-libsanitizer: -@if gcc-bootstrap -configure-target-libsanitizer: stage_current -@endif gcc-bootstrap -@if target-libsanitizer -maybe-configure-target-libsanitizer: configure-target-libsanitizer -configure-target-libsanitizer: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \ - cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - || exit 1 -@endif target-libsanitizer - - - -.PHONY: configure-stage1-target-libsanitizer maybe-configure-stage1-target-libsanitizer -maybe-configure-stage1-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-configure-stage1-target-libsanitizer: configure-stage1-target-libsanitizer -configure-stage1-target-libsanitizer: - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(TARGET_SUBDIR)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) -@endif target-libsanitizer-bootstrap - -.PHONY: configure-stage2-target-libsanitizer maybe-configure-stage2-target-libsanitizer -maybe-configure-stage2-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-configure-stage2-target-libsanitizer: configure-stage2-target-libsanitizer -configure-stage2-target-libsanitizer: - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(TARGET_SUBDIR)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE2_CONFIGURE_FLAGS) -@endif target-libsanitizer-bootstrap - -.PHONY: configure-stage3-target-libsanitizer maybe-configure-stage3-target-libsanitizer -maybe-configure-stage3-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-configure-stage3-target-libsanitizer: configure-stage3-target-libsanitizer -configure-stage3-target-libsanitizer: - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(TARGET_SUBDIR)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE3_CONFIGURE_FLAGS) -@endif target-libsanitizer-bootstrap - -.PHONY: configure-stage4-target-libsanitizer maybe-configure-stage4-target-libsanitizer -maybe-configure-stage4-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-configure-stage4-target-libsanitizer: configure-stage4-target-libsanitizer -configure-stage4-target-libsanitizer: - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(TARGET_SUBDIR)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGE4_CONFIGURE_FLAGS) -@endif target-libsanitizer-bootstrap - -.PHONY: configure-stageprofile-target-libsanitizer maybe-configure-stageprofile-target-libsanitizer -maybe-configure-stageprofile-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-configure-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer -configure-stageprofile-target-libsanitizer: - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(TARGET_SUBDIR)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEprofile_CONFIGURE_FLAGS) -@endif target-libsanitizer-bootstrap - -.PHONY: configure-stagefeedback-target-libsanitizer maybe-configure-stagefeedback-target-libsanitizer -maybe-configure-stagefeedback-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-configure-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer -configure-stagefeedback-target-libsanitizer: - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start - @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - echo "Checking multilib configuration for libsanitizer..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libsanitizer/multilib.tmp 2> /dev/null ; \ - if test -r $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libsanitizer/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(TARGET_SUBDIR)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ - --with-build-libsubdir=$(HOST_SUBDIR) \ - $(STAGEfeedback_CONFIGURE_FLAGS) -@endif target-libsanitizer-bootstrap - - - - - -.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer -maybe-all-target-libsanitizer: -@if gcc-bootstrap -all-target-libsanitizer: stage_current -@endif gcc-bootstrap -@if target-libsanitizer -TARGET-target-libsanitizer=all -maybe-all-target-libsanitizer: all-target-libsanitizer -all-target-libsanitizer: configure-target-libsanitizer - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - $(TARGET-target-libsanitizer)) -@endif target-libsanitizer - - - -.PHONY: all-stage1-target-libsanitizer maybe-all-stage1-target-libsanitizer -.PHONY: clean-stage1-target-libsanitizer maybe-clean-stage1-target-libsanitizer -maybe-all-stage1-target-libsanitizer: -maybe-clean-stage1-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-all-stage1-target-libsanitizer: all-stage1-target-libsanitizer -all-stage1: all-stage1-target-libsanitizer -TARGET-stage1-target-libsanitizer = $(TARGET-target-libsanitizer) -all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer - @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE1_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - \ - TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-target-libsanitizer) - -maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer -clean-stage1: clean-stage1-target-libsanitizer -clean-stage1-target-libsanitizer: - @if [ $(current_stage) = stage1 ]; then \ - [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \ - $(MAKE) stage1-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - clean -@endif target-libsanitizer-bootstrap - - -.PHONY: all-stage2-target-libsanitizer maybe-all-stage2-target-libsanitizer -.PHONY: clean-stage2-target-libsanitizer maybe-clean-stage2-target-libsanitizer -maybe-all-stage2-target-libsanitizer: -maybe-clean-stage2-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-all-stage2-target-libsanitizer: all-stage2-target-libsanitizer -all-stage2: all-stage2-target-libsanitizer -TARGET-stage2-target-libsanitizer = $(TARGET-target-libsanitizer) -all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer - @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-target-libsanitizer) - -maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer -clean-stage2: clean-stage2-target-libsanitizer -clean-stage2-target-libsanitizer: - @if [ $(current_stage) = stage2 ]; then \ - [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \ - $(MAKE) stage2-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libsanitizer-bootstrap - - -.PHONY: all-stage3-target-libsanitizer maybe-all-stage3-target-libsanitizer -.PHONY: clean-stage3-target-libsanitizer maybe-clean-stage3-target-libsanitizer -maybe-all-stage3-target-libsanitizer: -maybe-clean-stage3-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-all-stage3-target-libsanitizer: all-stage3-target-libsanitizer -all-stage3: all-stage3-target-libsanitizer -TARGET-stage3-target-libsanitizer = $(TARGET-target-libsanitizer) -all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer - @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE3_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-target-libsanitizer) - -maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer -clean-stage3: clean-stage3-target-libsanitizer -clean-stage3-target-libsanitizer: - @if [ $(current_stage) = stage3 ]; then \ - [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \ - $(MAKE) stage3-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libsanitizer-bootstrap - - -.PHONY: all-stage4-target-libsanitizer maybe-all-stage4-target-libsanitizer -.PHONY: clean-stage4-target-libsanitizer maybe-clean-stage4-target-libsanitizer -maybe-all-stage4-target-libsanitizer: -maybe-clean-stage4-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-all-stage4-target-libsanitizer: all-stage4-target-libsanitizer -all-stage4: all-stage4-target-libsanitizer -TARGET-stage4-target-libsanitizer = $(TARGET-target-libsanitizer) -all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer - @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE4_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGE4_TFLAGS)" \ - $(TARGET-stage4-target-libsanitizer) - -maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer -clean-stage4: clean-stage4-target-libsanitizer -clean-stage4-target-libsanitizer: - @if [ $(current_stage) = stage4 ]; then \ - [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \ - $(MAKE) stage4-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libsanitizer-bootstrap + || exit 1 +@endif target-libcilkrts -.PHONY: all-stageprofile-target-libsanitizer maybe-all-stageprofile-target-libsanitizer -.PHONY: clean-stageprofile-target-libsanitizer maybe-clean-stageprofile-target-libsanitizer -maybe-all-stageprofile-target-libsanitizer: -maybe-clean-stageprofile-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-all-stageprofile-target-libsanitizer: all-stageprofile-target-libsanitizer -all-stageprofile: all-stageprofile-target-libsanitizer -TARGET-stageprofile-target-libsanitizer = $(TARGET-target-libsanitizer) -all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer - @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEprofile_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGEprofile_TFLAGS)" \ - $(TARGET-stageprofile-target-libsanitizer) -maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer -clean-stageprofile: clean-stageprofile-target-libsanitizer -clean-stageprofile-target-libsanitizer: - @if [ $(current_stage) = stageprofile ]; then \ - [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ - else \ - [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \ - $(MAKE) stageprofile-start; \ - fi; \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libsanitizer-bootstrap -.PHONY: all-stagefeedback-target-libsanitizer maybe-all-stagefeedback-target-libsanitizer -.PHONY: clean-stagefeedback-target-libsanitizer maybe-clean-stagefeedback-target-libsanitizer -maybe-all-stagefeedback-target-libsanitizer: -maybe-clean-stagefeedback-target-libsanitizer: -@if target-libsanitizer-bootstrap -maybe-all-stagefeedback-target-libsanitizer: all-stagefeedback-target-libsanitizer -all-stagefeedback: all-stagefeedback-target-libsanitizer -TARGET-stagefeedback-target-libsanitizer = $(TARGET-target-libsanitizer) -all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitizer - @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + +.PHONY: configure-target-liboffloadmic maybe-configure-target-liboffloadmic +maybe-configure-target-liboffloadmic: +@if gcc-bootstrap +configure-target-liboffloadmic: stage_current +@endif gcc-bootstrap +@if target-liboffloadmic +maybe-configure-target-liboffloadmic: configure-target-liboffloadmic +configure-target-liboffloadmic: + @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ - CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ - CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ - LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ - $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - TFLAGS="$(STAGEfeedback_TFLAGS)" \ - $(TARGET-stagefeedback-target-libsanitizer) - -maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer -clean-stagefeedback: clean-stagefeedback-target-libsanitizer -clean-stagefeedback-target-libsanitizer: - @if [ $(current_stage) = stagefeedback ]; then \ - [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ + echo "Checking multilib configuration for liboffloadmic..."; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/liboffloadmic/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/liboffloadmic/Makefile; \ + mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \ + fi; \ else \ - [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \ - $(MAKE) stagefeedback-start; \ + mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \ fi; \ - cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libsanitizer-bootstrap + test ! -f $(TARGET_SUBDIR)/liboffloadmic/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/liboffloadmic; \ + $(NORMAL_TARGET_EXPORTS) \ + echo Configuring in $(TARGET_SUBDIR)/liboffloadmic; \ + cd "$(TARGET_SUBDIR)/liboffloadmic" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/liboffloadmic/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=liboffloadmic; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} @extra_liboffloadmic_configure_flags@ \ + || exit 1 +@endif target-liboffloadmic +.PHONY: all-target-liboffloadmic maybe-all-target-liboffloadmic +maybe-all-target-liboffloadmic: +@if gcc-bootstrap +all-target-liboffloadmic: stage_current +@endif gcc-bootstrap +@if target-liboffloadmic +TARGET-target-liboffloadmic=all +maybe-all-target-liboffloadmic: all-target-liboffloadmic +all-target-liboffloadmic: configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) \ + $(TARGET-target-liboffloadmic)) +@endif target-liboffloadmic -.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer -maybe-check-target-libsanitizer: -@if target-libsanitizer -maybe-check-target-libsanitizer: check-target-libsanitizer -check-target-libsanitizer: + + + +.PHONY: check-target-liboffloadmic maybe-check-target-liboffloadmic +maybe-check-target-liboffloadmic: +@if target-liboffloadmic +maybe-check-target-liboffloadmic: check-target-liboffloadmic + +check-target-liboffloadmic: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) check) -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: install-target-libsanitizer maybe-install-target-libsanitizer -maybe-install-target-libsanitizer: -@if target-libsanitizer -maybe-install-target-libsanitizer: install-target-libsanitizer +.PHONY: install-target-liboffloadmic maybe-install-target-liboffloadmic +maybe-install-target-liboffloadmic: +@if target-liboffloadmic +maybe-install-target-liboffloadmic: install-target-liboffloadmic -install-target-libsanitizer: installdirs +install-target-liboffloadmic: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: install-strip-target-libsanitizer maybe-install-strip-target-libsanitizer -maybe-install-strip-target-libsanitizer: -@if target-libsanitizer -maybe-install-strip-target-libsanitizer: install-strip-target-libsanitizer +.PHONY: install-strip-target-liboffloadmic maybe-install-strip-target-liboffloadmic +maybe-install-strip-target-liboffloadmic: +@if target-liboffloadmic +maybe-install-strip-target-liboffloadmic: install-strip-target-liboffloadmic -install-strip-target-libsanitizer: installdirs +install-strip-target-liboffloadmic: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) -@endif target-libsanitizer +@endif target-liboffloadmic # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-target-libsanitizer info-target-libsanitizer -maybe-info-target-libsanitizer: -@if target-libsanitizer -maybe-info-target-libsanitizer: info-target-libsanitizer +.PHONY: maybe-info-target-liboffloadmic info-target-liboffloadmic +maybe-info-target-liboffloadmic: +@if target-liboffloadmic +maybe-info-target-liboffloadmic: info-target-liboffloadmic -info-target-libsanitizer: \ - configure-target-libsanitizer +info-target-liboffloadmic: \ + configure-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing info in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32835,25 +36841,25 @@ info-target-libsanitizer: \ info) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-dvi-target-libsanitizer dvi-target-libsanitizer -maybe-dvi-target-libsanitizer: -@if target-libsanitizer -maybe-dvi-target-libsanitizer: dvi-target-libsanitizer +.PHONY: maybe-dvi-target-liboffloadmic dvi-target-liboffloadmic +maybe-dvi-target-liboffloadmic: +@if target-liboffloadmic +maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic -dvi-target-libsanitizer: \ - configure-target-libsanitizer +dvi-target-liboffloadmic: \ + configure-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing dvi in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32861,25 +36867,25 @@ dvi-target-libsanitizer: \ dvi) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-pdf-target-libsanitizer pdf-target-libsanitizer -maybe-pdf-target-libsanitizer: -@if target-libsanitizer -maybe-pdf-target-libsanitizer: pdf-target-libsanitizer +.PHONY: maybe-pdf-target-liboffloadmic pdf-target-liboffloadmic +maybe-pdf-target-liboffloadmic: +@if target-liboffloadmic +maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic -pdf-target-libsanitizer: \ - configure-target-libsanitizer +pdf-target-liboffloadmic: \ + configure-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing pdf in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32887,25 +36893,25 @@ pdf-target-libsanitizer: \ pdf) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-html-target-libsanitizer html-target-libsanitizer -maybe-html-target-libsanitizer: -@if target-libsanitizer -maybe-html-target-libsanitizer: html-target-libsanitizer +.PHONY: maybe-html-target-liboffloadmic html-target-liboffloadmic +maybe-html-target-liboffloadmic: +@if target-liboffloadmic +maybe-html-target-liboffloadmic: html-target-liboffloadmic -html-target-libsanitizer: \ - configure-target-libsanitizer +html-target-liboffloadmic: \ + configure-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32913,25 +36919,25 @@ html-target-libsanitizer: \ html) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-TAGS-target-libsanitizer TAGS-target-libsanitizer -maybe-TAGS-target-libsanitizer: -@if target-libsanitizer -maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer +.PHONY: maybe-TAGS-target-liboffloadmic TAGS-target-liboffloadmic +maybe-TAGS-target-liboffloadmic: +@if target-liboffloadmic +maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic -TAGS-target-libsanitizer: \ - configure-target-libsanitizer +TAGS-target-liboffloadmic: \ + configure-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing TAGS in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32939,26 +36945,26 @@ TAGS-target-libsanitizer: \ TAGS) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-install-info-target-libsanitizer install-info-target-libsanitizer -maybe-install-info-target-libsanitizer: -@if target-libsanitizer -maybe-install-info-target-libsanitizer: install-info-target-libsanitizer +.PHONY: maybe-install-info-target-liboffloadmic install-info-target-liboffloadmic +maybe-install-info-target-liboffloadmic: +@if target-liboffloadmic +maybe-install-info-target-liboffloadmic: install-info-target-liboffloadmic -install-info-target-libsanitizer: \ - configure-target-libsanitizer \ - info-target-libsanitizer +install-info-target-liboffloadmic: \ + configure-target-liboffloadmic \ + info-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing install-info in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32966,26 +36972,26 @@ install-info-target-libsanitizer: \ install-info) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-install-pdf-target-libsanitizer install-pdf-target-libsanitizer -maybe-install-pdf-target-libsanitizer: -@if target-libsanitizer -maybe-install-pdf-target-libsanitizer: install-pdf-target-libsanitizer +.PHONY: maybe-install-pdf-target-liboffloadmic install-pdf-target-liboffloadmic +maybe-install-pdf-target-liboffloadmic: +@if target-liboffloadmic +maybe-install-pdf-target-liboffloadmic: install-pdf-target-liboffloadmic -install-pdf-target-libsanitizer: \ - configure-target-libsanitizer \ - pdf-target-libsanitizer +install-pdf-target-liboffloadmic: \ + configure-target-liboffloadmic \ + pdf-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32993,26 +36999,26 @@ install-pdf-target-libsanitizer: \ install-pdf) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-install-html-target-libsanitizer install-html-target-libsanitizer -maybe-install-html-target-libsanitizer: -@if target-libsanitizer -maybe-install-html-target-libsanitizer: install-html-target-libsanitizer +.PHONY: maybe-install-html-target-liboffloadmic install-html-target-liboffloadmic +maybe-install-html-target-liboffloadmic: +@if target-liboffloadmic +maybe-install-html-target-liboffloadmic: install-html-target-liboffloadmic -install-html-target-libsanitizer: \ - configure-target-libsanitizer \ - html-target-libsanitizer +install-html-target-liboffloadmic: \ + configure-target-liboffloadmic \ + html-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing install-html in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -33020,25 +37026,25 @@ install-html-target-libsanitizer: \ install-html) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-installcheck-target-libsanitizer installcheck-target-libsanitizer -maybe-installcheck-target-libsanitizer: -@if target-libsanitizer -maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer +.PHONY: maybe-installcheck-target-liboffloadmic installcheck-target-liboffloadmic +maybe-installcheck-target-liboffloadmic: +@if target-liboffloadmic +maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic -installcheck-target-libsanitizer: \ - configure-target-libsanitizer +installcheck-target-liboffloadmic: \ + configure-target-liboffloadmic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing installcheck in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -33046,24 +37052,24 @@ installcheck-target-libsanitizer: \ installcheck) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-mostlyclean-target-libsanitizer mostlyclean-target-libsanitizer -maybe-mostlyclean-target-libsanitizer: -@if target-libsanitizer -maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer +.PHONY: maybe-mostlyclean-target-liboffloadmic mostlyclean-target-liboffloadmic +maybe-mostlyclean-target-liboffloadmic: +@if target-liboffloadmic +maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic -mostlyclean-target-libsanitizer: +mostlyclean-target-liboffloadmic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -33071,24 +37077,24 @@ mostlyclean-target-libsanitizer: mostlyclean) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-clean-target-libsanitizer clean-target-libsanitizer -maybe-clean-target-libsanitizer: -@if target-libsanitizer -maybe-clean-target-libsanitizer: clean-target-libsanitizer +.PHONY: maybe-clean-target-liboffloadmic clean-target-liboffloadmic +maybe-clean-target-liboffloadmic: +@if target-liboffloadmic +maybe-clean-target-liboffloadmic: clean-target-liboffloadmic -clean-target-libsanitizer: +clean-target-liboffloadmic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing clean in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -33096,24 +37102,24 @@ clean-target-libsanitizer: clean) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-distclean-target-libsanitizer distclean-target-libsanitizer -maybe-distclean-target-libsanitizer: -@if target-libsanitizer -maybe-distclean-target-libsanitizer: distclean-target-libsanitizer +.PHONY: maybe-distclean-target-liboffloadmic distclean-target-liboffloadmic +maybe-distclean-target-liboffloadmic: +@if target-liboffloadmic +maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic -distclean-target-libsanitizer: +distclean-target-liboffloadmic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing distclean in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -33121,24 +37127,24 @@ distclean-target-libsanitizer: distclean) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic -.PHONY: maybe-maintainer-clean-target-libsanitizer maintainer-clean-target-libsanitizer -maybe-maintainer-clean-target-libsanitizer: -@if target-libsanitizer -maybe-maintainer-clean-target-libsanitizer: maintainer-clean-target-libsanitizer +.PHONY: maybe-maintainer-clean-target-liboffloadmic maintainer-clean-target-liboffloadmic +maybe-maintainer-clean-target-liboffloadmic: +@if target-liboffloadmic +maybe-maintainer-clean-target-liboffloadmic: maintainer-clean-target-liboffloadmic -maintainer-clean-target-libsanitizer: +maintainer-clean-target-liboffloadmic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libsanitizer" ; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/liboffloadmic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - (cd $(TARGET_SUBDIR)/libsanitizer && \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -33146,7 +37152,7 @@ maintainer-clean-target-libsanitizer: maintainer-clean) \ || exit 1 -@endif target-libsanitizer +@endif target-liboffloadmic @@ -33164,8 +37170,8 @@ configure-target-libssp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libssp..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libssp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libssp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libssp/multilib.tmp; \ @@ -33177,7 +37183,7 @@ configure-target-libssp: mv $(TARGET_SUBDIR)/libssp/multilib.tmp $(TARGET_SUBDIR)/libssp/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libssp; \ cd "$(TARGET_SUBDIR)/libssp" || exit 1; \ @@ -33186,12 +37192,13 @@ configure-target-libssp: *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libssp"; \ - libsrcdir="$$s/libssp"; \ + module_srcdir=libssp; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libssp @@ -33276,11 +37283,11 @@ maybe-info-target-libssp: info-target-libssp info-target-libssp: \ configure-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33302,11 +37309,11 @@ maybe-dvi-target-libssp: dvi-target-libssp dvi-target-libssp: \ configure-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33328,11 +37335,11 @@ maybe-pdf-target-libssp: pdf-target-libssp pdf-target-libssp: \ configure-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33354,11 +37361,11 @@ maybe-html-target-libssp: html-target-libssp html-target-libssp: \ configure-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33380,11 +37387,11 @@ maybe-TAGS-target-libssp: TAGS-target-libssp TAGS-target-libssp: \ configure-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33407,11 +37414,11 @@ install-info-target-libssp: \ configure-target-libssp \ info-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33434,11 +37441,11 @@ install-pdf-target-libssp: \ configure-target-libssp \ pdf-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33461,11 +37468,11 @@ install-html-target-libssp: \ configure-target-libssp \ html-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33487,11 +37494,11 @@ maybe-installcheck-target-libssp: installcheck-target-libssp installcheck-target-libssp: \ configure-target-libssp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33512,11 +37519,11 @@ maybe-mostlyclean-target-libssp: mostlyclean-target-libssp mostlyclean-target-libssp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33537,11 +37544,11 @@ maybe-clean-target-libssp: clean-target-libssp clean-target-libssp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33562,11 +37569,11 @@ maybe-distclean-target-libssp: distclean-target-libssp distclean-target-libssp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33587,11 +37594,11 @@ maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp maintainer-clean-target-libssp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libssp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libssp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33621,8 +37628,8 @@ configure-target-newlib: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for newlib..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/newlib/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/newlib/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; then \ rm -f $(TARGET_SUBDIR)/newlib/multilib.tmp; \ @@ -33634,7 +37641,7 @@ configure-target-newlib: mv $(TARGET_SUBDIR)/newlib/multilib.tmp $(TARGET_SUBDIR)/newlib/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/newlib; \ cd "$(TARGET_SUBDIR)/newlib" || exit 1; \ @@ -33643,12 +37650,13 @@ configure-target-newlib: *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/newlib"; \ - libsrcdir="$$s/newlib"; \ + module_srcdir=newlib; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-newlib @@ -33733,11 +37741,11 @@ maybe-info-target-newlib: info-target-newlib info-target-newlib: \ configure-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing info in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33759,11 +37767,11 @@ maybe-dvi-target-newlib: dvi-target-newlib dvi-target-newlib: \ configure-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33785,11 +37793,11 @@ maybe-pdf-target-newlib: pdf-target-newlib pdf-target-newlib: \ configure-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33811,11 +37819,11 @@ maybe-html-target-newlib: html-target-newlib html-target-newlib: \ configure-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing html in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33837,11 +37845,11 @@ maybe-TAGS-target-newlib: TAGS-target-newlib TAGS-target-newlib: \ configure-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33864,11 +37872,11 @@ install-info-target-newlib: \ configure-target-newlib \ info-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33891,11 +37899,11 @@ install-pdf-target-newlib: \ configure-target-newlib \ pdf-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33918,11 +37926,11 @@ install-html-target-newlib: \ configure-target-newlib \ html-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33944,11 +37952,11 @@ maybe-installcheck-target-newlib: installcheck-target-newlib installcheck-target-newlib: \ configure-target-newlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33969,11 +37977,11 @@ maybe-mostlyclean-target-newlib: mostlyclean-target-newlib mostlyclean-target-newlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -33994,11 +38002,11 @@ maybe-clean-target-newlib: clean-target-newlib clean-target-newlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34019,11 +38027,11 @@ maybe-distclean-target-newlib: distclean-target-newlib distclean-target-newlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34044,11 +38052,11 @@ maybe-maintainer-clean-target-newlib: maintainer-clean-target-newlib maintainer-clean-target-newlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34077,8 +38085,8 @@ configure-target-libgcc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libgcc..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34090,7 +38098,7 @@ configure-target-libgcc: mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgcc; \ cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \ @@ -34099,12 +38107,13 @@ configure-target-libgcc: *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ + module_srcdir=libgcc; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libgcc @@ -34121,7 +38130,7 @@ configure-stage1-target-libgcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE1_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34137,19 +38146,20 @@ configure-stage1-target-libgcc: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -34164,7 +38174,7 @@ configure-stage2-target-libgcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE2_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34181,19 +38191,19 @@ configure-stage2-target-libgcc: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -34209,7 +38219,7 @@ configure-stage3-target-libgcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE3_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34226,19 +38236,19 @@ configure-stage3-target-libgcc: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -34254,7 +38264,7 @@ configure-stage4-target-libgcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE4_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34271,19 +38281,19 @@ configure-stage4-target-libgcc: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -34299,7 +38309,7 @@ configure-stageprofile-target-libgcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEprofile_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34316,19 +38326,19 @@ configure-stageprofile-target-libgcc: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -34344,7 +38354,7 @@ configure-stagefeedback-target-libgcc: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEfeedback_TFLAGS)"; \ echo "Checking multilib configuration for libgcc..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgcc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgcc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgcc/multilib.tmp; \ @@ -34361,19 +38371,19 @@ configure-stagefeedback-target-libgcc: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc; \ cd $(TARGET_SUBDIR)/libgcc || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgcc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgcc"; \ - libsrcdir="$$s/libgcc"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgcc; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif target-libgcc-bootstrap @@ -34702,11 +38712,11 @@ maybe-info-target-libgcc: info-target-libgcc info-target-libgcc: \ configure-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34728,11 +38738,11 @@ maybe-dvi-target-libgcc: dvi-target-libgcc dvi-target-libgcc: \ configure-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34754,11 +38764,11 @@ maybe-pdf-target-libgcc: pdf-target-libgcc pdf-target-libgcc: \ configure-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34780,11 +38790,11 @@ maybe-html-target-libgcc: html-target-libgcc html-target-libgcc: \ configure-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34806,11 +38816,11 @@ maybe-TAGS-target-libgcc: TAGS-target-libgcc TAGS-target-libgcc: \ configure-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34833,11 +38843,11 @@ install-info-target-libgcc: \ configure-target-libgcc \ info-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34860,11 +38870,11 @@ install-pdf-target-libgcc: \ configure-target-libgcc \ pdf-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34887,11 +38897,11 @@ install-html-target-libgcc: \ configure-target-libgcc \ html-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34913,11 +38923,11 @@ maybe-installcheck-target-libgcc: installcheck-target-libgcc installcheck-target-libgcc: \ configure-target-libgcc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34938,11 +38948,11 @@ maybe-mostlyclean-target-libgcc: mostlyclean-target-libgcc mostlyclean-target-libgcc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34963,11 +38973,11 @@ maybe-clean-target-libgcc: clean-target-libgcc clean-target-libgcc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -34988,11 +38998,11 @@ maybe-distclean-target-libgcc: distclean-target-libgcc distclean-target-libgcc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35013,11 +39023,11 @@ maybe-maintainer-clean-target-libgcc: maintainer-clean-target-libgcc maintainer-clean-target-libgcc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgcc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35047,8 +39057,8 @@ configure-target-libbacktrace: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libbacktrace..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libbacktrace/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libbacktrace/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libbacktrace/multilib.tmp; \ @@ -35060,7 +39070,7 @@ configure-target-libbacktrace: mv $(TARGET_SUBDIR)/libbacktrace/multilib.tmp $(TARGET_SUBDIR)/libbacktrace/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libbacktrace/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \ cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \ @@ -35069,12 +39079,13 @@ configure-target-libbacktrace: *) topdir=`echo $(TARGET_SUBDIR)/libbacktrace/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libbacktrace"; \ - libsrcdir="$$s/libbacktrace"; \ + module_srcdir=libbacktrace; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libbacktrace @@ -35159,11 +39170,11 @@ maybe-info-target-libbacktrace: info-target-libbacktrace info-target-libbacktrace: \ configure-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35185,11 +39196,11 @@ maybe-dvi-target-libbacktrace: dvi-target-libbacktrace dvi-target-libbacktrace: \ configure-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35211,11 +39222,11 @@ maybe-pdf-target-libbacktrace: pdf-target-libbacktrace pdf-target-libbacktrace: \ configure-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35237,11 +39248,11 @@ maybe-html-target-libbacktrace: html-target-libbacktrace html-target-libbacktrace: \ configure-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35263,11 +39274,11 @@ maybe-TAGS-target-libbacktrace: TAGS-target-libbacktrace TAGS-target-libbacktrace: \ configure-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35290,11 +39301,11 @@ install-info-target-libbacktrace: \ configure-target-libbacktrace \ info-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35317,11 +39328,11 @@ install-pdf-target-libbacktrace: \ configure-target-libbacktrace \ pdf-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35344,11 +39355,11 @@ install-html-target-libbacktrace: \ configure-target-libbacktrace \ html-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35370,11 +39381,11 @@ maybe-installcheck-target-libbacktrace: installcheck-target-libbacktrace installcheck-target-libbacktrace: \ configure-target-libbacktrace @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35395,11 +39406,11 @@ maybe-mostlyclean-target-libbacktrace: mostlyclean-target-libbacktrace mostlyclean-target-libbacktrace: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35420,11 +39431,11 @@ maybe-clean-target-libbacktrace: clean-target-libbacktrace clean-target-libbacktrace: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35445,11 +39456,11 @@ maybe-distclean-target-libbacktrace: distclean-target-libbacktrace distclean-target-libbacktrace: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35470,11 +39481,11 @@ maybe-maintainer-clean-target-libbacktrace: maintainer-clean-target-libbacktrace maintainer-clean-target-libbacktrace: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libbacktrace/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libbacktrace" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libbacktrace"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35504,8 +39515,8 @@ configure-target-libquadmath: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libquadmath..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libquadmath/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libquadmath/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libquadmath/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libquadmath/multilib.tmp; \ @@ -35517,7 +39528,7 @@ configure-target-libquadmath: mv $(TARGET_SUBDIR)/libquadmath/multilib.tmp $(TARGET_SUBDIR)/libquadmath/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libquadmath/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libquadmath; \ cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \ @@ -35526,12 +39537,13 @@ configure-target-libquadmath: *) topdir=`echo $(TARGET_SUBDIR)/libquadmath/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libquadmath"; \ - libsrcdir="$$s/libquadmath"; \ + module_srcdir=libquadmath; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libquadmath @@ -35616,11 +39628,11 @@ maybe-info-target-libquadmath: info-target-libquadmath info-target-libquadmath: \ configure-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35642,11 +39654,11 @@ maybe-dvi-target-libquadmath: dvi-target-libquadmath dvi-target-libquadmath: \ configure-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35668,11 +39680,11 @@ maybe-pdf-target-libquadmath: pdf-target-libquadmath pdf-target-libquadmath: \ configure-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35694,11 +39706,11 @@ maybe-html-target-libquadmath: html-target-libquadmath html-target-libquadmath: \ configure-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35720,11 +39732,11 @@ maybe-TAGS-target-libquadmath: TAGS-target-libquadmath TAGS-target-libquadmath: \ configure-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35747,11 +39759,11 @@ install-info-target-libquadmath: \ configure-target-libquadmath \ info-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35774,11 +39786,11 @@ install-pdf-target-libquadmath: \ configure-target-libquadmath \ pdf-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35801,11 +39813,11 @@ install-html-target-libquadmath: \ configure-target-libquadmath \ html-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35827,11 +39839,11 @@ maybe-installcheck-target-libquadmath: installcheck-target-libquadmath installcheck-target-libquadmath: \ configure-target-libquadmath @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35852,11 +39864,11 @@ maybe-mostlyclean-target-libquadmath: mostlyclean-target-libquadmath mostlyclean-target-libquadmath: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35877,11 +39889,11 @@ maybe-clean-target-libquadmath: clean-target-libquadmath clean-target-libquadmath: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35902,11 +39914,11 @@ maybe-distclean-target-libquadmath: distclean-target-libquadmath distclean-target-libquadmath: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35927,11 +39939,11 @@ maybe-maintainer-clean-target-libquadmath: maintainer-clean-target-libquadmath maintainer-clean-target-libquadmath: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libquadmath/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libquadmath" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libquadmath"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -35961,8 +39973,8 @@ configure-target-libgfortran: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libgfortran..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgfortran/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgfortran/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgfortran/multilib.tmp; \ @@ -35974,7 +39986,7 @@ configure-target-libgfortran: mv $(TARGET_SUBDIR)/libgfortran/multilib.tmp $(TARGET_SUBDIR)/libgfortran/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ @@ -35983,12 +39995,13 @@ configure-target-libgfortran: *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgfortran"; \ - libsrcdir="$$s/libgfortran"; \ + module_srcdir=libgfortran; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libgfortran @@ -36073,11 +40086,11 @@ maybe-info-target-libgfortran: info-target-libgfortran info-target-libgfortran: \ configure-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36099,11 +40112,11 @@ maybe-dvi-target-libgfortran: dvi-target-libgfortran dvi-target-libgfortran: \ configure-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36125,11 +40138,11 @@ maybe-pdf-target-libgfortran: pdf-target-libgfortran pdf-target-libgfortran: \ configure-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36151,11 +40164,11 @@ maybe-html-target-libgfortran: html-target-libgfortran html-target-libgfortran: \ configure-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36177,11 +40190,11 @@ maybe-TAGS-target-libgfortran: TAGS-target-libgfortran TAGS-target-libgfortran: \ configure-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36204,11 +40217,11 @@ install-info-target-libgfortran: \ configure-target-libgfortran \ info-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36231,11 +40244,11 @@ install-pdf-target-libgfortran: \ configure-target-libgfortran \ pdf-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36258,11 +40271,11 @@ install-html-target-libgfortran: \ configure-target-libgfortran \ html-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36284,11 +40297,11 @@ maybe-installcheck-target-libgfortran: installcheck-target-libgfortran installcheck-target-libgfortran: \ configure-target-libgfortran @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36309,11 +40322,11 @@ maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran mostlyclean-target-libgfortran: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36334,11 +40347,11 @@ maybe-clean-target-libgfortran: clean-target-libgfortran clean-target-libgfortran: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36359,11 +40372,11 @@ maybe-distclean-target-libgfortran: distclean-target-libgfortran distclean-target-libgfortran: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36384,11 +40397,11 @@ maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36418,8 +40431,8 @@ configure-target-libobjc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libobjc..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libobjc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libobjc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libobjc/multilib.tmp; \ @@ -36431,7 +40444,7 @@ configure-target-libobjc: mv $(TARGET_SUBDIR)/libobjc/multilib.tmp $(TARGET_SUBDIR)/libobjc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libobjc; \ cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \ @@ -36440,12 +40453,13 @@ configure-target-libobjc: *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libobjc"; \ - libsrcdir="$$s/libobjc"; \ + module_srcdir=libobjc; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libobjc @@ -36530,11 +40544,11 @@ maybe-info-target-libobjc: info-target-libobjc info-target-libobjc: \ configure-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36556,11 +40570,11 @@ maybe-dvi-target-libobjc: dvi-target-libobjc dvi-target-libobjc: \ configure-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36582,11 +40596,11 @@ maybe-pdf-target-libobjc: pdf-target-libobjc pdf-target-libobjc: \ configure-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36608,11 +40622,11 @@ maybe-html-target-libobjc: html-target-libobjc html-target-libobjc: \ configure-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36634,11 +40648,11 @@ maybe-TAGS-target-libobjc: TAGS-target-libobjc TAGS-target-libobjc: \ configure-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36661,11 +40675,11 @@ install-info-target-libobjc: \ configure-target-libobjc \ info-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36688,11 +40702,11 @@ install-pdf-target-libobjc: \ configure-target-libobjc \ pdf-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36715,11 +40729,11 @@ install-html-target-libobjc: \ configure-target-libobjc \ html-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36741,11 +40755,11 @@ maybe-installcheck-target-libobjc: installcheck-target-libobjc installcheck-target-libobjc: \ configure-target-libobjc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36766,11 +40780,11 @@ maybe-mostlyclean-target-libobjc: mostlyclean-target-libobjc mostlyclean-target-libobjc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36791,11 +40805,11 @@ maybe-clean-target-libobjc: clean-target-libobjc clean-target-libobjc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36816,11 +40830,11 @@ maybe-distclean-target-libobjc: distclean-target-libobjc distclean-target-libobjc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36841,11 +40855,11 @@ maybe-maintainer-clean-target-libobjc: maintainer-clean-target-libobjc maintainer-clean-target-libobjc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -36875,8 +40889,8 @@ configure-target-libgo: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libgo..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgo/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgo/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgo/multilib.tmp; \ @@ -36888,7 +40902,7 @@ configure-target-libgo: mv $(TARGET_SUBDIR)/libgo/multilib.tmp $(TARGET_SUBDIR)/libgo/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgo/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgo; \ cd "$(TARGET_SUBDIR)/libgo" || exit 1; \ @@ -36897,12 +40911,13 @@ configure-target-libgo: *) topdir=`echo $(TARGET_SUBDIR)/libgo/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgo"; \ - libsrcdir="$$s/libgo"; \ + module_srcdir=libgo; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libgo @@ -36987,11 +41002,11 @@ maybe-info-target-libgo: info-target-libgo info-target-libgo: \ configure-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37013,11 +41028,11 @@ maybe-dvi-target-libgo: dvi-target-libgo dvi-target-libgo: \ configure-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37039,11 +41054,11 @@ maybe-pdf-target-libgo: pdf-target-libgo pdf-target-libgo: \ configure-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37065,11 +41080,11 @@ maybe-html-target-libgo: html-target-libgo html-target-libgo: \ configure-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37091,11 +41106,11 @@ maybe-TAGS-target-libgo: TAGS-target-libgo TAGS-target-libgo: \ configure-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37118,11 +41133,11 @@ install-info-target-libgo: \ configure-target-libgo \ info-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37145,11 +41160,11 @@ install-pdf-target-libgo: \ configure-target-libgo \ pdf-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37172,11 +41187,11 @@ install-html-target-libgo: \ configure-target-libgo \ html-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37198,11 +41213,11 @@ maybe-installcheck-target-libgo: installcheck-target-libgo installcheck-target-libgo: \ configure-target-libgo @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37223,11 +41238,11 @@ maybe-mostlyclean-target-libgo: mostlyclean-target-libgo mostlyclean-target-libgo: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37248,11 +41263,11 @@ maybe-clean-target-libgo: clean-target-libgo clean-target-libgo: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37273,11 +41288,11 @@ maybe-distclean-target-libgo: distclean-target-libgo distclean-target-libgo: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37298,11 +41313,11 @@ maybe-maintainer-clean-target-libgo: maintainer-clean-target-libgo maintainer-clean-target-libgo: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgo" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgo"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37332,8 +41347,8 @@ configure-target-libtermcap: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libtermcap..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libtermcap/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libtermcap/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libtermcap/multilib.tmp; \ @@ -37345,7 +41360,7 @@ configure-target-libtermcap: mv $(TARGET_SUBDIR)/libtermcap/multilib.tmp $(TARGET_SUBDIR)/libtermcap/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libtermcap; \ cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \ @@ -37354,12 +41369,13 @@ configure-target-libtermcap: *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libtermcap"; \ - libsrcdir="$$s/libtermcap"; \ + module_srcdir=libtermcap; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libtermcap @@ -37439,11 +41455,11 @@ maybe-info-target-libtermcap: info-target-libtermcap info-target-libtermcap: \ configure-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37465,11 +41481,11 @@ maybe-dvi-target-libtermcap: dvi-target-libtermcap dvi-target-libtermcap: \ configure-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37491,11 +41507,11 @@ maybe-pdf-target-libtermcap: pdf-target-libtermcap pdf-target-libtermcap: \ configure-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37517,11 +41533,11 @@ maybe-html-target-libtermcap: html-target-libtermcap html-target-libtermcap: \ configure-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37543,11 +41559,11 @@ maybe-TAGS-target-libtermcap: TAGS-target-libtermcap TAGS-target-libtermcap: \ configure-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37570,11 +41586,11 @@ install-info-target-libtermcap: \ configure-target-libtermcap \ info-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37597,11 +41613,11 @@ install-pdf-target-libtermcap: \ configure-target-libtermcap \ pdf-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37624,11 +41640,11 @@ install-html-target-libtermcap: \ configure-target-libtermcap \ html-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37650,11 +41666,11 @@ maybe-installcheck-target-libtermcap: installcheck-target-libtermcap installcheck-target-libtermcap: \ configure-target-libtermcap @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37724,8 +41740,8 @@ configure-target-winsup: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for winsup..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/winsup/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/winsup/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; then \ rm -f $(TARGET_SUBDIR)/winsup/multilib.tmp; \ @@ -37737,7 +41753,7 @@ configure-target-winsup: mv $(TARGET_SUBDIR)/winsup/multilib.tmp $(TARGET_SUBDIR)/winsup/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/winsup; \ cd "$(TARGET_SUBDIR)/winsup" || exit 1; \ @@ -37746,12 +41762,13 @@ configure-target-winsup: *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/winsup"; \ - libsrcdir="$$s/winsup"; \ + module_srcdir=winsup; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-winsup @@ -37836,11 +41853,11 @@ maybe-info-target-winsup: info-target-winsup info-target-winsup: \ configure-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing info in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37862,11 +41879,11 @@ maybe-dvi-target-winsup: dvi-target-winsup dvi-target-winsup: \ configure-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37888,11 +41905,11 @@ maybe-pdf-target-winsup: pdf-target-winsup pdf-target-winsup: \ configure-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37914,11 +41931,11 @@ maybe-html-target-winsup: html-target-winsup html-target-winsup: \ configure-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing html in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37940,11 +41957,11 @@ maybe-TAGS-target-winsup: TAGS-target-winsup TAGS-target-winsup: \ configure-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37967,11 +41984,11 @@ install-info-target-winsup: \ configure-target-winsup \ info-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -37994,11 +42011,11 @@ install-pdf-target-winsup: \ configure-target-winsup \ pdf-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38021,11 +42038,11 @@ install-html-target-winsup: \ configure-target-winsup \ html-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38047,11 +42064,11 @@ maybe-installcheck-target-winsup: installcheck-target-winsup installcheck-target-winsup: \ configure-target-winsup @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38072,11 +42089,11 @@ maybe-mostlyclean-target-winsup: mostlyclean-target-winsup mostlyclean-target-winsup: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38097,11 +42114,11 @@ maybe-clean-target-winsup: clean-target-winsup clean-target-winsup: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38122,11 +42139,11 @@ maybe-distclean-target-winsup: distclean-target-winsup distclean-target-winsup: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38147,11 +42164,11 @@ maybe-maintainer-clean-target-winsup: maintainer-clean-target-winsup maintainer-clean-target-winsup: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38181,8 +42198,8 @@ configure-target-libgloss: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libgloss..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgloss/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgloss/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgloss/multilib.tmp; \ @@ -38194,7 +42211,7 @@ configure-target-libgloss: mv $(TARGET_SUBDIR)/libgloss/multilib.tmp $(TARGET_SUBDIR)/libgloss/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgloss; \ cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \ @@ -38203,12 +42220,13 @@ configure-target-libgloss: *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgloss"; \ - libsrcdir="$$s/libgloss"; \ + module_srcdir=libgloss; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libgloss @@ -38288,11 +42306,11 @@ maybe-info-target-libgloss: info-target-libgloss info-target-libgloss: \ configure-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38314,11 +42332,11 @@ maybe-dvi-target-libgloss: dvi-target-libgloss dvi-target-libgloss: \ configure-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38340,11 +42358,11 @@ maybe-pdf-target-libgloss: pdf-target-libgloss pdf-target-libgloss: \ configure-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38366,11 +42384,11 @@ maybe-html-target-libgloss: html-target-libgloss html-target-libgloss: \ configure-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38392,11 +42410,11 @@ maybe-TAGS-target-libgloss: TAGS-target-libgloss TAGS-target-libgloss: \ configure-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38419,11 +42437,11 @@ install-info-target-libgloss: \ configure-target-libgloss \ info-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38446,11 +42464,11 @@ install-pdf-target-libgloss: \ configure-target-libgloss \ pdf-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38473,11 +42491,11 @@ install-html-target-libgloss: \ configure-target-libgloss \ html-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38499,11 +42517,11 @@ maybe-installcheck-target-libgloss: installcheck-target-libgloss installcheck-target-libgloss: \ configure-target-libgloss @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38524,11 +42542,11 @@ maybe-mostlyclean-target-libgloss: mostlyclean-target-libgloss mostlyclean-target-libgloss: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38549,11 +42567,11 @@ maybe-clean-target-libgloss: clean-target-libgloss clean-target-libgloss: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38574,11 +42592,11 @@ maybe-distclean-target-libgloss: distclean-target-libgloss distclean-target-libgloss: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38599,11 +42617,11 @@ maybe-maintainer-clean-target-libgloss: maintainer-clean-target-libgloss maintainer-clean-target-libgloss: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38633,8 +42651,8 @@ configure-target-libffi: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libffi..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ @@ -38646,7 +42664,7 @@ configure-target-libffi: mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libffi; \ cd "$(TARGET_SUBDIR)/libffi" || exit 1; \ @@ -38655,12 +42673,13 @@ configure-target-libffi: *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libffi"; \ - libsrcdir="$$s/libffi"; \ + module_srcdir=libffi; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libffi @@ -38710,13 +42729,8 @@ maybe-install-target-libffi: @if target-libffi maybe-install-target-libffi: install-target-libffi -install-target-libffi: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) +# Dummy target for uninstallable. +install-target-libffi: @endif target-libffi @@ -38725,13 +42739,8 @@ maybe-install-strip-target-libffi: @if target-libffi maybe-install-strip-target-libffi: install-strip-target-libffi -install-strip-target-libffi: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(NORMAL_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) +# Dummy target for uninstallable. +install-strip-target-libffi: @endif target-libffi @@ -38745,11 +42754,11 @@ maybe-info-target-libffi: info-target-libffi info-target-libffi: \ configure-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38771,11 +42780,11 @@ maybe-dvi-target-libffi: dvi-target-libffi dvi-target-libffi: \ configure-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38797,11 +42806,11 @@ maybe-pdf-target-libffi: pdf-target-libffi pdf-target-libffi: \ configure-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38823,11 +42832,11 @@ maybe-html-target-libffi: html-target-libffi html-target-libffi: \ configure-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38849,11 +42858,11 @@ maybe-TAGS-target-libffi: TAGS-target-libffi TAGS-target-libffi: \ configure-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38876,11 +42885,11 @@ install-info-target-libffi: \ configure-target-libffi \ info-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38903,11 +42912,11 @@ install-pdf-target-libffi: \ configure-target-libffi \ pdf-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38930,11 +42939,11 @@ install-html-target-libffi: \ configure-target-libffi \ html-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38956,11 +42965,11 @@ maybe-installcheck-target-libffi: installcheck-target-libffi installcheck-target-libffi: \ configure-target-libffi @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -38981,11 +42990,11 @@ maybe-mostlyclean-target-libffi: mostlyclean-target-libffi mostlyclean-target-libffi: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39006,11 +43015,11 @@ maybe-clean-target-libffi: clean-target-libffi clean-target-libffi: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39031,11 +43040,11 @@ maybe-distclean-target-libffi: distclean-target-libffi distclean-target-libffi: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39056,11 +43065,11 @@ maybe-maintainer-clean-target-libffi: maintainer-clean-target-libffi maintainer-clean-target-libffi: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39090,8 +43099,8 @@ configure-target-libjava: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libjava..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \ @@ -39103,7 +43112,7 @@ configure-target-libjava: mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libjava; \ cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ @@ -39112,12 +43121,13 @@ configure-target-libjava: *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libjava"; \ - libsrcdir="$$s/libjava"; \ + module_srcdir=libjava; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \ + --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) \ || exit 1 @endif target-libjava @@ -39202,11 +43212,11 @@ maybe-info-target-libjava: info-target-libjava info-target-libjava: \ configure-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39228,11 +43238,11 @@ maybe-dvi-target-libjava: dvi-target-libjava dvi-target-libjava: \ configure-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39254,11 +43264,11 @@ maybe-pdf-target-libjava: pdf-target-libjava pdf-target-libjava: \ configure-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39280,11 +43290,11 @@ maybe-html-target-libjava: html-target-libjava html-target-libjava: \ configure-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39306,11 +43316,11 @@ maybe-TAGS-target-libjava: TAGS-target-libjava TAGS-target-libjava: \ configure-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39333,11 +43343,11 @@ install-info-target-libjava: \ configure-target-libjava \ info-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39360,11 +43370,11 @@ install-pdf-target-libjava: \ configure-target-libjava \ pdf-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39387,11 +43397,11 @@ install-html-target-libjava: \ configure-target-libjava \ html-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39413,11 +43423,11 @@ maybe-installcheck-target-libjava: installcheck-target-libjava installcheck-target-libjava: \ configure-target-libjava @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39438,11 +43448,11 @@ maybe-mostlyclean-target-libjava: mostlyclean-target-libjava mostlyclean-target-libjava: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39463,11 +43473,11 @@ maybe-clean-target-libjava: clean-target-libjava clean-target-libjava: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39488,11 +43498,11 @@ maybe-distclean-target-libjava: distclean-target-libjava distclean-target-libjava: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39513,11 +43523,11 @@ maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava maintainer-clean-target-libjava: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39547,8 +43557,8 @@ configure-target-zlib: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for zlib..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/zlib/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/zlib/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; then \ rm -f $(TARGET_SUBDIR)/zlib/multilib.tmp; \ @@ -39560,7 +43570,7 @@ configure-target-zlib: mv $(TARGET_SUBDIR)/zlib/multilib.tmp $(TARGET_SUBDIR)/zlib/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/zlib; \ cd "$(TARGET_SUBDIR)/zlib" || exit 1; \ @@ -39569,12 +43579,13 @@ configure-target-zlib: *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ + module_srcdir=zlib; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-zlib @@ -39659,11 +43670,11 @@ maybe-info-target-zlib: info-target-zlib info-target-zlib: \ configure-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing info in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39685,11 +43696,11 @@ maybe-dvi-target-zlib: dvi-target-zlib dvi-target-zlib: \ configure-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39711,11 +43722,11 @@ maybe-pdf-target-zlib: pdf-target-zlib pdf-target-zlib: \ configure-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39737,11 +43748,11 @@ maybe-html-target-zlib: html-target-zlib html-target-zlib: \ configure-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing html in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39763,11 +43774,11 @@ maybe-TAGS-target-zlib: TAGS-target-zlib TAGS-target-zlib: \ configure-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39790,11 +43801,11 @@ install-info-target-zlib: \ configure-target-zlib \ info-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39817,11 +43828,11 @@ install-pdf-target-zlib: \ configure-target-zlib \ pdf-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39844,11 +43855,11 @@ install-html-target-zlib: \ configure-target-zlib \ html-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39870,11 +43881,11 @@ maybe-installcheck-target-zlib: installcheck-target-zlib installcheck-target-zlib: \ configure-target-zlib @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39895,11 +43906,11 @@ maybe-mostlyclean-target-zlib: mostlyclean-target-zlib mostlyclean-target-zlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39920,11 +43931,11 @@ maybe-clean-target-zlib: clean-target-zlib clean-target-zlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39945,11 +43956,11 @@ maybe-distclean-target-zlib: distclean-target-zlib distclean-target-zlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -39970,11 +43981,11 @@ maybe-maintainer-clean-target-zlib: maintainer-clean-target-zlib maintainer-clean-target-zlib: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40004,8 +44015,8 @@ configure-target-boehm-gc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for boehm-gc..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/boehm-gc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/boehm-gc/multilib.tmp; \ @@ -40017,7 +44028,7 @@ configure-target-boehm-gc: mv $(TARGET_SUBDIR)/boehm-gc/multilib.tmp $(TARGET_SUBDIR)/boehm-gc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \ cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \ @@ -40026,12 +44037,13 @@ configure-target-boehm-gc: *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/boehm-gc"; \ - libsrcdir="$$s/boehm-gc"; \ + module_srcdir=boehm-gc; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-boehm-gc @@ -40116,11 +44128,11 @@ maybe-info-target-boehm-gc: info-target-boehm-gc info-target-boehm-gc: \ configure-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing info in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40142,11 +44154,11 @@ maybe-dvi-target-boehm-gc: dvi-target-boehm-gc dvi-target-boehm-gc: \ configure-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40168,11 +44180,11 @@ maybe-pdf-target-boehm-gc: pdf-target-boehm-gc pdf-target-boehm-gc: \ configure-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40194,11 +44206,11 @@ maybe-html-target-boehm-gc: html-target-boehm-gc html-target-boehm-gc: \ configure-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing html in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40220,11 +44232,11 @@ maybe-TAGS-target-boehm-gc: TAGS-target-boehm-gc TAGS-target-boehm-gc: \ configure-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40247,11 +44259,11 @@ install-info-target-boehm-gc: \ configure-target-boehm-gc \ info-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40274,11 +44286,11 @@ install-pdf-target-boehm-gc: \ configure-target-boehm-gc \ pdf-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40301,11 +44313,11 @@ install-html-target-boehm-gc: \ configure-target-boehm-gc \ html-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40327,11 +44339,11 @@ maybe-installcheck-target-boehm-gc: installcheck-target-boehm-gc installcheck-target-boehm-gc: \ configure-target-boehm-gc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40352,11 +44364,11 @@ maybe-mostlyclean-target-boehm-gc: mostlyclean-target-boehm-gc mostlyclean-target-boehm-gc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40377,11 +44389,11 @@ maybe-clean-target-boehm-gc: clean-target-boehm-gc clean-target-boehm-gc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40402,11 +44414,11 @@ maybe-distclean-target-boehm-gc: distclean-target-boehm-gc distclean-target-boehm-gc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40427,11 +44439,11 @@ maybe-maintainer-clean-target-boehm-gc: maintainer-clean-target-boehm-gc maintainer-clean-target-boehm-gc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40461,8 +44473,8 @@ configure-target-rda: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for rda..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/rda/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/rda/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; then \ rm -f $(TARGET_SUBDIR)/rda/multilib.tmp; \ @@ -40474,7 +44486,7 @@ configure-target-rda: mv $(TARGET_SUBDIR)/rda/multilib.tmp $(TARGET_SUBDIR)/rda/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/rda; \ cd "$(TARGET_SUBDIR)/rda" || exit 1; \ @@ -40483,12 +44495,13 @@ configure-target-rda: *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/rda"; \ - libsrcdir="$$s/rda"; \ + module_srcdir=rda; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-rda @@ -40573,11 +44586,11 @@ maybe-info-target-rda: info-target-rda info-target-rda: \ configure-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing info in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40599,11 +44612,11 @@ maybe-dvi-target-rda: dvi-target-rda dvi-target-rda: \ configure-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40625,11 +44638,11 @@ maybe-pdf-target-rda: pdf-target-rda pdf-target-rda: \ configure-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40651,11 +44664,11 @@ maybe-html-target-rda: html-target-rda html-target-rda: \ configure-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing html in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40677,11 +44690,11 @@ maybe-TAGS-target-rda: TAGS-target-rda TAGS-target-rda: \ configure-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40704,11 +44717,11 @@ install-info-target-rda: \ configure-target-rda \ info-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40731,11 +44744,11 @@ install-pdf-target-rda: \ configure-target-rda \ pdf-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40758,11 +44771,11 @@ install-html-target-rda: \ configure-target-rda \ html-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40784,11 +44797,11 @@ maybe-installcheck-target-rda: installcheck-target-rda installcheck-target-rda: \ configure-target-rda @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40809,11 +44822,11 @@ maybe-mostlyclean-target-rda: mostlyclean-target-rda mostlyclean-target-rda: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40834,11 +44847,11 @@ maybe-clean-target-rda: clean-target-rda clean-target-rda: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40859,11 +44872,11 @@ maybe-distclean-target-rda: distclean-target-rda distclean-target-rda: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40884,11 +44897,11 @@ maybe-maintainer-clean-target-rda: maintainer-clean-target-rda maintainer-clean-target-rda: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -40918,8 +44931,8 @@ configure-target-libada: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libada..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libada/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libada/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libada/multilib.tmp; \ @@ -40931,7 +44944,7 @@ configure-target-libada: mv $(TARGET_SUBDIR)/libada/multilib.tmp $(TARGET_SUBDIR)/libada/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libada; \ cd "$(TARGET_SUBDIR)/libada" || exit 1; \ @@ -40940,12 +44953,13 @@ configure-target-libada: *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libada"; \ - libsrcdir="$$s/libada"; \ + module_srcdir=libada; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libada @@ -41030,11 +45044,11 @@ maybe-info-target-libada: info-target-libada info-target-libada: \ configure-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41056,11 +45070,11 @@ maybe-dvi-target-libada: dvi-target-libada dvi-target-libada: \ configure-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41082,11 +45096,11 @@ maybe-pdf-target-libada: pdf-target-libada pdf-target-libada: \ configure-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41108,11 +45122,11 @@ maybe-html-target-libada: html-target-libada html-target-libada: \ configure-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41134,11 +45148,11 @@ maybe-TAGS-target-libada: TAGS-target-libada TAGS-target-libada: \ configure-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41161,11 +45175,11 @@ install-info-target-libada: \ configure-target-libada \ info-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41188,11 +45202,11 @@ install-pdf-target-libada: \ configure-target-libada \ pdf-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41215,11 +45229,11 @@ install-html-target-libada: \ configure-target-libada \ html-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41241,11 +45255,11 @@ maybe-installcheck-target-libada: installcheck-target-libada installcheck-target-libada: \ configure-target-libada @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41266,11 +45280,11 @@ maybe-mostlyclean-target-libada: mostlyclean-target-libada mostlyclean-target-libada: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41291,11 +45305,11 @@ maybe-clean-target-libada: clean-target-libada clean-target-libada: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41316,11 +45330,11 @@ maybe-distclean-target-libada: distclean-target-libada distclean-target-libada: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41341,11 +45355,11 @@ maybe-maintainer-clean-target-libada: maintainer-clean-target-libada maintainer-clean-target-libada: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41374,8 +45388,8 @@ configure-target-libgomp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libgomp..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41387,7 +45401,7 @@ configure-target-libgomp: mv $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgomp/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgomp; \ cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \ @@ -41396,12 +45410,13 @@ configure-target-libgomp: *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ + module_srcdir=libgomp; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libgomp @@ -41418,7 +45433,7 @@ configure-stage1-target-libgomp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE1_TFLAGS)"; \ echo "Checking multilib configuration for libgomp..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41434,19 +45449,20 @@ configure-stage1-target-libgomp: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 1 in $(TARGET_SUBDIR)/libgomp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libgomp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ cd $(TARGET_SUBDIR)/libgomp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgomp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ + \ $(STAGE1_CONFIGURE_FLAGS) @endif target-libgomp-bootstrap @@ -41461,7 +45477,7 @@ configure-stage2-target-libgomp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE2_TFLAGS)"; \ echo "Checking multilib configuration for libgomp..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41478,19 +45494,19 @@ configure-stage2-target-libgomp: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 2 in $(TARGET_SUBDIR)/libgomp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libgomp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ cd $(TARGET_SUBDIR)/libgomp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgomp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE2_CONFIGURE_FLAGS) @endif target-libgomp-bootstrap @@ -41506,7 +45522,7 @@ configure-stage3-target-libgomp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE3_TFLAGS)"; \ echo "Checking multilib configuration for libgomp..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41523,19 +45539,19 @@ configure-stage3-target-libgomp: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 3 in $(TARGET_SUBDIR)/libgomp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libgomp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ cd $(TARGET_SUBDIR)/libgomp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgomp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE3_CONFIGURE_FLAGS) @endif target-libgomp-bootstrap @@ -41551,7 +45567,7 @@ configure-stage4-target-libgomp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE4_TFLAGS)"; \ echo "Checking multilib configuration for libgomp..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41568,19 +45584,19 @@ configure-stage4-target-libgomp: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage 4 in $(TARGET_SUBDIR)/libgomp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libgomp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ cd $(TARGET_SUBDIR)/libgomp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgomp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGE4_CONFIGURE_FLAGS) @endif target-libgomp-bootstrap @@ -41596,7 +45612,7 @@ configure-stageprofile-target-libgomp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEprofile_TFLAGS)"; \ echo "Checking multilib configuration for libgomp..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41613,19 +45629,19 @@ configure-stageprofile-target-libgomp: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage profile in $(TARGET_SUBDIR)/libgomp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libgomp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ cd $(TARGET_SUBDIR)/libgomp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgomp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEprofile_CONFIGURE_FLAGS) @endif target-libgomp-bootstrap @@ -41641,7 +45657,7 @@ configure-stagefeedback-target-libgomp: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEfeedback_TFLAGS)"; \ echo "Checking multilib configuration for libgomp..."; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null ; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgomp/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgomp/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgomp/multilib.tmp $(TARGET_SUBDIR)/libgomp/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgomp/multilib.tmp; \ @@ -41658,19 +45674,19 @@ configure-stagefeedback-target-libgomp: CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ - echo Configuring stage feedback in $(TARGET_SUBDIR)/libgomp ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libgomp; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp; \ cd $(TARGET_SUBDIR)/libgomp || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ *) topdir=`echo $(TARGET_SUBDIR)/libgomp/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgomp"; \ - libsrcdir="$$s/libgomp"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libgomp; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ --with-build-libsubdir=$(HOST_SUBDIR) \ $(STAGEfeedback_CONFIGURE_FLAGS) @endif target-libgomp-bootstrap @@ -42004,11 +46020,11 @@ maybe-info-target-libgomp: info-target-libgomp info-target-libgomp: \ configure-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42030,11 +46046,11 @@ maybe-dvi-target-libgomp: dvi-target-libgomp dvi-target-libgomp: \ configure-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42056,11 +46072,11 @@ maybe-pdf-target-libgomp: pdf-target-libgomp pdf-target-libgomp: \ configure-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42082,11 +46098,11 @@ maybe-html-target-libgomp: html-target-libgomp html-target-libgomp: \ configure-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42108,11 +46124,11 @@ maybe-TAGS-target-libgomp: TAGS-target-libgomp TAGS-target-libgomp: \ configure-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42135,11 +46151,11 @@ install-info-target-libgomp: \ configure-target-libgomp \ info-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42162,11 +46178,11 @@ install-pdf-target-libgomp: \ configure-target-libgomp \ pdf-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42189,11 +46205,11 @@ install-html-target-libgomp: \ configure-target-libgomp \ html-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42215,11 +46231,11 @@ maybe-installcheck-target-libgomp: installcheck-target-libgomp installcheck-target-libgomp: \ configure-target-libgomp @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42240,11 +46256,11 @@ maybe-mostlyclean-target-libgomp: mostlyclean-target-libgomp mostlyclean-target-libgomp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42265,11 +46281,11 @@ maybe-clean-target-libgomp: clean-target-libgomp clean-target-libgomp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42290,11 +46306,11 @@ maybe-distclean-target-libgomp: distclean-target-libgomp distclean-target-libgomp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42315,11 +46331,11 @@ maybe-maintainer-clean-target-libgomp: maintainer-clean-target-libgomp maintainer-clean-target-libgomp: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgomp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgomp"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42349,8 +46365,8 @@ configure-target-libitm: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libitm..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libitm/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libitm/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libitm/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libitm/multilib.tmp $(TARGET_SUBDIR)/libitm/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libitm/multilib.tmp; \ @@ -42362,7 +46378,7 @@ configure-target-libitm: mv $(TARGET_SUBDIR)/libitm/multilib.tmp $(TARGET_SUBDIR)/libitm/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libitm/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libitm; \ cd "$(TARGET_SUBDIR)/libitm" || exit 1; \ @@ -42371,12 +46387,13 @@ configure-target-libitm: *) topdir=`echo $(TARGET_SUBDIR)/libitm/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libitm"; \ - libsrcdir="$$s/libitm"; \ + module_srcdir=libitm; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libitm @@ -42461,11 +46478,11 @@ maybe-info-target-libitm: info-target-libitm info-target-libitm: \ configure-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42487,11 +46504,11 @@ maybe-dvi-target-libitm: dvi-target-libitm dvi-target-libitm: \ configure-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42513,11 +46530,11 @@ maybe-pdf-target-libitm: pdf-target-libitm pdf-target-libitm: \ configure-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42539,11 +46556,11 @@ maybe-html-target-libitm: html-target-libitm html-target-libitm: \ configure-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42565,11 +46582,11 @@ maybe-TAGS-target-libitm: TAGS-target-libitm TAGS-target-libitm: \ configure-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42592,11 +46609,11 @@ install-info-target-libitm: \ configure-target-libitm \ info-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42619,11 +46636,11 @@ install-pdf-target-libitm: \ configure-target-libitm \ pdf-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42646,11 +46663,11 @@ install-html-target-libitm: \ configure-target-libitm \ html-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42672,11 +46689,11 @@ maybe-installcheck-target-libitm: installcheck-target-libitm installcheck-target-libitm: \ configure-target-libitm @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42697,11 +46714,11 @@ maybe-mostlyclean-target-libitm: mostlyclean-target-libitm mostlyclean-target-libitm: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42722,11 +46739,11 @@ maybe-clean-target-libitm: clean-target-libitm clean-target-libitm: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42747,11 +46764,11 @@ maybe-distclean-target-libitm: distclean-target-libitm distclean-target-libitm: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42772,11 +46789,11 @@ maybe-maintainer-clean-target-libitm: maintainer-clean-target-libitm maintainer-clean-target-libitm: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libitm/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libitm" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libitm"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42806,8 +46823,8 @@ configure-target-libatomic: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libatomic..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libatomic/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libatomic/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libatomic/multilib.tmp; \ @@ -42819,7 +46836,7 @@ configure-target-libatomic: mv $(TARGET_SUBDIR)/libatomic/multilib.tmp $(TARGET_SUBDIR)/libatomic/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libatomic/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libatomic; \ cd "$(TARGET_SUBDIR)/libatomic" || exit 1; \ @@ -42828,12 +46845,13 @@ configure-target-libatomic: *) topdir=`echo $(TARGET_SUBDIR)/libatomic/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libatomic"; \ - libsrcdir="$$s/libatomic"; \ + module_srcdir=libatomic; \ rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + CONFIG_SITE=no-such-file $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} \ || exit 1 @endif target-libatomic @@ -42918,11 +46936,11 @@ maybe-info-target-libatomic: info-target-libatomic info-target-libatomic: \ configure-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42944,11 +46962,11 @@ maybe-dvi-target-libatomic: dvi-target-libatomic dvi-target-libatomic: \ configure-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42970,11 +46988,11 @@ maybe-pdf-target-libatomic: pdf-target-libatomic pdf-target-libatomic: \ configure-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -42996,11 +47014,11 @@ maybe-html-target-libatomic: html-target-libatomic html-target-libatomic: \ configure-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43022,11 +47040,11 @@ maybe-TAGS-target-libatomic: TAGS-target-libatomic TAGS-target-libatomic: \ configure-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43049,11 +47067,11 @@ install-info-target-libatomic: \ configure-target-libatomic \ info-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43076,11 +47094,11 @@ install-pdf-target-libatomic: \ configure-target-libatomic \ pdf-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43103,11 +47121,11 @@ install-html-target-libatomic: \ configure-target-libatomic \ html-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43129,11 +47147,11 @@ maybe-installcheck-target-libatomic: installcheck-target-libatomic installcheck-target-libatomic: \ configure-target-libatomic @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43154,11 +47172,11 @@ maybe-mostlyclean-target-libatomic: mostlyclean-target-libatomic mostlyclean-target-libatomic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43179,11 +47197,11 @@ maybe-clean-target-libatomic: clean-target-libatomic clean-target-libatomic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43204,11 +47222,11 @@ maybe-distclean-target-libatomic: distclean-target-libatomic distclean-target-libatomic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43229,11 +47247,11 @@ maybe-maintainer-clean-target-libatomic: maintainer-clean-target-libatomic maintainer-clean-target-libatomic: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libatomic/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libatomic" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libatomic"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -43249,13 +47267,6 @@ maintainer-clean-target-libatomic: -@if target-libmudflap -.PHONY: check-target-libmudflap-c++ -check-target-libmudflap-c++: - $(MAKE) RUNTESTFLAGS="$(RUNTESTFLAGS) c++frags.exp" check-target-libmudflap - -@endif target-libmudflap - @if target-libgomp .PHONY: check-target-libgomp-c++ check-target-libgomp-c++: @@ -43283,7 +47294,7 @@ cross: all-build all-gas all-ld echo "Building the C and C++ compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) LANGUAGES="c c++" @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all @endif gcc-no-bootstrap @@ -43304,7 +47315,7 @@ check-gcc-c++: s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); -check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libmudflap-c++ check-target-libitm-c++ check-target-libgomp-c++ +check-c++: check-gcc-c++ check-target-libstdc++-v3 check-target-libitm-c++ check-target-libgomp-c++ .PHONY: check-gcc-fortran check-fortran check-gcc-fortran: @@ -43423,216 +47434,226 @@ objext = .o stage1-start:: @: $(MAKE); $(stage); \ - echo stage1 > stage_current ; \ + echo stage1 > stage_current; \ echo stage1 > stage_last; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \ mkdir stage1-bfd; \ - mv stage1-bfd bfd + mv stage1-bfd bfd @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \ mkdir stage1-opcodes; \ - mv stage1-opcodes opcodes + mv stage1-opcodes opcodes @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \ mkdir stage1-binutils; \ - mv stage1-binutils binutils + mv stage1-binutils binutils @endif binutils +@if fixincludes + @cd $(HOST_SUBDIR); [ -d stage1-fixincludes ] || \ + mkdir stage1-fixincludes; \ + mv stage1-fixincludes fixincludes +@endif fixincludes @if gas @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \ mkdir stage1-gas; \ - mv stage1-gas gas + mv stage1-gas gas @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \ mkdir stage1-gcc; \ - mv stage1-gcc gcc + mv stage1-gcc gcc @endif gcc @if gmp @cd $(HOST_SUBDIR); [ -d stage1-gmp ] || \ mkdir stage1-gmp; \ - mv stage1-gmp gmp + mv stage1-gmp gmp @endif gmp @if mpfr @cd $(HOST_SUBDIR); [ -d stage1-mpfr ] || \ mkdir stage1-mpfr; \ - mv stage1-mpfr mpfr + mv stage1-mpfr mpfr @endif mpfr @if mpc @cd $(HOST_SUBDIR); [ -d stage1-mpc ] || \ mkdir stage1-mpc; \ - mv stage1-mpc mpc + mv stage1-mpc mpc @endif mpc @if isl @cd $(HOST_SUBDIR); [ -d stage1-isl ] || \ mkdir stage1-isl; \ - mv stage1-isl isl + mv stage1-isl isl @endif isl -@if cloog - @cd $(HOST_SUBDIR); [ -d stage1-cloog ] || \ - mkdir stage1-cloog; \ - mv stage1-cloog cloog -@endif cloog @if libelf @cd $(HOST_SUBDIR); [ -d stage1-libelf ] || \ mkdir stage1-libelf; \ - mv stage1-libelf libelf + mv stage1-libelf libelf @endif libelf @if gold @cd $(HOST_SUBDIR); [ -d stage1-gold ] || \ mkdir stage1-gold; \ - mv stage1-gold gold + mv stage1-gold gold @endif gold @if intl @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \ mkdir stage1-intl; \ - mv stage1-intl intl + mv stage1-intl intl @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \ mkdir stage1-ld; \ - mv stage1-ld ld + mv stage1-ld ld @endif ld @if libbacktrace @cd $(HOST_SUBDIR); [ -d stage1-libbacktrace ] || \ mkdir stage1-libbacktrace; \ - mv stage1-libbacktrace libbacktrace + mv stage1-libbacktrace libbacktrace @endif libbacktrace @if libcpp @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \ mkdir stage1-libcpp; \ - mv stage1-libcpp libcpp + mv stage1-libcpp libcpp @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage1-libdecnumber ] || \ mkdir stage1-libdecnumber; \ - mv stage1-libdecnumber libdecnumber + mv stage1-libdecnumber libdecnumber @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \ mkdir stage1-libiberty; \ - mv stage1-libiberty libiberty + mv stage1-libiberty libiberty @endif libiberty +@if libiberty-linker-plugin + @cd $(HOST_SUBDIR); [ -d stage1-libiberty-linker-plugin ] || \ + mkdir stage1-libiberty-linker-plugin; \ + mv stage1-libiberty-linker-plugin libiberty-linker-plugin +@endif libiberty-linker-plugin @if zlib @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \ mkdir stage1-zlib; \ - mv stage1-zlib zlib + mv stage1-zlib zlib @endif zlib @if lto-plugin @cd $(HOST_SUBDIR); [ -d stage1-lto-plugin ] || \ mkdir stage1-lto-plugin; \ - mv stage1-lto-plugin lto-plugin + mv stage1-lto-plugin lto-plugin @endif lto-plugin @[ -d stage1-$(TARGET_SUBDIR) ] || \ mkdir stage1-$(TARGET_SUBDIR); \ - mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) + mv stage1-$(TARGET_SUBDIR) $(TARGET_SUBDIR) stage1-end:: @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage1-bfd ; \ + @if test -d $(HOST_SUBDIR)/bfd; then \ + cd $(HOST_SUBDIR); mv bfd stage1-bfd; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage1-opcodes ; \ + @if test -d $(HOST_SUBDIR)/opcodes; then \ + cd $(HOST_SUBDIR); mv opcodes stage1-opcodes; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage1-binutils ; \ + @if test -d $(HOST_SUBDIR)/binutils; then \ + cd $(HOST_SUBDIR); mv binutils stage1-binutils; \ fi @endif binutils +@if fixincludes + @if test -d $(HOST_SUBDIR)/fixincludes; then \ + cd $(HOST_SUBDIR); mv fixincludes stage1-fixincludes; \ + fi +@endif fixincludes @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage1-gas ; \ + @if test -d $(HOST_SUBDIR)/gas; then \ + cd $(HOST_SUBDIR); mv gas stage1-gas; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage1-gcc ; \ + @if test -d $(HOST_SUBDIR)/gcc; then \ + cd $(HOST_SUBDIR); mv gcc stage1-gcc; \ fi @endif gcc @if gmp - @if test -d $(HOST_SUBDIR)/gmp ; then \ - cd $(HOST_SUBDIR); mv gmp stage1-gmp ; \ + @if test -d $(HOST_SUBDIR)/gmp; then \ + cd $(HOST_SUBDIR); mv gmp stage1-gmp; \ fi @endif gmp @if mpfr - @if test -d $(HOST_SUBDIR)/mpfr ; then \ - cd $(HOST_SUBDIR); mv mpfr stage1-mpfr ; \ + @if test -d $(HOST_SUBDIR)/mpfr; then \ + cd $(HOST_SUBDIR); mv mpfr stage1-mpfr; \ fi @endif mpfr @if mpc - @if test -d $(HOST_SUBDIR)/mpc ; then \ - cd $(HOST_SUBDIR); mv mpc stage1-mpc ; \ + @if test -d $(HOST_SUBDIR)/mpc; then \ + cd $(HOST_SUBDIR); mv mpc stage1-mpc; \ fi @endif mpc @if isl - @if test -d $(HOST_SUBDIR)/isl ; then \ - cd $(HOST_SUBDIR); mv isl stage1-isl ; \ + @if test -d $(HOST_SUBDIR)/isl; then \ + cd $(HOST_SUBDIR); mv isl stage1-isl; \ fi @endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stage1-cloog ; \ - fi -@endif cloog @if libelf - @if test -d $(HOST_SUBDIR)/libelf ; then \ - cd $(HOST_SUBDIR); mv libelf stage1-libelf ; \ + @if test -d $(HOST_SUBDIR)/libelf; then \ + cd $(HOST_SUBDIR); mv libelf stage1-libelf; \ fi @endif libelf @if gold - @if test -d $(HOST_SUBDIR)/gold ; then \ - cd $(HOST_SUBDIR); mv gold stage1-gold ; \ + @if test -d $(HOST_SUBDIR)/gold; then \ + cd $(HOST_SUBDIR); mv gold stage1-gold; \ fi @endif gold @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage1-intl ; \ + @if test -d $(HOST_SUBDIR)/intl; then \ + cd $(HOST_SUBDIR); mv intl stage1-intl; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage1-ld ; \ + @if test -d $(HOST_SUBDIR)/ld; then \ + cd $(HOST_SUBDIR); mv ld stage1-ld; \ fi @endif ld @if libbacktrace - @if test -d $(HOST_SUBDIR)/libbacktrace ; then \ - cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace ; \ + @if test -d $(HOST_SUBDIR)/libbacktrace; then \ + cd $(HOST_SUBDIR); mv libbacktrace stage1-libbacktrace; \ fi @endif libbacktrace @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage1-libcpp ; \ + @if test -d $(HOST_SUBDIR)/libcpp; then \ + cd $(HOST_SUBDIR); mv libcpp stage1-libcpp; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber ; \ + @if test -d $(HOST_SUBDIR)/libdecnumber; then \ + cd $(HOST_SUBDIR); mv libdecnumber stage1-libdecnumber; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage1-libiberty ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stage1-libiberty; \ fi @endif libiberty +@if libiberty-linker-plugin + @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \ + cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage1-libiberty-linker-plugin; \ + fi +@endif libiberty-linker-plugin @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage1-zlib ; \ + @if test -d $(HOST_SUBDIR)/zlib; then \ + cd $(HOST_SUBDIR); mv zlib stage1-zlib; \ fi @endif zlib @if lto-plugin - @if test -d $(HOST_SUBDIR)/lto-plugin ; then \ - cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin ; \ + @if test -d $(HOST_SUBDIR)/lto-plugin; then \ + cd $(HOST_SUBDIR); mv lto-plugin stage1-lto-plugin; \ fi @endif lto-plugin - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; \ + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \ fi rm -f stage_current @@ -43643,8 +47664,8 @@ stage1-end:: stage1-bubble:: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage1-lean ; then \ - echo Skipping rebuild of stage1 ; \ + if test -f stage1-lean ; then \ + echo Skipping rebuild of stage1; \ else \ $(MAKE) stage1-start; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \ @@ -43676,576 +47697,600 @@ distclean-stage1:: stage2-start:: @: $(MAKE); $(stage); \ - echo stage2 > stage_current ; \ + echo stage2 > stage_current; \ echo stage2 > stage_last; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \ mkdir stage2-bfd; \ - mv stage2-bfd bfd ; \ + mv stage2-bfd bfd; \ mv stage1-bfd prev-bfd || test -f stage1-lean @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \ mkdir stage2-opcodes; \ - mv stage2-opcodes opcodes ; \ + mv stage2-opcodes opcodes; \ mv stage1-opcodes prev-opcodes || test -f stage1-lean @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \ mkdir stage2-binutils; \ - mv stage2-binutils binutils ; \ + mv stage2-binutils binutils; \ mv stage1-binutils prev-binutils || test -f stage1-lean @endif binutils +@if fixincludes + @cd $(HOST_SUBDIR); [ -d stage2-fixincludes ] || \ + mkdir stage2-fixincludes; \ + mv stage2-fixincludes fixincludes; \ + mv stage1-fixincludes prev-fixincludes || test -f stage1-lean +@endif fixincludes @if gas @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \ mkdir stage2-gas; \ - mv stage2-gas gas ; \ + mv stage2-gas gas; \ mv stage1-gas prev-gas || test -f stage1-lean @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \ mkdir stage2-gcc; \ - mv stage2-gcc gcc ; \ + mv stage2-gcc gcc; \ mv stage1-gcc prev-gcc || test -f stage1-lean @endif gcc @if gmp @cd $(HOST_SUBDIR); [ -d stage2-gmp ] || \ mkdir stage2-gmp; \ - mv stage2-gmp gmp ; \ + mv stage2-gmp gmp; \ mv stage1-gmp prev-gmp || test -f stage1-lean @endif gmp @if mpfr @cd $(HOST_SUBDIR); [ -d stage2-mpfr ] || \ mkdir stage2-mpfr; \ - mv stage2-mpfr mpfr ; \ + mv stage2-mpfr mpfr; \ mv stage1-mpfr prev-mpfr || test -f stage1-lean @endif mpfr @if mpc @cd $(HOST_SUBDIR); [ -d stage2-mpc ] || \ mkdir stage2-mpc; \ - mv stage2-mpc mpc ; \ + mv stage2-mpc mpc; \ mv stage1-mpc prev-mpc || test -f stage1-lean @endif mpc @if isl @cd $(HOST_SUBDIR); [ -d stage2-isl ] || \ mkdir stage2-isl; \ - mv stage2-isl isl ; \ + mv stage2-isl isl; \ mv stage1-isl prev-isl || test -f stage1-lean @endif isl -@if cloog - @cd $(HOST_SUBDIR); [ -d stage2-cloog ] || \ - mkdir stage2-cloog; \ - mv stage2-cloog cloog ; \ - mv stage1-cloog prev-cloog || test -f stage1-lean -@endif cloog @if libelf @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \ mkdir stage2-libelf; \ - mv stage2-libelf libelf ; \ + mv stage2-libelf libelf; \ mv stage1-libelf prev-libelf || test -f stage1-lean @endif libelf @if gold @cd $(HOST_SUBDIR); [ -d stage2-gold ] || \ mkdir stage2-gold; \ - mv stage2-gold gold ; \ + mv stage2-gold gold; \ mv stage1-gold prev-gold || test -f stage1-lean @endif gold @if intl @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \ mkdir stage2-intl; \ - mv stage2-intl intl ; \ + mv stage2-intl intl; \ mv stage1-intl prev-intl || test -f stage1-lean @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \ mkdir stage2-ld; \ - mv stage2-ld ld ; \ + mv stage2-ld ld; \ mv stage1-ld prev-ld || test -f stage1-lean @endif ld @if libbacktrace @cd $(HOST_SUBDIR); [ -d stage2-libbacktrace ] || \ mkdir stage2-libbacktrace; \ - mv stage2-libbacktrace libbacktrace ; \ + mv stage2-libbacktrace libbacktrace; \ mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean @endif libbacktrace @if libcpp @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \ mkdir stage2-libcpp; \ - mv stage2-libcpp libcpp ; \ + mv stage2-libcpp libcpp; \ mv stage1-libcpp prev-libcpp || test -f stage1-lean @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage2-libdecnumber ] || \ mkdir stage2-libdecnumber; \ - mv stage2-libdecnumber libdecnumber ; \ + mv stage2-libdecnumber libdecnumber; \ mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \ mkdir stage2-libiberty; \ - mv stage2-libiberty libiberty ; \ + mv stage2-libiberty libiberty; \ mv stage1-libiberty prev-libiberty || test -f stage1-lean @endif libiberty +@if libiberty-linker-plugin + @cd $(HOST_SUBDIR); [ -d stage2-libiberty-linker-plugin ] || \ + mkdir stage2-libiberty-linker-plugin; \ + mv stage2-libiberty-linker-plugin libiberty-linker-plugin; \ + mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean +@endif libiberty-linker-plugin @if zlib @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \ mkdir stage2-zlib; \ - mv stage2-zlib zlib ; \ + mv stage2-zlib zlib; \ mv stage1-zlib prev-zlib || test -f stage1-lean @endif zlib @if lto-plugin @cd $(HOST_SUBDIR); [ -d stage2-lto-plugin ] || \ mkdir stage2-lto-plugin; \ - mv stage2-lto-plugin lto-plugin ; \ + mv stage2-lto-plugin lto-plugin; \ mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean @endif lto-plugin @[ -d stage2-$(TARGET_SUBDIR) ] || \ mkdir stage2-$(TARGET_SUBDIR); \ - mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + mv stage2-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \ mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean stage2-end:: @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage2-bfd ; \ - mv prev-bfd stage1-bfd ; : ; \ + @if test -d $(HOST_SUBDIR)/bfd; then \ + cd $(HOST_SUBDIR); mv bfd stage2-bfd; \ + mv prev-bfd stage1-bfd; : ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage2-opcodes ; \ - mv prev-opcodes stage1-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR)/opcodes; then \ + cd $(HOST_SUBDIR); mv opcodes stage2-opcodes; \ + mv prev-opcodes stage1-opcodes; : ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage2-binutils ; \ - mv prev-binutils stage1-binutils ; : ; \ + @if test -d $(HOST_SUBDIR)/binutils; then \ + cd $(HOST_SUBDIR); mv binutils stage2-binutils; \ + mv prev-binutils stage1-binutils; : ; \ fi @endif binutils +@if fixincludes + @if test -d $(HOST_SUBDIR)/fixincludes; then \ + cd $(HOST_SUBDIR); mv fixincludes stage2-fixincludes; \ + mv prev-fixincludes stage1-fixincludes; : ; \ + fi +@endif fixincludes @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage2-gas ; \ - mv prev-gas stage1-gas ; : ; \ + @if test -d $(HOST_SUBDIR)/gas; then \ + cd $(HOST_SUBDIR); mv gas stage2-gas; \ + mv prev-gas stage1-gas; : ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage2-gcc ; \ - mv prev-gcc stage1-gcc ; : ; \ + @if test -d $(HOST_SUBDIR)/gcc; then \ + cd $(HOST_SUBDIR); mv gcc stage2-gcc; \ + mv prev-gcc stage1-gcc; : ; \ fi @endif gcc @if gmp - @if test -d $(HOST_SUBDIR)/gmp ; then \ - cd $(HOST_SUBDIR); mv gmp stage2-gmp ; \ - mv prev-gmp stage1-gmp ; : ; \ + @if test -d $(HOST_SUBDIR)/gmp; then \ + cd $(HOST_SUBDIR); mv gmp stage2-gmp; \ + mv prev-gmp stage1-gmp; : ; \ fi @endif gmp @if mpfr - @if test -d $(HOST_SUBDIR)/mpfr ; then \ - cd $(HOST_SUBDIR); mv mpfr stage2-mpfr ; \ - mv prev-mpfr stage1-mpfr ; : ; \ + @if test -d $(HOST_SUBDIR)/mpfr; then \ + cd $(HOST_SUBDIR); mv mpfr stage2-mpfr; \ + mv prev-mpfr stage1-mpfr; : ; \ fi @endif mpfr @if mpc - @if test -d $(HOST_SUBDIR)/mpc ; then \ - cd $(HOST_SUBDIR); mv mpc stage2-mpc ; \ - mv prev-mpc stage1-mpc ; : ; \ + @if test -d $(HOST_SUBDIR)/mpc; then \ + cd $(HOST_SUBDIR); mv mpc stage2-mpc; \ + mv prev-mpc stage1-mpc; : ; \ fi @endif mpc @if isl - @if test -d $(HOST_SUBDIR)/isl ; then \ - cd $(HOST_SUBDIR); mv isl stage2-isl ; \ - mv prev-isl stage1-isl ; : ; \ + @if test -d $(HOST_SUBDIR)/isl; then \ + cd $(HOST_SUBDIR); mv isl stage2-isl; \ + mv prev-isl stage1-isl; : ; \ + fi +@endif isl +@if libelf + @if test -d $(HOST_SUBDIR)/libelf; then \ + cd $(HOST_SUBDIR); mv libelf stage2-libelf; \ + mv prev-libelf stage1-libelf; : ; \ + fi +@endif libelf +@if gold + @if test -d $(HOST_SUBDIR)/gold; then \ + cd $(HOST_SUBDIR); mv gold stage2-gold; \ + mv prev-gold stage1-gold; : ; \ + fi +@endif gold +@if intl + @if test -d $(HOST_SUBDIR)/intl; then \ + cd $(HOST_SUBDIR); mv intl stage2-intl; \ + mv prev-intl stage1-intl; : ; \ + fi +@endif intl +@if ld + @if test -d $(HOST_SUBDIR)/ld; then \ + cd $(HOST_SUBDIR); mv ld stage2-ld; \ + mv prev-ld stage1-ld; : ; \ + fi +@endif ld +@if libbacktrace + @if test -d $(HOST_SUBDIR)/libbacktrace; then \ + cd $(HOST_SUBDIR); mv libbacktrace stage2-libbacktrace; \ + mv prev-libbacktrace stage1-libbacktrace; : ; \ + fi +@endif libbacktrace +@if libcpp + @if test -d $(HOST_SUBDIR)/libcpp; then \ + cd $(HOST_SUBDIR); mv libcpp stage2-libcpp; \ + mv prev-libcpp stage1-libcpp; : ; \ + fi +@endif libcpp +@if libdecnumber + @if test -d $(HOST_SUBDIR)/libdecnumber; then \ + cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber; \ + mv prev-libdecnumber stage1-libdecnumber; : ; \ + fi +@endif libdecnumber +@if libiberty + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stage2-libiberty; \ + mv prev-libiberty stage1-libiberty; : ; \ + fi +@endif libiberty +@if libiberty-linker-plugin + @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \ + cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage2-libiberty-linker-plugin; \ + mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin; : ; \ + fi +@endif libiberty-linker-plugin +@if zlib + @if test -d $(HOST_SUBDIR)/zlib; then \ + cd $(HOST_SUBDIR); mv zlib stage2-zlib; \ + mv prev-zlib stage1-zlib; : ; \ + fi +@endif zlib +@if lto-plugin + @if test -d $(HOST_SUBDIR)/lto-plugin; then \ + cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin; \ + mv prev-lto-plugin stage1-lto-plugin; : ; \ + fi +@endif lto-plugin + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \ + mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \ + fi + rm -f stage_current + +# Bubble a bug fix through all the stages up to stage 2. They are +# remade, but not reconfigured. The next stage (if any) will not be +# reconfigured either. +.PHONY: stage2-bubble +stage2-bubble:: stage1-bubble + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stage2-lean || test -f stage1-lean ; then \ + echo Skipping rebuild of stage2; \ + else \ + $(MAKE) stage2-start; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \ fi + +.PHONY: all-stage2 clean-stage2 +do-clean: clean-stage2 + +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap + + + +.PHONY: bootstrap2 bootstrap2-lean +bootstrap2: + echo stage2 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + +bootstrap2-lean: + echo stage2 > stage_final + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target + + +# Rules to wipe a stage and all the following ones, also used for cleanstrap +distclean-stage1:: distclean-stage2 +.PHONY: distclean-stage2 +distclean-stage2:: + @: $(MAKE); $(stage) + @test "`cat stage_last`" != stage2 || rm -f stage_last + rm -rf stage2-* + + +@endif gcc-bootstrap + + +.PHONY: stage3-start stage3-end + +stage3-start:: + @: $(MAKE); $(stage); \ + echo stage3 > stage_current; \ + echo stage3 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \ + mkdir stage3-bfd; \ + mv stage3-bfd bfd; \ + mv stage2-bfd prev-bfd || test -f stage2-lean +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \ + mkdir stage3-opcodes; \ + mv stage3-opcodes opcodes; \ + mv stage2-opcodes prev-opcodes || test -f stage2-lean +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \ + mkdir stage3-binutils; \ + mv stage3-binutils binutils; \ + mv stage2-binutils prev-binutils || test -f stage2-lean +@endif binutils +@if fixincludes + @cd $(HOST_SUBDIR); [ -d stage3-fixincludes ] || \ + mkdir stage3-fixincludes; \ + mv stage3-fixincludes fixincludes; \ + mv stage2-fixincludes prev-fixincludes || test -f stage2-lean +@endif fixincludes +@if gas + @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \ + mkdir stage3-gas; \ + mv stage3-gas gas; \ + mv stage2-gas prev-gas || test -f stage2-lean +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \ + mkdir stage3-gcc; \ + mv stage3-gcc gcc; \ + mv stage2-gcc prev-gcc || test -f stage2-lean +@endif gcc +@if gmp + @cd $(HOST_SUBDIR); [ -d stage3-gmp ] || \ + mkdir stage3-gmp; \ + mv stage3-gmp gmp; \ + mv stage2-gmp prev-gmp || test -f stage2-lean +@endif gmp +@if mpfr + @cd $(HOST_SUBDIR); [ -d stage3-mpfr ] || \ + mkdir stage3-mpfr; \ + mv stage3-mpfr mpfr; \ + mv stage2-mpfr prev-mpfr || test -f stage2-lean +@endif mpfr +@if mpc + @cd $(HOST_SUBDIR); [ -d stage3-mpc ] || \ + mkdir stage3-mpc; \ + mv stage3-mpc mpc; \ + mv stage2-mpc prev-mpc || test -f stage2-lean +@endif mpc +@if isl + @cd $(HOST_SUBDIR); [ -d stage3-isl ] || \ + mkdir stage3-isl; \ + mv stage3-isl isl; \ + mv stage2-isl prev-isl || test -f stage2-lean @endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stage2-cloog ; \ - mv prev-cloog stage1-cloog ; : ; \ +@if libelf + @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \ + mkdir stage3-libelf; \ + mv stage3-libelf libelf; \ + mv stage2-libelf prev-libelf || test -f stage2-lean +@endif libelf +@if gold + @cd $(HOST_SUBDIR); [ -d stage3-gold ] || \ + mkdir stage3-gold; \ + mv stage3-gold gold; \ + mv stage2-gold prev-gold || test -f stage2-lean +@endif gold +@if intl + @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \ + mkdir stage3-intl; \ + mv stage3-intl intl; \ + mv stage2-intl prev-intl || test -f stage2-lean +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \ + mkdir stage3-ld; \ + mv stage3-ld ld; \ + mv stage2-ld prev-ld || test -f stage2-lean +@endif ld +@if libbacktrace + @cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \ + mkdir stage3-libbacktrace; \ + mv stage3-libbacktrace libbacktrace; \ + mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean +@endif libbacktrace +@if libcpp + @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \ + mkdir stage3-libcpp; \ + mv stage3-libcpp libcpp; \ + mv stage2-libcpp prev-libcpp || test -f stage2-lean +@endif libcpp +@if libdecnumber + @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \ + mkdir stage3-libdecnumber; \ + mv stage3-libdecnumber libdecnumber; \ + mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean +@endif libdecnumber +@if libiberty + @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \ + mkdir stage3-libiberty; \ + mv stage3-libiberty libiberty; \ + mv stage2-libiberty prev-libiberty || test -f stage2-lean +@endif libiberty +@if libiberty-linker-plugin + @cd $(HOST_SUBDIR); [ -d stage3-libiberty-linker-plugin ] || \ + mkdir stage3-libiberty-linker-plugin; \ + mv stage3-libiberty-linker-plugin libiberty-linker-plugin; \ + mv stage2-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage2-lean +@endif libiberty-linker-plugin +@if zlib + @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \ + mkdir stage3-zlib; \ + mv stage3-zlib zlib; \ + mv stage2-zlib prev-zlib || test -f stage2-lean +@endif zlib +@if lto-plugin + @cd $(HOST_SUBDIR); [ -d stage3-lto-plugin ] || \ + mkdir stage3-lto-plugin; \ + mv stage3-lto-plugin lto-plugin; \ + mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean +@endif lto-plugin + @[ -d stage3-$(TARGET_SUBDIR) ] || \ + mkdir stage3-$(TARGET_SUBDIR); \ + mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \ + mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean + +stage3-end:: +@if bfd + @if test -d $(HOST_SUBDIR)/bfd; then \ + cd $(HOST_SUBDIR); mv bfd stage3-bfd; \ + mv prev-bfd stage2-bfd; : ; \ + fi +@endif bfd +@if opcodes + @if test -d $(HOST_SUBDIR)/opcodes; then \ + cd $(HOST_SUBDIR); mv opcodes stage3-opcodes; \ + mv prev-opcodes stage2-opcodes; : ; \ + fi +@endif opcodes +@if binutils + @if test -d $(HOST_SUBDIR)/binutils; then \ + cd $(HOST_SUBDIR); mv binutils stage3-binutils; \ + mv prev-binutils stage2-binutils; : ; \ + fi +@endif binutils +@if fixincludes + @if test -d $(HOST_SUBDIR)/fixincludes; then \ + cd $(HOST_SUBDIR); mv fixincludes stage3-fixincludes; \ + mv prev-fixincludes stage2-fixincludes; : ; \ + fi +@endif fixincludes +@if gas + @if test -d $(HOST_SUBDIR)/gas; then \ + cd $(HOST_SUBDIR); mv gas stage3-gas; \ + mv prev-gas stage2-gas; : ; \ fi -@endif cloog +@endif gas +@if gcc + @if test -d $(HOST_SUBDIR)/gcc; then \ + cd $(HOST_SUBDIR); mv gcc stage3-gcc; \ + mv prev-gcc stage2-gcc; : ; \ + fi +@endif gcc +@if gmp + @if test -d $(HOST_SUBDIR)/gmp; then \ + cd $(HOST_SUBDIR); mv gmp stage3-gmp; \ + mv prev-gmp stage2-gmp; : ; \ + fi +@endif gmp +@if mpfr + @if test -d $(HOST_SUBDIR)/mpfr; then \ + cd $(HOST_SUBDIR); mv mpfr stage3-mpfr; \ + mv prev-mpfr stage2-mpfr; : ; \ + fi +@endif mpfr +@if mpc + @if test -d $(HOST_SUBDIR)/mpc; then \ + cd $(HOST_SUBDIR); mv mpc stage3-mpc; \ + mv prev-mpc stage2-mpc; : ; \ + fi +@endif mpc +@if isl + @if test -d $(HOST_SUBDIR)/isl; then \ + cd $(HOST_SUBDIR); mv isl stage3-isl; \ + mv prev-isl stage2-isl; : ; \ + fi +@endif isl @if libelf - @if test -d $(HOST_SUBDIR)/libelf ; then \ - cd $(HOST_SUBDIR); mv libelf stage2-libelf ; \ - mv prev-libelf stage1-libelf ; : ; \ + @if test -d $(HOST_SUBDIR)/libelf; then \ + cd $(HOST_SUBDIR); mv libelf stage3-libelf; \ + mv prev-libelf stage2-libelf; : ; \ fi @endif libelf @if gold - @if test -d $(HOST_SUBDIR)/gold ; then \ - cd $(HOST_SUBDIR); mv gold stage2-gold ; \ - mv prev-gold stage1-gold ; : ; \ + @if test -d $(HOST_SUBDIR)/gold; then \ + cd $(HOST_SUBDIR); mv gold stage3-gold; \ + mv prev-gold stage2-gold; : ; \ fi @endif gold @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage2-intl ; \ - mv prev-intl stage1-intl ; : ; \ + @if test -d $(HOST_SUBDIR)/intl; then \ + cd $(HOST_SUBDIR); mv intl stage3-intl; \ + mv prev-intl stage2-intl; : ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage2-ld ; \ - mv prev-ld stage1-ld ; : ; \ + @if test -d $(HOST_SUBDIR)/ld; then \ + cd $(HOST_SUBDIR); mv ld stage3-ld; \ + mv prev-ld stage2-ld; : ; \ fi @endif ld @if libbacktrace - @if test -d $(HOST_SUBDIR)/libbacktrace ; then \ - cd $(HOST_SUBDIR); mv libbacktrace stage2-libbacktrace ; \ - mv prev-libbacktrace stage1-libbacktrace ; : ; \ + @if test -d $(HOST_SUBDIR)/libbacktrace; then \ + cd $(HOST_SUBDIR); mv libbacktrace stage3-libbacktrace; \ + mv prev-libbacktrace stage2-libbacktrace; : ; \ fi @endif libbacktrace @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage2-libcpp ; \ - mv prev-libcpp stage1-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR)/libcpp; then \ + cd $(HOST_SUBDIR); mv libcpp stage3-libcpp; \ + mv prev-libcpp stage2-libcpp; : ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage2-libdecnumber ; \ - mv prev-libdecnumber stage1-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR)/libdecnumber; then \ + cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber; \ + mv prev-libdecnumber stage2-libdecnumber; : ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage2-libiberty ; \ - mv prev-libiberty stage1-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stage3-libiberty; \ + mv prev-libiberty stage2-libiberty; : ; \ fi @endif libiberty -@if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \ - mv prev-zlib stage1-zlib ; : ; \ +@if libiberty-linker-plugin + @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \ + cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage3-libiberty-linker-plugin; \ + mv prev-libiberty-linker-plugin stage2-libiberty-linker-plugin; : ; \ fi -@endif zlib -@if lto-plugin - @if test -d $(HOST_SUBDIR)/lto-plugin ; then \ - cd $(HOST_SUBDIR); mv lto-plugin stage2-lto-plugin ; \ - mv prev-lto-plugin stage1-lto-plugin ; : ; \ - fi -@endif lto-plugin - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ - fi - rm -f stage_current - -# Bubble a bug fix through all the stages up to stage 2. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured either. -.PHONY: stage2-bubble -stage2-bubble:: stage1-bubble - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage2-lean || test -f stage1-lean ; then \ - echo Skipping rebuild of stage2 ; \ - else \ - $(MAKE) stage2-start; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \ - fi - -.PHONY: all-stage2 clean-stage2 -do-clean: clean-stage2 - -# FIXME: Will not need to be conditional when toplevel bootstrap is the -# only possibility, but now it conflicts with no-bootstrap rules -@if gcc-bootstrap - - - -.PHONY: bootstrap2 bootstrap2-lean -bootstrap2: - echo stage2 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - -bootstrap2-lean: - echo stage2 > stage_final - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) LEAN=: stage2-bubble - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - TFLAGS="$(STAGE2_TFLAGS)"; \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target - - -# Rules to wipe a stage and all the following ones, also used for cleanstrap -distclean-stage1:: distclean-stage2 -.PHONY: distclean-stage2 -distclean-stage2:: - @: $(MAKE); $(stage) - @test "`cat stage_last`" != stage2 || rm -f stage_last - rm -rf stage2-* - - -@endif gcc-bootstrap - - -.PHONY: stage3-start stage3-end - -stage3-start:: - @: $(MAKE); $(stage); \ - echo stage3 > stage_current ; \ - echo stage3 > stage_last; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) -@if bfd - @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \ - mkdir stage3-bfd; \ - mv stage3-bfd bfd ; \ - mv stage2-bfd prev-bfd || test -f stage2-lean -@endif bfd -@if opcodes - @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \ - mkdir stage3-opcodes; \ - mv stage3-opcodes opcodes ; \ - mv stage2-opcodes prev-opcodes || test -f stage2-lean -@endif opcodes -@if binutils - @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \ - mkdir stage3-binutils; \ - mv stage3-binutils binutils ; \ - mv stage2-binutils prev-binutils || test -f stage2-lean -@endif binutils -@if gas - @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \ - mkdir stage3-gas; \ - mv stage3-gas gas ; \ - mv stage2-gas prev-gas || test -f stage2-lean -@endif gas -@if gcc - @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \ - mkdir stage3-gcc; \ - mv stage3-gcc gcc ; \ - mv stage2-gcc prev-gcc || test -f stage2-lean -@endif gcc -@if gmp - @cd $(HOST_SUBDIR); [ -d stage3-gmp ] || \ - mkdir stage3-gmp; \ - mv stage3-gmp gmp ; \ - mv stage2-gmp prev-gmp || test -f stage2-lean -@endif gmp -@if mpfr - @cd $(HOST_SUBDIR); [ -d stage3-mpfr ] || \ - mkdir stage3-mpfr; \ - mv stage3-mpfr mpfr ; \ - mv stage2-mpfr prev-mpfr || test -f stage2-lean -@endif mpfr -@if mpc - @cd $(HOST_SUBDIR); [ -d stage3-mpc ] || \ - mkdir stage3-mpc; \ - mv stage3-mpc mpc ; \ - mv stage2-mpc prev-mpc || test -f stage2-lean -@endif mpc -@if isl - @cd $(HOST_SUBDIR); [ -d stage3-isl ] || \ - mkdir stage3-isl; \ - mv stage3-isl isl ; \ - mv stage2-isl prev-isl || test -f stage2-lean -@endif isl -@if cloog - @cd $(HOST_SUBDIR); [ -d stage3-cloog ] || \ - mkdir stage3-cloog; \ - mv stage3-cloog cloog ; \ - mv stage2-cloog prev-cloog || test -f stage2-lean -@endif cloog -@if libelf - @cd $(HOST_SUBDIR); [ -d stage3-libelf ] || \ - mkdir stage3-libelf; \ - mv stage3-libelf libelf ; \ - mv stage2-libelf prev-libelf || test -f stage2-lean -@endif libelf -@if gold - @cd $(HOST_SUBDIR); [ -d stage3-gold ] || \ - mkdir stage3-gold; \ - mv stage3-gold gold ; \ - mv stage2-gold prev-gold || test -f stage2-lean -@endif gold -@if intl - @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \ - mkdir stage3-intl; \ - mv stage3-intl intl ; \ - mv stage2-intl prev-intl || test -f stage2-lean -@endif intl -@if ld - @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \ - mkdir stage3-ld; \ - mv stage3-ld ld ; \ - mv stage2-ld prev-ld || test -f stage2-lean -@endif ld -@if libbacktrace - @cd $(HOST_SUBDIR); [ -d stage3-libbacktrace ] || \ - mkdir stage3-libbacktrace; \ - mv stage3-libbacktrace libbacktrace ; \ - mv stage2-libbacktrace prev-libbacktrace || test -f stage2-lean -@endif libbacktrace -@if libcpp - @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \ - mkdir stage3-libcpp; \ - mv stage3-libcpp libcpp ; \ - mv stage2-libcpp prev-libcpp || test -f stage2-lean -@endif libcpp -@if libdecnumber - @cd $(HOST_SUBDIR); [ -d stage3-libdecnumber ] || \ - mkdir stage3-libdecnumber; \ - mv stage3-libdecnumber libdecnumber ; \ - mv stage2-libdecnumber prev-libdecnumber || test -f stage2-lean -@endif libdecnumber -@if libiberty - @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \ - mkdir stage3-libiberty; \ - mv stage3-libiberty libiberty ; \ - mv stage2-libiberty prev-libiberty || test -f stage2-lean -@endif libiberty -@if zlib - @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \ - mkdir stage3-zlib; \ - mv stage3-zlib zlib ; \ - mv stage2-zlib prev-zlib || test -f stage2-lean -@endif zlib -@if lto-plugin - @cd $(HOST_SUBDIR); [ -d stage3-lto-plugin ] || \ - mkdir stage3-lto-plugin; \ - mv stage3-lto-plugin lto-plugin ; \ - mv stage2-lto-plugin prev-lto-plugin || test -f stage2-lean -@endif lto-plugin - @[ -d stage3-$(TARGET_SUBDIR) ] || \ - mkdir stage3-$(TARGET_SUBDIR); \ - mv stage3-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ - mv stage2-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage2-lean - -stage3-end:: -@if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage3-bfd ; \ - mv prev-bfd stage2-bfd ; : ; \ - fi -@endif bfd -@if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage3-opcodes ; \ - mv prev-opcodes stage2-opcodes ; : ; \ - fi -@endif opcodes -@if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage3-binutils ; \ - mv prev-binutils stage2-binutils ; : ; \ - fi -@endif binutils -@if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage3-gas ; \ - mv prev-gas stage2-gas ; : ; \ - fi -@endif gas -@if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage3-gcc ; \ - mv prev-gcc stage2-gcc ; : ; \ - fi -@endif gcc -@if gmp - @if test -d $(HOST_SUBDIR)/gmp ; then \ - cd $(HOST_SUBDIR); mv gmp stage3-gmp ; \ - mv prev-gmp stage2-gmp ; : ; \ - fi -@endif gmp -@if mpfr - @if test -d $(HOST_SUBDIR)/mpfr ; then \ - cd $(HOST_SUBDIR); mv mpfr stage3-mpfr ; \ - mv prev-mpfr stage2-mpfr ; : ; \ - fi -@endif mpfr -@if mpc - @if test -d $(HOST_SUBDIR)/mpc ; then \ - cd $(HOST_SUBDIR); mv mpc stage3-mpc ; \ - mv prev-mpc stage2-mpc ; : ; \ - fi -@endif mpc -@if isl - @if test -d $(HOST_SUBDIR)/isl ; then \ - cd $(HOST_SUBDIR); mv isl stage3-isl ; \ - mv prev-isl stage2-isl ; : ; \ - fi -@endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stage3-cloog ; \ - mv prev-cloog stage2-cloog ; : ; \ - fi -@endif cloog -@if libelf - @if test -d $(HOST_SUBDIR)/libelf ; then \ - cd $(HOST_SUBDIR); mv libelf stage3-libelf ; \ - mv prev-libelf stage2-libelf ; : ; \ - fi -@endif libelf -@if gold - @if test -d $(HOST_SUBDIR)/gold ; then \ - cd $(HOST_SUBDIR); mv gold stage3-gold ; \ - mv prev-gold stage2-gold ; : ; \ - fi -@endif gold -@if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage3-intl ; \ - mv prev-intl stage2-intl ; : ; \ - fi -@endif intl -@if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage3-ld ; \ - mv prev-ld stage2-ld ; : ; \ - fi -@endif ld -@if libbacktrace - @if test -d $(HOST_SUBDIR)/libbacktrace ; then \ - cd $(HOST_SUBDIR); mv libbacktrace stage3-libbacktrace ; \ - mv prev-libbacktrace stage2-libbacktrace ; : ; \ - fi -@endif libbacktrace -@if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage3-libcpp ; \ - mv prev-libcpp stage2-libcpp ; : ; \ - fi -@endif libcpp -@if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage3-libdecnumber ; \ - mv prev-libdecnumber stage2-libdecnumber ; : ; \ - fi -@endif libdecnumber -@if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage3-libiberty ; \ - mv prev-libiberty stage2-libiberty ; : ; \ - fi -@endif libiberty +@endif libiberty-linker-plugin @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage3-zlib ; \ - mv prev-zlib stage2-zlib ; : ; \ + @if test -d $(HOST_SUBDIR)/zlib; then \ + cd $(HOST_SUBDIR); mv zlib stage3-zlib; \ + mv prev-zlib stage2-zlib; : ; \ fi @endif zlib @if lto-plugin - @if test -d $(HOST_SUBDIR)/lto-plugin ; then \ - cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin ; \ - mv prev-lto-plugin stage2-lto-plugin ; : ; \ + @if test -d $(HOST_SUBDIR)/lto-plugin; then \ + cd $(HOST_SUBDIR); mv lto-plugin stage3-lto-plugin; \ + mv prev-lto-plugin stage2-lto-plugin; : ; \ fi @endif lto-plugin - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR) ; : ; \ + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); \ + mv prev-$(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); : ; \ fi rm -f stage_current @@ -44256,13 +48301,13 @@ stage3-end:: stage3-bubble:: stage2-bubble @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage3-lean || test -f stage2-lean ; then \ - echo Skipping rebuild of stage3 ; \ + if test -f stage3-lean || test -f stage2-lean ; then \ + echo Skipping rebuild of stage3; \ else \ $(MAKE) stage3-start; \ if $(LEAN); then \ - rm -rf stage1-* ; \ - $(STAMP) stage1-lean ; \ + rm -rf stage1-*; \ + $(STAMP) stage1-lean; \ fi; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \ fi @@ -44279,16 +48324,16 @@ compare: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ if test -f stage2-lean; then \ - echo Cannot compare object files as stage 2 was deleted. ; \ - exit 0 ; \ + echo Cannot compare object files as stage 2 was deleted.; \ + exit 0; \ fi; \ : $(MAKE); $(stage); \ - rm -f .bad_compare ; \ - echo Comparing stages 2 and 3 ; \ + rm -f .bad_compare; \ + echo Comparing stages 2 and 3; \ sed=`echo stage3 | sed 's,^stage,,;s,.,.,g'`; \ files=`find stage3-* -name "*$(objext)" -print | \ - sed -n s,^stage$$sed-,,p` ; \ - for file in $${files} ; do \ + sed -n s,^stage$$sed-,,p`; \ + for file in $${files}; do \ f1=$$r/stage2-$$file; f2=$$r/stage3-$$file; \ if test ! -f $$f1; then continue; fi; \ $(do-compare) > /dev/null 2>&1; \ @@ -44298,16 +48343,16 @@ compare: echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ - esac ; \ - fi ; \ - done ; \ + esac; \ + fi; \ + done; \ if [ -f .bad_compare ]; then \ echo "Bootstrap comparison failure!"; \ cat .bad_compare; \ exit 1; \ else \ echo Comparison successful.; \ - fi ; \ + fi; \ $(STAMP) compare if $(LEAN); then \ rm -rf stage2-*; \ @@ -44368,258 +48413,270 @@ cleanstrap: do-distclean local-clean stage4-start:: @: $(MAKE); $(stage); \ - echo stage4 > stage_current ; \ + echo stage4 > stage_current; \ echo stage4 > stage_last; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \ mkdir stage4-bfd; \ - mv stage4-bfd bfd ; \ + mv stage4-bfd bfd; \ mv stage3-bfd prev-bfd || test -f stage3-lean @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \ mkdir stage4-opcodes; \ - mv stage4-opcodes opcodes ; \ + mv stage4-opcodes opcodes; \ mv stage3-opcodes prev-opcodes || test -f stage3-lean @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \ mkdir stage4-binutils; \ - mv stage4-binutils binutils ; \ + mv stage4-binutils binutils; \ mv stage3-binutils prev-binutils || test -f stage3-lean @endif binutils +@if fixincludes + @cd $(HOST_SUBDIR); [ -d stage4-fixincludes ] || \ + mkdir stage4-fixincludes; \ + mv stage4-fixincludes fixincludes; \ + mv stage3-fixincludes prev-fixincludes || test -f stage3-lean +@endif fixincludes @if gas @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \ mkdir stage4-gas; \ - mv stage4-gas gas ; \ + mv stage4-gas gas; \ mv stage3-gas prev-gas || test -f stage3-lean @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \ mkdir stage4-gcc; \ - mv stage4-gcc gcc ; \ + mv stage4-gcc gcc; \ mv stage3-gcc prev-gcc || test -f stage3-lean @endif gcc @if gmp @cd $(HOST_SUBDIR); [ -d stage4-gmp ] || \ mkdir stage4-gmp; \ - mv stage4-gmp gmp ; \ + mv stage4-gmp gmp; \ mv stage3-gmp prev-gmp || test -f stage3-lean @endif gmp @if mpfr @cd $(HOST_SUBDIR); [ -d stage4-mpfr ] || \ mkdir stage4-mpfr; \ - mv stage4-mpfr mpfr ; \ + mv stage4-mpfr mpfr; \ mv stage3-mpfr prev-mpfr || test -f stage3-lean @endif mpfr @if mpc @cd $(HOST_SUBDIR); [ -d stage4-mpc ] || \ mkdir stage4-mpc; \ - mv stage4-mpc mpc ; \ + mv stage4-mpc mpc; \ mv stage3-mpc prev-mpc || test -f stage3-lean @endif mpc @if isl @cd $(HOST_SUBDIR); [ -d stage4-isl ] || \ mkdir stage4-isl; \ - mv stage4-isl isl ; \ + mv stage4-isl isl; \ mv stage3-isl prev-isl || test -f stage3-lean @endif isl -@if cloog - @cd $(HOST_SUBDIR); [ -d stage4-cloog ] || \ - mkdir stage4-cloog; \ - mv stage4-cloog cloog ; \ - mv stage3-cloog prev-cloog || test -f stage3-lean -@endif cloog @if libelf @cd $(HOST_SUBDIR); [ -d stage4-libelf ] || \ mkdir stage4-libelf; \ - mv stage4-libelf libelf ; \ + mv stage4-libelf libelf; \ mv stage3-libelf prev-libelf || test -f stage3-lean @endif libelf @if gold @cd $(HOST_SUBDIR); [ -d stage4-gold ] || \ mkdir stage4-gold; \ - mv stage4-gold gold ; \ + mv stage4-gold gold; \ mv stage3-gold prev-gold || test -f stage3-lean @endif gold @if intl @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \ mkdir stage4-intl; \ - mv stage4-intl intl ; \ + mv stage4-intl intl; \ mv stage3-intl prev-intl || test -f stage3-lean @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \ mkdir stage4-ld; \ - mv stage4-ld ld ; \ + mv stage4-ld ld; \ mv stage3-ld prev-ld || test -f stage3-lean @endif ld @if libbacktrace @cd $(HOST_SUBDIR); [ -d stage4-libbacktrace ] || \ mkdir stage4-libbacktrace; \ - mv stage4-libbacktrace libbacktrace ; \ + mv stage4-libbacktrace libbacktrace; \ mv stage3-libbacktrace prev-libbacktrace || test -f stage3-lean @endif libbacktrace @if libcpp @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \ mkdir stage4-libcpp; \ - mv stage4-libcpp libcpp ; \ + mv stage4-libcpp libcpp; \ mv stage3-libcpp prev-libcpp || test -f stage3-lean @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stage4-libdecnumber ] || \ mkdir stage4-libdecnumber; \ - mv stage4-libdecnumber libdecnumber ; \ + mv stage4-libdecnumber libdecnumber; \ mv stage3-libdecnumber prev-libdecnumber || test -f stage3-lean @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \ mkdir stage4-libiberty; \ - mv stage4-libiberty libiberty ; \ + mv stage4-libiberty libiberty; \ mv stage3-libiberty prev-libiberty || test -f stage3-lean @endif libiberty +@if libiberty-linker-plugin + @cd $(HOST_SUBDIR); [ -d stage4-libiberty-linker-plugin ] || \ + mkdir stage4-libiberty-linker-plugin; \ + mv stage4-libiberty-linker-plugin libiberty-linker-plugin; \ + mv stage3-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage3-lean +@endif libiberty-linker-plugin @if zlib @cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \ mkdir stage4-zlib; \ - mv stage4-zlib zlib ; \ + mv stage4-zlib zlib; \ mv stage3-zlib prev-zlib || test -f stage3-lean @endif zlib @if lto-plugin @cd $(HOST_SUBDIR); [ -d stage4-lto-plugin ] || \ mkdir stage4-lto-plugin; \ - mv stage4-lto-plugin lto-plugin ; \ + mv stage4-lto-plugin lto-plugin; \ mv stage3-lto-plugin prev-lto-plugin || test -f stage3-lean @endif lto-plugin @[ -d stage4-$(TARGET_SUBDIR) ] || \ mkdir stage4-$(TARGET_SUBDIR); \ - mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + mv stage4-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \ mv stage3-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage3-lean stage4-end:: @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stage4-bfd ; \ - mv prev-bfd stage3-bfd ; : ; \ + @if test -d $(HOST_SUBDIR)/bfd; then \ + cd $(HOST_SUBDIR); mv bfd stage4-bfd; \ + mv prev-bfd stage3-bfd; : ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stage4-opcodes ; \ - mv prev-opcodes stage3-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR)/opcodes; then \ + cd $(HOST_SUBDIR); mv opcodes stage4-opcodes; \ + mv prev-opcodes stage3-opcodes; : ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stage4-binutils ; \ - mv prev-binutils stage3-binutils ; : ; \ + @if test -d $(HOST_SUBDIR)/binutils; then \ + cd $(HOST_SUBDIR); mv binutils stage4-binutils; \ + mv prev-binutils stage3-binutils; : ; \ fi @endif binutils +@if fixincludes + @if test -d $(HOST_SUBDIR)/fixincludes; then \ + cd $(HOST_SUBDIR); mv fixincludes stage4-fixincludes; \ + mv prev-fixincludes stage3-fixincludes; : ; \ + fi +@endif fixincludes @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stage4-gas ; \ - mv prev-gas stage3-gas ; : ; \ + @if test -d $(HOST_SUBDIR)/gas; then \ + cd $(HOST_SUBDIR); mv gas stage4-gas; \ + mv prev-gas stage3-gas; : ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stage4-gcc ; \ - mv prev-gcc stage3-gcc ; : ; \ + @if test -d $(HOST_SUBDIR)/gcc; then \ + cd $(HOST_SUBDIR); mv gcc stage4-gcc; \ + mv prev-gcc stage3-gcc; : ; \ fi @endif gcc @if gmp - @if test -d $(HOST_SUBDIR)/gmp ; then \ - cd $(HOST_SUBDIR); mv gmp stage4-gmp ; \ - mv prev-gmp stage3-gmp ; : ; \ + @if test -d $(HOST_SUBDIR)/gmp; then \ + cd $(HOST_SUBDIR); mv gmp stage4-gmp; \ + mv prev-gmp stage3-gmp; : ; \ fi @endif gmp @if mpfr - @if test -d $(HOST_SUBDIR)/mpfr ; then \ - cd $(HOST_SUBDIR); mv mpfr stage4-mpfr ; \ - mv prev-mpfr stage3-mpfr ; : ; \ + @if test -d $(HOST_SUBDIR)/mpfr; then \ + cd $(HOST_SUBDIR); mv mpfr stage4-mpfr; \ + mv prev-mpfr stage3-mpfr; : ; \ fi @endif mpfr @if mpc - @if test -d $(HOST_SUBDIR)/mpc ; then \ - cd $(HOST_SUBDIR); mv mpc stage4-mpc ; \ - mv prev-mpc stage3-mpc ; : ; \ + @if test -d $(HOST_SUBDIR)/mpc; then \ + cd $(HOST_SUBDIR); mv mpc stage4-mpc; \ + mv prev-mpc stage3-mpc; : ; \ fi @endif mpc @if isl - @if test -d $(HOST_SUBDIR)/isl ; then \ - cd $(HOST_SUBDIR); mv isl stage4-isl ; \ - mv prev-isl stage3-isl ; : ; \ + @if test -d $(HOST_SUBDIR)/isl; then \ + cd $(HOST_SUBDIR); mv isl stage4-isl; \ + mv prev-isl stage3-isl; : ; \ fi @endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stage4-cloog ; \ - mv prev-cloog stage3-cloog ; : ; \ - fi -@endif cloog @if libelf - @if test -d $(HOST_SUBDIR)/libelf ; then \ - cd $(HOST_SUBDIR); mv libelf stage4-libelf ; \ - mv prev-libelf stage3-libelf ; : ; \ + @if test -d $(HOST_SUBDIR)/libelf; then \ + cd $(HOST_SUBDIR); mv libelf stage4-libelf; \ + mv prev-libelf stage3-libelf; : ; \ fi @endif libelf @if gold - @if test -d $(HOST_SUBDIR)/gold ; then \ - cd $(HOST_SUBDIR); mv gold stage4-gold ; \ - mv prev-gold stage3-gold ; : ; \ + @if test -d $(HOST_SUBDIR)/gold; then \ + cd $(HOST_SUBDIR); mv gold stage4-gold; \ + mv prev-gold stage3-gold; : ; \ fi @endif gold @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stage4-intl ; \ - mv prev-intl stage3-intl ; : ; \ + @if test -d $(HOST_SUBDIR)/intl; then \ + cd $(HOST_SUBDIR); mv intl stage4-intl; \ + mv prev-intl stage3-intl; : ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stage4-ld ; \ - mv prev-ld stage3-ld ; : ; \ + @if test -d $(HOST_SUBDIR)/ld; then \ + cd $(HOST_SUBDIR); mv ld stage4-ld; \ + mv prev-ld stage3-ld; : ; \ fi @endif ld @if libbacktrace - @if test -d $(HOST_SUBDIR)/libbacktrace ; then \ - cd $(HOST_SUBDIR); mv libbacktrace stage4-libbacktrace ; \ - mv prev-libbacktrace stage3-libbacktrace ; : ; \ + @if test -d $(HOST_SUBDIR)/libbacktrace; then \ + cd $(HOST_SUBDIR); mv libbacktrace stage4-libbacktrace; \ + mv prev-libbacktrace stage3-libbacktrace; : ; \ fi @endif libbacktrace @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stage4-libcpp ; \ - mv prev-libcpp stage3-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR)/libcpp; then \ + cd $(HOST_SUBDIR); mv libcpp stage4-libcpp; \ + mv prev-libcpp stage3-libcpp; : ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber ; \ - mv prev-libdecnumber stage3-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR)/libdecnumber; then \ + cd $(HOST_SUBDIR); mv libdecnumber stage4-libdecnumber; \ + mv prev-libdecnumber stage3-libdecnumber; : ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stage4-libiberty ; \ - mv prev-libiberty stage3-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stage4-libiberty; \ + mv prev-libiberty stage3-libiberty; : ; \ fi @endif libiberty +@if libiberty-linker-plugin + @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \ + cd $(HOST_SUBDIR); mv libiberty-linker-plugin stage4-libiberty-linker-plugin; \ + mv prev-libiberty-linker-plugin stage3-libiberty-linker-plugin; : ; \ + fi +@endif libiberty-linker-plugin @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage4-zlib ; \ - mv prev-zlib stage3-zlib ; : ; \ + @if test -d $(HOST_SUBDIR)/zlib; then \ + cd $(HOST_SUBDIR); mv zlib stage4-zlib; \ + mv prev-zlib stage3-zlib; : ; \ fi @endif zlib @if lto-plugin - @if test -d $(HOST_SUBDIR)/lto-plugin ; then \ - cd $(HOST_SUBDIR); mv lto-plugin stage4-lto-plugin ; \ - mv prev-lto-plugin stage3-lto-plugin ; : ; \ + @if test -d $(HOST_SUBDIR)/lto-plugin; then \ + cd $(HOST_SUBDIR); mv lto-plugin stage4-lto-plugin; \ + mv prev-lto-plugin stage3-lto-plugin; : ; \ fi @endif lto-plugin - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR) ; : ; \ + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stage4-$(TARGET_SUBDIR); \ + mv prev-$(TARGET_SUBDIR) stage3-$(TARGET_SUBDIR); : ; \ fi rm -f stage_current @@ -44630,13 +48687,13 @@ stage4-end:: stage4-bubble:: stage3-bubble @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stage4-lean || test -f stage3-lean ; then \ - echo Skipping rebuild of stage4 ; \ + if test -f stage4-lean || test -f stage3-lean ; then \ + echo Skipping rebuild of stage4; \ else \ $(MAKE) stage4-start; \ if $(LEAN); then \ - rm -rf stage2-* ; \ - $(STAMP) stage2-lean ; \ + rm -rf stage2-*; \ + $(STAMP) stage2-lean; \ fi; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \ fi @@ -44653,16 +48710,16 @@ compare3: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ if test -f stage3-lean; then \ - echo Cannot compare object files as stage 3 was deleted. ; \ - exit 0 ; \ + echo Cannot compare object files as stage 3 was deleted.; \ + exit 0; \ fi; \ : $(MAKE); $(stage); \ - rm -f .bad_compare ; \ - echo Comparing stages 3 and 4 ; \ + rm -f .bad_compare; \ + echo Comparing stages 3 and 4; \ sed=`echo stage4 | sed 's,^stage,,;s,.,.,g'`; \ files=`find stage4-* -name "*$(objext)" -print | \ - sed -n s,^stage$$sed-,,p` ; \ - for file in $${files} ; do \ + sed -n s,^stage$$sed-,,p`; \ + for file in $${files}; do \ f1=$$r/stage3-$$file; f2=$$r/stage4-$$file; \ if test ! -f $$f1; then continue; fi; \ $(do-compare3) > /dev/null 2>&1; \ @@ -44672,16 +48729,16 @@ compare3: echo warning: $$file differs ;; \ *) \ echo $$file differs >> .bad_compare ;; \ - esac ; \ - fi ; \ - done ; \ + esac; \ + fi; \ + done; \ if [ -f .bad_compare ]; then \ echo "Bootstrap comparison failure!"; \ cat .bad_compare; \ exit 1; \ else \ echo Comparison successful.; \ - fi ; \ + fi; \ $(STAMP) compare3 if $(LEAN); then \ rm -rf stage3-*; \ @@ -44730,258 +48787,270 @@ distclean-stage4:: stageprofile-start:: @: $(MAKE); $(stage); \ - echo stageprofile > stage_current ; \ + echo stageprofile > stage_current; \ echo stageprofile > stage_last; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \ mkdir stageprofile-bfd; \ - mv stageprofile-bfd bfd ; \ + mv stageprofile-bfd bfd; \ mv stage1-bfd prev-bfd || test -f stage1-lean @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \ mkdir stageprofile-opcodes; \ - mv stageprofile-opcodes opcodes ; \ + mv stageprofile-opcodes opcodes; \ mv stage1-opcodes prev-opcodes || test -f stage1-lean @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \ mkdir stageprofile-binutils; \ - mv stageprofile-binutils binutils ; \ + mv stageprofile-binutils binutils; \ mv stage1-binutils prev-binutils || test -f stage1-lean @endif binutils +@if fixincludes + @cd $(HOST_SUBDIR); [ -d stageprofile-fixincludes ] || \ + mkdir stageprofile-fixincludes; \ + mv stageprofile-fixincludes fixincludes; \ + mv stage1-fixincludes prev-fixincludes || test -f stage1-lean +@endif fixincludes @if gas @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \ mkdir stageprofile-gas; \ - mv stageprofile-gas gas ; \ + mv stageprofile-gas gas; \ mv stage1-gas prev-gas || test -f stage1-lean @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \ mkdir stageprofile-gcc; \ - mv stageprofile-gcc gcc ; \ + mv stageprofile-gcc gcc; \ mv stage1-gcc prev-gcc || test -f stage1-lean @endif gcc @if gmp @cd $(HOST_SUBDIR); [ -d stageprofile-gmp ] || \ mkdir stageprofile-gmp; \ - mv stageprofile-gmp gmp ; \ + mv stageprofile-gmp gmp; \ mv stage1-gmp prev-gmp || test -f stage1-lean @endif gmp @if mpfr @cd $(HOST_SUBDIR); [ -d stageprofile-mpfr ] || \ mkdir stageprofile-mpfr; \ - mv stageprofile-mpfr mpfr ; \ + mv stageprofile-mpfr mpfr; \ mv stage1-mpfr prev-mpfr || test -f stage1-lean @endif mpfr @if mpc @cd $(HOST_SUBDIR); [ -d stageprofile-mpc ] || \ mkdir stageprofile-mpc; \ - mv stageprofile-mpc mpc ; \ + mv stageprofile-mpc mpc; \ mv stage1-mpc prev-mpc || test -f stage1-lean @endif mpc @if isl @cd $(HOST_SUBDIR); [ -d stageprofile-isl ] || \ mkdir stageprofile-isl; \ - mv stageprofile-isl isl ; \ + mv stageprofile-isl isl; \ mv stage1-isl prev-isl || test -f stage1-lean @endif isl -@if cloog - @cd $(HOST_SUBDIR); [ -d stageprofile-cloog ] || \ - mkdir stageprofile-cloog; \ - mv stageprofile-cloog cloog ; \ - mv stage1-cloog prev-cloog || test -f stage1-lean -@endif cloog @if libelf @cd $(HOST_SUBDIR); [ -d stageprofile-libelf ] || \ mkdir stageprofile-libelf; \ - mv stageprofile-libelf libelf ; \ + mv stageprofile-libelf libelf; \ mv stage1-libelf prev-libelf || test -f stage1-lean @endif libelf @if gold @cd $(HOST_SUBDIR); [ -d stageprofile-gold ] || \ mkdir stageprofile-gold; \ - mv stageprofile-gold gold ; \ + mv stageprofile-gold gold; \ mv stage1-gold prev-gold || test -f stage1-lean @endif gold @if intl @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \ mkdir stageprofile-intl; \ - mv stageprofile-intl intl ; \ + mv stageprofile-intl intl; \ mv stage1-intl prev-intl || test -f stage1-lean @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \ mkdir stageprofile-ld; \ - mv stageprofile-ld ld ; \ + mv stageprofile-ld ld; \ mv stage1-ld prev-ld || test -f stage1-lean @endif ld @if libbacktrace @cd $(HOST_SUBDIR); [ -d stageprofile-libbacktrace ] || \ mkdir stageprofile-libbacktrace; \ - mv stageprofile-libbacktrace libbacktrace ; \ + mv stageprofile-libbacktrace libbacktrace; \ mv stage1-libbacktrace prev-libbacktrace || test -f stage1-lean @endif libbacktrace @if libcpp @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \ mkdir stageprofile-libcpp; \ - mv stageprofile-libcpp libcpp ; \ + mv stageprofile-libcpp libcpp; \ mv stage1-libcpp prev-libcpp || test -f stage1-lean @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stageprofile-libdecnumber ] || \ mkdir stageprofile-libdecnumber; \ - mv stageprofile-libdecnumber libdecnumber ; \ + mv stageprofile-libdecnumber libdecnumber; \ mv stage1-libdecnumber prev-libdecnumber || test -f stage1-lean @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \ mkdir stageprofile-libiberty; \ - mv stageprofile-libiberty libiberty ; \ + mv stageprofile-libiberty libiberty; \ mv stage1-libiberty prev-libiberty || test -f stage1-lean @endif libiberty +@if libiberty-linker-plugin + @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty-linker-plugin ] || \ + mkdir stageprofile-libiberty-linker-plugin; \ + mv stageprofile-libiberty-linker-plugin libiberty-linker-plugin; \ + mv stage1-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stage1-lean +@endif libiberty-linker-plugin @if zlib @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \ mkdir stageprofile-zlib; \ - mv stageprofile-zlib zlib ; \ + mv stageprofile-zlib zlib; \ mv stage1-zlib prev-zlib || test -f stage1-lean @endif zlib @if lto-plugin @cd $(HOST_SUBDIR); [ -d stageprofile-lto-plugin ] || \ mkdir stageprofile-lto-plugin; \ - mv stageprofile-lto-plugin lto-plugin ; \ + mv stageprofile-lto-plugin lto-plugin; \ mv stage1-lto-plugin prev-lto-plugin || test -f stage1-lean @endif lto-plugin @[ -d stageprofile-$(TARGET_SUBDIR) ] || \ mkdir stageprofile-$(TARGET_SUBDIR); \ - mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + mv stageprofile-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \ mv stage1-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stage1-lean stageprofile-end:: @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stageprofile-bfd ; \ - mv prev-bfd stage1-bfd ; : ; \ + @if test -d $(HOST_SUBDIR)/bfd; then \ + cd $(HOST_SUBDIR); mv bfd stageprofile-bfd; \ + mv prev-bfd stage1-bfd; : ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes ; \ - mv prev-opcodes stage1-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR)/opcodes; then \ + cd $(HOST_SUBDIR); mv opcodes stageprofile-opcodes; \ + mv prev-opcodes stage1-opcodes; : ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stageprofile-binutils ; \ - mv prev-binutils stage1-binutils ; : ; \ + @if test -d $(HOST_SUBDIR)/binutils; then \ + cd $(HOST_SUBDIR); mv binutils stageprofile-binutils; \ + mv prev-binutils stage1-binutils; : ; \ fi @endif binutils +@if fixincludes + @if test -d $(HOST_SUBDIR)/fixincludes; then \ + cd $(HOST_SUBDIR); mv fixincludes stageprofile-fixincludes; \ + mv prev-fixincludes stage1-fixincludes; : ; \ + fi +@endif fixincludes @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stageprofile-gas ; \ - mv prev-gas stage1-gas ; : ; \ + @if test -d $(HOST_SUBDIR)/gas; then \ + cd $(HOST_SUBDIR); mv gas stageprofile-gas; \ + mv prev-gas stage1-gas; : ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stageprofile-gcc ; \ - mv prev-gcc stage1-gcc ; : ; \ + @if test -d $(HOST_SUBDIR)/gcc; then \ + cd $(HOST_SUBDIR); mv gcc stageprofile-gcc; \ + mv prev-gcc stage1-gcc; : ; \ fi @endif gcc @if gmp - @if test -d $(HOST_SUBDIR)/gmp ; then \ - cd $(HOST_SUBDIR); mv gmp stageprofile-gmp ; \ - mv prev-gmp stage1-gmp ; : ; \ + @if test -d $(HOST_SUBDIR)/gmp; then \ + cd $(HOST_SUBDIR); mv gmp stageprofile-gmp; \ + mv prev-gmp stage1-gmp; : ; \ fi @endif gmp @if mpfr - @if test -d $(HOST_SUBDIR)/mpfr ; then \ - cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr ; \ - mv prev-mpfr stage1-mpfr ; : ; \ + @if test -d $(HOST_SUBDIR)/mpfr; then \ + cd $(HOST_SUBDIR); mv mpfr stageprofile-mpfr; \ + mv prev-mpfr stage1-mpfr; : ; \ fi @endif mpfr @if mpc - @if test -d $(HOST_SUBDIR)/mpc ; then \ - cd $(HOST_SUBDIR); mv mpc stageprofile-mpc ; \ - mv prev-mpc stage1-mpc ; : ; \ + @if test -d $(HOST_SUBDIR)/mpc; then \ + cd $(HOST_SUBDIR); mv mpc stageprofile-mpc; \ + mv prev-mpc stage1-mpc; : ; \ fi @endif mpc @if isl - @if test -d $(HOST_SUBDIR)/isl ; then \ - cd $(HOST_SUBDIR); mv isl stageprofile-isl ; \ - mv prev-isl stage1-isl ; : ; \ + @if test -d $(HOST_SUBDIR)/isl; then \ + cd $(HOST_SUBDIR); mv isl stageprofile-isl; \ + mv prev-isl stage1-isl; : ; \ fi @endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stageprofile-cloog ; \ - mv prev-cloog stage1-cloog ; : ; \ - fi -@endif cloog @if libelf - @if test -d $(HOST_SUBDIR)/libelf ; then \ - cd $(HOST_SUBDIR); mv libelf stageprofile-libelf ; \ - mv prev-libelf stage1-libelf ; : ; \ + @if test -d $(HOST_SUBDIR)/libelf; then \ + cd $(HOST_SUBDIR); mv libelf stageprofile-libelf; \ + mv prev-libelf stage1-libelf; : ; \ fi @endif libelf @if gold - @if test -d $(HOST_SUBDIR)/gold ; then \ - cd $(HOST_SUBDIR); mv gold stageprofile-gold ; \ - mv prev-gold stage1-gold ; : ; \ + @if test -d $(HOST_SUBDIR)/gold; then \ + cd $(HOST_SUBDIR); mv gold stageprofile-gold; \ + mv prev-gold stage1-gold; : ; \ fi @endif gold @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stageprofile-intl ; \ - mv prev-intl stage1-intl ; : ; \ + @if test -d $(HOST_SUBDIR)/intl; then \ + cd $(HOST_SUBDIR); mv intl stageprofile-intl; \ + mv prev-intl stage1-intl; : ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stageprofile-ld ; \ - mv prev-ld stage1-ld ; : ; \ + @if test -d $(HOST_SUBDIR)/ld; then \ + cd $(HOST_SUBDIR); mv ld stageprofile-ld; \ + mv prev-ld stage1-ld; : ; \ fi @endif ld @if libbacktrace - @if test -d $(HOST_SUBDIR)/libbacktrace ; then \ - cd $(HOST_SUBDIR); mv libbacktrace stageprofile-libbacktrace ; \ - mv prev-libbacktrace stage1-libbacktrace ; : ; \ + @if test -d $(HOST_SUBDIR)/libbacktrace; then \ + cd $(HOST_SUBDIR); mv libbacktrace stageprofile-libbacktrace; \ + mv prev-libbacktrace stage1-libbacktrace; : ; \ fi @endif libbacktrace @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp ; \ - mv prev-libcpp stage1-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR)/libcpp; then \ + cd $(HOST_SUBDIR); mv libcpp stageprofile-libcpp; \ + mv prev-libcpp stage1-libcpp; : ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber ; \ - mv prev-libdecnumber stage1-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR)/libdecnumber; then \ + cd $(HOST_SUBDIR); mv libdecnumber stageprofile-libdecnumber; \ + mv prev-libdecnumber stage1-libdecnumber; : ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty ; \ - mv prev-libiberty stage1-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stageprofile-libiberty; \ + mv prev-libiberty stage1-libiberty; : ; \ fi @endif libiberty +@if libiberty-linker-plugin + @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \ + cd $(HOST_SUBDIR); mv libiberty-linker-plugin stageprofile-libiberty-linker-plugin; \ + mv prev-libiberty-linker-plugin stage1-libiberty-linker-plugin; : ; \ + fi +@endif libiberty-linker-plugin @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stageprofile-zlib ; \ - mv prev-zlib stage1-zlib ; : ; \ + @if test -d $(HOST_SUBDIR)/zlib; then \ + cd $(HOST_SUBDIR); mv zlib stageprofile-zlib; \ + mv prev-zlib stage1-zlib; : ; \ fi @endif zlib @if lto-plugin - @if test -d $(HOST_SUBDIR)/lto-plugin ; then \ - cd $(HOST_SUBDIR); mv lto-plugin stageprofile-lto-plugin ; \ - mv prev-lto-plugin stage1-lto-plugin ; : ; \ + @if test -d $(HOST_SUBDIR)/lto-plugin; then \ + cd $(HOST_SUBDIR); mv lto-plugin stageprofile-lto-plugin; \ + mv prev-lto-plugin stage1-lto-plugin; : ; \ fi @endif lto-plugin - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR) ; : ; \ + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); \ + mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \ fi rm -f stage_current @@ -44992,8 +49061,8 @@ stageprofile-end:: stageprofile-bubble:: stage1-bubble @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stageprofile-lean || test -f stage1-lean ; then \ - echo Skipping rebuild of stageprofile ; \ + if test -f stageprofile-lean || test -f stage1-lean ; then \ + echo Skipping rebuild of stageprofile; \ else \ $(MAKE) stageprofile-start; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \ @@ -45025,258 +49094,270 @@ distclean-stageprofile:: stagefeedback-start:: @: $(MAKE); $(stage); \ - echo stagefeedback > stage_current ; \ + echo stagefeedback > stage_current; \ echo stagefeedback > stage_last; \ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) @if bfd @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \ mkdir stagefeedback-bfd; \ - mv stagefeedback-bfd bfd ; \ + mv stagefeedback-bfd bfd; \ mv stageprofile-bfd prev-bfd || test -f stageprofile-lean @endif bfd @if opcodes @cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \ mkdir stagefeedback-opcodes; \ - mv stagefeedback-opcodes opcodes ; \ + mv stagefeedback-opcodes opcodes; \ mv stageprofile-opcodes prev-opcodes || test -f stageprofile-lean @endif opcodes @if binutils @cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \ mkdir stagefeedback-binutils; \ - mv stagefeedback-binutils binutils ; \ + mv stagefeedback-binutils binutils; \ mv stageprofile-binutils prev-binutils || test -f stageprofile-lean @endif binutils +@if fixincludes + @cd $(HOST_SUBDIR); [ -d stagefeedback-fixincludes ] || \ + mkdir stagefeedback-fixincludes; \ + mv stagefeedback-fixincludes fixincludes; \ + mv stageprofile-fixincludes prev-fixincludes || test -f stageprofile-lean +@endif fixincludes @if gas @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \ mkdir stagefeedback-gas; \ - mv stagefeedback-gas gas ; \ + mv stagefeedback-gas gas; \ mv stageprofile-gas prev-gas || test -f stageprofile-lean @endif gas @if gcc @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \ mkdir stagefeedback-gcc; \ - mv stagefeedback-gcc gcc ; \ + mv stagefeedback-gcc gcc; \ mv stageprofile-gcc prev-gcc || test -f stageprofile-lean @endif gcc @if gmp @cd $(HOST_SUBDIR); [ -d stagefeedback-gmp ] || \ mkdir stagefeedback-gmp; \ - mv stagefeedback-gmp gmp ; \ + mv stagefeedback-gmp gmp; \ mv stageprofile-gmp prev-gmp || test -f stageprofile-lean @endif gmp @if mpfr @cd $(HOST_SUBDIR); [ -d stagefeedback-mpfr ] || \ mkdir stagefeedback-mpfr; \ - mv stagefeedback-mpfr mpfr ; \ + mv stagefeedback-mpfr mpfr; \ mv stageprofile-mpfr prev-mpfr || test -f stageprofile-lean @endif mpfr @if mpc @cd $(HOST_SUBDIR); [ -d stagefeedback-mpc ] || \ mkdir stagefeedback-mpc; \ - mv stagefeedback-mpc mpc ; \ + mv stagefeedback-mpc mpc; \ mv stageprofile-mpc prev-mpc || test -f stageprofile-lean @endif mpc @if isl @cd $(HOST_SUBDIR); [ -d stagefeedback-isl ] || \ mkdir stagefeedback-isl; \ - mv stagefeedback-isl isl ; \ + mv stagefeedback-isl isl; \ mv stageprofile-isl prev-isl || test -f stageprofile-lean @endif isl -@if cloog - @cd $(HOST_SUBDIR); [ -d stagefeedback-cloog ] || \ - mkdir stagefeedback-cloog; \ - mv stagefeedback-cloog cloog ; \ - mv stageprofile-cloog prev-cloog || test -f stageprofile-lean -@endif cloog @if libelf @cd $(HOST_SUBDIR); [ -d stagefeedback-libelf ] || \ mkdir stagefeedback-libelf; \ - mv stagefeedback-libelf libelf ; \ + mv stagefeedback-libelf libelf; \ mv stageprofile-libelf prev-libelf || test -f stageprofile-lean @endif libelf @if gold @cd $(HOST_SUBDIR); [ -d stagefeedback-gold ] || \ mkdir stagefeedback-gold; \ - mv stagefeedback-gold gold ; \ + mv stagefeedback-gold gold; \ mv stageprofile-gold prev-gold || test -f stageprofile-lean @endif gold @if intl @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \ mkdir stagefeedback-intl; \ - mv stagefeedback-intl intl ; \ + mv stagefeedback-intl intl; \ mv stageprofile-intl prev-intl || test -f stageprofile-lean @endif intl @if ld @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \ mkdir stagefeedback-ld; \ - mv stagefeedback-ld ld ; \ + mv stagefeedback-ld ld; \ mv stageprofile-ld prev-ld || test -f stageprofile-lean @endif ld @if libbacktrace @cd $(HOST_SUBDIR); [ -d stagefeedback-libbacktrace ] || \ mkdir stagefeedback-libbacktrace; \ - mv stagefeedback-libbacktrace libbacktrace ; \ + mv stagefeedback-libbacktrace libbacktrace; \ mv stageprofile-libbacktrace prev-libbacktrace || test -f stageprofile-lean @endif libbacktrace @if libcpp @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \ mkdir stagefeedback-libcpp; \ - mv stagefeedback-libcpp libcpp ; \ + mv stagefeedback-libcpp libcpp; \ mv stageprofile-libcpp prev-libcpp || test -f stageprofile-lean @endif libcpp @if libdecnumber @cd $(HOST_SUBDIR); [ -d stagefeedback-libdecnumber ] || \ mkdir stagefeedback-libdecnumber; \ - mv stagefeedback-libdecnumber libdecnumber ; \ + mv stagefeedback-libdecnumber libdecnumber; \ mv stageprofile-libdecnumber prev-libdecnumber || test -f stageprofile-lean @endif libdecnumber @if libiberty @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \ mkdir stagefeedback-libiberty; \ - mv stagefeedback-libiberty libiberty ; \ + mv stagefeedback-libiberty libiberty; \ mv stageprofile-libiberty prev-libiberty || test -f stageprofile-lean @endif libiberty +@if libiberty-linker-plugin + @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty-linker-plugin ] || \ + mkdir stagefeedback-libiberty-linker-plugin; \ + mv stagefeedback-libiberty-linker-plugin libiberty-linker-plugin; \ + mv stageprofile-libiberty-linker-plugin prev-libiberty-linker-plugin || test -f stageprofile-lean +@endif libiberty-linker-plugin @if zlib @cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \ mkdir stagefeedback-zlib; \ - mv stagefeedback-zlib zlib ; \ + mv stagefeedback-zlib zlib; \ mv stageprofile-zlib prev-zlib || test -f stageprofile-lean @endif zlib @if lto-plugin @cd $(HOST_SUBDIR); [ -d stagefeedback-lto-plugin ] || \ mkdir stagefeedback-lto-plugin; \ - mv stagefeedback-lto-plugin lto-plugin ; \ + mv stagefeedback-lto-plugin lto-plugin; \ mv stageprofile-lto-plugin prev-lto-plugin || test -f stageprofile-lean @endif lto-plugin @[ -d stagefeedback-$(TARGET_SUBDIR) ] || \ mkdir stagefeedback-$(TARGET_SUBDIR); \ - mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR) ; \ + mv stagefeedback-$(TARGET_SUBDIR) $(TARGET_SUBDIR); \ mv stageprofile-$(TARGET_SUBDIR) prev-$(TARGET_SUBDIR) || test -f stageprofile-lean stagefeedback-end:: @if bfd - @if test -d $(HOST_SUBDIR)/bfd ; then \ - cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd ; \ - mv prev-bfd stageprofile-bfd ; : ; \ + @if test -d $(HOST_SUBDIR)/bfd; then \ + cd $(HOST_SUBDIR); mv bfd stagefeedback-bfd; \ + mv prev-bfd stageprofile-bfd; : ; \ fi @endif bfd @if opcodes - @if test -d $(HOST_SUBDIR)/opcodes ; then \ - cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes ; \ - mv prev-opcodes stageprofile-opcodes ; : ; \ + @if test -d $(HOST_SUBDIR)/opcodes; then \ + cd $(HOST_SUBDIR); mv opcodes stagefeedback-opcodes; \ + mv prev-opcodes stageprofile-opcodes; : ; \ fi @endif opcodes @if binutils - @if test -d $(HOST_SUBDIR)/binutils ; then \ - cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils ; \ - mv prev-binutils stageprofile-binutils ; : ; \ + @if test -d $(HOST_SUBDIR)/binutils; then \ + cd $(HOST_SUBDIR); mv binutils stagefeedback-binutils; \ + mv prev-binutils stageprofile-binutils; : ; \ fi @endif binutils +@if fixincludes + @if test -d $(HOST_SUBDIR)/fixincludes; then \ + cd $(HOST_SUBDIR); mv fixincludes stagefeedback-fixincludes; \ + mv prev-fixincludes stageprofile-fixincludes; : ; \ + fi +@endif fixincludes @if gas - @if test -d $(HOST_SUBDIR)/gas ; then \ - cd $(HOST_SUBDIR); mv gas stagefeedback-gas ; \ - mv prev-gas stageprofile-gas ; : ; \ + @if test -d $(HOST_SUBDIR)/gas; then \ + cd $(HOST_SUBDIR); mv gas stagefeedback-gas; \ + mv prev-gas stageprofile-gas; : ; \ fi @endif gas @if gcc - @if test -d $(HOST_SUBDIR)/gcc ; then \ - cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc ; \ - mv prev-gcc stageprofile-gcc ; : ; \ + @if test -d $(HOST_SUBDIR)/gcc; then \ + cd $(HOST_SUBDIR); mv gcc stagefeedback-gcc; \ + mv prev-gcc stageprofile-gcc; : ; \ fi @endif gcc @if gmp - @if test -d $(HOST_SUBDIR)/gmp ; then \ - cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp ; \ - mv prev-gmp stageprofile-gmp ; : ; \ + @if test -d $(HOST_SUBDIR)/gmp; then \ + cd $(HOST_SUBDIR); mv gmp stagefeedback-gmp; \ + mv prev-gmp stageprofile-gmp; : ; \ fi @endif gmp @if mpfr - @if test -d $(HOST_SUBDIR)/mpfr ; then \ - cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr ; \ - mv prev-mpfr stageprofile-mpfr ; : ; \ + @if test -d $(HOST_SUBDIR)/mpfr; then \ + cd $(HOST_SUBDIR); mv mpfr stagefeedback-mpfr; \ + mv prev-mpfr stageprofile-mpfr; : ; \ fi @endif mpfr @if mpc - @if test -d $(HOST_SUBDIR)/mpc ; then \ - cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc ; \ - mv prev-mpc stageprofile-mpc ; : ; \ + @if test -d $(HOST_SUBDIR)/mpc; then \ + cd $(HOST_SUBDIR); mv mpc stagefeedback-mpc; \ + mv prev-mpc stageprofile-mpc; : ; \ fi @endif mpc @if isl - @if test -d $(HOST_SUBDIR)/isl ; then \ - cd $(HOST_SUBDIR); mv isl stagefeedback-isl ; \ - mv prev-isl stageprofile-isl ; : ; \ + @if test -d $(HOST_SUBDIR)/isl; then \ + cd $(HOST_SUBDIR); mv isl stagefeedback-isl; \ + mv prev-isl stageprofile-isl; : ; \ fi @endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stagefeedback-cloog ; \ - mv prev-cloog stageprofile-cloog ; : ; \ - fi -@endif cloog @if libelf - @if test -d $(HOST_SUBDIR)/libelf ; then \ - cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf ; \ - mv prev-libelf stageprofile-libelf ; : ; \ + @if test -d $(HOST_SUBDIR)/libelf; then \ + cd $(HOST_SUBDIR); mv libelf stagefeedback-libelf; \ + mv prev-libelf stageprofile-libelf; : ; \ fi @endif libelf @if gold - @if test -d $(HOST_SUBDIR)/gold ; then \ - cd $(HOST_SUBDIR); mv gold stagefeedback-gold ; \ - mv prev-gold stageprofile-gold ; : ; \ + @if test -d $(HOST_SUBDIR)/gold; then \ + cd $(HOST_SUBDIR); mv gold stagefeedback-gold; \ + mv prev-gold stageprofile-gold; : ; \ fi @endif gold @if intl - @if test -d $(HOST_SUBDIR)/intl ; then \ - cd $(HOST_SUBDIR); mv intl stagefeedback-intl ; \ - mv prev-intl stageprofile-intl ; : ; \ + @if test -d $(HOST_SUBDIR)/intl; then \ + cd $(HOST_SUBDIR); mv intl stagefeedback-intl; \ + mv prev-intl stageprofile-intl; : ; \ fi @endif intl @if ld - @if test -d $(HOST_SUBDIR)/ld ; then \ - cd $(HOST_SUBDIR); mv ld stagefeedback-ld ; \ - mv prev-ld stageprofile-ld ; : ; \ + @if test -d $(HOST_SUBDIR)/ld; then \ + cd $(HOST_SUBDIR); mv ld stagefeedback-ld; \ + mv prev-ld stageprofile-ld; : ; \ fi @endif ld @if libbacktrace - @if test -d $(HOST_SUBDIR)/libbacktrace ; then \ - cd $(HOST_SUBDIR); mv libbacktrace stagefeedback-libbacktrace ; \ - mv prev-libbacktrace stageprofile-libbacktrace ; : ; \ + @if test -d $(HOST_SUBDIR)/libbacktrace; then \ + cd $(HOST_SUBDIR); mv libbacktrace stagefeedback-libbacktrace; \ + mv prev-libbacktrace stageprofile-libbacktrace; : ; \ fi @endif libbacktrace @if libcpp - @if test -d $(HOST_SUBDIR)/libcpp ; then \ - cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp ; \ - mv prev-libcpp stageprofile-libcpp ; : ; \ + @if test -d $(HOST_SUBDIR)/libcpp; then \ + cd $(HOST_SUBDIR); mv libcpp stagefeedback-libcpp; \ + mv prev-libcpp stageprofile-libcpp; : ; \ fi @endif libcpp @if libdecnumber - @if test -d $(HOST_SUBDIR)/libdecnumber ; then \ - cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber ; \ - mv prev-libdecnumber stageprofile-libdecnumber ; : ; \ + @if test -d $(HOST_SUBDIR)/libdecnumber; then \ + cd $(HOST_SUBDIR); mv libdecnumber stagefeedback-libdecnumber; \ + mv prev-libdecnumber stageprofile-libdecnumber; : ; \ fi @endif libdecnumber @if libiberty - @if test -d $(HOST_SUBDIR)/libiberty ; then \ - cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty ; \ - mv prev-libiberty stageprofile-libiberty ; : ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stagefeedback-libiberty; \ + mv prev-libiberty stageprofile-libiberty; : ; \ fi @endif libiberty +@if libiberty-linker-plugin + @if test -d $(HOST_SUBDIR)/libiberty-linker-plugin; then \ + cd $(HOST_SUBDIR); mv libiberty-linker-plugin stagefeedback-libiberty-linker-plugin; \ + mv prev-libiberty-linker-plugin stageprofile-libiberty-linker-plugin; : ; \ + fi +@endif libiberty-linker-plugin @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib ; \ - mv prev-zlib stageprofile-zlib ; : ; \ + @if test -d $(HOST_SUBDIR)/zlib; then \ + cd $(HOST_SUBDIR); mv zlib stagefeedback-zlib; \ + mv prev-zlib stageprofile-zlib; : ; \ fi @endif zlib @if lto-plugin - @if test -d $(HOST_SUBDIR)/lto-plugin ; then \ - cd $(HOST_SUBDIR); mv lto-plugin stagefeedback-lto-plugin ; \ - mv prev-lto-plugin stageprofile-lto-plugin ; : ; \ + @if test -d $(HOST_SUBDIR)/lto-plugin; then \ + cd $(HOST_SUBDIR); mv lto-plugin stagefeedback-lto-plugin; \ + mv prev-lto-plugin stageprofile-lto-plugin; : ; \ fi @endif lto-plugin - @if test -d $(TARGET_SUBDIR) ; then \ - mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR) ; \ - mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR) ; : ; \ + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stagefeedback-$(TARGET_SUBDIR); \ + mv prev-$(TARGET_SUBDIR) stageprofile-$(TARGET_SUBDIR); : ; \ fi rm -f stage_current @@ -45287,8 +49368,8 @@ stagefeedback-end:: stagefeedback-bubble:: stageprofile-bubble @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - if test -f stagefeedback-lean || test -f stageprofile-lean ; then \ - echo Skipping rebuild of stagefeedback ; \ + if test -f stagefeedback-lean || test -f stageprofile-lean ; then \ + echo Skipping rebuild of stagefeedback; \ else \ $(MAKE) stagefeedback-start; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \ @@ -45347,10 +49428,10 @@ stagefeedback-start:: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ for i in prev-*; do \ - j=`echo $$i | sed s/^prev-//` ; \ + j=`echo $$i | sed s/^prev-//`; \ cd $$r/$$i && \ - { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL) ; } && \ - { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL) ; } ; \ + { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../'$$j'/&",' | $(SHELL); } && \ + { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../'$$j'/&",' | $(SHELL); }; \ done @if gcc-bootstrap @@ -45387,13 +49468,26 @@ configure-stage3-target-libstdc++-v3: maybe-all-stage3-gcc configure-stage4-target-libstdc++-v3: maybe-all-stage4-gcc configure-stageprofile-target-libstdc++-v3: maybe-all-stageprofile-gcc configure-stagefeedback-target-libstdc++-v3: maybe-all-stagefeedback-gcc -configure-target-libmudflap: stage_last configure-stage1-target-libsanitizer: maybe-all-stage1-gcc configure-stage2-target-libsanitizer: maybe-all-stage2-gcc configure-stage3-target-libsanitizer: maybe-all-stage3-gcc configure-stage4-target-libsanitizer: maybe-all-stage4-gcc configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-gcc configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-gcc +configure-stage1-target-libmpx: maybe-all-stage1-gcc +configure-stage2-target-libmpx: maybe-all-stage2-gcc +configure-stage3-target-libmpx: maybe-all-stage3-gcc +configure-stage4-target-libmpx: maybe-all-stage4-gcc +configure-stageprofile-target-libmpx: maybe-all-stageprofile-gcc +configure-stagefeedback-target-libmpx: maybe-all-stagefeedback-gcc +configure-stage1-target-libvtv: maybe-all-stage1-gcc +configure-stage2-target-libvtv: maybe-all-stage2-gcc +configure-stage3-target-libvtv: maybe-all-stage3-gcc +configure-stage4-target-libvtv: maybe-all-stage4-gcc +configure-stageprofile-target-libvtv: maybe-all-stageprofile-gcc +configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-gcc +configure-target-libcilkrts: stage_last +configure-target-liboffloadmic: stage_last configure-target-libssp: stage_last configure-target-newlib: stage_last configure-stage1-target-libgcc: maybe-all-stage1-gcc @@ -45428,8 +49522,11 @@ configure-target-libatomic: stage_last @if gcc-no-bootstrap configure-target-libstdc++-v3: maybe-all-gcc -configure-target-libmudflap: maybe-all-gcc configure-target-libsanitizer: maybe-all-gcc +configure-target-libmpx: maybe-all-gcc +configure-target-libvtv: maybe-all-gcc +configure-target-libcilkrts: maybe-all-gcc +configure-target-liboffloadmic: maybe-all-gcc configure-target-libssp: maybe-all-gcc configure-target-newlib: maybe-all-gcc configure-target-libgcc: maybe-all-gcc @@ -45477,6 +49574,7 @@ all-build-flex: maybe-all-build-m4 all-build-libiberty: maybe-all-build-texinfo all-build-m4: maybe-all-build-texinfo all-build-fixincludes: maybe-all-build-libiberty +all-build-libcpp: maybe-all-build-libiberty configure-gcc: maybe-configure-intl configure-stage1-gcc: maybe-configure-stage1-intl @@ -45485,6 +49583,38 @@ configure-stage3-gcc: maybe-configure-stage3-intl configure-stage4-gcc: maybe-configure-stage4-intl configure-stageprofile-gcc: maybe-configure-stageprofile-intl configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl +configure-gcc: maybe-all-gmp + +configure-stage1-gcc: maybe-all-stage1-gmp +configure-stage2-gcc: maybe-all-stage2-gmp +configure-stage3-gcc: maybe-all-stage3-gmp +configure-stage4-gcc: maybe-all-stage4-gmp +configure-stageprofile-gcc: maybe-all-stageprofile-gmp +configure-stagefeedback-gcc: maybe-all-stagefeedback-gmp +configure-gcc: maybe-all-mpfr + +configure-stage1-gcc: maybe-all-stage1-mpfr +configure-stage2-gcc: maybe-all-stage2-mpfr +configure-stage3-gcc: maybe-all-stage3-mpfr +configure-stage4-gcc: maybe-all-stage4-mpfr +configure-stageprofile-gcc: maybe-all-stageprofile-mpfr +configure-stagefeedback-gcc: maybe-all-stagefeedback-mpfr +configure-gcc: maybe-all-mpc + +configure-stage1-gcc: maybe-all-stage1-mpc +configure-stage2-gcc: maybe-all-stage2-mpc +configure-stage3-gcc: maybe-all-stage3-mpc +configure-stage4-gcc: maybe-all-stage4-mpc +configure-stageprofile-gcc: maybe-all-stageprofile-mpc +configure-stagefeedback-gcc: maybe-all-stagefeedback-mpc +configure-gcc: maybe-all-isl + +configure-stage1-gcc: maybe-all-stage1-isl +configure-stage2-gcc: maybe-all-stage2-isl +configure-stage3-gcc: maybe-all-stage3-isl +configure-stage4-gcc: maybe-all-stage4-isl +configure-stageprofile-gcc: maybe-all-stageprofile-isl +configure-stagefeedback-gcc: maybe-all-stagefeedback-isl configure-gcc: maybe-all-lto-plugin configure-stage1-gcc: maybe-all-stage1-lto-plugin @@ -45541,14 +49671,6 @@ all-stage3-gcc: all-stage3-libiberty all-stage4-gcc: all-stage4-libiberty all-stageprofile-gcc: all-stageprofile-libiberty all-stagefeedback-gcc: all-stagefeedback-libiberty -all-gcc: maybe-all-gmp - -all-stage1-gcc: maybe-all-stage1-gmp -all-stage2-gcc: maybe-all-stage2-gmp -all-stage3-gcc: maybe-all-stage3-gmp -all-stage4-gcc: maybe-all-stage4-gmp -all-stageprofile-gcc: maybe-all-stageprofile-gmp -all-stagefeedback-gcc: maybe-all-stagefeedback-gmp all-gcc: maybe-all-intl all-stage1-gcc: maybe-all-stage1-intl @@ -45573,14 +49695,14 @@ all-stage3-gcc: maybe-all-stage3-mpc all-stage4-gcc: maybe-all-stage4-mpc all-stageprofile-gcc: maybe-all-stageprofile-mpc all-stagefeedback-gcc: maybe-all-stagefeedback-mpc -all-gcc: maybe-all-cloog - -all-stage1-gcc: maybe-all-stage1-cloog -all-stage2-gcc: maybe-all-stage2-cloog -all-stage3-gcc: maybe-all-stage3-cloog -all-stage4-gcc: maybe-all-stage4-cloog -all-stageprofile-gcc: maybe-all-stageprofile-cloog -all-stagefeedback-gcc: maybe-all-stagefeedback-cloog +all-gcc: maybe-all-isl + +all-stage1-gcc: maybe-all-stage1-isl +all-stage2-gcc: maybe-all-stage2-isl +all-stage3-gcc: maybe-all-stage3-isl +all-stage4-gcc: maybe-all-stage4-isl +all-stageprofile-gcc: maybe-all-stageprofile-isl +all-stagefeedback-gcc: maybe-all-stagefeedback-isl all-gcc: maybe-all-build-texinfo all-stage1-gcc: maybe-all-build-texinfo @@ -45621,6 +49743,14 @@ all-stage3-gcc: maybe-all-build-fixincludes all-stage4-gcc: maybe-all-build-fixincludes all-stageprofile-gcc: maybe-all-build-fixincludes all-stagefeedback-gcc: maybe-all-build-fixincludes +all-gcc: maybe-all-build-libcpp + +all-stage1-gcc: maybe-all-build-libcpp +all-stage2-gcc: maybe-all-build-libcpp +all-stage3-gcc: maybe-all-build-libcpp +all-stage4-gcc: maybe-all-build-libcpp +all-stageprofile-gcc: maybe-all-build-libcpp +all-stagefeedback-gcc: maybe-all-build-libcpp all-gcc: maybe-all-zlib all-stage1-gcc: maybe-all-stage1-zlib @@ -45662,6 +49792,13 @@ all-stage4-gcc: maybe-all-stage4-libiberty all-stageprofile-gcc: maybe-all-stageprofile-libiberty all-stagefeedback-gcc: maybe-all-stagefeedback-libiberty all-gcc: maybe-all-fixincludes + +all-stage1-gcc: maybe-all-stage1-fixincludes +all-stage2-gcc: maybe-all-stage2-fixincludes +all-stage3-gcc: maybe-all-stage3-fixincludes +all-stage4-gcc: maybe-all-stage4-fixincludes +all-stageprofile-gcc: maybe-all-stageprofile-fixincludes +all-stagefeedback-gcc: maybe-all-stagefeedback-fixincludes all-gcc: maybe-all-lto-plugin all-stage1-gcc: maybe-all-stage1-lto-plugin @@ -45739,7 +49876,15 @@ all-stage4-libcpp: maybe-all-stage4-intl all-stageprofile-libcpp: maybe-all-stageprofile-intl all-stagefeedback-libcpp: maybe-all-stagefeedback-intl all-fixincludes: maybe-all-libiberty + +all-stage1-fixincludes: maybe-all-stage1-libiberty +all-stage2-fixincludes: maybe-all-stage2-libiberty +all-stage3-fixincludes: maybe-all-stage3-libiberty +all-stage4-fixincludes: maybe-all-stage4-libiberty +all-stageprofile-fixincludes: maybe-all-stageprofile-libiberty +all-stagefeedback-fixincludes: maybe-all-stagefeedback-libiberty all-gnattools: maybe-all-target-libada +all-gnattools: maybe-all-target-libstdc++-v3 all-lto-plugin: maybe-all-libiberty all-stage1-lto-plugin: maybe-all-stage1-libiberty @@ -45748,6 +49893,17 @@ all-stage3-lto-plugin: maybe-all-stage3-libiberty all-stage4-lto-plugin: maybe-all-stage4-libiberty all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty +all-lto-plugin: maybe-all-libiberty-linker-plugin + +all-stage1-lto-plugin: maybe-all-stage1-libiberty-linker-plugin +all-stage2-lto-plugin: maybe-all-stage2-libiberty-linker-plugin +all-stage3-lto-plugin: maybe-all-stage3-libiberty-linker-plugin +all-stage4-lto-plugin: maybe-all-stage4-libiberty-linker-plugin +all-stageprofile-lto-plugin: maybe-all-stageprofile-libiberty-linker-plugin +all-stagefeedback-lto-plugin: maybe-all-stagefeedback-libiberty-linker-plugin +configure-libcc1: maybe-configure-gcc +all-libcc1: maybe-all-gcc +all-gotools: maybe-all-target-libgo all-utils: maybe-all-libiberty configure-mpfr: maybe-all-gmp @@ -45773,22 +49929,6 @@ configure-stage3-isl: maybe-all-stage3-gmp configure-stage4-isl: maybe-all-stage4-gmp configure-stageprofile-isl: maybe-all-stageprofile-gmp configure-stagefeedback-isl: maybe-all-stagefeedback-gmp -configure-cloog: maybe-all-isl - -configure-stage1-cloog: maybe-all-stage1-isl -configure-stage2-cloog: maybe-all-stage2-isl -configure-stage3-cloog: maybe-all-stage3-isl -configure-stage4-cloog: maybe-all-stage4-isl -configure-stageprofile-cloog: maybe-all-stageprofile-isl -configure-stagefeedback-cloog: maybe-all-stagefeedback-isl -configure-cloog: maybe-all-gmp - -configure-stage1-cloog: maybe-all-stage1-gmp -configure-stage2-cloog: maybe-all-stage2-gmp -configure-stage3-cloog: maybe-all-stage3-gmp -configure-stage4-cloog: maybe-all-stage4-gmp -configure-stageprofile-cloog: maybe-all-stageprofile-gmp -configure-stagefeedback-cloog: maybe-all-stagefeedback-gmp configure-gdb: maybe-all-intl configure-gdb: maybe-configure-sim configure-gdb: maybe-all-bfd @@ -45910,6 +50050,14 @@ all-stage3-binutils: maybe-all-stage3-intl all-stage4-binutils: maybe-all-stage4-intl all-stageprofile-binutils: maybe-all-stageprofile-intl all-stagefeedback-binutils: maybe-all-stagefeedback-intl +all-binutils: maybe-all-gas + +all-stage1-binutils: maybe-all-stage1-gas +all-stage2-binutils: maybe-all-stage2-gas +all-stage3-binutils: maybe-all-stage3-gas +all-stage4-binutils: maybe-all-stage4-gas +all-stageprofile-binutils: maybe-all-stageprofile-gas +all-stagefeedback-binutils: maybe-all-stagefeedback-gas install-binutils: maybe-install-opcodes install-strip-binutils: maybe-install-strip-opcodes install-opcodes: maybe-install-bfd @@ -45959,6 +50107,7 @@ all-gprof: maybe-all-libiberty all-gprof: maybe-all-bfd all-gprof: maybe-all-opcodes all-gprof: maybe-all-intl +all-gprof: maybe-all-gas configure-ld: maybe-configure-intl configure-stage1-ld: maybe-configure-stage1-intl @@ -46015,6 +50164,22 @@ all-stage3-ld: maybe-all-stage3-intl all-stage4-ld: maybe-all-stage4-intl all-stageprofile-ld: maybe-all-stageprofile-intl all-stagefeedback-ld: maybe-all-stagefeedback-intl +all-ld: maybe-all-gas + +all-stage1-ld: maybe-all-stage1-gas +all-stage2-ld: maybe-all-stage2-gas +all-stage3-ld: maybe-all-stage3-gas +all-stage4-ld: maybe-all-stage4-gas +all-stageprofile-ld: maybe-all-stageprofile-gas +all-stagefeedback-ld: maybe-all-stagefeedback-gas +all-ld: maybe-all-binutils + +all-stage1-ld: maybe-all-stage1-binutils +all-stage2-ld: maybe-all-stage2-binutils +all-stage3-ld: maybe-all-stage3-binutils +all-stage4-ld: maybe-all-stage4-binutils +all-stageprofile-ld: maybe-all-stageprofile-binutils +all-stagefeedback-ld: maybe-all-stagefeedback-binutils install-ld: maybe-install-gold install-strip-ld: maybe-install-strip-gold configure-gold: maybe-configure-intl @@ -46057,6 +50222,14 @@ all-stage3-gold: maybe-all-build-bison all-stage4-gold: maybe-all-build-bison all-stageprofile-gold: maybe-all-build-bison all-stagefeedback-gold: maybe-all-build-bison +all-gold: maybe-all-gas + +all-stage1-gold: maybe-all-stage1-gas +all-stage2-gold: maybe-all-stage2-gas +all-stage3-gold: maybe-all-stage3-gas +all-stage4-gold: maybe-all-stage4-gas +all-stageprofile-gold: maybe-all-stageprofile-gas +all-stagefeedback-gold: maybe-all-stagefeedback-gas check-gold: maybe-all-binutils check-stage1-gold: maybe-all-stage1-binutils @@ -46172,6 +50345,7 @@ configure-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp configure-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp configure-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp configure-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp +configure-target-liboffloadmic: maybe-configure-target-libgomp configure-target-libsanitizer: maybe-all-target-libstdc++-v3 configure-stage1-target-libsanitizer: maybe-all-stage1-target-libstdc++-v3 @@ -46180,6 +50354,14 @@ configure-stage3-target-libsanitizer: maybe-all-stage3-target-libstdc++-v3 configure-stage4-target-libsanitizer: maybe-all-stage4-target-libstdc++-v3 configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libstdc++-v3 configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libstdc++-v3 +configure-target-libvtv: maybe-all-target-libstdc++-v3 + +configure-stage1-target-libvtv: maybe-all-stage1-target-libstdc++-v3 +configure-stage2-target-libvtv: maybe-all-stage2-target-libstdc++-v3 +configure-stage3-target-libvtv: maybe-all-stage3-target-libstdc++-v3 +configure-stage4-target-libvtv: maybe-all-stage4-target-libstdc++-v3 +configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libstdc++-v3 +configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libstdc++-v3 all-target-libstdc++-v3: maybe-configure-target-libgomp all-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp @@ -46188,10 +50370,18 @@ all-stage3-target-libstdc++-v3: maybe-configure-stage3-target-libgomp all-stage4-target-libstdc++-v3: maybe-configure-stage4-target-libgomp all-stageprofile-target-libstdc++-v3: maybe-configure-stageprofile-target-libgomp all-stagefeedback-target-libstdc++-v3: maybe-configure-stagefeedback-target-libgomp +all-target-liboffloadmic: maybe-all-target-libgomp install-target-libgo: maybe-install-target-libatomic install-target-libgfortran: maybe-install-target-libquadmath install-target-libgfortran: maybe-install-target-libgcc +install-target-libsanitizer: maybe-install-target-libstdc++-v3 install-target-libsanitizer: maybe-install-target-libgcc +install-target-libvtv: maybe-install-target-libstdc++-v3 +install-target-libvtv: maybe-install-target-libgcc +install-target-libcilkrts: maybe-install-target-libstdc++-v3 +install-target-libcilkrts: maybe-install-target-libgcc +install-target-liboffloadmic: maybe-install-target-libstdc++-v3 +install-target-liboffloadmic: maybe-install-target-libgcc install-target-libjava: maybe-install-target-libgcc install-target-libitm: maybe-install-target-libgcc install-target-libobjc: maybe-install-target-libgcc @@ -46221,6 +50411,18 @@ configure-stage3-target-libsanitizer: maybe-all-stage3-target-libgcc configure-stage4-target-libsanitizer: maybe-all-stage4-target-libgcc configure-stageprofile-target-libsanitizer: maybe-all-stageprofile-target-libgcc configure-stagefeedback-target-libsanitizer: maybe-all-stagefeedback-target-libgcc +configure-stage1-target-libmpx: maybe-all-stage1-target-libgcc +configure-stage2-target-libmpx: maybe-all-stage2-target-libgcc +configure-stage3-target-libmpx: maybe-all-stage3-target-libgcc +configure-stage4-target-libmpx: maybe-all-stage4-target-libgcc +configure-stageprofile-target-libmpx: maybe-all-stageprofile-target-libgcc +configure-stagefeedback-target-libmpx: maybe-all-stagefeedback-target-libgcc +configure-stage1-target-libvtv: maybe-all-stage1-target-libgcc +configure-stage2-target-libvtv: maybe-all-stage2-target-libgcc +configure-stage3-target-libvtv: maybe-all-stage3-target-libgcc +configure-stage4-target-libvtv: maybe-all-stage4-target-libgcc +configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libgcc +configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc @@ -46231,8 +50433,11 @@ configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc @if gcc-no-bootstrap configure-target-libstdc++-v3: maybe-all-target-libgcc -configure-target-libmudflap: maybe-all-target-libgcc configure-target-libsanitizer: maybe-all-target-libgcc +configure-target-libmpx: maybe-all-target-libgcc +configure-target-libvtv: maybe-all-target-libgcc +configure-target-libcilkrts: maybe-all-target-libgcc +configure-target-liboffloadmic: maybe-all-target-libgcc configure-target-libssp: maybe-all-target-libgcc configure-target-newlib: maybe-all-target-libgcc configure-target-libbacktrace: maybe-all-target-libgcc @@ -46257,10 +50462,18 @@ configure-target-libatomic: maybe-all-target-libgcc configure-target-libstdc++-v3: maybe-all-target-newlib maybe-all-target-libgloss -configure-target-libmudflap: maybe-all-target-newlib maybe-all-target-libgloss - configure-target-libsanitizer: maybe-all-target-newlib maybe-all-target-libgloss +configure-target-libmpx: maybe-all-target-newlib maybe-all-target-libgloss + +configure-target-libvtv: maybe-all-target-newlib maybe-all-target-libgloss + +configure-target-libcilkrts: maybe-all-target-newlib maybe-all-target-libgloss +configure-target-libcilkrts: maybe-all-target-libstdc++-v3 + +configure-target-liboffloadmic: maybe-all-target-newlib maybe-all-target-libgloss +configure-target-liboffloadmic: maybe-all-target-libstdc++-v3 + configure-target-libssp: maybe-all-target-newlib maybe-all-target-libgloss