X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=Makefile.in;h=cb0136e8f81aed4b44a6a099f70447bc591725bf;hb=c88960d081f0b37ec03c66a13115e2a68e40d1ad;hp=f9e8e0d5cb79fe0eb0bf4773ee095f0e28bf9acb;hpb=e78e02e6d91ee2ec3c3d1c560366089dfbafab2c;p=deliverable%2Fbinutils-gdb.git diff --git a/Makefile.in b/Makefile.in index f9e8e0d5cb..cb0136e8f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,8 @@ # # Makefile for directory with subdirs to build. # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +# 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2011, 2012, 2013, 2014, 2015, 2016 # Free Software Foundation # # This file is free software; you can redistribute it and/or modify @@ -213,17 +214,19 @@ 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; \ + ISLVER="$(HOST_ISLVER)"; export ISLVER; \ + LIBELFLIBS="$(HOST_LIBELFLIBS)"; export LIBELFLIBS; \ + LIBELFINC="$(HOST_LIBELFINC)"; export LIBELFINC; \ + XGCC_FLAGS_FOR_TARGET="$(XGCC_FLAGS_FOR_TARGET)"; export XGCC_FLAGS_FOR_TARGET; \ @if gcc-bootstrap $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ @endif gcc-bootstrap @@ -239,9 +242,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 +259,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 +289,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; \ @@ -309,12 +314,10 @@ NORMAL_TARGET_EXPORTS = \ HOST_GMPLIBS = @gmplibs@ HOST_GMPINC = @gmpinc@ -# Where to find ISL +# Where to find isl +HOST_ISLLIBS = @isllibs@ HOST_ISLINC = @islinc@ - -# Where to find CLOOG -HOST_CLOOGLIBS = @clooglibs@ -HOST_CLOOGINC = @clooginc@ +HOST_ISLVER = @islver@ # Where to find libelf HOST_LIBELFLIBS = @libelflibs@ @@ -483,11 +486,9 @@ 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_CHECKING = @stage1_checking@ @@ -536,6 +537,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@ @@ -577,7 +579,7 @@ 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_libsanitizer)$(TARGET_LIB_PATH_libvtv)$(TARGET_LIB_PATH_libcilkrts)$(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: @@ -587,6 +589,10 @@ TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs: 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 @@ -595,6 +601,10 @@ TARGET_LIB_PATH_libvtv = $$r/$(TARGET_SUBDIR)/libvtv/.libs: 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 @@ -615,7 +625,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 @@ -643,11 +653,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: @@ -674,7 +679,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)" \ @@ -755,6 +762,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)" \ @@ -784,7 +792,8 @@ BASE_FLAGS_TO_PASS = \ $(CXX_FOR_TARGET_FLAG_TO_PASS) \ "TFLAGS=$(TFLAGS)" \ "CONFIG_SHELL=$(SHELL)" \ - "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + $(if $(LSAN_OPTIONS),"LSAN_OPTIONS=$(LSAN_OPTIONS)") # We leave this in just in case, but it is not needed anymore. RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) @@ -826,8 +835,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 @@ -838,7 +856,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)' \ @@ -851,11 +871,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) @@ -898,7 +921,6 @@ configure-host: \ maybe-configure-mpfr \ maybe-configure-mpc \ maybe-configure-isl \ - maybe-configure-cloog \ maybe-configure-libelf \ maybe-configure-gold \ maybe-configure-gprof \ @@ -911,6 +933,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 \ @@ -925,13 +948,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-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 \ @@ -986,6 +1013,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 @@ -1003,7 +1031,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 @@ -1023,9 +1053,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 @@ -1054,7 +1081,12 @@ 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 +@if libiconv-no-bootstrap all-host: maybe-all-libiconv +@endif libiconv-no-bootstrap all-host: maybe-all-m4 all-host: maybe-all-readline all-host: maybe-all-sid @@ -1073,6 +1105,8 @@ 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 @@ -1082,10 +1116,14 @@ all-target: maybe-all-target-libstdc++-v3 @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 @@ -1143,7 +1181,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 @@ -1156,6 +1193,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 @@ -1171,13 +1209,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-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 @@ -1226,7 +1268,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 @@ -1239,6 +1280,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 @@ -1254,13 +1296,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-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 @@ -1309,7 +1355,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 @@ -1322,6 +1367,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 @@ -1337,13 +1383,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-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 @@ -1392,7 +1442,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 @@ -1405,6 +1454,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 @@ -1420,13 +1470,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-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 @@ -1475,7 +1529,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 @@ -1488,6 +1541,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 @@ -1503,13 +1557,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-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 @@ -1558,7 +1616,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 @@ -1571,6 +1628,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 @@ -1586,13 +1644,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-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 @@ -1641,7 +1703,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 @@ -1654,6 +1715,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 @@ -1669,13 +1731,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-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 @@ -1724,7 +1790,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 @@ -1737,6 +1802,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 @@ -1752,13 +1818,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-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 @@ -1807,7 +1877,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 @@ -1820,6 +1889,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 @@ -1835,13 +1905,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-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 @@ -1890,7 +1964,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 @@ -1903,6 +1976,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 @@ -1918,13 +1992,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-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 @@ -1973,7 +2051,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 @@ -1986,6 +2063,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 @@ -2001,13 +2079,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-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 @@ -2056,7 +2138,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 @@ -2069,6 +2150,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 @@ -2084,13 +2166,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-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 @@ -2139,7 +2225,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 @@ -2152,6 +2237,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 @@ -2167,13 +2253,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-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 @@ -2214,9 +2304,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 @@ -2227,7 +2317,7 @@ local-clean: local-distclean: -rm -f Makefile config.status config.cache mh-frag mt-frag - -rm -f maybedep.tmp serdep.tmp + -rm -f maybedep.tmp serdep.tmp stage_final -if [ "$(TARGET_SUBDIR)" != "." ]; then \ rm -rf $(TARGET_SUBDIR); \ else true; fi @@ -2239,7 +2329,8 @@ local-distclean: -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null -rmdir texinfo/makeinfo texinfo/po texinfo/util 2>/dev/null - -rmdir fastjar gcc libiberty texinfo zlib 2>/dev/null + -rmdir fastjar gcc gnattools gotools libcc1 libiberty 2>/dev/null + -rmdir texinfo zlib 2>/dev/null -find . -name config.cache -exec rm -f {} \; \; 2>/dev/null local-maintainer-clean: @@ -2277,7 +2368,6 @@ check-host: \ maybe-check-mpfr \ maybe-check-mpc \ maybe-check-isl \ - maybe-check-cloog \ maybe-check-libelf \ maybe-check-gold \ maybe-check-gprof \ @@ -2290,6 +2380,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 \ @@ -2304,14 +2395,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-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 \ @@ -2360,6 +2455,27 @@ 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 + +# clang-format config + +$(srcdir)/.clang-format: + $(LN_S) contrib/clang-format $@ + +clang-format: $(srcdir)/.clang-format + +.PHONY: clang-format + # Installation targets. .PHONY: install uninstall @@ -2386,7 +2502,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 \ @@ -2399,6 +2514,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 \ @@ -2413,7 +2529,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: \ @@ -2433,7 +2551,6 @@ install-host: \ maybe-install-mpfr \ maybe-install-mpc \ maybe-install-isl \ - maybe-install-cloog \ maybe-install-libelf \ maybe-install-gold \ maybe-install-gprof \ @@ -2446,6 +2563,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 \ @@ -2460,14 +2578,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-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 \ @@ -2494,14 +2616,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 @@ -2536,7 +2658,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 \ @@ -2549,6 +2670,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 \ @@ -2563,14 +2685,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-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 \ @@ -2603,10 +2729,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: @@ -2648,7 +2774,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; \ @@ -2657,12 +2783,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 @@ -2704,7 +2831,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; \ @@ -2713,12 +2840,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 @@ -2760,7 +2888,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; \ @@ -2769,12 +2897,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 @@ -2816,7 +2945,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; \ @@ -2825,12 +2954,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 @@ -2872,7 +3002,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; \ @@ -2881,12 +3011,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 @@ -2928,7 +3059,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; \ @@ -2937,12 +3068,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 @@ -2972,6 +3104,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 # -------------------------------------- @@ -2988,7 +3177,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; \ @@ -2997,11 +3186,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 @@ -3022,19 +3212,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 @@ -3054,19 +3245,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 @@ -3087,19 +3278,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 @@ -3120,19 +3311,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 @@ -3153,19 +3344,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 @@ -3186,19 +3377,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 @@ -3485,9 +3676,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 @@ -3537,7 +3728,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}" \ @@ -3562,7 +3753,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}" \ @@ -3587,7 +3778,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}" \ @@ -3612,7 +3803,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}" \ @@ -3637,7 +3828,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}" \ @@ -3663,7 +3854,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}" \ @@ -3689,7 +3880,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}" \ @@ -3715,7 +3906,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}" \ @@ -3740,7 +3931,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}" \ @@ -3764,7 +3955,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}" \ @@ -3788,7 +3979,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}" \ @@ -3812,7 +4003,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}" \ @@ -3836,7 +4027,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}" \ @@ -3860,7 +4051,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; \ @@ -3869,11 +4060,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 @@ -3894,19 +4086,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 @@ -3926,19 +4119,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 @@ -3959,19 +4152,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 @@ -3992,19 +4185,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 @@ -4025,19 +4218,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 @@ -4058,19 +4251,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 @@ -4357,9 +4550,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 @@ -4409,7 +4602,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}" \ @@ -4434,7 +4627,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}" \ @@ -4459,7 +4652,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}" \ @@ -4484,7 +4677,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}" \ @@ -4509,7 +4702,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}" \ @@ -4535,7 +4728,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}" \ @@ -4561,7 +4754,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}" \ @@ -4587,7 +4780,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}" \ @@ -4612,7 +4805,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}" \ @@ -4636,7 +4829,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}" \ @@ -4660,7 +4853,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}" \ @@ -4684,7 +4877,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}" \ @@ -4708,7 +4901,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}" \ @@ -4732,7 +4925,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; \ @@ -4741,11 +4934,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 @@ -4766,19 +4960,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 @@ -4798,19 +4993,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 @@ -4831,19 +5026,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 @@ -4864,19 +5059,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 @@ -4897,19 +5092,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 @@ -4930,19 +5125,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 @@ -5229,9 +5424,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 @@ -5281,7 +5476,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}" \ @@ -5306,7 +5501,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}" \ @@ -5331,7 +5526,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}" \ @@ -5356,7 +5551,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}" \ @@ -5381,7 +5576,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}" \ @@ -5407,7 +5602,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}" \ @@ -5433,7 +5628,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}" \ @@ -5459,7 +5654,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}" \ @@ -5484,7 +5679,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}" \ @@ -5508,7 +5703,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}" \ @@ -5532,7 +5727,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}" \ @@ -5556,7 +5751,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}" \ @@ -5580,7 +5775,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}" \ @@ -5605,7 +5800,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; \ @@ -5614,11 +5809,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 @@ -5655,12 +5851,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 @@ -5712,7 +5908,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}" \ @@ -5738,7 +5934,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}" \ @@ -5764,7 +5960,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}" \ @@ -5790,7 +5986,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}" \ @@ -5816,7 +6012,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}" \ @@ -5843,7 +6039,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}" \ @@ -5870,7 +6066,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}" \ @@ -5897,7 +6093,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}" \ @@ -5923,7 +6119,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}" \ @@ -5948,7 +6144,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}" \ @@ -5973,7 +6169,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}" \ @@ -5998,7 +6194,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}" \ @@ -6023,7 +6219,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}" \ @@ -6048,7 +6244,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; \ @@ -6057,11 +6253,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 @@ -6099,7 +6296,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) @@ -6152,7 +6349,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}" \ @@ -6178,7 +6375,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}" \ @@ -6204,7 +6401,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}" \ @@ -6230,7 +6427,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}" \ @@ -6256,7 +6453,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}" \ @@ -6283,7 +6480,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}" \ @@ -6310,7 +6507,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}" \ @@ -6337,7 +6534,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}" \ @@ -6363,7 +6560,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}" \ @@ -6388,7 +6585,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}" \ @@ -6413,7 +6610,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}" \ @@ -6438,7 +6635,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}" \ @@ -6463,7 +6660,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}" \ @@ -6488,7 +6685,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; \ @@ -6497,11 +6694,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 @@ -6539,7 +6737,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) @@ -6592,7 +6790,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}" \ @@ -6618,7 +6816,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}" \ @@ -6644,7 +6842,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}" \ @@ -6670,7 +6868,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}" \ @@ -6696,7 +6894,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}" \ @@ -6723,7 +6921,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}" \ @@ -6750,7 +6948,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}" \ @@ -6777,7 +6975,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}" \ @@ -6803,7 +7001,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}" \ @@ -6828,7 +7026,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}" \ @@ -6853,7 +7051,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}" \ @@ -6878,7 +7076,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}" \ @@ -6903,7 +7101,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}" \ @@ -6928,7 +7126,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; \ @@ -6937,11 +7135,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 @@ -6979,7 +7178,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) @@ -7032,7 +7231,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}" \ @@ -7058,7 +7257,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}" \ @@ -7084,7 +7283,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}" \ @@ -7110,7 +7309,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}" \ @@ -7136,7 +7335,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}" \ @@ -7163,7 +7362,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}" \ @@ -7190,7 +7389,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}" \ @@ -7217,7 +7416,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}" \ @@ -7243,7 +7442,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}" \ @@ -7268,7 +7467,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}" \ @@ -7293,7 +7492,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}" \ @@ -7318,7 +7517,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}" \ @@ -7343,7 +7542,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}" \ @@ -7368,7 +7567,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; \ @@ -7377,11 +7576,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 @@ -7418,12 +7618,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 @@ -7475,7 +7675,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}" \ @@ -7501,7 +7701,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}" \ @@ -7527,7 +7727,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}" \ @@ -7553,7 +7753,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}" \ @@ -7579,7 +7779,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}" \ @@ -7606,7 +7806,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}" \ @@ -7633,7 +7833,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}" \ @@ -7660,7 +7860,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}" \ @@ -7686,7 +7886,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}" \ @@ -7711,7 +7911,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}" \ @@ -7736,7 +7936,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}" \ @@ -7761,7 +7961,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}" \ @@ -7786,7 +7986,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}" \ @@ -7807,11 +8007,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; \ @@ -7820,16 +8019,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 @@ -7841,7 +8240,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) \ @@ -7852,6 +8250,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: @@ -7862,9 +8509,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 @@ -7907,7 +8554,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; \ @@ -7915,7 +8561,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}" \ @@ -7933,7 +8579,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; \ @@ -7941,7 +8586,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}" \ @@ -7959,7 +8604,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; \ @@ -7967,7 +8611,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}" \ @@ -7985,7 +8629,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; \ @@ -7993,7 +8636,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}" \ @@ -8022,7 +8665,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; \ @@ -8030,7 +8672,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}" \ @@ -8049,7 +8691,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; \ @@ -8057,7 +8698,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}" \ @@ -8076,7 +8717,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; \ @@ -8084,7 +8724,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}" \ @@ -8102,7 +8742,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; \ @@ -8110,7 +8749,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}" \ @@ -8127,7 +8766,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; \ @@ -8135,7 +8773,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}" \ @@ -8152,7 +8790,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; \ @@ -8160,7 +8797,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}" \ @@ -8177,7 +8814,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; \ @@ -8185,7 +8821,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}" \ @@ -8202,7 +8838,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; \ @@ -8210,7 +8845,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}" \ @@ -8235,7 +8870,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; \ @@ -8244,11 +8879,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 @@ -8285,12 +8921,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 @@ -8342,7 +8978,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}" \ @@ -8368,7 +9004,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}" \ @@ -8394,7 +9030,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}" \ @@ -8420,7 +9056,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}" \ @@ -8446,7 +9082,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}" \ @@ -8473,7 +9109,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}" \ @@ -8500,7 +9136,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}" \ @@ -8527,7 +9163,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}" \ @@ -8553,7 +9189,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}" \ @@ -8578,7 +9214,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}" \ @@ -8603,7 +9239,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}" \ @@ -8628,7 +9264,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}" \ @@ -8653,7 +9289,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}" \ @@ -8677,7 +9313,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; \ @@ -8686,11 +9322,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 @@ -8711,19 +9348,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 @@ -8743,19 +9381,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 @@ -8776,19 +9414,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 @@ -8809,19 +9447,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 @@ -8842,19 +9480,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 @@ -8875,19 +9513,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 @@ -9174,9 +9812,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 @@ -9226,7 +9864,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}" \ @@ -9251,7 +9889,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}" \ @@ -9276,7 +9914,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}" \ @@ -9301,7 +9939,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}" \ @@ -9326,7 +9964,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}" \ @@ -9352,7 +9990,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}" \ @@ -9378,7 +10016,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}" \ @@ -9404,7 +10042,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}" \ @@ -9429,7 +10067,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}" \ @@ -9453,7 +10091,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}" \ @@ -9477,7 +10115,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}" \ @@ -9501,7 +10139,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}" \ @@ -9525,7 +10163,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}" \ @@ -9549,7 +10187,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; \ @@ -9558,11 +10196,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 @@ -9583,19 +10222,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 @@ -9615,19 +10255,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 @@ -9648,19 +10288,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 @@ -9681,19 +10321,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 @@ -9714,19 +10354,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 @@ -9747,19 +10387,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 @@ -10046,9 +10686,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 @@ -10098,7 +10738,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}" \ @@ -10123,7 +10763,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}" \ @@ -10148,7 +10788,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}" \ @@ -10173,7 +10813,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}" \ @@ -10198,7 +10838,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}" \ @@ -10224,7 +10864,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}" \ @@ -10250,7 +10890,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}" \ @@ -10276,7 +10916,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}" \ @@ -10301,7 +10941,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}" \ @@ -10325,7 +10965,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}" \ @@ -10349,7 +10989,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}" \ @@ -10373,7 +11013,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}" \ @@ -10397,7 +11037,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}" \ @@ -10421,7 +11061,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; \ @@ -10430,11 +11070,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 @@ -10455,21 +11096,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 @@ -10488,22 +11130,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 @@ -10522,22 +11164,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 @@ -10556,22 +11198,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 @@ -10590,22 +11232,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 @@ -10624,22 +11266,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 @@ -10924,9 +11566,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 @@ -10964,7 +11606,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}" \ @@ -10989,7 +11631,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}" \ @@ -11014,7 +11656,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}" \ @@ -11039,7 +11681,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}" \ @@ -11064,7 +11706,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}" \ @@ -11090,7 +11732,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}" \ @@ -11116,7 +11758,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}" \ @@ -11142,7 +11784,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}" \ @@ -11167,7 +11809,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}" \ @@ -11191,7 +11833,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}" \ @@ -11215,7 +11857,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}" \ @@ -11239,7 +11881,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}" \ @@ -11263,7 +11905,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}" \ @@ -11287,7 +11929,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; \ @@ -11296,11 +11938,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 @@ -11321,19 +11964,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 @@ -11354,19 +11998,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@ @@ -11388,19 +12032,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@ @@ -11422,19 +12066,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@ @@ -11456,19 +12100,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@ @@ -11490,19 +12134,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@ @@ -11525,7 +12169,7 @@ all-mpfr: configure-mpfr s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ (cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \ $(TARGET-mpfr)) @endif mpfr @@ -11554,7 +12198,7 @@ all-stage1-mpfr: configure-stage1-mpfr CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) \ + $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" \ TFLAGS="$(STAGE1_TFLAGS)" \ $(TARGET-stage1-mpfr) @@ -11569,7 +12213,7 @@ clean-stage1-mpfr: fi; \ cd $(HOST_SUBDIR)/mpfr && \ $(MAKE) $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) clean + $(STAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean @endif mpfr-bootstrap @@ -11596,7 +12240,7 @@ all-stage2-mpfr: configure-stage2-mpfr 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) AM_CFLAGS="-DNO_ASM" \ TFLAGS="$(STAGE2_TFLAGS)" \ $(TARGET-stage2-mpfr) @@ -11610,7 +12254,7 @@ clean-stage2-mpfr: $(MAKE) stage2-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean @endif mpfr-bootstrap @@ -11637,7 +12281,7 @@ all-stage3-mpfr: configure-stage3-mpfr 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) AM_CFLAGS="-DNO_ASM" \ TFLAGS="$(STAGE3_TFLAGS)" \ $(TARGET-stage3-mpfr) @@ -11651,7 +12295,7 @@ clean-stage3-mpfr: $(MAKE) stage3-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean @endif mpfr-bootstrap @@ -11678,7 +12322,7 @@ all-stage4-mpfr: configure-stage4-mpfr 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) AM_CFLAGS="-DNO_ASM" \ TFLAGS="$(STAGE4_TFLAGS)" \ $(TARGET-stage4-mpfr) @@ -11692,7 +12336,7 @@ clean-stage4-mpfr: $(MAKE) stage4-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean @endif mpfr-bootstrap @@ -11719,7 +12363,7 @@ all-stageprofile-mpfr: configure-stageprofile-mpfr 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) AM_CFLAGS="-DNO_ASM" \ TFLAGS="$(STAGEprofile_TFLAGS)" \ $(TARGET-stageprofile-mpfr) @@ -11733,7 +12377,7 @@ clean-stageprofile-mpfr: $(MAKE) stageprofile-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean @endif mpfr-bootstrap @@ -11760,7 +12404,7 @@ all-stagefeedback-mpfr: configure-stagefeedback-mpfr 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) AM_CFLAGS="-DNO_ASM" \ TFLAGS="$(STAGEfeedback_TFLAGS)" \ $(TARGET-stagefeedback-mpfr) @@ -11774,7 +12418,7 @@ clean-stagefeedback-mpfr: $(MAKE) stagefeedback-start; \ fi; \ cd $(HOST_SUBDIR)/mpfr && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) AM_CFLAGS="-DNO_ASM" clean @endif mpfr-bootstrap @@ -11790,9 +12434,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) AM_CFLAGS="-DNO_ASM" $(EXTRA_BOOTSTRAP_FLAGS) check) @endif mpfr @@ -11827,10 +12471,10 @@ info-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -11852,10 +12496,10 @@ dvi-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -11877,10 +12521,10 @@ pdf-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -11902,10 +12546,10 @@ html-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -11927,10 +12571,10 @@ TAGS-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -11953,10 +12597,10 @@ install-info-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -11979,10 +12623,10 @@ install-pdf-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12005,10 +12649,10 @@ install-html-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12030,10 +12674,10 @@ installcheck-mpfr: \ 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12054,10 +12698,10 @@ mostlyclean-mpfr: 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12078,10 +12722,10 @@ clean-mpfr: 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12102,10 +12746,10 @@ distclean-mpfr: 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12126,10 +12770,10 @@ maintainer-clean-mpfr: 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) AM_CFLAGS="-DNO_ASM"; 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}" \ @@ -12153,7 +12797,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; \ @@ -12162,11 +12806,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 @@ -12187,19 +12832,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 @@ -12220,19 +12866,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@ @@ -12254,19 +12900,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@ @@ -12288,19 +12934,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@ @@ -12322,19 +12968,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@ @@ -12356,19 +13002,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@ @@ -12656,9 +13302,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 @@ -12696,7 +13342,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}" \ @@ -12721,7 +13367,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}" \ @@ -12746,7 +13392,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}" \ @@ -12771,7 +13417,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}" \ @@ -12796,7 +13442,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}" \ @@ -12822,7 +13468,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}" \ @@ -12848,7 +13494,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}" \ @@ -12874,7 +13520,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}" \ @@ -12899,7 +13545,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}" \ @@ -12923,7 +13569,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}" \ @@ -12947,7 +13593,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}" \ @@ -12971,7 +13617,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}" \ @@ -12995,7 +13641,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}" \ @@ -13019,7 +13665,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; \ @@ -13028,11 +13674,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 @@ -13053,19 +13700,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 @@ -13086,19 +13734,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@ @@ -13120,19 +13768,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@ @@ -13154,19 +13802,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@ @@ -13188,19 +13836,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@ @@ -13222,19 +13870,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@ @@ -13522,9 +14170,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 @@ -13562,7 +14210,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}" \ @@ -13587,7 +14235,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}" \ @@ -13612,7 +14260,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}" \ @@ -13637,7 +14285,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}" \ @@ -13662,7 +14310,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}" \ @@ -13688,7 +14336,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}" \ @@ -13714,7 +14362,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}" \ @@ -13740,7 +14388,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}" \ @@ -13765,7 +14413,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}" \ @@ -13789,7 +14437,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}" \ @@ -13813,7 +14461,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}" \ @@ -13837,7 +14485,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}" \ @@ -13861,7 +14509,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}" \ @@ -13874,872 +14522,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 @@ -14751,7 +14533,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; \ @@ -14760,11 +14542,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 @@ -14785,19 +14568,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 @@ -14818,19 +14602,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 @@ -14852,19 +14636,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 @@ -14886,19 +14670,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 @@ -14920,19 +14704,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 @@ -14954,19 +14738,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 @@ -15254,9 +15038,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 @@ -15294,7 +15078,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}" \ @@ -15319,7 +15103,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}" \ @@ -15344,7 +15128,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}" \ @@ -15369,7 +15153,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}" \ @@ -15394,7 +15178,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}" \ @@ -15420,7 +15204,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}" \ @@ -15446,7 +15230,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}" \ @@ -15472,7 +15256,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}" \ @@ -15497,7 +15281,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}" \ @@ -15521,7 +15305,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}" \ @@ -15545,7 +15329,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}" \ @@ -15569,7 +15353,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}" \ @@ -15593,7 +15377,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}" \ @@ -15617,7 +15401,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; \ @@ -15626,11 +15410,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 @@ -15651,19 +15436,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 @@ -15683,19 +15469,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 @@ -15716,19 +15502,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 @@ -15749,19 +15535,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 @@ -15782,19 +15568,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 @@ -15815,19 +15601,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 @@ -16114,9 +15900,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 @@ -16166,7 +15952,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}" \ @@ -16191,7 +15977,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}" \ @@ -16216,7 +16002,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}" \ @@ -16241,7 +16027,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}" \ @@ -16266,7 +16052,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}" \ @@ -16292,7 +16078,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}" \ @@ -16318,7 +16104,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}" \ @@ -16344,7 +16130,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}" \ @@ -16369,7 +16155,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}" \ @@ -16393,7 +16179,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}" \ @@ -16417,7 +16203,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}" \ @@ -16441,7 +16227,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}" \ @@ -16465,7 +16251,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}" \ @@ -16490,7 +16276,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; \ @@ -16499,11 +16285,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 @@ -16541,7 +16328,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) @@ -16594,7 +16381,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}" \ @@ -16620,7 +16407,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}" \ @@ -16646,7 +16433,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}" \ @@ -16672,7 +16459,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}" \ @@ -16698,7 +16485,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}" \ @@ -16725,7 +16512,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}" \ @@ -16752,7 +16539,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}" \ @@ -16779,7 +16566,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}" \ @@ -16805,7 +16592,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}" \ @@ -16830,7 +16617,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}" \ @@ -16855,7 +16642,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}" \ @@ -16880,7 +16667,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}" \ @@ -16905,7 +16692,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}" \ @@ -16929,7 +16716,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; \ @@ -16938,11 +16725,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 @@ -16963,19 +16751,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 @@ -16995,19 +16784,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 @@ -17028,19 +16817,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 @@ -17061,19 +16850,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 @@ -17094,19 +16883,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 @@ -17127,19 +16916,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 @@ -17426,9 +17215,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 @@ -17478,7 +17267,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}" \ @@ -17503,7 +17292,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}" \ @@ -17528,7 +17317,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}" \ @@ -17553,7 +17342,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}" \ @@ -17578,7 +17367,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}" \ @@ -17604,7 +17393,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}" \ @@ -17630,7 +17419,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}" \ @@ -17656,7 +17445,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}" \ @@ -17681,7 +17470,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}" \ @@ -17705,7 +17494,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}" \ @@ -17729,7 +17518,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}" \ @@ -17753,7 +17542,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}" \ @@ -17777,7 +17566,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}" \ @@ -17802,7 +17591,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; \ @@ -17811,11 +17600,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 @@ -17853,7 +17643,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) @@ -17906,7 +17696,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}" \ @@ -17932,7 +17722,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}" \ @@ -17958,7 +17748,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}" \ @@ -17984,7 +17774,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}" \ @@ -18010,7 +17800,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}" \ @@ -18037,7 +17827,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}" \ @@ -18064,7 +17854,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}" \ @@ -18091,7 +17881,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}" \ @@ -18117,7 +17907,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}" \ @@ -18152,7 +17942,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}" \ @@ -18177,7 +17967,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}" \ @@ -18202,7 +17992,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}" \ @@ -18227,7 +18017,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; \ @@ -18236,11 +18026,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 @@ -18278,7 +18069,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) @@ -18331,7 +18122,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}" \ @@ -18357,7 +18148,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}" \ @@ -18383,7 +18174,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}" \ @@ -18409,7 +18200,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}" \ @@ -18435,7 +18226,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}" \ @@ -18462,7 +18253,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}" \ @@ -18489,7 +18280,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}" \ @@ -18516,7 +18307,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}" \ @@ -18542,7 +18333,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}" \ @@ -18567,7 +18358,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}" \ @@ -18592,7 +18383,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}" \ @@ -18617,7 +18408,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}" \ @@ -18642,7 +18433,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}" \ @@ -18666,7 +18457,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; \ @@ -18675,11 +18466,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 @@ -18700,19 +18492,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 @@ -18732,19 +18525,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 @@ -18765,19 +18558,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 @@ -18798,19 +18591,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 @@ -18831,19 +18624,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 @@ -18864,19 +18657,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 @@ -19163,9 +18956,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 @@ -19215,7 +19008,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}" \ @@ -19240,7 +19033,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}" \ @@ -19265,7 +19058,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}" \ @@ -19290,7 +19083,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}" \ @@ -19315,7 +19108,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}" \ @@ -19341,7 +19134,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}" \ @@ -19367,7 +19160,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}" \ @@ -19393,7 +19186,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}" \ @@ -19418,7 +19211,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}" \ @@ -19442,7 +19235,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}" \ @@ -19466,7 +19259,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}" \ @@ -19490,7 +19283,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}" \ @@ -19514,7 +19307,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}" \ @@ -19538,7 +19331,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; \ @@ -19547,11 +19340,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 @@ -19572,19 +19366,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 @@ -19604,19 +19399,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 @@ -19637,19 +19432,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 @@ -19670,19 +19465,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 @@ -19703,19 +19498,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 @@ -19736,19 +19531,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 @@ -20035,9 +19830,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 @@ -20087,7 +19882,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}" \ @@ -20112,7 +19907,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}" \ @@ -20137,7 +19932,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}" \ @@ -20162,7 +19957,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}" \ @@ -20187,7 +19982,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}" \ @@ -20213,7 +20008,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}" \ @@ -20239,7 +20034,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}" \ @@ -20265,7 +20060,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}" \ @@ -20290,7 +20085,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}" \ @@ -20314,7 +20109,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}" \ @@ -20338,7 +20133,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}" \ @@ -20362,7 +20157,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}" \ @@ -20386,7 +20181,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}" \ @@ -20410,7 +20205,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; \ @@ -20419,11 +20214,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 @@ -20444,19 +20240,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 @@ -20476,19 +20273,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 @@ -20509,19 +20306,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 @@ -20542,19 +20339,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 @@ -20575,19 +20372,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 @@ -20608,19 +20405,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 @@ -20907,9 +20704,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 @@ -20959,7 +20756,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}" \ @@ -20984,7 +20781,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}" \ @@ -21009,7 +20806,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}" \ @@ -21034,7 +20831,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}" \ @@ -21059,7 +20856,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}" \ @@ -21085,7 +20882,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}" \ @@ -21111,7 +20908,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}" \ @@ -21137,7 +20934,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}" \ @@ -21162,7 +20959,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}" \ @@ -21186,7 +20983,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}" \ @@ -21210,7 +21007,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}" \ @@ -21234,7 +21031,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}" \ @@ -21258,7 +21055,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}" \ @@ -21282,7 +21079,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; \ @@ -21291,11 +21088,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 @@ -21316,19 +21114,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 @@ -21348,19 +21147,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 @@ -21381,19 +21180,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 @@ -21414,19 +21213,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 @@ -21447,19 +21246,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 @@ -21480,19 +21279,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 @@ -21779,9 +21578,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 @@ -21831,7 +21630,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}" \ @@ -21856,7 +21655,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}" \ @@ -21881,7 +21680,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}" \ @@ -21906,7 +21705,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}" \ @@ -21931,7 +21730,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}" \ @@ -21957,7 +21756,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}" \ @@ -21983,7 +21782,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}" \ @@ -22009,7 +21808,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}" \ @@ -22034,7 +21833,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}" \ @@ -22058,7 +21857,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}" \ @@ -22082,7 +21881,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}" \ @@ -22106,7 +21905,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}" \ @@ -22130,7 +21929,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}" \ @@ -22155,7 +21954,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; \ @@ -22164,11 +21963,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 @@ -22206,7 +22006,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) @@ -22259,7 +22059,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}" \ @@ -22285,7 +22085,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}" \ @@ -22311,7 +22111,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}" \ @@ -22337,7 +22137,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}" \ @@ -22363,7 +22163,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}" \ @@ -22390,7 +22190,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}" \ @@ -22417,7 +22217,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}" \ @@ -22444,7 +22244,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}" \ @@ -22470,7 +22270,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}" \ @@ -22495,7 +22295,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}" \ @@ -22520,7 +22320,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}" \ @@ -22545,7 +22345,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}" \ @@ -22570,7 +22370,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}" \ @@ -22594,7 +22394,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; \ @@ -22603,11 +22403,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 @@ -22628,19 +22429,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 @@ -22661,19 +22463,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@ @@ -22695,19 +22497,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@ @@ -22729,19 +22531,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@ @@ -22763,19 +22565,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@ @@ -22797,19 +22599,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@ @@ -23097,9 +22899,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 @@ -23149,7 +22951,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}" \ @@ -23174,7 +22976,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}" \ @@ -23199,7 +23001,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}" \ @@ -23224,7 +23026,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}" \ @@ -23249,7 +23051,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}" \ @@ -23275,7 +23077,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}" \ @@ -23301,7 +23103,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}" \ @@ -23327,7 +23129,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}" \ @@ -23352,7 +23154,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}" \ @@ -23376,7 +23178,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}" \ @@ -23400,7 +23202,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}" \ @@ -23424,7 +23226,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}" \ @@ -23448,7 +23250,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}" \ @@ -23461,112 +23263,576 @@ maintainer-clean-libiberty: -.PHONY: configure-libiconv maybe-configure-libiconv -maybe-configure-libiconv: +.PHONY: configure-libiberty-linker-plugin maybe-configure-libiberty-linker-plugin +maybe-configure-libiberty-linker-plugin: @if gcc-bootstrap -configure-libiconv: stage_current +configure-libiberty-linker-plugin: stage_current @endif gcc-bootstrap -@if libiconv -maybe-configure-libiconv: configure-libiconv -configure-libiconv: - @: $(MAKE); $(unstage) +@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)/libiconv/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \ + 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)/libiconv; \ - cd "$(HOST_SUBDIR)/libiconv" || exit 1; \ + 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)/libiconv/ | \ + *) topdir=`echo $(HOST_SUBDIR)/libiberty-linker-plugin/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiconv"; \ - libsrcdir="$$s/libiconv"; \ - $(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} --disable-shared \ + --target=${target_alias} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \ || exit 1 -@endif libiconv +@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-libiconv maybe-all-libiconv -maybe-all-libiconv: +.PHONY: all-libiberty-linker-plugin maybe-all-libiberty-linker-plugin +maybe-all-libiberty-linker-plugin: @if gcc-bootstrap -all-libiconv: stage_current +all-libiberty-linker-plugin: stage_current @endif gcc-bootstrap -@if libiconv -TARGET-libiconv=all -maybe-all-libiconv: all-libiconv -all-libiconv: configure-libiconv - @: $(MAKE); $(unstage) +@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)/libiconv && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-libiconv)) -@endif libiconv + (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) -.PHONY: check-libiconv maybe-check-libiconv -maybe-check-libiconv: -@if libiconv -maybe-check-libiconv: check-libiconv +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) -check-libiconv: - @: $(MAKE); $(unstage) +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) \ - (cd $(HOST_SUBDIR)/libiconv && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(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) -@endif libiconv +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: install-libiconv maybe-install-libiconv -maybe-install-libiconv: -@if libiconv -maybe-install-libiconv: install-libiconv -install-libiconv: -@endif libiconv -.PHONY: install-strip-libiconv maybe-install-strip-libiconv -maybe-install-strip-libiconv: -@if libiconv -maybe-install-strip-libiconv: install-strip-libiconv -install-strip-libiconv: +.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 -@endif libiconv +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) -# Other targets (info, dvi, pdf, etc.) +@endif libiberty-linker-plugin -.PHONY: maybe-info-libiconv info-libiconv -maybe-info-libiconv: -@if libiconv -maybe-info-libiconv: info-libiconv +.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 -info-libiconv: \ - configure-libiconv +install-libiberty-linker-plugin: installdirs @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ + @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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23574,25 +23840,24 @@ info-libiconv: \ info) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-dvi-libiconv dvi-libiconv -maybe-dvi-libiconv: -@if libiconv -maybe-dvi-libiconv: dvi-libiconv +.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-libiconv: \ - configure-libiconv - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23600,25 +23865,24 @@ dvi-libiconv: \ dvi) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-pdf-libiconv pdf-libiconv -maybe-pdf-libiconv: -@if libiconv -maybe-pdf-libiconv: pdf-libiconv +.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-libiconv: \ - configure-libiconv - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23626,25 +23890,24 @@ pdf-libiconv: \ pdf) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-html-libiconv html-libiconv -maybe-html-libiconv: -@if libiconv -maybe-html-libiconv: html-libiconv +.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-libiconv: \ - configure-libiconv - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23652,25 +23915,24 @@ html-libiconv: \ html) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-TAGS-libiconv TAGS-libiconv -maybe-TAGS-libiconv: -@if libiconv -maybe-TAGS-libiconv: TAGS-libiconv +.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-libiconv: \ - configure-libiconv - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23678,55 +23940,102 @@ TAGS-libiconv: \ TAGS) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-install-info-libiconv install-info-libiconv -maybe-install-info-libiconv: -@if libiconv -maybe-install-info-libiconv: install-info-libiconv +.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 -# libiconv doesn't support install-info. -install-info-libiconv: +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 libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv -maybe-install-pdf-libiconv: -@if libiconv -maybe-install-pdf-libiconv: install-pdf-libiconv +.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 -# libiconv doesn't support install-pdf. -install-pdf-libiconv: +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 libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-install-html-libiconv install-html-libiconv -maybe-install-html-libiconv: -@if libiconv -maybe-install-html-libiconv: install-html-libiconv +.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 -# libiconv doesn't support install-html. -install-html-libiconv: +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 libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-installcheck-libiconv installcheck-libiconv -maybe-installcheck-libiconv: -@if libiconv -maybe-installcheck-libiconv: installcheck-libiconv +.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-libiconv: \ - configure-libiconv - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23734,24 +24043,23 @@ installcheck-libiconv: \ installcheck) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv -maybe-mostlyclean-libiconv: -@if libiconv -maybe-mostlyclean-libiconv: mostlyclean-libiconv +.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-libiconv: - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23759,24 +24067,23 @@ mostlyclean-libiconv: mostlyclean) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-clean-libiconv clean-libiconv -maybe-clean-libiconv: -@if libiconv -maybe-clean-libiconv: clean-libiconv +.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-libiconv: - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23784,24 +24091,23 @@ clean-libiconv: clean) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-distclean-libiconv distclean-libiconv -maybe-distclean-libiconv: -@if libiconv -maybe-distclean-libiconv: distclean-libiconv +.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-libiconv: - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23809,24 +24115,23 @@ distclean-libiconv: distclean) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv -maybe-maintainer-clean-libiconv: -@if libiconv -maybe-maintainer-clean-libiconv: maintainer-clean-libiconv +.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-libiconv: - @: $(MAKE); $(unstage) - @[ -f ./libiconv/Makefile ] || exit 0; \ +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) ; 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 libiconv" ; \ - (cd $(HOST_SUBDIR)/libiconv && \ + 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}" \ @@ -23834,154 +24139,578 @@ maintainer-clean-libiconv: maintainer-clean) \ || exit 1 -@endif libiconv +@endif libiberty-linker-plugin -.PHONY: configure-m4 maybe-configure-m4 -maybe-configure-m4: +.PHONY: configure-libiconv maybe-configure-libiconv +maybe-configure-libiconv: @if gcc-bootstrap -configure-m4: stage_current +configure-libiconv: stage_current @endif gcc-bootstrap -@if m4 -maybe-configure-m4: configure-m4 -configure-m4: - @: $(MAKE); $(unstage) +@if libiconv +maybe-configure-libiconv: configure-libiconv +configure-libiconv: @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 ; \ + test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/m4; \ - cd "$(HOST_SUBDIR)/m4" || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libiconv; \ + cd "$(HOST_SUBDIR)/libiconv" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/m4/ | \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/m4"; \ - libsrcdir="$$s/m4"; \ - $(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} \ + --target=${target_alias} --disable-shared \ || exit 1 -@endif m4 - - - - - -.PHONY: all-m4 maybe-all-m4 -maybe-all-m4: -@if gcc-bootstrap -all-m4: stage_current -@endif gcc-bootstrap -@if m4 -TARGET-m4=all -maybe-all-m4: all-m4 -all-m4: configure-m4 - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-m4)) -@endif m4 - - +@endif libiconv -.PHONY: check-m4 maybe-check-m4 -maybe-check-m4: -@if m4 -maybe-check-m4: check-m4 -check-m4: - @: $(MAKE); $(unstage) +.PHONY: configure-stage1-libiconv maybe-configure-stage1-libiconv +maybe-configure-stage1-libiconv: +@if libiconv-bootstrap +maybe-configure-stage1-libiconv: configure-stage1-libiconv +configure-stage1-libiconv: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) check) - -@endif m4 - -.PHONY: install-m4 maybe-install-m4 -maybe-install-m4: -@if m4 -maybe-install-m4: install-m4 + CFLAGS="$(STAGE1_CFLAGS)"; export CFLAGS; \ + CXXFLAGS="$(STAGE1_CXXFLAGS)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(HOST_SUBDIR)/libiconv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ + cd $(HOST_SUBDIR)/libiconv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiconv; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) \ + --disable-shared +@endif libiconv-bootstrap -install-m4: installdirs - @: $(MAKE); $(unstage) +.PHONY: configure-stage2-libiconv maybe-configure-stage2-libiconv +maybe-configure-stage2-libiconv: +@if libiconv-bootstrap +maybe-configure-stage2-libiconv: configure-stage2-libiconv +configure-stage2-libiconv: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) install) + $(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)/libiconv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ + cd $(HOST_SUBDIR)/libiconv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiconv; \ + $(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) \ + --disable-shared +@endif libiconv-bootstrap -@endif m4 +.PHONY: configure-stage3-libiconv maybe-configure-stage3-libiconv +maybe-configure-stage3-libiconv: +@if libiconv-bootstrap +maybe-configure-stage3-libiconv: configure-stage3-libiconv +configure-stage3-libiconv: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ + cd $(HOST_SUBDIR)/libiconv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiconv; \ + $(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) \ + --disable-shared +@endif libiconv-bootstrap -.PHONY: install-strip-m4 maybe-install-strip-m4 -maybe-install-strip-m4: -@if m4 -maybe-install-strip-m4: install-strip-m4 +.PHONY: configure-stage4-libiconv maybe-configure-stage4-libiconv +maybe-configure-stage4-libiconv: +@if libiconv-bootstrap +maybe-configure-stage4-libiconv: configure-stage4-libiconv +configure-stage4-libiconv: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ + cd $(HOST_SUBDIR)/libiconv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiconv; \ + $(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) \ + --disable-shared +@endif libiconv-bootstrap -install-strip-m4: installdirs - @: $(MAKE); $(unstage) +.PHONY: configure-stageprofile-libiconv maybe-configure-stageprofile-libiconv +maybe-configure-stageprofile-libiconv: +@if libiconv-bootstrap +maybe-configure-stageprofile-libiconv: configure-stageprofile-libiconv +configure-stageprofile-libiconv: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiconv/Makefile || exit 0; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/m4 && \ - $(MAKE) $(FLAGS_TO_PASS) install-strip) + $(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)/libiconv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ + cd $(HOST_SUBDIR)/libiconv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiconv; \ + $(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) \ + --disable-shared +@endif libiconv-bootstrap -@endif m4 +.PHONY: configure-stagefeedback-libiconv maybe-configure-stagefeedback-libiconv +maybe-configure-stagefeedback-libiconv: +@if libiconv-bootstrap +maybe-configure-stagefeedback-libiconv: configure-stagefeedback-libiconv +configure-stagefeedback-libiconv: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/libiconv/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)/libiconv; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv; \ + cd $(HOST_SUBDIR)/libiconv || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libiconv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libiconv; \ + $(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) \ + --disable-shared +@endif libiconv-bootstrap -# Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-m4 info-m4 -maybe-info-m4: -@if m4 -maybe-info-m4: info-m4 -info-m4: \ - configure-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ + + +.PHONY: all-libiconv maybe-all-libiconv +maybe-all-libiconv: +@if gcc-bootstrap +all-libiconv: stage_current +@endif gcc-bootstrap +@if libiconv +TARGET-libiconv=all +maybe-all-libiconv: all-libiconv +all-libiconv: configure-libiconv + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-libiconv)) +@endif libiconv + + + +.PHONY: all-stage1-libiconv maybe-all-stage1-libiconv +.PHONY: clean-stage1-libiconv maybe-clean-stage1-libiconv +maybe-all-stage1-libiconv: +maybe-clean-stage1-libiconv: +@if libiconv-bootstrap +maybe-all-stage1-libiconv: all-stage1-libiconv +all-stage1: all-stage1-libiconv +TARGET-stage1-libiconv = $(TARGET-libiconv) +all-stage1-libiconv: configure-stage1-libiconv + @[ $(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)/libiconv && \ + $(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-libiconv) + +maybe-clean-stage1-libiconv: clean-stage1-libiconv +clean-stage1: clean-stage1-libiconv +clean-stage1-libiconv: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage1-libiconv/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(STAGE1_FLAGS_TO_PASS) clean +@endif libiconv-bootstrap + + +.PHONY: all-stage2-libiconv maybe-all-stage2-libiconv +.PHONY: clean-stage2-libiconv maybe-clean-stage2-libiconv +maybe-all-stage2-libiconv: +maybe-clean-stage2-libiconv: +@if libiconv-bootstrap +maybe-all-stage2-libiconv: all-stage2-libiconv +all-stage2: all-stage2-libiconv +TARGET-stage2-libiconv = $(TARGET-libiconv) +all-stage2-libiconv: configure-stage2-libiconv + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - 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}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - info) \ - || exit 1 + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiconv && \ + $(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-libiconv) -@endif m4 +maybe-clean-stage2-libiconv: clean-stage2-libiconv +clean-stage2: clean-stage2-libiconv +clean-stage2-libiconv: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage2-libiconv/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif libiconv-bootstrap + + +.PHONY: all-stage3-libiconv maybe-all-stage3-libiconv +.PHONY: clean-stage3-libiconv maybe-clean-stage3-libiconv +maybe-all-stage3-libiconv: +maybe-clean-stage3-libiconv: +@if libiconv-bootstrap +maybe-all-stage3-libiconv: all-stage3-libiconv +all-stage3: all-stage3-libiconv +TARGET-stage3-libiconv = $(TARGET-libiconv) +all-stage3-libiconv: configure-stage3-libiconv + @[ $(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)/libiconv && \ + $(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-libiconv) -.PHONY: maybe-dvi-m4 dvi-m4 -maybe-dvi-m4: -@if m4 -maybe-dvi-m4: dvi-m4 +maybe-clean-stage3-libiconv: clean-stage3-libiconv +clean-stage3: clean-stage3-libiconv +clean-stage3-libiconv: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage3-libiconv/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif libiconv-bootstrap + + +.PHONY: all-stage4-libiconv maybe-all-stage4-libiconv +.PHONY: clean-stage4-libiconv maybe-clean-stage4-libiconv +maybe-all-stage4-libiconv: +maybe-clean-stage4-libiconv: +@if libiconv-bootstrap +maybe-all-stage4-libiconv: all-stage4-libiconv +all-stage4: all-stage4-libiconv +TARGET-stage4-libiconv = $(TARGET-libiconv) +all-stage4-libiconv: configure-stage4-libiconv + @[ $(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)/libiconv && \ + $(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-libiconv) -dvi-m4: \ - configure-m4 +maybe-clean-stage4-libiconv: clean-stage4-libiconv +clean-stage4: clean-stage4-libiconv +clean-stage4-libiconv: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage4-libiconv/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif libiconv-bootstrap + + +.PHONY: all-stageprofile-libiconv maybe-all-stageprofile-libiconv +.PHONY: clean-stageprofile-libiconv maybe-clean-stageprofile-libiconv +maybe-all-stageprofile-libiconv: +maybe-clean-stageprofile-libiconv: +@if libiconv-bootstrap +maybe-all-stageprofile-libiconv: all-stageprofile-libiconv +all-stageprofile: all-stageprofile-libiconv +TARGET-stageprofile-libiconv = $(TARGET-libiconv) +all-stageprofile-libiconv: configure-stageprofile-libiconv + @[ $(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)/libiconv && \ + $(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-libiconv) + +maybe-clean-stageprofile-libiconv: clean-stageprofile-libiconv +clean-stageprofile: clean-stageprofile-libiconv +clean-stageprofile-libiconv: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageprofile-libiconv/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif libiconv-bootstrap + + +.PHONY: all-stagefeedback-libiconv maybe-all-stagefeedback-libiconv +.PHONY: clean-stagefeedback-libiconv maybe-clean-stagefeedback-libiconv +maybe-all-stagefeedback-libiconv: +maybe-clean-stagefeedback-libiconv: +@if libiconv-bootstrap +maybe-all-stagefeedback-libiconv: all-stagefeedback-libiconv +all-stagefeedback: all-stagefeedback-libiconv +TARGET-stagefeedback-libiconv = $(TARGET-libiconv) +all-stagefeedback-libiconv: configure-stagefeedback-libiconv + @[ $(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)/libiconv && \ + $(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-libiconv) + +maybe-clean-stagefeedback-libiconv: clean-stagefeedback-libiconv +clean-stagefeedback: clean-stagefeedback-libiconv +clean-stagefeedback-libiconv: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(HOST_SUBDIR)/libiconv/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stagefeedback-libiconv/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean +@endif libiconv-bootstrap + + + + + +.PHONY: check-libiconv maybe-check-libiconv +maybe-check-libiconv: +@if libiconv +maybe-check-libiconv: check-libiconv + +check-libiconv: @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libiconv && \ + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_BOOTSTRAP_FLAGS) check) + +@endif libiconv + +.PHONY: install-libiconv maybe-install-libiconv +maybe-install-libiconv: +@if libiconv +maybe-install-libiconv: install-libiconv + +install-libiconv: + +@endif libiconv + +.PHONY: install-strip-libiconv maybe-install-strip-libiconv +maybe-install-strip-libiconv: +@if libiconv +maybe-install-strip-libiconv: install-strip-libiconv + +install-strip-libiconv: + +@endif libiconv + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-libiconv info-libiconv +maybe-info-libiconv: +@if libiconv +maybe-info-libiconv: info-libiconv + +# libiconv doesn't support info. +info-libiconv: + +@endif libiconv + +.PHONY: maybe-dvi-libiconv dvi-libiconv +maybe-dvi-libiconv: +@if libiconv +maybe-dvi-libiconv: dvi-libiconv + +dvi-libiconv: \ + configure-libiconv + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ @@ -23989,166 +24718,518 @@ dvi-m4: \ dvi) \ || exit 1 -@endif m4 +@endif libiconv -.PHONY: maybe-pdf-m4 pdf-m4 -maybe-pdf-m4: -@if m4 -maybe-pdf-m4: pdf-m4 +.PHONY: maybe-pdf-libiconv pdf-libiconv +maybe-pdf-libiconv: +@if libiconv +maybe-pdf-libiconv: pdf-libiconv -pdf-m4: \ - configure-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ +# libiconv doesn't support pdf. +pdf-libiconv: + +@endif libiconv + +.PHONY: maybe-html-libiconv html-libiconv +maybe-html-libiconv: +@if libiconv +maybe-html-libiconv: html-libiconv + +# libiconv doesn't support html. +html-libiconv: + +@endif libiconv + +.PHONY: maybe-TAGS-libiconv TAGS-libiconv +maybe-TAGS-libiconv: +@if libiconv +maybe-TAGS-libiconv: TAGS-libiconv + +TAGS-libiconv: \ + configure-libiconv + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - pdf) \ + TAGS) \ || exit 1 -@endif m4 +@endif libiconv -.PHONY: maybe-html-m4 html-m4 -maybe-html-m4: -@if m4 -maybe-html-m4: html-m4 +.PHONY: maybe-install-info-libiconv install-info-libiconv +maybe-install-info-libiconv: +@if libiconv +maybe-install-info-libiconv: install-info-libiconv -html-m4: \ - configure-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ +# libiconv doesn't support install-info. +install-info-libiconv: + +@endif libiconv + +.PHONY: maybe-install-pdf-libiconv install-pdf-libiconv +maybe-install-pdf-libiconv: +@if libiconv +maybe-install-pdf-libiconv: install-pdf-libiconv + +# libiconv doesn't support install-pdf. +install-pdf-libiconv: + +@endif libiconv + +.PHONY: maybe-install-html-libiconv install-html-libiconv +maybe-install-html-libiconv: +@if libiconv +maybe-install-html-libiconv: install-html-libiconv + +# libiconv doesn't support install-html. +install-html-libiconv: + +@endif libiconv + +.PHONY: maybe-installcheck-libiconv installcheck-libiconv +maybe-installcheck-libiconv: +@if libiconv +maybe-installcheck-libiconv: installcheck-libiconv + +installcheck-libiconv: \ + configure-libiconv + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - html) \ + installcheck) \ || exit 1 -@endif m4 +@endif libiconv -.PHONY: maybe-TAGS-m4 TAGS-m4 -maybe-TAGS-m4: -@if m4 -maybe-TAGS-m4: TAGS-m4 +.PHONY: maybe-mostlyclean-libiconv mostlyclean-libiconv +maybe-mostlyclean-libiconv: +@if libiconv +maybe-mostlyclean-libiconv: mostlyclean-libiconv -TAGS-m4: \ - configure-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ +mostlyclean-libiconv: + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - TAGS) \ + mostlyclean) \ || exit 1 -@endif m4 +@endif libiconv -.PHONY: maybe-install-info-m4 install-info-m4 -maybe-install-info-m4: -@if m4 -maybe-install-info-m4: install-info-m4 +.PHONY: maybe-clean-libiconv clean-libiconv +maybe-clean-libiconv: +@if libiconv +maybe-clean-libiconv: clean-libiconv -install-info-m4: \ - configure-m4 \ - info-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ +clean-libiconv: + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-info) \ + clean) \ || exit 1 -@endif m4 +@endif libiconv -.PHONY: maybe-install-pdf-m4 install-pdf-m4 -maybe-install-pdf-m4: -@if m4 -maybe-install-pdf-m4: install-pdf-m4 +.PHONY: maybe-distclean-libiconv distclean-libiconv +maybe-distclean-libiconv: +@if libiconv +maybe-distclean-libiconv: distclean-libiconv -install-pdf-m4: \ - configure-m4 \ - pdf-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ +distclean-libiconv: + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-pdf) \ + distclean) \ || exit 1 -@endif m4 +@endif libiconv -.PHONY: maybe-install-html-m4 install-html-m4 -maybe-install-html-m4: -@if m4 -maybe-install-html-m4: install-html-m4 +.PHONY: maybe-maintainer-clean-libiconv maintainer-clean-libiconv +maybe-maintainer-clean-libiconv: +@if libiconv +maybe-maintainer-clean-libiconv: maintainer-clean-libiconv -install-html-m4: \ - configure-m4 \ - html-m4 - @: $(MAKE); $(unstage) - @[ -f ./m4/Makefile ] || exit 0; \ +maintainer-clean-libiconv: + @[ -f ./libiconv/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 m4" ; \ - (cd $(HOST_SUBDIR)/m4 && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-html) \ + maintainer-clean) \ || exit 1 -@endif m4 +@endif libiconv + + + +.PHONY: configure-m4 maybe-configure-m4 +maybe-configure-m4: +@if gcc-bootstrap +configure-m4: stage_current +@endif gcc-bootstrap +@if m4 +maybe-configure-m4: configure-m4 +configure-m4: + @: $(MAKE); $(unstage) + @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; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/m4; \ + cd "$(HOST_SUBDIR)/m4" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/m4/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=m4; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + || exit 1 +@endif m4 + + + + + +.PHONY: all-m4 maybe-all-m4 +maybe-all-m4: +@if gcc-bootstrap +all-m4: stage_current +@endif gcc-bootstrap +@if m4 +TARGET-m4=all +maybe-all-m4: all-m4 +all-m4: configure-m4 + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-m4)) +@endif m4 + + + + +.PHONY: check-m4 maybe-check-m4 +maybe-check-m4: +@if m4 +maybe-check-m4: check-m4 + +check-m4: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(FLAGS_TO_PASS) check) + +@endif m4 + +.PHONY: install-m4 maybe-install-m4 +maybe-install-m4: +@if m4 +maybe-install-m4: install-m4 + +install-m4: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif m4 + +.PHONY: install-strip-m4 maybe-install-strip-m4 +maybe-install-strip-m4: +@if m4 +maybe-install-strip-m4: install-strip-m4 + +install-strip-m4: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif m4 + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-m4 info-m4 +maybe-info-m4: +@if m4 +maybe-info-m4: info-m4 + +info-m4: \ + configure-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-dvi-m4 dvi-m4 +maybe-dvi-m4: +@if m4 +maybe-dvi-m4: dvi-m4 + +dvi-m4: \ + configure-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-pdf-m4 pdf-m4 +maybe-pdf-m4: +@if m4 +maybe-pdf-m4: pdf-m4 + +pdf-m4: \ + configure-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-html-m4 html-m4 +maybe-html-m4: +@if m4 +maybe-html-m4: html-m4 + +html-m4: \ + configure-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-TAGS-m4 TAGS-m4 +maybe-TAGS-m4: +@if m4 +maybe-TAGS-m4: TAGS-m4 + +TAGS-m4: \ + configure-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-install-info-m4 install-info-m4 +maybe-install-info-m4: +@if m4 +maybe-install-info-m4: install-info-m4 + +install-info-m4: \ + configure-m4 \ + info-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-install-pdf-m4 install-pdf-m4 +maybe-install-pdf-m4: +@if m4 +maybe-install-pdf-m4: install-pdf-m4 + +install-pdf-m4: \ + configure-m4 \ + pdf-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 + +.PHONY: maybe-install-html-m4 install-html-m4 +maybe-install-html-m4: +@if m4 +maybe-install-html-m4: install-html-m4 + +install-html-m4: \ + configure-m4 \ + html-m4 + @: $(MAKE); $(unstage) + @[ -f ./m4/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 m4"; \ + (cd $(HOST_SUBDIR)/m4 && \ + $(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 m4 .PHONY: maybe-installcheck-m4 installcheck-m4 maybe-installcheck-m4: @@ -24165,7 +25246,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}" \ @@ -24190,7 +25271,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}" \ @@ -24215,7 +25296,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}" \ @@ -24240,7 +25321,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}" \ @@ -24265,7 +25346,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}" \ @@ -24290,7 +25371,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; \ @@ -24299,11 +25380,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 @@ -24341,7 +25423,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) @@ -24394,7 +25476,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}" \ @@ -24420,7 +25502,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}" \ @@ -24446,7 +25528,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}" \ @@ -24472,7 +25554,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}" \ @@ -24498,7 +25580,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}" \ @@ -24525,7 +25607,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}" \ @@ -24552,7 +25634,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}" \ @@ -24579,7 +25661,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}" \ @@ -24605,7 +25687,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}" \ @@ -24630,7 +25712,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}" \ @@ -24655,7 +25737,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}" \ @@ -24680,7 +25762,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}" \ @@ -24705,7 +25787,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}" \ @@ -24730,7 +25812,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; \ @@ -24739,11 +25821,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 @@ -24781,7 +25864,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) @@ -24834,7 +25917,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}" \ @@ -24860,7 +25943,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}" \ @@ -24886,7 +25969,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}" \ @@ -24912,7 +25995,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}" \ @@ -24938,7 +26021,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}" \ @@ -24965,7 +26048,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}" \ @@ -24992,7 +26075,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}" \ @@ -25019,7 +26102,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}" \ @@ -25045,7 +26128,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}" \ @@ -25070,7 +26153,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}" \ @@ -25095,7 +26178,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}" \ @@ -25120,7 +26203,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}" \ @@ -25145,7 +26228,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}" \ @@ -25170,7 +26253,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; \ @@ -25179,11 +26262,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 @@ -25221,7 +26305,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) @@ -25274,7 +26358,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}" \ @@ -25300,7 +26384,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}" \ @@ -25326,7 +26410,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}" \ @@ -25352,7 +26436,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}" \ @@ -25378,7 +26462,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}" \ @@ -25405,7 +26489,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}" \ @@ -25432,7 +26516,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}" \ @@ -25459,7 +26543,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}" \ @@ -25485,7 +26569,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}" \ @@ -25510,7 +26594,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}" \ @@ -25535,7 +26619,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}" \ @@ -25560,7 +26644,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}" \ @@ -25585,7 +26669,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}" \ @@ -25610,7 +26694,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; \ @@ -25619,11 +26703,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 @@ -25661,7 +26746,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) @@ -25702,7 +26787,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}" \ @@ -25728,7 +26813,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}" \ @@ -25754,7 +26839,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}" \ @@ -25780,7 +26865,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}" \ @@ -25806,7 +26891,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}" \ @@ -25833,7 +26918,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}" \ @@ -25860,7 +26945,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}" \ @@ -25887,7 +26972,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}" \ @@ -25913,7 +26998,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}" \ @@ -25938,7 +27023,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}" \ @@ -25963,7 +27048,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}" \ @@ -25988,7 +27073,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}" \ @@ -26013,7 +27098,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}" \ @@ -26037,7 +27122,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; \ @@ -26046,11 +27131,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} @extra_host_zlib_configure_flags@ \ || exit 1 @endif zlib @@ -26071,20 +27157,22 @@ 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} \ - $(STAGE1_CONFIGURE_FLAGS) + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) \ + @extra_host_zlib_configure_flags@ @endif zlib-bootstrap .PHONY: configure-stage2-zlib maybe-configure-stage2-zlib @@ -26103,21 +27191,22 @@ 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) + $(STAGE2_CONFIGURE_FLAGS) \ + @extra_host_zlib_configure_flags@ @endif zlib-bootstrap .PHONY: configure-stage3-zlib maybe-configure-stage3-zlib @@ -26136,21 +27225,22 @@ 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) + $(STAGE3_CONFIGURE_FLAGS) \ + @extra_host_zlib_configure_flags@ @endif zlib-bootstrap .PHONY: configure-stage4-zlib maybe-configure-stage4-zlib @@ -26169,21 +27259,22 @@ 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) + $(STAGE4_CONFIGURE_FLAGS) \ + @extra_host_zlib_configure_flags@ @endif zlib-bootstrap .PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib @@ -26202,21 +27293,22 @@ 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) + $(STAGEprofile_CONFIGURE_FLAGS) \ + @extra_host_zlib_configure_flags@ @endif zlib-bootstrap .PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib @@ -26235,21 +27327,22 @@ 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) + $(STAGEfeedback_CONFIGURE_FLAGS) \ + @extra_host_zlib_configure_flags@ @endif zlib-bootstrap @@ -26568,7 +27661,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}" \ @@ -26593,7 +27686,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}" \ @@ -26618,7 +27711,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}" \ @@ -26643,7 +27736,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}" \ @@ -26668,7 +27761,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}" \ @@ -26694,7 +27787,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}" \ @@ -26720,7 +27813,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}" \ @@ -26746,7 +27839,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}" \ @@ -26771,7 +27864,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}" \ @@ -26795,7 +27888,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}" \ @@ -26819,7 +27912,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}" \ @@ -26843,7 +27936,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}" \ @@ -26867,7 +27960,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}" \ @@ -26892,7 +27985,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; \ @@ -26901,11 +27994,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 @@ -26943,7 +28037,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) @@ -26996,7 +28090,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}" \ @@ -27022,7 +28116,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}" \ @@ -27048,7 +28142,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}" \ @@ -27074,7 +28168,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}" \ @@ -27100,7 +28194,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}" \ @@ -27127,7 +28221,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}" \ @@ -27154,7 +28248,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}" \ @@ -27181,7 +28275,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}" \ @@ -27207,7 +28301,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}" \ @@ -27232,7 +28326,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}" \ @@ -27257,7 +28351,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}" \ @@ -27282,7 +28376,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}" \ @@ -27307,7 +28401,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}" \ @@ -27332,7 +28426,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; \ @@ -27341,11 +28435,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 @@ -27383,7 +28478,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) @@ -27436,7 +28531,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}" \ @@ -27462,7 +28557,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}" \ @@ -27488,7 +28583,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}" \ @@ -27514,7 +28609,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}" \ @@ -27540,7 +28635,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}" \ @@ -27567,7 +28662,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}" \ @@ -27594,7 +28689,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}" \ @@ -27621,7 +28716,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}" \ @@ -27647,7 +28742,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}" \ @@ -27672,7 +28767,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}" \ @@ -27697,7 +28792,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}" \ @@ -27722,7 +28817,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}" \ @@ -27747,7 +28842,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}" \ @@ -27772,7 +28867,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; \ @@ -27781,11 +28876,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 @@ -27823,7 +28919,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) @@ -27876,7 +28972,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}" \ @@ -27902,7 +28998,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}" \ @@ -27928,7 +29024,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}" \ @@ -27954,7 +29050,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}" \ @@ -27980,7 +29076,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}" \ @@ -28007,7 +29103,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}" \ @@ -28034,7 +29130,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}" \ @@ -28061,7 +29157,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}" \ @@ -28087,7 +29183,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}" \ @@ -28112,7 +29208,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}" \ @@ -28137,7 +29233,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}" \ @@ -28162,7 +29258,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}" \ @@ -28187,7 +29283,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}" \ @@ -28212,7 +29308,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; \ @@ -28221,11 +29317,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 @@ -28263,7 +29360,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) @@ -28316,7 +29413,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}" \ @@ -28342,7 +29439,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}" \ @@ -28368,7 +29465,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}" \ @@ -28394,7 +29491,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}" \ @@ -28410,722 +29507,2486 @@ maybe-TAGS-tk: @if tk maybe-TAGS-tk: TAGS-tk -TAGS-tk: \ - configure-tk - @: $(MAKE); $(unstage) - @[ -f ./tk/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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ - $(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 +TAGS-tk: \ + configure-tk + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-install-info-tk install-info-tk +maybe-install-info-tk: +@if tk +maybe-install-info-tk: install-info-tk + +install-info-tk: \ + configure-tk \ + info-tk + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-install-pdf-tk install-pdf-tk +maybe-install-pdf-tk: +@if tk +maybe-install-pdf-tk: install-pdf-tk + +install-pdf-tk: \ + configure-tk \ + pdf-tk + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-install-html-tk install-html-tk +maybe-install-html-tk: +@if tk +maybe-install-html-tk: install-html-tk + +install-html-tk: \ + configure-tk \ + html-tk + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-installcheck-tk installcheck-tk +maybe-installcheck-tk: +@if tk +maybe-installcheck-tk: installcheck-tk + +installcheck-tk: \ + configure-tk + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-mostlyclean-tk mostlyclean-tk +maybe-mostlyclean-tk: +@if tk +maybe-mostlyclean-tk: mostlyclean-tk + +mostlyclean-tk: + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-clean-tk clean-tk +maybe-clean-tk: +@if tk +maybe-clean-tk: clean-tk + +clean-tk: + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-distclean-tk distclean-tk +maybe-distclean-tk: +@if tk +maybe-distclean-tk: distclean-tk + +distclean-tk: + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + +.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk +maybe-maintainer-clean-tk: +@if tk +maybe-maintainer-clean-tk: maintainer-clean-tk + +maintainer-clean-tk: + @: $(MAKE); $(unstage) + @[ -f ./tk/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 tk"; \ + (cd $(HOST_SUBDIR)/tk && \ + $(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 tk + + + +.PHONY: configure-libtermcap maybe-configure-libtermcap +maybe-configure-libtermcap: +@if gcc-bootstrap +configure-libtermcap: stage_current +@endif gcc-bootstrap +@if libtermcap +maybe-configure-libtermcap: configure-libtermcap +configure-libtermcap: + @: $(MAKE); $(unstage) + @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; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/libtermcap; \ + cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libtermcap; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + || exit 1 +@endif libtermcap + + + + + +.PHONY: all-libtermcap maybe-all-libtermcap +maybe-all-libtermcap: +@if gcc-bootstrap +all-libtermcap: stage_current +@endif gcc-bootstrap +@if libtermcap +TARGET-libtermcap=all +maybe-all-libtermcap: all-libtermcap +all-libtermcap: configure-libtermcap + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-libtermcap)) +@endif libtermcap + + + + +.PHONY: check-libtermcap maybe-check-libtermcap +maybe-check-libtermcap: +@if libtermcap +maybe-check-libtermcap: check-libtermcap + +check-libtermcap: + +@endif libtermcap + +.PHONY: install-libtermcap maybe-install-libtermcap +maybe-install-libtermcap: +@if libtermcap +maybe-install-libtermcap: install-libtermcap + +install-libtermcap: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif libtermcap + +.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap +maybe-install-strip-libtermcap: +@if libtermcap +maybe-install-strip-libtermcap: install-strip-libtermcap + +install-strip-libtermcap: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif libtermcap + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-libtermcap info-libtermcap +maybe-info-libtermcap: +@if libtermcap +maybe-info-libtermcap: info-libtermcap + +info-libtermcap: \ + configure-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-dvi-libtermcap dvi-libtermcap +maybe-dvi-libtermcap: +@if libtermcap +maybe-dvi-libtermcap: dvi-libtermcap + +dvi-libtermcap: \ + configure-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-pdf-libtermcap pdf-libtermcap +maybe-pdf-libtermcap: +@if libtermcap +maybe-pdf-libtermcap: pdf-libtermcap + +pdf-libtermcap: \ + configure-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-html-libtermcap html-libtermcap +maybe-html-libtermcap: +@if libtermcap +maybe-html-libtermcap: html-libtermcap + +html-libtermcap: \ + configure-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap +maybe-TAGS-libtermcap: +@if libtermcap +maybe-TAGS-libtermcap: TAGS-libtermcap + +TAGS-libtermcap: \ + configure-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-install-info-libtermcap install-info-libtermcap +maybe-install-info-libtermcap: +@if libtermcap +maybe-install-info-libtermcap: install-info-libtermcap + +install-info-libtermcap: \ + configure-libtermcap \ + info-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap +maybe-install-pdf-libtermcap: +@if libtermcap +maybe-install-pdf-libtermcap: install-pdf-libtermcap + +install-pdf-libtermcap: \ + configure-libtermcap \ + pdf-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-install-html-libtermcap install-html-libtermcap +maybe-install-html-libtermcap: +@if libtermcap +maybe-install-html-libtermcap: install-html-libtermcap + +install-html-libtermcap: \ + configure-libtermcap \ + html-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap +maybe-installcheck-libtermcap: +@if libtermcap +maybe-installcheck-libtermcap: installcheck-libtermcap + +installcheck-libtermcap: \ + configure-libtermcap + @: $(MAKE); $(unstage) + @[ -f ./libtermcap/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 libtermcap"; \ + (cd $(HOST_SUBDIR)/libtermcap && \ + $(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 libtermcap + +.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap +maybe-mostlyclean-libtermcap: +@if libtermcap +maybe-mostlyclean-libtermcap: mostlyclean-libtermcap + +# libtermcap doesn't support mostlyclean. +mostlyclean-libtermcap: + +@endif libtermcap + +.PHONY: maybe-clean-libtermcap clean-libtermcap +maybe-clean-libtermcap: +@if libtermcap +maybe-clean-libtermcap: clean-libtermcap + +# libtermcap doesn't support clean. +clean-libtermcap: + +@endif libtermcap + +.PHONY: maybe-distclean-libtermcap distclean-libtermcap +maybe-distclean-libtermcap: +@if libtermcap +maybe-distclean-libtermcap: distclean-libtermcap + +# libtermcap doesn't support distclean. +distclean-libtermcap: + +@endif libtermcap + +.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap +maybe-maintainer-clean-libtermcap: +@if libtermcap +maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap + +# libtermcap doesn't support maintainer-clean. +maintainer-clean-libtermcap: + +@endif libtermcap + + + +.PHONY: configure-utils maybe-configure-utils +maybe-configure-utils: +@if gcc-bootstrap +configure-utils: stage_current +@endif gcc-bootstrap +@if utils +maybe-configure-utils: configure-utils +configure-utils: + @: $(MAKE); $(unstage) + @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; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/utils; \ + cd "$(HOST_SUBDIR)/utils" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/utils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=utils; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + || exit 1 +@endif utils + + + + + +.PHONY: all-utils maybe-all-utils +maybe-all-utils: +@if gcc-bootstrap +all-utils: stage_current +@endif gcc-bootstrap +@if utils +TARGET-utils=all +maybe-all-utils: all-utils +all-utils: configure-utils + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/utils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-utils)) +@endif utils + + + + +.PHONY: check-utils maybe-check-utils +maybe-check-utils: +@if utils +maybe-check-utils: check-utils + +check-utils: + +@endif utils + +.PHONY: install-utils maybe-install-utils +maybe-install-utils: +@if utils +maybe-install-utils: install-utils + +install-utils: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/utils && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif utils + +.PHONY: install-strip-utils maybe-install-strip-utils +maybe-install-strip-utils: +@if utils +maybe-install-strip-utils: install-strip-utils + +install-strip-utils: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/utils && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif utils + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-utils info-utils +maybe-info-utils: +@if utils +maybe-info-utils: info-utils + +info-utils: \ + configure-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-dvi-utils dvi-utils +maybe-dvi-utils: +@if utils +maybe-dvi-utils: dvi-utils + +dvi-utils: \ + configure-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-pdf-utils pdf-utils +maybe-pdf-utils: +@if utils +maybe-pdf-utils: pdf-utils + +pdf-utils: \ + configure-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-html-utils html-utils +maybe-html-utils: +@if utils +maybe-html-utils: html-utils + +html-utils: \ + configure-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-TAGS-utils TAGS-utils +maybe-TAGS-utils: +@if utils +maybe-TAGS-utils: TAGS-utils + +TAGS-utils: \ + configure-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-install-info-utils install-info-utils +maybe-install-info-utils: +@if utils +maybe-install-info-utils: install-info-utils + +install-info-utils: \ + configure-utils \ + info-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-install-pdf-utils install-pdf-utils +maybe-install-pdf-utils: +@if utils +maybe-install-pdf-utils: install-pdf-utils + +install-pdf-utils: \ + configure-utils \ + pdf-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-install-html-utils install-html-utils +maybe-install-html-utils: +@if utils +maybe-install-html-utils: install-html-utils + +install-html-utils: \ + configure-utils \ + html-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-installcheck-utils installcheck-utils +maybe-installcheck-utils: +@if utils +maybe-installcheck-utils: installcheck-utils + +installcheck-utils: \ + configure-utils + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-mostlyclean-utils mostlyclean-utils +maybe-mostlyclean-utils: +@if utils +maybe-mostlyclean-utils: mostlyclean-utils + +mostlyclean-utils: + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-clean-utils clean-utils +maybe-clean-utils: +@if utils +maybe-clean-utils: clean-utils + +clean-utils: + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-distclean-utils distclean-utils +maybe-distclean-utils: +@if utils +maybe-distclean-utils: distclean-utils + +distclean-utils: + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + +.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils +maybe-maintainer-clean-utils: +@if utils +maybe-maintainer-clean-utils: maintainer-clean-utils + +maintainer-clean-utils: + @: $(MAKE); $(unstage) + @[ -f ./utils/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 utils"; \ + (cd $(HOST_SUBDIR)/utils && \ + $(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 utils + + + +.PHONY: configure-gnattools maybe-configure-gnattools +maybe-configure-gnattools: +@if gcc-bootstrap +configure-gnattools: stage_current +@endif gcc-bootstrap +@if gnattools +maybe-configure-gnattools: configure-gnattools +configure-gnattools: + @: $(MAKE); $(unstage) + @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; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/gnattools; \ + cd "$(HOST_SUBDIR)/gnattools" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=gnattools; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + || exit 1 +@endif gnattools + + + + + +.PHONY: all-gnattools maybe-all-gnattools +maybe-all-gnattools: +@if gcc-bootstrap +all-gnattools: stage_current +@endif gcc-bootstrap +@if gnattools +TARGET-gnattools=all +maybe-all-gnattools: all-gnattools +all-gnattools: configure-gnattools + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-gnattools)) +@endif gnattools + + + + +.PHONY: check-gnattools maybe-check-gnattools +maybe-check-gnattools: +@if gnattools +maybe-check-gnattools: check-gnattools + +check-gnattools: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(MAKE) $(FLAGS_TO_PASS) check) + +@endif gnattools + +.PHONY: install-gnattools maybe-install-gnattools +maybe-install-gnattools: +@if gnattools +maybe-install-gnattools: install-gnattools + +install-gnattools: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif gnattools + +.PHONY: install-strip-gnattools maybe-install-strip-gnattools +maybe-install-strip-gnattools: +@if gnattools +maybe-install-strip-gnattools: install-strip-gnattools + +install-strip-gnattools: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif gnattools + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-gnattools info-gnattools +maybe-info-gnattools: +@if gnattools +maybe-info-gnattools: info-gnattools + +info-gnattools: \ + configure-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-dvi-gnattools dvi-gnattools +maybe-dvi-gnattools: +@if gnattools +maybe-dvi-gnattools: dvi-gnattools + +dvi-gnattools: \ + configure-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-pdf-gnattools pdf-gnattools +maybe-pdf-gnattools: +@if gnattools +maybe-pdf-gnattools: pdf-gnattools + +pdf-gnattools: \ + configure-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-html-gnattools html-gnattools +maybe-html-gnattools: +@if gnattools +maybe-html-gnattools: html-gnattools + +html-gnattools: \ + configure-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-TAGS-gnattools TAGS-gnattools +maybe-TAGS-gnattools: +@if gnattools +maybe-TAGS-gnattools: TAGS-gnattools + +TAGS-gnattools: \ + configure-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-install-info-gnattools install-info-gnattools +maybe-install-info-gnattools: +@if gnattools +maybe-install-info-gnattools: install-info-gnattools + +install-info-gnattools: \ + configure-gnattools \ + info-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools +maybe-install-pdf-gnattools: +@if gnattools +maybe-install-pdf-gnattools: install-pdf-gnattools + +install-pdf-gnattools: \ + configure-gnattools \ + pdf-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-install-html-gnattools install-html-gnattools +maybe-install-html-gnattools: +@if gnattools +maybe-install-html-gnattools: install-html-gnattools + +install-html-gnattools: \ + configure-gnattools \ + html-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-installcheck-gnattools installcheck-gnattools +maybe-installcheck-gnattools: +@if gnattools +maybe-installcheck-gnattools: installcheck-gnattools + +installcheck-gnattools: \ + configure-gnattools + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools +maybe-mostlyclean-gnattools: +@if gnattools +maybe-mostlyclean-gnattools: mostlyclean-gnattools + +mostlyclean-gnattools: + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-clean-gnattools clean-gnattools +maybe-clean-gnattools: +@if gnattools +maybe-clean-gnattools: clean-gnattools + +clean-gnattools: + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-distclean-gnattools distclean-gnattools +maybe-distclean-gnattools: +@if gnattools +maybe-distclean-gnattools: distclean-gnattools + +distclean-gnattools: + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + +.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools +maybe-maintainer-clean-gnattools: +@if gnattools +maybe-maintainer-clean-gnattools: maintainer-clean-gnattools + +maintainer-clean-gnattools: + @: $(MAKE); $(unstage) + @[ -f ./gnattools/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 gnattools"; \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(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 gnattools + + + +.PHONY: configure-lto-plugin maybe-configure-lto-plugin +maybe-configure-lto-plugin: +@if gcc-bootstrap +configure-lto-plugin: stage_current +@endif gcc-bootstrap +@if lto-plugin +maybe-configure-lto-plugin: configure-lto-plugin +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; \ + $(HOST_EXPORTS) \ + echo Configuring in $(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; \ + module_srcdir=lto-plugin; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \ + || exit 1 +@endif lto-plugin + + + +.PHONY: configure-stage1-lto-plugin maybe-configure-stage1-lto-plugin +maybe-configure-stage1-lto-plugin: +@if lto-plugin-bootstrap +maybe-configure-stage1-lto-plugin: configure-stage1-lto-plugin +configure-stage1-lto-plugin: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/lto-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)/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; \ + module_srcdir=lto-plugin; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) \ + --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 +maybe-configure-stage2-lto-plugin: +@if lto-plugin-bootstrap +maybe-configure-stage2-lto-plugin: configure-stage2-lto-plugin +configure-stage2-lto-plugin: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/lto-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)/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; \ + module_srcdir=lto-plugin; \ + $(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) \ + --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 +maybe-configure-stage3-lto-plugin: +@if lto-plugin-bootstrap +maybe-configure-stage3-lto-plugin: configure-stage3-lto-plugin +configure-stage3-lto-plugin: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/lto-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)/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; \ + module_srcdir=lto-plugin; \ + $(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) \ + --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 +maybe-configure-stage4-lto-plugin: +@if lto-plugin-bootstrap +maybe-configure-stage4-lto-plugin: configure-stage4-lto-plugin +configure-stage4-lto-plugin: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/lto-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)/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; \ + module_srcdir=lto-plugin; \ + $(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) \ + --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 +maybe-configure-stageprofile-lto-plugin: +@if lto-plugin-bootstrap +maybe-configure-stageprofile-lto-plugin: configure-stageprofile-lto-plugin +configure-stageprofile-lto-plugin: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/lto-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)/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; \ + module_srcdir=lto-plugin; \ + $(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) \ + --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 +maybe-configure-stagefeedback-lto-plugin: +@if lto-plugin-bootstrap +maybe-configure-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin +configure-stagefeedback-lto-plugin: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + test ! -f $(HOST_SUBDIR)/lto-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)/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; \ + module_srcdir=lto-plugin; \ + $(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) \ + --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ +@endif lto-plugin-bootstrap + + + + + +.PHONY: all-lto-plugin maybe-all-lto-plugin +maybe-all-lto-plugin: +@if gcc-bootstrap +all-lto-plugin: stage_current +@endif gcc-bootstrap +@if lto-plugin +TARGET-lto-plugin=all +maybe-all-lto-plugin: all-lto-plugin +all-lto-plugin: configure-lto-plugin + @r=`${PWD_COMMAND}`; export r; \ + 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) @extra_linker_plugin_flags@ \ + $(TARGET-lto-plugin)) +@endif lto-plugin + + + +.PHONY: all-stage1-lto-plugin maybe-all-stage1-lto-plugin +.PHONY: clean-stage1-lto-plugin maybe-clean-stage1-lto-plugin +maybe-all-stage1-lto-plugin: +maybe-clean-stage1-lto-plugin: +@if lto-plugin-bootstrap +maybe-all-stage1-lto-plugin: all-stage1-lto-plugin +all-stage1: all-stage1-lto-plugin +TARGET-stage1-lto-plugin = $(TARGET-lto-plugin) +all-stage1-lto-plugin: configure-stage1-lto-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)/lto-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-lto-plugin) + +maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin +clean-stage1: clean-stage1-lto-plugin +clean-stage1-lto-plugin: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage1-lto-plugin/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) \ + $(STAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif lto-plugin-bootstrap + + +.PHONY: all-stage2-lto-plugin maybe-all-stage2-lto-plugin +.PHONY: clean-stage2-lto-plugin maybe-clean-stage2-lto-plugin +maybe-all-stage2-lto-plugin: +maybe-clean-stage2-lto-plugin: +@if lto-plugin-bootstrap +maybe-all-stage2-lto-plugin: all-stage2-lto-plugin +all-stage2: all-stage2-lto-plugin +TARGET-stage2-lto-plugin = $(TARGET-lto-plugin) +all-stage2-lto-plugin: configure-stage2-lto-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)/lto-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-lto-plugin) + +maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin +clean-stage2: clean-stage2-lto-plugin +clean-stage2-lto-plugin: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage2-lto-plugin/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif lto-plugin-bootstrap + + +.PHONY: all-stage3-lto-plugin maybe-all-stage3-lto-plugin +.PHONY: clean-stage3-lto-plugin maybe-clean-stage3-lto-plugin +maybe-all-stage3-lto-plugin: +maybe-clean-stage3-lto-plugin: +@if lto-plugin-bootstrap +maybe-all-stage3-lto-plugin: all-stage3-lto-plugin +all-stage3: all-stage3-lto-plugin +TARGET-stage3-lto-plugin = $(TARGET-lto-plugin) +all-stage3-lto-plugin: configure-stage3-lto-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)/lto-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-lto-plugin) + +maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin +clean-stage3: clean-stage3-lto-plugin +clean-stage3-lto-plugin: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage3-lto-plugin/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif lto-plugin-bootstrap + + +.PHONY: all-stage4-lto-plugin maybe-all-stage4-lto-plugin +.PHONY: clean-stage4-lto-plugin maybe-clean-stage4-lto-plugin +maybe-all-stage4-lto-plugin: +maybe-clean-stage4-lto-plugin: +@if lto-plugin-bootstrap +maybe-all-stage4-lto-plugin: all-stage4-lto-plugin +all-stage4: all-stage4-lto-plugin +TARGET-stage4-lto-plugin = $(TARGET-lto-plugin) +all-stage4-lto-plugin: configure-stage4-lto-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)/lto-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-lto-plugin) + +maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin +clean-stage4: clean-stage4-lto-plugin +clean-stage4-lto-plugin: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stage4-lto-plugin/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif lto-plugin-bootstrap + + +.PHONY: all-stageprofile-lto-plugin maybe-all-stageprofile-lto-plugin +.PHONY: clean-stageprofile-lto-plugin maybe-clean-stageprofile-lto-plugin +maybe-all-stageprofile-lto-plugin: +maybe-clean-stageprofile-lto-plugin: +@if lto-plugin-bootstrap +maybe-all-stageprofile-lto-plugin: all-stageprofile-lto-plugin +all-stageprofile: all-stageprofile-lto-plugin +TARGET-stageprofile-lto-plugin = $(TARGET-lto-plugin) +all-stageprofile-lto-plugin: configure-stageprofile-lto-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)/lto-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-lto-plugin) + +maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin +clean-stageprofile: clean-stageprofile-lto-plugin +clean-stageprofile-lto-plugin: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stageprofile-lto-plugin/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif lto-plugin-bootstrap + + +.PHONY: all-stagefeedback-lto-plugin maybe-all-stagefeedback-lto-plugin +.PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin +maybe-all-stagefeedback-lto-plugin: +maybe-clean-stagefeedback-lto-plugin: +@if lto-plugin-bootstrap +maybe-all-stagefeedback-lto-plugin: all-stagefeedback-lto-plugin +all-stagefeedback: all-stagefeedback-lto-plugin +TARGET-stagefeedback-lto-plugin = $(TARGET-lto-plugin) +all-stagefeedback-lto-plugin: configure-stagefeedback-lto-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)/lto-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-lto-plugin) + +maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin +clean-stagefeedback: clean-stagefeedback-lto-plugin +clean-stagefeedback-lto-plugin: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + else \ + [ -f $(HOST_SUBDIR)/stagefeedback-lto-plugin/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) @extra_linker_plugin_flags@ clean +@endif lto-plugin-bootstrap -@endif tk -.PHONY: maybe-install-info-tk install-info-tk -maybe-install-info-tk: -@if tk -maybe-install-info-tk: install-info-tk -install-info-tk: \ - configure-tk \ - info-tk - @: $(MAKE); $(unstage) - @[ -f ./tk/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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ - $(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 tk -.PHONY: maybe-install-pdf-tk install-pdf-tk -maybe-install-pdf-tk: -@if tk -maybe-install-pdf-tk: install-pdf-tk +.PHONY: check-lto-plugin maybe-check-lto-plugin +maybe-check-lto-plugin: +@if lto-plugin +maybe-check-lto-plugin: check-lto-plugin -install-pdf-tk: \ - configure-tk \ - pdf-tk +check-lto-plugin: @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ + @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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ - $(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 + $(HOST_EXPORTS) $(EXTRA_HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ $(EXTRA_BOOTSTRAP_FLAGS) check) -@endif tk +@endif lto-plugin -.PHONY: maybe-install-html-tk install-html-tk -maybe-install-html-tk: -@if tk -maybe-install-html-tk: install-html-tk +.PHONY: install-lto-plugin maybe-install-lto-plugin +maybe-install-lto-plugin: +@if lto-plugin +maybe-install-lto-plugin: install-lto-plugin -install-html-tk: \ - configure-tk \ - html-tk +install-lto-plugin: installdirs @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ + @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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ - $(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 + (cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install) -@endif tk +@endif lto-plugin -.PHONY: maybe-installcheck-tk installcheck-tk -maybe-installcheck-tk: -@if tk -maybe-installcheck-tk: installcheck-tk +.PHONY: install-strip-lto-plugin maybe-install-strip-lto-plugin +maybe-install-strip-lto-plugin: +@if lto-plugin +maybe-install-strip-lto-plugin: install-strip-lto-plugin -installcheck-tk: \ - configure-tk +install-strip-lto-plugin: installdirs @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ + @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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ - $(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 + (cd $(HOST_SUBDIR)/lto-plugin && \ + $(MAKE) $(FLAGS_TO_PASS) @extra_linker_plugin_flags@ install-strip) -@endif tk +@endif lto-plugin -.PHONY: maybe-mostlyclean-tk mostlyclean-tk -maybe-mostlyclean-tk: -@if tk -maybe-mostlyclean-tk: mostlyclean-tk +# Other targets (info, dvi, pdf, etc.) -mostlyclean-tk: - @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ +.PHONY: maybe-info-lto-plugin info-lto-plugin +maybe-info-lto-plugin: +@if lto-plugin +maybe-info-lto-plugin: info-lto-plugin + +info-lto-plugin: \ + configure-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - mostlyclean) \ + info) \ || exit 1 -@endif tk +@endif lto-plugin -.PHONY: maybe-clean-tk clean-tk -maybe-clean-tk: -@if tk -maybe-clean-tk: clean-tk +.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin +maybe-dvi-lto-plugin: +@if lto-plugin +maybe-dvi-lto-plugin: dvi-lto-plugin -clean-tk: - @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ +dvi-lto-plugin: \ + configure-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - clean) \ + dvi) \ || exit 1 -@endif tk +@endif lto-plugin -.PHONY: maybe-distclean-tk distclean-tk -maybe-distclean-tk: -@if tk -maybe-distclean-tk: distclean-tk +.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin +maybe-pdf-lto-plugin: +@if lto-plugin +maybe-pdf-lto-plugin: pdf-lto-plugin -distclean-tk: - @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ +pdf-lto-plugin: \ + configure-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - distclean) \ + pdf) \ || exit 1 -@endif tk +@endif lto-plugin -.PHONY: maybe-maintainer-clean-tk maintainer-clean-tk -maybe-maintainer-clean-tk: -@if tk -maybe-maintainer-clean-tk: maintainer-clean-tk +.PHONY: maybe-html-lto-plugin html-lto-plugin +maybe-html-lto-plugin: +@if lto-plugin +maybe-html-lto-plugin: html-lto-plugin -maintainer-clean-tk: - @: $(MAKE); $(unstage) - @[ -f ./tk/Makefile ] || exit 0; \ +html-lto-plugin: \ + configure-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 tk" ; \ - (cd $(HOST_SUBDIR)/tk && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - maintainer-clean) \ - || exit 1 - -@endif tk - - - -.PHONY: configure-libtermcap maybe-configure-libtermcap -maybe-configure-libtermcap: -@if gcc-bootstrap -configure-libtermcap: stage_current -@endif gcc-bootstrap -@if libtermcap -maybe-configure-libtermcap: configure-libtermcap -configure-libtermcap: - @: $(MAKE); $(unstage) - @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 ; \ - $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/libtermcap; \ - cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/libtermcap/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - srcdiroption="--srcdir=$${topdir}/libtermcap"; \ - libsrcdir="$$s/libtermcap"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + html) \ || exit 1 -@endif libtermcap - - - - - -.PHONY: all-libtermcap maybe-all-libtermcap -maybe-all-libtermcap: -@if gcc-bootstrap -all-libtermcap: stage_current -@endif gcc-bootstrap -@if libtermcap -TARGET-libtermcap=all -maybe-all-libtermcap: all-libtermcap -all-libtermcap: configure-libtermcap - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-libtermcap)) -@endif libtermcap - - - - -.PHONY: check-libtermcap maybe-check-libtermcap -maybe-check-libtermcap: -@if libtermcap -maybe-check-libtermcap: check-libtermcap - -check-libtermcap: - -@endif libtermcap - -.PHONY: install-libtermcap maybe-install-libtermcap -maybe-install-libtermcap: -@if libtermcap -maybe-install-libtermcap: install-libtermcap - -install-libtermcap: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(FLAGS_TO_PASS) install) - -@endif libtermcap - -.PHONY: install-strip-libtermcap maybe-install-strip-libtermcap -maybe-install-strip-libtermcap: -@if libtermcap -maybe-install-strip-libtermcap: install-strip-libtermcap - -install-strip-libtermcap: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/libtermcap && \ - $(MAKE) $(FLAGS_TO_PASS) install-strip) - -@endif libtermcap -# Other targets (info, dvi, pdf, etc.) +@endif lto-plugin -.PHONY: maybe-info-libtermcap info-libtermcap -maybe-info-libtermcap: -@if libtermcap -maybe-info-libtermcap: info-libtermcap +.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin +maybe-TAGS-lto-plugin: +@if lto-plugin +maybe-TAGS-lto-plugin: TAGS-lto-plugin -info-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +TAGS-lto-plugin: \ + configure-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - info) \ + TAGS) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-dvi-libtermcap dvi-libtermcap -maybe-dvi-libtermcap: -@if libtermcap -maybe-dvi-libtermcap: dvi-libtermcap +.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin +maybe-install-info-lto-plugin: +@if lto-plugin +maybe-install-info-lto-plugin: install-info-lto-plugin -dvi-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +install-info-lto-plugin: \ + configure-lto-plugin \ + info-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - dvi) \ + install-info) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-pdf-libtermcap pdf-libtermcap -maybe-pdf-libtermcap: -@if libtermcap -maybe-pdf-libtermcap: pdf-libtermcap +.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin +maybe-install-pdf-lto-plugin: +@if lto-plugin +maybe-install-pdf-lto-plugin: install-pdf-lto-plugin -pdf-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +install-pdf-lto-plugin: \ + configure-lto-plugin \ + pdf-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - pdf) \ + install-pdf) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-html-libtermcap html-libtermcap -maybe-html-libtermcap: -@if libtermcap -maybe-html-libtermcap: html-libtermcap +.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin +maybe-install-html-lto-plugin: +@if lto-plugin +maybe-install-html-lto-plugin: install-html-lto-plugin -html-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +install-html-lto-plugin: \ + configure-lto-plugin \ + html-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - html) \ + install-html) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-TAGS-libtermcap TAGS-libtermcap -maybe-TAGS-libtermcap: -@if libtermcap -maybe-TAGS-libtermcap: TAGS-libtermcap +.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin +maybe-installcheck-lto-plugin: +@if lto-plugin +maybe-installcheck-lto-plugin: installcheck-lto-plugin -TAGS-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +installcheck-lto-plugin: \ + configure-lto-plugin + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - TAGS) \ + installcheck) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-install-info-libtermcap install-info-libtermcap -maybe-install-info-libtermcap: -@if libtermcap -maybe-install-info-libtermcap: install-info-libtermcap +.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin +maybe-mostlyclean-lto-plugin: +@if lto-plugin +maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin -install-info-libtermcap: \ - configure-libtermcap \ - info-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +mostlyclean-lto-plugin: + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-info) \ + mostlyclean) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-install-pdf-libtermcap install-pdf-libtermcap -maybe-install-pdf-libtermcap: -@if libtermcap -maybe-install-pdf-libtermcap: install-pdf-libtermcap +.PHONY: maybe-clean-lto-plugin clean-lto-plugin +maybe-clean-lto-plugin: +@if lto-plugin +maybe-clean-lto-plugin: clean-lto-plugin -install-pdf-libtermcap: \ - configure-libtermcap \ - pdf-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +clean-lto-plugin: + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-pdf) \ + clean) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-install-html-libtermcap install-html-libtermcap -maybe-install-html-libtermcap: -@if libtermcap -maybe-install-html-libtermcap: install-html-libtermcap +.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin +maybe-distclean-lto-plugin: +@if lto-plugin +maybe-distclean-lto-plugin: distclean-lto-plugin -install-html-libtermcap: \ - configure-libtermcap \ - html-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +distclean-lto-plugin: + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-html) \ + distclean) \ || exit 1 -@endif libtermcap +@endif lto-plugin -.PHONY: maybe-installcheck-libtermcap installcheck-libtermcap -maybe-installcheck-libtermcap: -@if libtermcap -maybe-installcheck-libtermcap: installcheck-libtermcap +.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin +maybe-maintainer-clean-lto-plugin: +@if lto-plugin +maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin -installcheck-libtermcap: \ - configure-libtermcap - @: $(MAKE); $(unstage) - @[ -f ./libtermcap/Makefile ] || exit 0; \ +maintainer-clean-lto-plugin: + @[ -f ./lto-plugin/Makefile ] || exit 0; \ 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 libtermcap" ; \ - (cd $(HOST_SUBDIR)/libtermcap && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - installcheck) \ + maintainer-clean) \ || exit 1 -@endif libtermcap - -.PHONY: maybe-mostlyclean-libtermcap mostlyclean-libtermcap -maybe-mostlyclean-libtermcap: -@if libtermcap -maybe-mostlyclean-libtermcap: mostlyclean-libtermcap - -# libtermcap doesn't support mostlyclean. -mostlyclean-libtermcap: - -@endif libtermcap - -.PHONY: maybe-clean-libtermcap clean-libtermcap -maybe-clean-libtermcap: -@if libtermcap -maybe-clean-libtermcap: clean-libtermcap - -# libtermcap doesn't support clean. -clean-libtermcap: - -@endif libtermcap - -.PHONY: maybe-distclean-libtermcap distclean-libtermcap -maybe-distclean-libtermcap: -@if libtermcap -maybe-distclean-libtermcap: distclean-libtermcap - -# libtermcap doesn't support distclean. -distclean-libtermcap: - -@endif libtermcap - -.PHONY: maybe-maintainer-clean-libtermcap maintainer-clean-libtermcap -maybe-maintainer-clean-libtermcap: -@if libtermcap -maybe-maintainer-clean-libtermcap: maintainer-clean-libtermcap - -# libtermcap doesn't support maintainer-clean. -maintainer-clean-libtermcap: - -@endif libtermcap +@endif lto-plugin -.PHONY: configure-utils maybe-configure-utils -maybe-configure-utils: +.PHONY: configure-libcc1 maybe-configure-libcc1 +maybe-configure-libcc1: @if gcc-bootstrap -configure-utils: stage_current +configure-libcc1: stage_current @endif gcc-bootstrap -@if utils -maybe-configure-utils: configure-utils -configure-utils: +@if libcc1 +maybe-configure-libcc1: configure-libcc1 +configure-libcc1: @: $(MAKE); $(unstage) @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 ; \ + test ! -f $(HOST_SUBDIR)/libcc1/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcc1; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/utils; \ - cd "$(HOST_SUBDIR)/utils" || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libcc1; \ + cd "$(HOST_SUBDIR)/libcc1" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/utils/ | \ + *) topdir=`echo $(HOST_SUBDIR)/libcc1/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/utils"; \ - libsrcdir="$$s/utils"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libcc1; \ + $(SHELL) \ + $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=${target_alias} --enable-shared \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: all-utils maybe-all-utils -maybe-all-utils: +.PHONY: all-libcc1 maybe-all-libcc1 +maybe-all-libcc1: @if gcc-bootstrap -all-utils: stage_current +all-libcc1: stage_current @endif gcc-bootstrap -@if utils -TARGET-utils=all -maybe-all-utils: all-utils -all-utils: configure-utils +@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; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/utils && \ + (cd $(HOST_SUBDIR)/libcc1 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-utils)) -@endif utils + $(TARGET-libcc1)) +@endif libcc1 -.PHONY: check-utils maybe-check-utils -maybe-check-utils: -@if utils -maybe-check-utils: check-utils +.PHONY: check-libcc1 maybe-check-libcc1 +maybe-check-libcc1: +@if libcc1 +maybe-check-libcc1: check-libcc1 -check-utils: +check-libcc1: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/libcc1 && \ + $(MAKE) $(FLAGS_TO_PASS) check) -@endif utils +@endif libcc1 -.PHONY: install-utils maybe-install-utils -maybe-install-utils: -@if utils -maybe-install-utils: install-utils +.PHONY: install-libcc1 maybe-install-libcc1 +maybe-install-libcc1: +@if libcc1 +maybe-install-libcc1: install-libcc1 -install-utils: installdirs +install-libcc1: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/utils && \ + (cd $(HOST_SUBDIR)/libcc1 && \ $(MAKE) $(FLAGS_TO_PASS) install) -@endif utils +@endif libcc1 -.PHONY: install-strip-utils maybe-install-strip-utils -maybe-install-strip-utils: -@if utils -maybe-install-strip-utils: install-strip-utils +.PHONY: install-strip-libcc1 maybe-install-strip-libcc1 +maybe-install-strip-libcc1: +@if libcc1 +maybe-install-strip-libcc1: install-strip-libcc1 -install-strip-utils: installdirs +install-strip-libcc1: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/utils && \ + (cd $(HOST_SUBDIR)/libcc1 && \ $(MAKE) $(FLAGS_TO_PASS) install-strip) -@endif utils +@endif libcc1 # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-utils info-utils -maybe-info-utils: -@if utils -maybe-info-utils: info-utils +.PHONY: maybe-info-libcc1 info-libcc1 +maybe-info-libcc1: +@if libcc1 +maybe-info-libcc1: info-libcc1 -info-utils: \ - configure-utils +info-libcc1: \ + configure-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 info in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29133,25 +31994,25 @@ info-utils: \ info) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-dvi-utils dvi-utils -maybe-dvi-utils: -@if utils -maybe-dvi-utils: dvi-utils +.PHONY: maybe-dvi-libcc1 dvi-libcc1 +maybe-dvi-libcc1: +@if libcc1 +maybe-dvi-libcc1: dvi-libcc1 -dvi-utils: \ - configure-utils +dvi-libcc1: \ + configure-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 dvi in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29159,25 +32020,25 @@ dvi-utils: \ dvi) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-pdf-utils pdf-utils -maybe-pdf-utils: -@if utils -maybe-pdf-utils: pdf-utils +.PHONY: maybe-pdf-libcc1 pdf-libcc1 +maybe-pdf-libcc1: +@if libcc1 +maybe-pdf-libcc1: pdf-libcc1 -pdf-utils: \ - configure-utils +pdf-libcc1: \ + configure-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 pdf in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29185,25 +32046,25 @@ pdf-utils: \ pdf) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-html-utils html-utils -maybe-html-utils: -@if utils -maybe-html-utils: html-utils +.PHONY: maybe-html-libcc1 html-libcc1 +maybe-html-libcc1: +@if libcc1 +maybe-html-libcc1: html-libcc1 -html-utils: \ - configure-utils +html-libcc1: \ + configure-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 html in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29211,25 +32072,25 @@ html-utils: \ html) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-TAGS-utils TAGS-utils -maybe-TAGS-utils: -@if utils -maybe-TAGS-utils: TAGS-utils +.PHONY: maybe-TAGS-libcc1 TAGS-libcc1 +maybe-TAGS-libcc1: +@if libcc1 +maybe-TAGS-libcc1: TAGS-libcc1 -TAGS-utils: \ - configure-utils +TAGS-libcc1: \ + configure-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 TAGS in utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29237,26 +32098,26 @@ TAGS-utils: \ TAGS) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-install-info-utils install-info-utils -maybe-install-info-utils: -@if utils -maybe-install-info-utils: install-info-utils +.PHONY: maybe-install-info-libcc1 install-info-libcc1 +maybe-install-info-libcc1: +@if libcc1 +maybe-install-info-libcc1: install-info-libcc1 -install-info-utils: \ - configure-utils \ - info-utils +install-info-libcc1: \ + configure-libcc1 \ + info-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29264,26 +32125,26 @@ install-info-utils: \ install-info) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-install-pdf-utils install-pdf-utils -maybe-install-pdf-utils: -@if utils -maybe-install-pdf-utils: install-pdf-utils +.PHONY: maybe-install-pdf-libcc1 install-pdf-libcc1 +maybe-install-pdf-libcc1: +@if libcc1 +maybe-install-pdf-libcc1: install-pdf-libcc1 -install-pdf-utils: \ - configure-utils \ - pdf-utils +install-pdf-libcc1: \ + configure-libcc1 \ + pdf-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29291,26 +32152,26 @@ install-pdf-utils: \ install-pdf) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-install-html-utils install-html-utils -maybe-install-html-utils: -@if utils -maybe-install-html-utils: install-html-utils +.PHONY: maybe-install-html-libcc1 install-html-libcc1 +maybe-install-html-libcc1: +@if libcc1 +maybe-install-html-libcc1: install-html-libcc1 -install-html-utils: \ - configure-utils \ - html-utils +install-html-libcc1: \ + configure-libcc1 \ + html-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29318,25 +32179,25 @@ install-html-utils: \ install-html) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-installcheck-utils installcheck-utils -maybe-installcheck-utils: -@if utils -maybe-installcheck-utils: installcheck-utils +.PHONY: maybe-installcheck-libcc1 installcheck-libcc1 +maybe-installcheck-libcc1: +@if libcc1 +maybe-installcheck-libcc1: installcheck-libcc1 -installcheck-utils: \ - configure-utils +installcheck-libcc1: \ + configure-libcc1 @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29344,24 +32205,24 @@ installcheck-utils: \ installcheck) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-mostlyclean-utils mostlyclean-utils -maybe-mostlyclean-utils: -@if utils -maybe-mostlyclean-utils: mostlyclean-utils +.PHONY: maybe-mostlyclean-libcc1 mostlyclean-libcc1 +maybe-mostlyclean-libcc1: +@if libcc1 +maybe-mostlyclean-libcc1: mostlyclean-libcc1 -mostlyclean-utils: +mostlyclean-libcc1: @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29369,24 +32230,24 @@ mostlyclean-utils: mostlyclean) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-clean-utils clean-utils -maybe-clean-utils: -@if utils -maybe-clean-utils: clean-utils +.PHONY: maybe-clean-libcc1 clean-libcc1 +maybe-clean-libcc1: +@if libcc1 +maybe-clean-libcc1: clean-libcc1 -clean-utils: +clean-libcc1: @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29394,24 +32255,24 @@ clean-utils: clean) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-distclean-utils distclean-utils -maybe-distclean-utils: -@if utils -maybe-distclean-utils: distclean-utils +.PHONY: maybe-distclean-libcc1 distclean-libcc1 +maybe-distclean-libcc1: +@if libcc1 +maybe-distclean-libcc1: distclean-libcc1 -distclean-utils: +distclean-libcc1: @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29419,24 +32280,24 @@ distclean-utils: distclean) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: maybe-maintainer-clean-utils maintainer-clean-utils -maybe-maintainer-clean-utils: -@if utils -maybe-maintainer-clean-utils: maintainer-clean-utils +.PHONY: maybe-maintainer-clean-libcc1 maintainer-clean-libcc1 +maybe-maintainer-clean-libcc1: +@if libcc1 +maybe-maintainer-clean-libcc1: maintainer-clean-libcc1 -maintainer-clean-utils: +maintainer-clean-libcc1: @: $(MAKE); $(unstage) - @[ -f ./utils/Makefile ] || exit 0; \ + @[ -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 utils" ; \ - (cd $(HOST_SUBDIR)/utils && \ + 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}" \ @@ -29444,128 +32305,129 @@ maintainer-clean-utils: maintainer-clean) \ || exit 1 -@endif utils +@endif libcc1 -.PHONY: configure-gnattools maybe-configure-gnattools -maybe-configure-gnattools: +.PHONY: configure-gotools maybe-configure-gotools +maybe-configure-gotools: @if gcc-bootstrap -configure-gnattools: stage_current +configure-gotools: stage_current @endif gcc-bootstrap -@if gnattools -maybe-configure-gnattools: configure-gnattools -configure-gnattools: +@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)/gnattools/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \ + test ! -f $(HOST_SUBDIR)/gotools/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gotools; \ $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/gnattools; \ - cd "$(HOST_SUBDIR)/gnattools" || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gotools; \ + cd "$(HOST_SUBDIR)/gotools" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(HOST_SUBDIR)/gnattools/ | \ + *) topdir=`echo $(HOST_SUBDIR)/gotools/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gnattools"; \ - libsrcdir="$$s/gnattools"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=gotools; \ + $(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 +@endif gotools -.PHONY: all-gnattools maybe-all-gnattools -maybe-all-gnattools: +.PHONY: all-gotools maybe-all-gotools +maybe-all-gotools: @if gcc-bootstrap -all-gnattools: stage_current +all-gotools: stage_current @endif gcc-bootstrap -@if gnattools -TARGET-gnattools=all -maybe-all-gnattools: all-gnattools -all-gnattools: configure-gnattools +@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)/gnattools && \ + (cd $(HOST_SUBDIR)/gotools && \ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-gnattools)) -@endif gnattools + $(TARGET-gotools)) +@endif gotools -.PHONY: check-gnattools maybe-check-gnattools -maybe-check-gnattools: -@if gnattools -maybe-check-gnattools: check-gnattools +.PHONY: check-gotools maybe-check-gotools +maybe-check-gotools: +@if gotools +maybe-check-gotools: check-gotools -check-gnattools: +check-gotools: @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnattools && \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gotools && \ $(MAKE) $(FLAGS_TO_PASS) check) -@endif gnattools +@endif gotools -.PHONY: install-gnattools maybe-install-gnattools -maybe-install-gnattools: -@if gnattools -maybe-install-gnattools: install-gnattools +.PHONY: install-gotools maybe-install-gotools +maybe-install-gotools: +@if gotools +maybe-install-gotools: install-gotools -install-gnattools: installdirs +install-gotools: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnattools && \ + (cd $(HOST_SUBDIR)/gotools && \ $(MAKE) $(FLAGS_TO_PASS) install) -@endif gnattools +@endif gotools -.PHONY: install-strip-gnattools maybe-install-strip-gnattools -maybe-install-strip-gnattools: -@if gnattools -maybe-install-strip-gnattools: install-strip-gnattools +.PHONY: install-strip-gotools maybe-install-strip-gotools +maybe-install-strip-gotools: +@if gotools +maybe-install-strip-gotools: install-strip-gotools -install-strip-gnattools: installdirs +install-strip-gotools: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/gnattools && \ + (cd $(HOST_SUBDIR)/gotools && \ $(MAKE) $(FLAGS_TO_PASS) install-strip) -@endif gnattools +@endif gotools # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-gnattools info-gnattools -maybe-info-gnattools: -@if gnattools -maybe-info-gnattools: info-gnattools +.PHONY: maybe-info-gotools info-gotools +maybe-info-gotools: +@if gotools +maybe-info-gotools: info-gotools -info-gnattools: \ - configure-gnattools +info-gotools: \ + configure-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29573,25 +32435,25 @@ info-gnattools: \ info) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-dvi-gnattools dvi-gnattools -maybe-dvi-gnattools: -@if gnattools -maybe-dvi-gnattools: dvi-gnattools +.PHONY: maybe-dvi-gotools dvi-gotools +maybe-dvi-gotools: +@if gotools +maybe-dvi-gotools: dvi-gotools -dvi-gnattools: \ - configure-gnattools +dvi-gotools: \ + configure-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29599,25 +32461,25 @@ dvi-gnattools: \ dvi) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-pdf-gnattools pdf-gnattools -maybe-pdf-gnattools: -@if gnattools -maybe-pdf-gnattools: pdf-gnattools +.PHONY: maybe-pdf-gotools pdf-gotools +maybe-pdf-gotools: +@if gotools +maybe-pdf-gotools: pdf-gotools -pdf-gnattools: \ - configure-gnattools +pdf-gotools: \ + configure-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29625,25 +32487,25 @@ pdf-gnattools: \ pdf) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-html-gnattools html-gnattools -maybe-html-gnattools: -@if gnattools -maybe-html-gnattools: html-gnattools +.PHONY: maybe-html-gotools html-gotools +maybe-html-gotools: +@if gotools +maybe-html-gotools: html-gotools -html-gnattools: \ - configure-gnattools +html-gotools: \ + configure-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29651,25 +32513,25 @@ html-gnattools: \ html) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-TAGS-gnattools TAGS-gnattools -maybe-TAGS-gnattools: -@if gnattools -maybe-TAGS-gnattools: TAGS-gnattools +.PHONY: maybe-TAGS-gotools TAGS-gotools +maybe-TAGS-gotools: +@if gotools +maybe-TAGS-gotools: TAGS-gotools -TAGS-gnattools: \ - configure-gnattools +TAGS-gotools: \ + configure-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29677,26 +32539,26 @@ TAGS-gnattools: \ TAGS) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-install-info-gnattools install-info-gnattools -maybe-install-info-gnattools: -@if gnattools -maybe-install-info-gnattools: install-info-gnattools +.PHONY: maybe-install-info-gotools install-info-gotools +maybe-install-info-gotools: +@if gotools +maybe-install-info-gotools: install-info-gotools -install-info-gnattools: \ - configure-gnattools \ - info-gnattools +install-info-gotools: \ + configure-gotools \ + info-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29704,26 +32566,26 @@ install-info-gnattools: \ install-info) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-install-pdf-gnattools install-pdf-gnattools -maybe-install-pdf-gnattools: -@if gnattools -maybe-install-pdf-gnattools: install-pdf-gnattools +.PHONY: maybe-install-pdf-gotools install-pdf-gotools +maybe-install-pdf-gotools: +@if gotools +maybe-install-pdf-gotools: install-pdf-gotools -install-pdf-gnattools: \ - configure-gnattools \ - pdf-gnattools +install-pdf-gotools: \ + configure-gotools \ + pdf-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29731,26 +32593,26 @@ install-pdf-gnattools: \ install-pdf) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-install-html-gnattools install-html-gnattools -maybe-install-html-gnattools: -@if gnattools -maybe-install-html-gnattools: install-html-gnattools +.PHONY: maybe-install-html-gotools install-html-gotools +maybe-install-html-gotools: +@if gotools +maybe-install-html-gotools: install-html-gotools -install-html-gnattools: \ - configure-gnattools \ - html-gnattools +install-html-gotools: \ + configure-gotools \ + html-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29758,25 +32620,25 @@ install-html-gnattools: \ install-html) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-installcheck-gnattools installcheck-gnattools -maybe-installcheck-gnattools: -@if gnattools -maybe-installcheck-gnattools: installcheck-gnattools +.PHONY: maybe-installcheck-gotools installcheck-gotools +maybe-installcheck-gotools: +@if gotools +maybe-installcheck-gotools: installcheck-gotools -installcheck-gnattools: \ - configure-gnattools +installcheck-gotools: \ + configure-gotools @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29784,24 +32646,24 @@ installcheck-gnattools: \ installcheck) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools -maybe-mostlyclean-gnattools: -@if gnattools -maybe-mostlyclean-gnattools: mostlyclean-gnattools +.PHONY: maybe-mostlyclean-gotools mostlyclean-gotools +maybe-mostlyclean-gotools: +@if gotools +maybe-mostlyclean-gotools: mostlyclean-gotools -mostlyclean-gnattools: +mostlyclean-gotools: @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29809,24 +32671,24 @@ mostlyclean-gnattools: mostlyclean) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-clean-gnattools clean-gnattools -maybe-clean-gnattools: -@if gnattools -maybe-clean-gnattools: clean-gnattools +.PHONY: maybe-clean-gotools clean-gotools +maybe-clean-gotools: +@if gotools +maybe-clean-gotools: clean-gotools -clean-gnattools: +clean-gotools: @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29834,24 +32696,24 @@ clean-gnattools: clean) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-distclean-gnattools distclean-gnattools -maybe-distclean-gnattools: -@if gnattools -maybe-distclean-gnattools: distclean-gnattools +.PHONY: maybe-distclean-gotools distclean-gotools +maybe-distclean-gotools: +@if gotools +maybe-distclean-gotools: distclean-gotools -distclean-gnattools: +distclean-gotools: @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29859,24 +32721,24 @@ distclean-gnattools: distclean) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: maybe-maintainer-clean-gnattools maintainer-clean-gnattools -maybe-maintainer-clean-gnattools: -@if gnattools -maybe-maintainer-clean-gnattools: maintainer-clean-gnattools +.PHONY: maybe-maintainer-clean-gotools maintainer-clean-gotools +maybe-maintainer-clean-gotools: +@if gotools +maybe-maintainer-clean-gotools: maintainer-clean-gotools -maintainer-clean-gnattools: +maintainer-clean-gotools: @: $(MAKE); $(unstage) - @[ -f ./gnattools/Makefile ] || exit 0; \ + @[ -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 gnattools" ; \ - (cd $(HOST_SUBDIR)/gnattools && \ + 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}" \ @@ -29884,1245 +32746,1345 @@ maintainer-clean-gnattools: maintainer-clean) \ || exit 1 -@endif gnattools +@endif gotools -.PHONY: configure-lto-plugin maybe-configure-lto-plugin -maybe-configure-lto-plugin: +# --------------------------------------- +# 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-lto-plugin: stage_current +configure-target-libstdc++-v3: stage_current @endif gcc-bootstrap -@if lto-plugin -maybe-configure-lto-plugin: configure-lto-plugin -configure-lto-plugin: +@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; \ - test ! -f $(HOST_SUBDIR)/lto-plugin/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - $(HOST_EXPORTS) \ - echo Configuring in $(HOST_SUBDIR)/lto-plugin; \ - cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --enable-shared \ + 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 lto-plugin +@endif target-libstdc++-v3 -.PHONY: configure-stage1-lto-plugin maybe-configure-stage1-lto-plugin -maybe-configure-stage1-lto-plugin: -@if lto-plugin-bootstrap -maybe-configure-stage1-lto-plugin: configure-stage1-lto-plugin -configure-stage1-lto-plugin: +.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 $(HOST_SUBDIR)/lto-plugin + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE1_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/lto-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)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ - $(STAGE1_CONFIGURE_FLAGS) \ - --enable-shared -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-configure-stage2-lto-plugin -maybe-configure-stage2-lto-plugin: -@if lto-plugin-bootstrap -maybe-configure-stage2-lto-plugin: configure-stage2-lto-plugin -configure-stage2-lto-plugin: +.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 $(HOST_SUBDIR)/lto-plugin + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE2_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/lto-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)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + 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) \ - --enable-shared -@endif lto-plugin-bootstrap + $(STAGE2_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap -.PHONY: configure-stage3-lto-plugin maybe-configure-stage3-lto-plugin -maybe-configure-stage3-lto-plugin: -@if lto-plugin-bootstrap -maybe-configure-stage3-lto-plugin: configure-stage3-lto-plugin -configure-stage3-lto-plugin: +.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 $(HOST_SUBDIR)/lto-plugin + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE3_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/lto-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)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + 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) \ - --enable-shared -@endif lto-plugin-bootstrap + $(STAGE3_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap -.PHONY: configure-stage4-lto-plugin maybe-configure-stage4-lto-plugin -maybe-configure-stage4-lto-plugin: -@if lto-plugin-bootstrap -maybe-configure-stage4-lto-plugin: configure-stage4-lto-plugin -configure-stage4-lto-plugin: +.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 $(HOST_SUBDIR)/lto-plugin + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGE4_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/lto-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)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + 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) \ - --enable-shared -@endif lto-plugin-bootstrap + $(STAGE4_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap -.PHONY: configure-stageprofile-lto-plugin maybe-configure-stageprofile-lto-plugin -maybe-configure-stageprofile-lto-plugin: -@if lto-plugin-bootstrap -maybe-configure-stageprofile-lto-plugin: configure-stageprofile-lto-plugin -configure-stageprofile-lto-plugin: +.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 $(HOST_SUBDIR)/lto-plugin + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEprofile_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/lto-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)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + 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) \ - --enable-shared -@endif lto-plugin-bootstrap + $(STAGEprofile_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap -.PHONY: configure-stagefeedback-lto-plugin maybe-configure-stagefeedback-lto-plugin -maybe-configure-stagefeedback-lto-plugin: -@if lto-plugin-bootstrap -maybe-configure-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin -configure-stagefeedback-lto-plugin: +.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 $(HOST_SUBDIR)/lto-plugin + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ TFLAGS="$(STAGEfeedback_TFLAGS)"; \ - test ! -f $(HOST_SUBDIR)/lto-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)/lto-plugin ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ - cd $(HOST_SUBDIR)/lto-plugin || exit 1; \ + 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 $(HOST_SUBDIR)/lto-plugin/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/lto-plugin"; \ - libsrcdir="$$s/lto-plugin"; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + 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) \ - --enable-shared -@endif lto-plugin-bootstrap + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif target-libstdc++-v3-bootstrap -.PHONY: all-lto-plugin maybe-all-lto-plugin -maybe-all-lto-plugin: +.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3 +maybe-all-target-libstdc++-v3: @if gcc-bootstrap -all-lto-plugin: stage_current +all-target-libstdc++-v3: stage_current @endif gcc-bootstrap -@if lto-plugin -TARGET-lto-plugin=all -maybe-all-lto-plugin: all-lto-plugin -all-lto-plugin: configure-lto-plugin +@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; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ - $(TARGET-lto-plugin)) -@endif lto-plugin + $(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-lto-plugin maybe-all-stage1-lto-plugin -.PHONY: clean-stage1-lto-plugin maybe-clean-stage1-lto-plugin -maybe-all-stage1-lto-plugin: -maybe-clean-stage1-lto-plugin: -@if lto-plugin-bootstrap -maybe-all-stage1-lto-plugin: all-stage1-lto-plugin -all-stage1: all-stage1-lto-plugin -TARGET-stage1-lto-plugin = $(TARGET-lto-plugin) -all-stage1-lto-plugin: configure-stage1-lto-plugin +.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)"; \ - $(HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/lto-plugin && \ + $(RAW_CXX_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - CXXFLAGS="$(STAGE1_CXXFLAGS)" \ - LIBCFLAGS="$(LIBCFLAGS)" \ + 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_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ + \ TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-lto-plugin) + $(TARGET-stage1-target-libstdc++-v3) -maybe-clean-stage1-lto-plugin: clean-stage1-lto-plugin -clean-stage1: clean-stage1-lto-plugin -clean-stage1-lto-plugin: +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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage1-lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \ $(MAKE) stage1-start; \ fi; \ - cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) \ - $(STAGE1_FLAGS_TO_PASS) clean -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-all-stage2-lto-plugin -.PHONY: clean-stage2-lto-plugin maybe-clean-stage2-lto-plugin -maybe-all-stage2-lto-plugin: -maybe-clean-stage2-lto-plugin: -@if lto-plugin-bootstrap -maybe-all-stage2-lto-plugin: all-stage2-lto-plugin -all-stage2: all-stage2-lto-plugin -TARGET-stage2-lto-plugin = $(TARGET-lto-plugin) -all-stage2-lto-plugin: configure-stage2-lto-plugin +.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)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/lto-plugin && \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE2_CFLAGS)" \ - CXXFLAGS="$(STAGE2_CXXFLAGS)" \ - LIBCFLAGS="$(STAGE2_CFLAGS)" \ + 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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-lto-plugin) + $(TARGET-stage2-target-libstdc++-v3) -maybe-clean-stage2-lto-plugin: clean-stage2-lto-plugin -clean-stage2: clean-stage2-lto-plugin -clean-stage2-lto-plugin: +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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage2-lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \ $(MAKE) stage2-start; \ fi; \ - cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-all-stage3-lto-plugin -.PHONY: clean-stage3-lto-plugin maybe-clean-stage3-lto-plugin -maybe-all-stage3-lto-plugin: -maybe-clean-stage3-lto-plugin: -@if lto-plugin-bootstrap -maybe-all-stage3-lto-plugin: all-stage3-lto-plugin -all-stage3: all-stage3-lto-plugin -TARGET-stage3-lto-plugin = $(TARGET-lto-plugin) -all-stage3-lto-plugin: configure-stage3-lto-plugin +.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)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/lto-plugin && \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE3_CFLAGS)" \ - CXXFLAGS="$(STAGE3_CXXFLAGS)" \ - LIBCFLAGS="$(STAGE3_CFLAGS)" \ + 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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-lto-plugin) + $(TARGET-stage3-target-libstdc++-v3) -maybe-clean-stage3-lto-plugin: clean-stage3-lto-plugin -clean-stage3: clean-stage3-lto-plugin -clean-stage3-lto-plugin: +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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage3-lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \ $(MAKE) stage3-start; \ fi; \ - cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-all-stage4-lto-plugin -.PHONY: clean-stage4-lto-plugin maybe-clean-stage4-lto-plugin -maybe-all-stage4-lto-plugin: -maybe-clean-stage4-lto-plugin: -@if lto-plugin-bootstrap -maybe-all-stage4-lto-plugin: all-stage4-lto-plugin -all-stage4: all-stage4-lto-plugin -TARGET-stage4-lto-plugin = $(TARGET-lto-plugin) -all-stage4-lto-plugin: configure-stage4-lto-plugin +.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)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/lto-plugin && \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE4_CFLAGS)" \ - CXXFLAGS="$(STAGE4_CXXFLAGS)" \ - LIBCFLAGS="$(STAGE4_CFLAGS)" \ + 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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGE4_TFLAGS)" \ - $(TARGET-stage4-lto-plugin) + $(TARGET-stage4-target-libstdc++-v3) -maybe-clean-stage4-lto-plugin: clean-stage4-lto-plugin -clean-stage4: clean-stage4-lto-plugin -clean-stage4-lto-plugin: +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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stage4-lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \ $(MAKE) stage4-start; \ fi; \ - cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-all-stageprofile-lto-plugin -.PHONY: clean-stageprofile-lto-plugin maybe-clean-stageprofile-lto-plugin -maybe-all-stageprofile-lto-plugin: -maybe-clean-stageprofile-lto-plugin: -@if lto-plugin-bootstrap -maybe-all-stageprofile-lto-plugin: all-stageprofile-lto-plugin -all-stageprofile: all-stageprofile-lto-plugin -TARGET-stageprofile-lto-plugin = $(TARGET-lto-plugin) -all-stageprofile-lto-plugin: configure-stageprofile-lto-plugin +.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)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/lto-plugin && \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEprofile_CFLAGS)" \ - CXXFLAGS="$(STAGEprofile_CXXFLAGS)" \ - LIBCFLAGS="$(STAGEprofile_CFLAGS)" \ + 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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGEprofile_TFLAGS)" \ - $(TARGET-stageprofile-lto-plugin) + $(TARGET-stageprofile-target-libstdc++-v3) -maybe-clean-stageprofile-lto-plugin: clean-stageprofile-lto-plugin -clean-stageprofile: clean-stageprofile-lto-plugin -clean-stageprofile-lto-plugin: +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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stageprofile-lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \ $(MAKE) stageprofile-start; \ fi; \ - cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-all-stagefeedback-lto-plugin -.PHONY: clean-stagefeedback-lto-plugin maybe-clean-stagefeedback-lto-plugin -maybe-all-stagefeedback-lto-plugin: -maybe-clean-stagefeedback-lto-plugin: -@if lto-plugin-bootstrap -maybe-all-stagefeedback-lto-plugin: all-stagefeedback-lto-plugin -all-stagefeedback: all-stagefeedback-lto-plugin -TARGET-stagefeedback-lto-plugin = $(TARGET-lto-plugin) -all-stagefeedback-lto-plugin: configure-stagefeedback-lto-plugin +.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)"; \ - $(HOST_EXPORTS) \ - $(POSTSTAGE1_HOST_EXPORTS) \ - cd $(HOST_SUBDIR)/lto-plugin && \ + $(RAW_CXX_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ - CFLAGS="$(STAGEfeedback_CFLAGS)" \ - CXXFLAGS="$(STAGEfeedback_CXXFLAGS)" \ - LIBCFLAGS="$(STAGEfeedback_CFLAGS)" \ + 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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ TFLAGS="$(STAGEfeedback_TFLAGS)" \ - $(TARGET-stagefeedback-lto-plugin) + $(TARGET-stagefeedback-target-libstdc++-v3) -maybe-clean-stagefeedback-lto-plugin: clean-stagefeedback-lto-plugin -clean-stagefeedback: clean-stagefeedback-lto-plugin -clean-stagefeedback-lto-plugin: +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 $(HOST_SUBDIR)/lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ else \ - [ -f $(HOST_SUBDIR)/stagefeedback-lto-plugin/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \ $(MAKE) stagefeedback-start; \ fi; \ - cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) clean -@endif lto-plugin-bootstrap + 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-lto-plugin maybe-check-lto-plugin -maybe-check-lto-plugin: -@if lto-plugin -maybe-check-lto-plugin: check-lto-plugin -check-lto-plugin: +.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; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(FLAGS_TO_PASS) check) + $(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 lto-plugin +@endif target-libstdc++-v3 -.PHONY: install-lto-plugin maybe-install-lto-plugin -maybe-install-lto-plugin: -@if lto-plugin -maybe-install-lto-plugin: install-lto-plugin +.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-lto-plugin: installdirs +install-target-libstdc++-v3: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(FLAGS_TO_PASS) install) + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: install-strip-lto-plugin maybe-install-strip-lto-plugin -maybe-install-strip-lto-plugin: -@if lto-plugin -maybe-install-strip-lto-plugin: install-strip-lto-plugin +.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-lto-plugin: installdirs +install-strip-target-libstdc++-v3: installdirs @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd $(HOST_SUBDIR)/lto-plugin && \ - $(MAKE) $(FLAGS_TO_PASS) install-strip) + $(RAW_CXX_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) -@endif lto-plugin +@endif target-libstdc++-v3 # Other targets (info, dvi, pdf, etc.) -.PHONY: maybe-info-lto-plugin info-lto-plugin -maybe-info-lto-plugin: -@if lto-plugin -maybe-info-lto-plugin: info-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing info in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + info) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-dvi-lto-plugin dvi-lto-plugin -maybe-dvi-lto-plugin: -@if lto-plugin -maybe-dvi-lto-plugin: dvi-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing dvi in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + dvi) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-pdf-lto-plugin pdf-lto-plugin -maybe-pdf-lto-plugin: -@if lto-plugin -maybe-pdf-lto-plugin: pdf-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing pdf in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + pdf) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-html-lto-plugin html-lto-plugin -maybe-html-lto-plugin: -@if lto-plugin -maybe-html-lto-plugin: html-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing html in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + html) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-TAGS-lto-plugin TAGS-lto-plugin -maybe-TAGS-lto-plugin: -@if lto-plugin -maybe-TAGS-lto-plugin: TAGS-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing TAGS in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + TAGS) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-install-info-lto-plugin install-info-lto-plugin -maybe-install-info-lto-plugin: -@if lto-plugin -maybe-install-info-lto-plugin: install-info-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin \ - info-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing install-info in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + install-info) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-install-pdf-lto-plugin install-pdf-lto-plugin -maybe-install-pdf-lto-plugin: -@if lto-plugin -maybe-install-pdf-lto-plugin: install-pdf-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin \ - pdf-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing install-pdf in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + install-pdf) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-install-html-lto-plugin install-html-lto-plugin -maybe-install-html-lto-plugin: -@if lto-plugin -maybe-install-html-lto-plugin: install-html-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin \ - html-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing install-html in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + install-html) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-installcheck-lto-plugin installcheck-lto-plugin -maybe-installcheck-lto-plugin: -@if lto-plugin -maybe-installcheck-lto-plugin: installcheck-lto-plugin +.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-lto-plugin: \ - configure-lto-plugin - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing installcheck in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + installcheck) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-mostlyclean-lto-plugin mostlyclean-lto-plugin -maybe-mostlyclean-lto-plugin: -@if lto-plugin -maybe-mostlyclean-lto-plugin: mostlyclean-lto-plugin +.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-lto-plugin: - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing mostlyclean in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + mostlyclean) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-clean-lto-plugin clean-lto-plugin -maybe-clean-lto-plugin: -@if lto-plugin -maybe-clean-lto-plugin: clean-lto-plugin +.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-lto-plugin: - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing clean in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + clean) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-distclean-lto-plugin distclean-lto-plugin -maybe-distclean-lto-plugin: -@if lto-plugin -maybe-distclean-lto-plugin: distclean-lto-plugin +.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-lto-plugin: - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing distclean in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + distclean) \ || exit 1 -@endif lto-plugin +@endif target-libstdc++-v3 -.PHONY: maybe-maintainer-clean-lto-plugin maintainer-clean-lto-plugin -maybe-maintainer-clean-lto-plugin: -@if lto-plugin -maybe-maintainer-clean-lto-plugin: maintainer-clean-lto-plugin +.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-lto-plugin: - @[ -f ./lto-plugin/Makefile ] || exit 0; \ +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; \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + $(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; \ - echo "Doing maintainer-clean in lto-plugin" ; \ - (cd $(HOST_SUBDIR)/lto-plugin && \ + (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) \ + maintainer-clean) \ || exit 1 -@endif lto-plugin - - +@endif target-libstdc++-v3 -# --------------------------------------- -# Modules which run on the target machine -# --------------------------------------- -.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3 -maybe-configure-target-libstdc++-v3: +.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer +maybe-configure-target-libsanitizer: @if gcc-bootstrap -configure-target-libstdc++-v3: stage_current +configure-target-libsanitizer: stage_current @endif gcc-bootstrap -@if target-libstdc++-v3 -maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 -configure-target-libstdc++-v3: +@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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ + test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer; \ $(RAW_CXX_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ - cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ + echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \ + cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ + module_srcdir=libsanitizer; \ 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-libstdc++-v3 +@endif target-libsanitizer -.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: +.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)/libstdc++-v3 + @$(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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + 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)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + 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)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libsanitizer; \ + $(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-libstdc++-v3-bootstrap +@endif target-libsanitizer-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: +.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)/libstdc++-v3 + @$(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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + 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)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + 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)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libsanitizer; \ + $(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-libstdc++-v3-bootstrap +@endif target-libsanitizer-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: +.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)/libstdc++-v3 + @$(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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + 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)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + 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)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libsanitizer; \ + $(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-libstdc++-v3-bootstrap +@endif target-libsanitizer-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: +.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)/libstdc++-v3 + @$(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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + 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)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + 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)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libsanitizer; \ + $(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-libstdc++-v3-bootstrap +@endif target-libsanitizer-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: +.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)/libstdc++-v3 + @$(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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + 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)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + 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)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libsanitizer; \ + $(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-libstdc++-v3-bootstrap +@endif target-libsanitizer-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: +.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)/libstdc++-v3 + @$(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 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; \ + 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)/libstdc++-v3/Makefile; \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libsanitizer/Makefile; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libstdc++-v3/multilib.tmp $(TARGET_SUBDIR)/libstdc++-v3/multilib.out; \ + mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ + 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)/libstdc++-v3 ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 || exit 1; \ + 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)/libstdc++-v3/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libsanitizer/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libsanitizer; \ + $(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-libstdc++-v3-bootstrap +@endif target-libsanitizer-bootstrap -.PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3 -maybe-all-target-libstdc++-v3: +.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer +maybe-all-target-libsanitizer: @if gcc-bootstrap -all-target-libstdc++-v3: stage_current +all-target-libsanitizer: 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 +@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)/libstdc++-v3 && \ + (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-libstdc++-v3)) -@endif target-libstdc++-v3 + $(TARGET-target-libsanitizer)) +@endif target-libsanitizer -.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 +.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)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31133,39 +34095,39 @@ all-stage1-target-libstdc++-v3: configure-stage1-target-libstdc++-v3 $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ \ TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-target-libstdc++-v3) + $(TARGET-stage1-target-libsanitizer) -maybe-clean-stage1-target-libstdc++-v3: clean-stage1-target-libstdc++-v3 -clean-stage1: clean-stage1-target-libstdc++-v3 -clean-stage1-target-libstdc++-v3: +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)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage1-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \ $(MAKE) stage1-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ clean -@endif target-libstdc++-v3-bootstrap +@endif target-libsanitizer-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 +.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)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31175,38 +34137,38 @@ all-stage2-target-libstdc++-v3: configure-stage2-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="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-target-libstdc++-v3) + $(TARGET-stage2-target-libsanitizer) -maybe-clean-stage2-target-libstdc++-v3: clean-stage2-target-libstdc++-v3 -clean-stage2: clean-stage2-target-libstdc++-v3 -clean-stage2-target-libstdc++-v3: +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)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage2-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \ $(MAKE) stage2-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif target-libsanitizer-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 +.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)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31216,38 +34178,38 @@ all-stage3-target-libstdc++-v3: configure-stage3-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="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-target-libstdc++-v3) + $(TARGET-stage3-target-libsanitizer) -maybe-clean-stage3-target-libstdc++-v3: clean-stage3-target-libstdc++-v3 -clean-stage3: clean-stage3-target-libstdc++-v3 -clean-stage3-target-libstdc++-v3: +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)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage3-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \ $(MAKE) stage3-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif target-libsanitizer-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 +.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)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31257,38 +34219,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-libsanitizer) -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-libsanitizer: clean-stage4-target-libsanitizer +clean-stage4: clean-stage4-target-libsanitizer +clean-stage4-target-libsanitizer: @if [ $(current_stage) = stage4 ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage4-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \ $(MAKE) stage4-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif target-libsanitizer-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 +.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)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31298,38 +34260,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-libsanitizer) -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-libsanitizer: clean-stageprofile-target-libsanitizer +clean-stageprofile: clean-stageprofile-target-libsanitizer +clean-stageprofile-target-libsanitizer: @if [ $(current_stage) = stageprofile ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stageprofile-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \ $(MAKE) stageprofile-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif target-libsanitizer-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 +.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)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -31339,90 +34301,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-libsanitizer) -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-libsanitizer: clean-stagefeedback-target-libsanitizer +clean-stagefeedback: clean-stagefeedback-target-libsanitizer +clean-stagefeedback-target-libsanitizer: @if [ $(current_stage) = stagefeedback ]; then \ - [ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stagefeedback-libstdc++-v3/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \ $(MAKE) stagefeedback-start; \ fi; \ - cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' clean -@endif target-libstdc++-v3-bootstrap +@endif target-libsanitizer-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-libsanitizer maybe-check-target-libsanitizer +maybe-check-target-libsanitizer: +@if target-libsanitizer +maybe-check-target-libsanitizer: check-target-libsanitizer -check-target-libstdc++-v3: +check-target-libsanitizer: @: $(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)/libsanitizer && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer maybe-install-target-libsanitizer +maybe-install-target-libsanitizer: +@if target-libsanitizer +maybe-install-target-libsanitizer: install-target-libsanitizer -install-target-libstdc++-v3: installdirs +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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-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-libstdc++-v3: installdirs +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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) -@endif target-libstdc++-v3 +@endif target-libsanitizer # 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-libsanitizer info-target-libsanitizer +maybe-info-target-libsanitizer: +@if target-libsanitizer +maybe-info-target-libsanitizer: info-target-libsanitizer -info-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +info-target-libsanitizer: \ + configure-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31430,25 +34392,25 @@ info-target-libstdc++-v3: \ info) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer dvi-target-libsanitizer +maybe-dvi-target-libsanitizer: +@if target-libsanitizer +maybe-dvi-target-libsanitizer: dvi-target-libsanitizer -dvi-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +dvi-target-libsanitizer: \ + configure-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31456,25 +34418,25 @@ dvi-target-libstdc++-v3: \ dvi) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer pdf-target-libsanitizer +maybe-pdf-target-libsanitizer: +@if target-libsanitizer +maybe-pdf-target-libsanitizer: pdf-target-libsanitizer -pdf-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +pdf-target-libsanitizer: \ + configure-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31482,25 +34444,25 @@ pdf-target-libstdc++-v3: \ pdf) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer html-target-libsanitizer +maybe-html-target-libsanitizer: +@if target-libsanitizer +maybe-html-target-libsanitizer: html-target-libsanitizer -html-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +html-target-libsanitizer: \ + configure-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31508,25 +34470,25 @@ html-target-libstdc++-v3: \ html) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer TAGS-target-libsanitizer +maybe-TAGS-target-libsanitizer: +@if target-libsanitizer +maybe-TAGS-target-libsanitizer: TAGS-target-libsanitizer -TAGS-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +TAGS-target-libsanitizer: \ + configure-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31534,26 +34496,26 @@ TAGS-target-libstdc++-v3: \ TAGS) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-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-libstdc++-v3: \ - configure-target-libstdc++-v3 \ - info-target-libstdc++-v3 +install-info-target-libsanitizer: \ + configure-target-libsanitizer \ + info-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31561,26 +34523,26 @@ install-info-target-libstdc++-v3: \ install-info) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-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-libstdc++-v3: \ - configure-target-libstdc++-v3 \ - pdf-target-libstdc++-v3 +install-pdf-target-libsanitizer: \ + configure-target-libsanitizer \ + pdf-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31588,26 +34550,26 @@ install-pdf-target-libstdc++-v3: \ install-pdf) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-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-libstdc++-v3: \ - configure-target-libstdc++-v3 \ - html-target-libstdc++-v3 +install-html-target-libsanitizer: \ + configure-target-libsanitizer \ + html-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31615,25 +34577,25 @@ install-html-target-libstdc++-v3: \ install-html) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer installcheck-target-libsanitizer +maybe-installcheck-target-libsanitizer: +@if target-libsanitizer +maybe-installcheck-target-libsanitizer: installcheck-target-libsanitizer -installcheck-target-libstdc++-v3: \ - configure-target-libstdc++-v3 +installcheck-target-libsanitizer: \ + configure-target-libsanitizer @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31641,24 +34603,24 @@ installcheck-target-libstdc++-v3: \ installcheck) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer mostlyclean-target-libsanitizer +maybe-mostlyclean-target-libsanitizer: +@if target-libsanitizer +maybe-mostlyclean-target-libsanitizer: mostlyclean-target-libsanitizer -mostlyclean-target-libstdc++-v3: +mostlyclean-target-libsanitizer: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31666,24 +34628,24 @@ mostlyclean-target-libstdc++-v3: mostlyclean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer clean-target-libsanitizer +maybe-clean-target-libsanitizer: +@if target-libsanitizer +maybe-clean-target-libsanitizer: clean-target-libsanitizer -clean-target-libstdc++-v3: +clean-target-libsanitizer: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31691,24 +34653,24 @@ clean-target-libstdc++-v3: clean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-libsanitizer distclean-target-libsanitizer +maybe-distclean-target-libsanitizer: +@if target-libsanitizer +maybe-distclean-target-libsanitizer: distclean-target-libsanitizer -distclean-target-libstdc++-v3: +distclean-target-libsanitizer: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31716,24 +34678,24 @@ distclean-target-libstdc++-v3: distclean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.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-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-libstdc++-v3: +maintainer-clean-target-libsanitizer: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + @[ -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)/libstdc++-v3" ; \ + 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)/libstdc++-v3 && \ + (cd $(TARGET_SUBDIR)/libsanitizer && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -31741,362 +34703,364 @@ maintainer-clean-target-libstdc++-v3: maintainer-clean) \ || exit 1 -@endif target-libstdc++-v3 +@endif target-libsanitizer -.PHONY: configure-target-libsanitizer maybe-configure-target-libsanitizer -maybe-configure-target-libsanitizer: +.PHONY: configure-target-libmpx maybe-configure-target-libmpx +maybe-configure-target-libmpx: @if gcc-bootstrap -configure-target-libsanitizer: stage_current +configure-target-libmpx: stage_current @endif gcc-bootstrap -@if target-libsanitizer -maybe-configure-target-libsanitizer: configure-target-libsanitizer -configure-target-libsanitizer: +@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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/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; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ + module_srcdir=libmpx; \ 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-libsanitizer +@endif target-libmpx -.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: +.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)/libsanitizer + @$(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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ + 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)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libmpx; \ + $(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-libsanitizer-bootstrap +@endif target-libmpx-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: +.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)/libsanitizer + @$(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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ + 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)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libmpx; \ + $(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-libsanitizer-bootstrap +@endif target-libmpx-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: +.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)/libsanitizer + @$(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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ + 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)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libmpx; \ + $(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-libsanitizer-bootstrap +@endif target-libmpx-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: +.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)/libsanitizer + @$(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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ + 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)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libmpx; \ + $(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-libsanitizer-bootstrap +@endif target-libmpx-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: +.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)/libsanitizer + @$(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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ + 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)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libmpx; \ + $(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-libsanitizer-bootstrap +@endif target-libmpx-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: +.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)/libsanitizer + @$(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 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; \ + 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)/libsanitizer/Makefile; \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + rm -f $(TARGET_SUBDIR)/libmpx/Makefile; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ else \ - mv $(TARGET_SUBDIR)/libsanitizer/multilib.tmp $(TARGET_SUBDIR)/libsanitizer/multilib.out; \ + mv $(TARGET_SUBDIR)/libmpx/multilib.tmp $(TARGET_SUBDIR)/libmpx/multilib.out; \ fi; \ - test ! -f $(TARGET_SUBDIR)/libsanitizer/Makefile || exit 0; \ - $(RAW_CXX_TARGET_EXPORTS) \ + 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)/libsanitizer ; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ - cd $(TARGET_SUBDIR)/libsanitizer || exit 1; \ + 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)/libsanitizer/ | \ + *) topdir=`echo $(TARGET_SUBDIR)/libmpx/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libsanitizer"; \ - libsrcdir="$$s/libsanitizer"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libmpx; \ + $(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-libsanitizer-bootstrap +@endif target-libmpx-bootstrap -.PHONY: all-target-libsanitizer maybe-all-target-libsanitizer -maybe-all-target-libsanitizer: +.PHONY: all-target-libmpx maybe-all-target-libmpx +maybe-all-target-libmpx: @if gcc-bootstrap -all-target-libsanitizer: stage_current +all-target-libmpx: 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 +@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; \ - $(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 + $(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-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 +.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)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ - cd $(TARGET_SUBDIR)/libsanitizer && \ + $(NORMAL_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -32104,42 +35068,42 @@ all-stage1-target-libsanitizer: configure-stage1-target-libsanitizer 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)' \ + $(EXTRA_TARGET_FLAGS) \ \ TFLAGS="$(STAGE1_TFLAGS)" \ - $(TARGET-stage1-target-libsanitizer) + $(TARGET-stage1-target-libmpx) -maybe-clean-stage1-target-libsanitizer: clean-stage1-target-libsanitizer -clean-stage1: clean-stage1-target-libsanitizer -clean-stage1-target-libsanitizer: +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)/libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage1-libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage1-libmpx/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)' \ + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ 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 +@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)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ + $(NORMAL_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libsanitizer && \ + cd $(TARGET_SUBDIR)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -32147,40 +35111,40 @@ all-stage2-target-libsanitizer: configure-stage2-target-libsanitizer 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)' \ + $(EXTRA_TARGET_FLAGS) \ TFLAGS="$(STAGE2_TFLAGS)" \ - $(TARGET-stage2-target-libsanitizer) + $(TARGET-stage2-target-libmpx) -maybe-clean-stage2-target-libsanitizer: clean-stage2-target-libsanitizer -clean-stage2: clean-stage2-target-libsanitizer -clean-stage2-target-libsanitizer: +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)/libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage2-libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage2-libmpx/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 + 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)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ + $(NORMAL_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libsanitizer && \ + cd $(TARGET_SUBDIR)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -32188,40 +35152,40 @@ all-stage3-target-libsanitizer: configure-stage3-target-libsanitizer 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)' \ + $(EXTRA_TARGET_FLAGS) \ TFLAGS="$(STAGE3_TFLAGS)" \ - $(TARGET-stage3-target-libsanitizer) + $(TARGET-stage3-target-libmpx) -maybe-clean-stage3-target-libsanitizer: clean-stage3-target-libsanitizer -clean-stage3: clean-stage3-target-libsanitizer -clean-stage3-target-libsanitizer: +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)/libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage3-libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage3-libmpx/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 + 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)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ + $(NORMAL_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libsanitizer && \ + cd $(TARGET_SUBDIR)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -32229,40 +35193,40 @@ all-stage4-target-libsanitizer: configure-stage4-target-libsanitizer 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)' \ + $(EXTRA_TARGET_FLAGS) \ TFLAGS="$(STAGE4_TFLAGS)" \ - $(TARGET-stage4-target-libsanitizer) + $(TARGET-stage4-target-libmpx) -maybe-clean-stage4-target-libsanitizer: clean-stage4-target-libsanitizer -clean-stage4: clean-stage4-target-libsanitizer -clean-stage4-target-libsanitizer: +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)/libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stage4-libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stage4-libmpx/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 + 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)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ + $(NORMAL_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libsanitizer && \ + cd $(TARGET_SUBDIR)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -32270,40 +35234,40 @@ all-stageprofile-target-libsanitizer: configure-stageprofile-target-libsanitizer 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)' \ + $(EXTRA_TARGET_FLAGS) \ TFLAGS="$(STAGEprofile_TFLAGS)" \ - $(TARGET-stageprofile-target-libsanitizer) + $(TARGET-stageprofile-target-libmpx) -maybe-clean-stageprofile-target-libsanitizer: clean-stageprofile-target-libsanitizer -clean-stageprofile: clean-stageprofile-target-libsanitizer -clean-stageprofile-target-libsanitizer: +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)/libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stageprofile-libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stageprofile-libmpx/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 + 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)"; \ - $(RAW_CXX_TARGET_EXPORTS) \ + $(NORMAL_TARGET_EXPORTS) \ \ - cd $(TARGET_SUBDIR)/libsanitizer && \ + cd $(TARGET_SUBDIR)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS_FOR_TARGET)" \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ @@ -32311,92 +35275,92 @@ all-stagefeedback-target-libsanitizer: configure-stagefeedback-target-libsanitiz 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)' \ + $(EXTRA_TARGET_FLAGS) \ TFLAGS="$(STAGEfeedback_TFLAGS)" \ - $(TARGET-stagefeedback-target-libsanitizer) + $(TARGET-stagefeedback-target-libmpx) -maybe-clean-stagefeedback-target-libsanitizer: clean-stagefeedback-target-libsanitizer -clean-stagefeedback: clean-stagefeedback-target-libsanitizer -clean-stagefeedback-target-libsanitizer: +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)/libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/libmpx/Makefile ] || exit 0; \ else \ - [ -f $(TARGET_SUBDIR)/stagefeedback-libsanitizer/Makefile ] || exit 0; \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libmpx/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 + cd $(TARGET_SUBDIR)/libmpx && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libmpx-bootstrap -.PHONY: check-target-libsanitizer maybe-check-target-libsanitizer -maybe-check-target-libsanitizer: -@if target-libsanitizer -maybe-check-target-libsanitizer: check-target-libsanitizer +.PHONY: check-target-libmpx maybe-check-target-libmpx +maybe-check-target-libmpx: +@if target-libmpx +maybe-check-target-libmpx: check-target-libmpx -check-target-libsanitizer: +check-target-libmpx: @: $(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)/libmpx && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) check) -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx maybe-install-target-libmpx +maybe-install-target-libmpx: +@if target-libmpx +maybe-install-target-libmpx: install-target-libmpx -install-target-libsanitizer: installdirs +install-target-libmpx: 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)/libmpx && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -@endif target-libsanitizer +@endif target-libmpx -.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-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-libsanitizer: installdirs +install-strip-target-libmpx: 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)/libmpx && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) -@endif target-libsanitizer +@endif target-libmpx # 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-libmpx info-target-libmpx +maybe-info-target-libmpx: +@if target-libmpx +maybe-info-target-libmpx: info-target-libmpx -info-target-libsanitizer: \ - configure-target-libsanitizer +info-target-libmpx: \ + configure-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32404,25 +35368,25 @@ info-target-libsanitizer: \ info) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx dvi-target-libmpx +maybe-dvi-target-libmpx: +@if target-libmpx +maybe-dvi-target-libmpx: dvi-target-libmpx -dvi-target-libsanitizer: \ - configure-target-libsanitizer +dvi-target-libmpx: \ + configure-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32430,25 +35394,25 @@ dvi-target-libsanitizer: \ dvi) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx pdf-target-libmpx +maybe-pdf-target-libmpx: +@if target-libmpx +maybe-pdf-target-libmpx: pdf-target-libmpx -pdf-target-libsanitizer: \ - configure-target-libsanitizer +pdf-target-libmpx: \ + configure-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32456,25 +35420,25 @@ pdf-target-libsanitizer: \ pdf) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx html-target-libmpx +maybe-html-target-libmpx: +@if target-libmpx +maybe-html-target-libmpx: html-target-libmpx -html-target-libsanitizer: \ - configure-target-libsanitizer +html-target-libmpx: \ + configure-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32482,25 +35446,25 @@ html-target-libsanitizer: \ html) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx TAGS-target-libmpx +maybe-TAGS-target-libmpx: +@if target-libmpx +maybe-TAGS-target-libmpx: TAGS-target-libmpx -TAGS-target-libsanitizer: \ - configure-target-libsanitizer +TAGS-target-libmpx: \ + configure-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32508,26 +35472,26 @@ TAGS-target-libsanitizer: \ TAGS) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-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-libsanitizer: \ - configure-target-libsanitizer \ - info-target-libsanitizer +install-info-target-libmpx: \ + configure-target-libmpx \ + info-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32535,26 +35499,26 @@ install-info-target-libsanitizer: \ install-info) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-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-libsanitizer: \ - configure-target-libsanitizer \ - pdf-target-libsanitizer +install-pdf-target-libmpx: \ + configure-target-libmpx \ + pdf-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32562,26 +35526,26 @@ install-pdf-target-libsanitizer: \ install-pdf) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-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-libsanitizer: \ - configure-target-libsanitizer \ - html-target-libsanitizer +install-html-target-libmpx: \ + configure-target-libmpx \ + html-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32589,25 +35553,25 @@ install-html-target-libsanitizer: \ install-html) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx installcheck-target-libmpx +maybe-installcheck-target-libmpx: +@if target-libmpx +maybe-installcheck-target-libmpx: installcheck-target-libmpx -installcheck-target-libsanitizer: \ - configure-target-libsanitizer +installcheck-target-libmpx: \ + configure-target-libmpx @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32615,24 +35579,24 @@ installcheck-target-libsanitizer: \ installcheck) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx mostlyclean-target-libmpx +maybe-mostlyclean-target-libmpx: +@if target-libmpx +maybe-mostlyclean-target-libmpx: mostlyclean-target-libmpx -mostlyclean-target-libsanitizer: +mostlyclean-target-libmpx: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32640,24 +35604,24 @@ mostlyclean-target-libsanitizer: mostlyclean) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx clean-target-libmpx +maybe-clean-target-libmpx: +@if target-libmpx +maybe-clean-target-libmpx: clean-target-libmpx -clean-target-libsanitizer: +clean-target-libmpx: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32665,24 +35629,24 @@ clean-target-libsanitizer: clean) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-libmpx distclean-target-libmpx +maybe-distclean-target-libmpx: +@if target-libmpx +maybe-distclean-target-libmpx: distclean-target-libmpx -distclean-target-libsanitizer: +distclean-target-libmpx: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32690,24 +35654,24 @@ distclean-target-libsanitizer: distclean) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx -.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-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-libsanitizer: +maintainer-clean-target-libmpx: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libsanitizer/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libmpx/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)/libmpx"; \ 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)/libmpx && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -32715,7 +35679,7 @@ maintainer-clean-target-libsanitizer: maintainer-clean) \ || exit 1 -@endif target-libsanitizer +@endif target-libmpx @@ -32732,8 +35696,8 @@ 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 ; \ + $(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; \ @@ -32745,7 +35709,7 @@ configure-target-libvtv: 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 ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libvtv; \ cd "$(TARGET_SUBDIR)/libvtv" || exit 1; \ @@ -32754,12 +35718,13 @@ configure-target-libvtv: *) topdir=`echo $(TARGET_SUBDIR)/libvtv/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ + module_srcdir=libvtv; \ 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-libvtv @@ -32776,7 +35741,7 @@ configure-stage1-target-libvtv: 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 ; \ + $(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; \ @@ -32792,19 +35757,20 @@ configure-stage1-target-libvtv: 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 ; \ + 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; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libvtv; \ + $(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-libvtv-bootstrap @@ -32819,7 +35785,7 @@ configure-stage2-target-libvtv: 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 ; \ + $(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; \ @@ -32836,19 +35802,19 @@ configure-stage2-target-libvtv: 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 ; \ + 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; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libvtv; \ + $(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-libvtv-bootstrap @@ -32864,7 +35830,7 @@ configure-stage3-target-libvtv: 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 ; \ + $(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; \ @@ -32881,19 +35847,19 @@ configure-stage3-target-libvtv: 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 ; \ + 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; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libvtv; \ + $(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-libvtv-bootstrap @@ -32909,7 +35875,7 @@ configure-stage4-target-libvtv: 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 ; \ + $(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; \ @@ -32926,19 +35892,19 @@ configure-stage4-target-libvtv: 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 ; \ + 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; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libvtv; \ + $(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-libvtv-bootstrap @@ -32954,7 +35920,7 @@ configure-stageprofile-target-libvtv: 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 ; \ + $(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; \ @@ -32971,19 +35937,19 @@ configure-stageprofile-target-libvtv: 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 ; \ + 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; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libvtv; \ + $(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-libvtv-bootstrap @@ -32999,7 +35965,7 @@ configure-stagefeedback-target-libvtv: 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 ; \ + $(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; \ @@ -33016,19 +35982,19 @@ configure-stagefeedback-target-libvtv: 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 ; \ + 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; \ - srcdiroption="--srcdir=$${topdir}/libvtv"; \ - libsrcdir="$$s/libvtv"; \ - $(SHELL) $${libsrcdir}/configure \ + module_srcdir=libvtv; \ + $(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-libvtv-bootstrap @@ -33362,11 +36328,11 @@ maybe-info-target-libvtv: info-target-libvtv info-target-libvtv: \ configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33388,11 +36354,11 @@ maybe-dvi-target-libvtv: dvi-target-libvtv dvi-target-libvtv: \ configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33414,11 +36380,11 @@ maybe-pdf-target-libvtv: pdf-target-libvtv pdf-target-libvtv: \ configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33440,11 +36406,11 @@ maybe-html-target-libvtv: html-target-libvtv html-target-libvtv: \ configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33466,11 +36432,11 @@ maybe-TAGS-target-libvtv: TAGS-target-libvtv TAGS-target-libvtv: \ configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33493,11 +36459,11 @@ install-info-target-libvtv: \ configure-target-libvtv \ info-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33520,11 +36486,11 @@ install-pdf-target-libvtv: \ configure-target-libvtv \ pdf-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33547,11 +36513,11 @@ install-html-target-libvtv: \ configure-target-libvtv \ html-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33573,11 +36539,11 @@ maybe-installcheck-target-libvtv: installcheck-target-libvtv installcheck-target-libvtv: \ configure-target-libvtv @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33598,11 +36564,11 @@ maybe-mostlyclean-target-libvtv: mostlyclean-target-libvtv mostlyclean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33623,11 +36589,11 @@ maybe-clean-target-libvtv: clean-target-libvtv clean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33648,11 +36614,11 @@ maybe-distclean-target-libvtv: distclean-target-libvtv distclean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33673,11 +36639,11 @@ maybe-maintainer-clean-target-libvtv: maintainer-clean-target-libvtv maintainer-clean-target-libvtv: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libvtv/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)/libvtv" ; \ + 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; \ @@ -33707,8 +36673,8 @@ configure-target-libcilkrts: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ 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 ; \ + $(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; \ @@ -33720,7 +36686,7 @@ configure-target-libcilkrts: mv $(TARGET_SUBDIR)/libcilkrts/multilib.tmp $(TARGET_SUBDIR)/libcilkrts/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libcilkrts/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \ cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \ @@ -33729,12 +36695,13 @@ configure-target-libcilkrts: *) topdir=`echo $(TARGET_SUBDIR)/libcilkrts/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libcilkrts"; \ - libsrcdir="$$s/libcilkrts"; \ + 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-libcilkrts @@ -33819,11 +36786,11 @@ maybe-info-target-libcilkrts: info-target-libcilkrts info-target-libcilkrts: \ configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -33845,11 +36812,11 @@ maybe-dvi-target-libcilkrts: dvi-target-libcilkrts dvi-target-libcilkrts: \ configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -33871,11 +36838,11 @@ maybe-pdf-target-libcilkrts: pdf-target-libcilkrts pdf-target-libcilkrts: \ configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -33897,11 +36864,11 @@ maybe-html-target-libcilkrts: html-target-libcilkrts html-target-libcilkrts: \ configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -33923,11 +36890,11 @@ maybe-TAGS-target-libcilkrts: TAGS-target-libcilkrts TAGS-target-libcilkrts: \ configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -33950,11 +36917,11 @@ install-info-target-libcilkrts: \ configure-target-libcilkrts \ info-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -33977,11 +36944,11 @@ install-pdf-target-libcilkrts: \ configure-target-libcilkrts \ pdf-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34004,11 +36971,11 @@ install-html-target-libcilkrts: \ configure-target-libcilkrts \ html-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34030,11 +36997,11 @@ maybe-installcheck-target-libcilkrts: installcheck-target-libcilkrts installcheck-target-libcilkrts: \ configure-target-libcilkrts @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34055,11 +37022,11 @@ maybe-mostlyclean-target-libcilkrts: mostlyclean-target-libcilkrts mostlyclean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34080,11 +37047,11 @@ maybe-clean-target-libcilkrts: clean-target-libcilkrts clean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34105,11 +37072,11 @@ maybe-distclean-target-libcilkrts: distclean-target-libcilkrts distclean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34130,11 +37097,11 @@ maybe-maintainer-clean-target-libcilkrts: maintainer-clean-target-libcilkrts maintainer-clean-target-libcilkrts: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libcilkrts/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)/libcilkrts" ; \ + 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; \ @@ -34152,6 +37119,464 @@ maintainer-clean-target-libcilkrts: +.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; \ + 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 \ + mv $(TARGET_SUBDIR)/liboffloadmic/multilib.tmp $(TARGET_SUBDIR)/liboffloadmic/multilib.out; \ + fi; \ + 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-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; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) check) + +@endif target-liboffloadmic + +.PHONY: install-target-liboffloadmic maybe-install-target-liboffloadmic +maybe-install-target-liboffloadmic: +@if target-liboffloadmic +maybe-install-target-liboffloadmic: install-target-liboffloadmic + +install-target-liboffloadmic: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) + +@endif target-liboffloadmic + +.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-liboffloadmic: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) + +@endif target-liboffloadmic + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-target-liboffloadmic info-target-liboffloadmic +maybe-info-target-liboffloadmic: +@if target-liboffloadmic +maybe-info-target-liboffloadmic: info-target-liboffloadmic + +info-target-liboffloadmic: \ + configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-dvi-target-liboffloadmic dvi-target-liboffloadmic +maybe-dvi-target-liboffloadmic: +@if target-liboffloadmic +maybe-dvi-target-liboffloadmic: dvi-target-liboffloadmic + +dvi-target-liboffloadmic: \ + configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-pdf-target-liboffloadmic pdf-target-liboffloadmic +maybe-pdf-target-liboffloadmic: +@if target-liboffloadmic +maybe-pdf-target-liboffloadmic: pdf-target-liboffloadmic + +pdf-target-liboffloadmic: \ + configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-html-target-liboffloadmic html-target-liboffloadmic +maybe-html-target-liboffloadmic: +@if target-liboffloadmic +maybe-html-target-liboffloadmic: html-target-liboffloadmic + +html-target-liboffloadmic: \ + configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-TAGS-target-liboffloadmic TAGS-target-liboffloadmic +maybe-TAGS-target-liboffloadmic: +@if target-liboffloadmic +maybe-TAGS-target-liboffloadmic: TAGS-target-liboffloadmic + +TAGS-target-liboffloadmic: \ + configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.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-liboffloadmic: \ + configure-target-liboffloadmic \ + info-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(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-liboffloadmic + +.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-liboffloadmic: \ + configure-target-liboffloadmic \ + pdf-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(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-liboffloadmic + +.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-liboffloadmic: \ + configure-target-liboffloadmic \ + html-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-installcheck-target-liboffloadmic installcheck-target-liboffloadmic +maybe-installcheck-target-liboffloadmic: +@if target-liboffloadmic +maybe-installcheck-target-liboffloadmic: installcheck-target-liboffloadmic + +installcheck-target-liboffloadmic: \ + configure-target-liboffloadmic + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-mostlyclean-target-liboffloadmic mostlyclean-target-liboffloadmic +maybe-mostlyclean-target-liboffloadmic: +@if target-liboffloadmic +maybe-mostlyclean-target-liboffloadmic: mostlyclean-target-liboffloadmic + +mostlyclean-target-liboffloadmic: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-clean-target-liboffloadmic clean-target-liboffloadmic +maybe-clean-target-liboffloadmic: +@if target-liboffloadmic +maybe-clean-target-liboffloadmic: clean-target-liboffloadmic + +clean-target-liboffloadmic: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.PHONY: maybe-distclean-target-liboffloadmic distclean-target-liboffloadmic +maybe-distclean-target-liboffloadmic: +@if target-liboffloadmic +maybe-distclean-target-liboffloadmic: distclean-target-liboffloadmic + +distclean-target-liboffloadmic: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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)/liboffloadmic && \ + $(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-liboffloadmic + +.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-liboffloadmic: + @: $(MAKE); $(unstage) + @[ -f $(TARGET_SUBDIR)/liboffloadmic/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)/liboffloadmic"; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/liboffloadmic && \ + $(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-liboffloadmic + + + + + .PHONY: configure-target-libssp maybe-configure-target-libssp maybe-configure-target-libssp: @if gcc-bootstrap @@ -34164,8 +37589,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; \ @@ -34177,7 +37602,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; \ @@ -34186,12 +37611,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 @@ -34276,11 +37702,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; \ @@ -34302,11 +37728,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; \ @@ -34328,11 +37754,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; \ @@ -34354,11 +37780,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; \ @@ -34380,11 +37806,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; \ @@ -34407,11 +37833,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; \ @@ -34434,11 +37860,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; \ @@ -34461,11 +37887,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; \ @@ -34487,11 +37913,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; \ @@ -34512,11 +37938,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; \ @@ -34537,11 +37963,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; \ @@ -34562,11 +37988,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; \ @@ -34587,11 +38013,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; \ @@ -34621,8 +38047,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; \ @@ -34634,7 +38060,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; \ @@ -34643,12 +38069,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 @@ -34733,11 +38160,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; \ @@ -34759,11 +38186,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; \ @@ -34785,11 +38212,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; \ @@ -34811,11 +38238,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; \ @@ -34837,11 +38264,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; \ @@ -34864,11 +38291,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; \ @@ -34891,11 +38318,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; \ @@ -34918,11 +38345,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; \ @@ -34944,11 +38371,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; \ @@ -34969,11 +38396,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; \ @@ -34994,11 +38421,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; \ @@ -35019,11 +38446,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; \ @@ -35044,11 +38471,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; \ @@ -35077,8 +38504,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; \ @@ -35090,7 +38517,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; \ @@ -35099,12 +38526,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 @@ -35121,7 +38549,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; \ @@ -35137,19 +38565,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 @@ -35164,7 +38593,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; \ @@ -35181,19 +38610,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 @@ -35209,7 +38638,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; \ @@ -35226,19 +38655,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 @@ -35254,7 +38683,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; \ @@ -35271,19 +38700,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 @@ -35299,7 +38728,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; \ @@ -35316,19 +38745,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 @@ -35344,7 +38773,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; \ @@ -35361,19 +38790,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 @@ -35702,11 +39131,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; \ @@ -35728,11 +39157,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; \ @@ -35754,11 +39183,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; \ @@ -35780,11 +39209,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; \ @@ -35806,11 +39235,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; \ @@ -35833,11 +39262,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; \ @@ -35860,11 +39289,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; \ @@ -35887,11 +39316,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; \ @@ -35913,11 +39342,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; \ @@ -35938,11 +39367,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; \ @@ -35963,11 +39392,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; \ @@ -35988,11 +39417,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; \ @@ -36013,11 +39442,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; \ @@ -36047,8 +39476,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; \ @@ -36060,7 +39489,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; \ @@ -36069,12 +39498,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 @@ -36159,11 +39589,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; \ @@ -36185,11 +39615,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; \ @@ -36211,11 +39641,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; \ @@ -36237,11 +39667,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; \ @@ -36263,11 +39693,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; \ @@ -36290,11 +39720,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; \ @@ -36317,11 +39747,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; \ @@ -36344,11 +39774,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; \ @@ -36370,11 +39800,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; \ @@ -36395,11 +39825,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; \ @@ -36420,11 +39850,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; \ @@ -36445,11 +39875,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; \ @@ -36470,11 +39900,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; \ @@ -36504,8 +39934,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; \ @@ -36517,7 +39947,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; \ @@ -36526,12 +39956,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 @@ -36616,11 +40047,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; \ @@ -36642,11 +40073,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; \ @@ -36668,11 +40099,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; \ @@ -36694,11 +40125,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; \ @@ -36720,11 +40151,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; \ @@ -36747,11 +40178,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; \ @@ -36774,11 +40205,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; \ @@ -36801,11 +40232,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; \ @@ -36827,11 +40258,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; \ @@ -36852,11 +40283,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; \ @@ -36877,11 +40308,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; \ @@ -36902,11 +40333,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; \ @@ -36927,11 +40358,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; \ @@ -36961,8 +40392,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; \ @@ -36974,7 +40405,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; \ @@ -36983,12 +40414,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 @@ -37073,11 +40505,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; \ @@ -37099,11 +40531,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; \ @@ -37125,11 +40557,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; \ @@ -37151,11 +40583,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; \ @@ -37177,11 +40609,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; \ @@ -37204,11 +40636,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; \ @@ -37231,11 +40663,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; \ @@ -37258,11 +40690,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; \ @@ -37284,11 +40716,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; \ @@ -37309,11 +40741,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; \ @@ -37334,11 +40766,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; \ @@ -37359,11 +40791,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; \ @@ -37384,11 +40816,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; \ @@ -37418,8 +40850,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; \ @@ -37431,7 +40863,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; \ @@ -37440,12 +40872,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 @@ -37530,11 +40963,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; \ @@ -37556,11 +40989,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; \ @@ -37582,11 +41015,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; \ @@ -37608,11 +41041,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; \ @@ -37634,11 +41067,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; \ @@ -37661,11 +41094,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; \ @@ -37688,11 +41121,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; \ @@ -37715,11 +41148,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; \ @@ -37741,11 +41174,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; \ @@ -37766,11 +41199,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; \ @@ -37791,11 +41224,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; \ @@ -37816,11 +41249,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; \ @@ -37841,11 +41274,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; \ @@ -37875,8 +41308,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; \ @@ -37888,7 +41321,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; \ @@ -37897,12 +41330,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 @@ -37987,11 +41421,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; \ @@ -38013,11 +41447,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; \ @@ -38039,11 +41473,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; \ @@ -38065,11 +41499,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; \ @@ -38091,11 +41525,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; \ @@ -38118,11 +41552,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; \ @@ -38145,11 +41579,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; \ @@ -38172,11 +41606,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; \ @@ -38198,11 +41632,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; \ @@ -38223,11 +41657,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; \ @@ -38248,11 +41682,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; \ @@ -38273,11 +41707,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; \ @@ -38298,11 +41732,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; \ @@ -38332,8 +41766,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; \ @@ -38345,7 +41779,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; \ @@ -38354,12 +41788,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 @@ -38439,11 +41874,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; \ @@ -38465,11 +41900,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; \ @@ -38491,11 +41926,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; \ @@ -38517,11 +41952,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; \ @@ -38543,11 +41978,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; \ @@ -38570,11 +42005,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; \ @@ -38597,11 +42032,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; \ @@ -38624,11 +42059,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; \ @@ -38650,11 +42085,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; \ @@ -38724,8 +42159,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; \ @@ -38737,7 +42172,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; \ @@ -38746,12 +42181,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 @@ -38836,11 +42272,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; \ @@ -38862,11 +42298,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; \ @@ -38888,11 +42324,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; \ @@ -38914,11 +42350,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; \ @@ -38940,11 +42376,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; \ @@ -38967,11 +42403,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; \ @@ -38994,11 +42430,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; \ @@ -39021,11 +42457,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; \ @@ -39047,11 +42483,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; \ @@ -39072,11 +42508,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; \ @@ -39097,11 +42533,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; \ @@ -39122,11 +42558,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; \ @@ -39147,11 +42583,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; \ @@ -39181,8 +42617,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; \ @@ -39194,7 +42630,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; \ @@ -39203,12 +42639,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 @@ -39288,11 +42725,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; \ @@ -39314,11 +42751,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; \ @@ -39340,11 +42777,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; \ @@ -39366,11 +42803,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; \ @@ -39392,11 +42829,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; \ @@ -39419,11 +42856,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; \ @@ -39446,11 +42883,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; \ @@ -39473,11 +42910,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; \ @@ -39499,11 +42936,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; \ @@ -39524,11 +42961,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; \ @@ -39549,11 +42986,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; \ @@ -39574,11 +43011,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; \ @@ -39599,11 +43036,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; \ @@ -39633,8 +43070,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; \ @@ -39646,7 +43083,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; \ @@ -39655,12 +43092,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 @@ -39735,11 +43173,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; \ @@ -39761,11 +43199,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; \ @@ -39787,11 +43225,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; \ @@ -39813,11 +43251,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; \ @@ -39839,11 +43277,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; \ @@ -39866,11 +43304,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; \ @@ -39893,11 +43331,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; \ @@ -39920,11 +43358,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; \ @@ -39946,11 +43384,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; \ @@ -39971,11 +43409,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; \ @@ -39996,11 +43434,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; \ @@ -40021,11 +43459,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; \ @@ -40046,11 +43484,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; \ @@ -40080,8 +43518,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; \ @@ -40093,7 +43531,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; \ @@ -40102,12 +43540,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 @@ -40192,11 +43631,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; \ @@ -40218,11 +43657,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; \ @@ -40244,11 +43683,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; \ @@ -40270,11 +43709,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; \ @@ -40296,11 +43735,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; \ @@ -40323,11 +43762,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; \ @@ -40350,11 +43789,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; \ @@ -40377,11 +43816,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; \ @@ -40403,11 +43842,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; \ @@ -40428,11 +43867,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; \ @@ -40453,11 +43892,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; \ @@ -40478,11 +43917,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; \ @@ -40503,11 +43942,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; \ @@ -40537,8 +43976,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; \ @@ -40550,7 +43989,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; \ @@ -40559,12 +43998,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 @@ -40649,11 +44089,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; \ @@ -40675,11 +44115,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; \ @@ -40701,11 +44141,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; \ @@ -40727,11 +44167,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; \ @@ -40753,11 +44193,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; \ @@ -40780,11 +44220,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; \ @@ -40807,11 +44247,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; \ @@ -40834,11 +44274,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; \ @@ -40860,11 +44300,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; \ @@ -40885,11 +44325,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; \ @@ -40910,11 +44350,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; \ @@ -40935,11 +44375,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; \ @@ -40960,11 +44400,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; \ @@ -40994,8 +44434,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; \ @@ -41007,7 +44447,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; \ @@ -41016,12 +44456,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 @@ -41106,11 +44547,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; \ @@ -41132,11 +44573,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; \ @@ -41158,11 +44599,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; \ @@ -41184,11 +44625,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; \ @@ -41210,11 +44651,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; \ @@ -41237,11 +44678,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; \ @@ -41264,11 +44705,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; \ @@ -41291,11 +44732,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; \ @@ -41317,11 +44758,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; \ @@ -41342,11 +44783,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; \ @@ -41367,11 +44808,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; \ @@ -41392,11 +44833,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; \ @@ -41417,11 +44858,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; \ @@ -41451,8 +44892,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; \ @@ -41464,7 +44905,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; \ @@ -41473,12 +44914,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 @@ -41563,11 +45005,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; \ @@ -41589,11 +45031,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; \ @@ -41615,11 +45057,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; \ @@ -41641,11 +45083,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; \ @@ -41667,11 +45109,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; \ @@ -41694,11 +45136,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; \ @@ -41721,11 +45163,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; \ @@ -41748,11 +45190,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; \ @@ -41774,11 +45216,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; \ @@ -41799,11 +45241,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; \ @@ -41824,11 +45266,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; \ @@ -41849,11 +45291,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; \ @@ -41874,11 +45316,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; \ @@ -41908,8 +45350,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; \ @@ -41921,7 +45363,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; \ @@ -41930,12 +45372,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 @@ -42020,11 +45463,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; \ @@ -42046,11 +45489,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; \ @@ -42072,11 +45515,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; \ @@ -42098,11 +45541,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; \ @@ -42124,11 +45567,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; \ @@ -42151,11 +45594,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; \ @@ -42178,11 +45621,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; \ @@ -42205,11 +45648,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; \ @@ -42231,11 +45674,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; \ @@ -42256,11 +45699,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; \ @@ -42281,11 +45724,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; \ @@ -42306,11 +45749,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; \ @@ -42331,11 +45774,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; \ @@ -42364,8 +45807,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; \ @@ -42377,7 +45820,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; \ @@ -42386,12 +45829,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 @@ -42408,7 +45852,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; \ @@ -42424,19 +45868,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 @@ -42451,7 +45896,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; \ @@ -42468,19 +45913,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 @@ -42496,7 +45941,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; \ @@ -42513,19 +45958,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 @@ -42541,7 +45986,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; \ @@ -42558,19 +46003,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 @@ -42586,7 +46031,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; \ @@ -42603,19 +46048,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 @@ -42631,7 +46076,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; \ @@ -42648,19 +46093,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 @@ -42994,11 +46439,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; \ @@ -43020,11 +46465,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; \ @@ -43046,11 +46491,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; \ @@ -43072,11 +46517,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; \ @@ -43098,11 +46543,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; \ @@ -43125,11 +46570,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; \ @@ -43152,11 +46597,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; \ @@ -43179,11 +46624,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; \ @@ -43205,11 +46650,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; \ @@ -43230,11 +46675,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; \ @@ -43255,11 +46700,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; \ @@ -43280,11 +46725,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; \ @@ -43305,11 +46750,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; \ @@ -43339,8 +46784,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; \ @@ -43352,7 +46797,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; \ @@ -43361,12 +46806,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 @@ -43451,11 +46897,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; \ @@ -43477,11 +46923,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; \ @@ -43503,11 +46949,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; \ @@ -43529,11 +46975,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; \ @@ -43555,11 +47001,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; \ @@ -43582,11 +47028,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; \ @@ -43609,11 +47055,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; \ @@ -43636,11 +47082,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; \ @@ -43662,11 +47108,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; \ @@ -43687,11 +47133,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; \ @@ -43712,11 +47158,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; \ @@ -43737,11 +47183,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; \ @@ -43762,11 +47208,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; \ @@ -43796,8 +47242,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; \ @@ -43809,7 +47255,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; \ @@ -43818,12 +47264,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 @@ -43908,11 +47355,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; \ @@ -43934,11 +47381,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; \ @@ -43960,11 +47407,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; \ @@ -43986,11 +47433,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; \ @@ -44012,11 +47459,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; \ @@ -44039,11 +47486,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; \ @@ -44066,11 +47513,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; \ @@ -44093,11 +47540,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; \ @@ -44119,11 +47566,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; \ @@ -44144,11 +47591,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; \ @@ -44169,11 +47616,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; \ @@ -44194,11 +47641,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; \ @@ -44219,11 +47666,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; \ @@ -44266,7 +47713,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 @@ -44406,511 +47853,555 @@ 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 libiconv + @cd $(HOST_SUBDIR); [ -d stage1-libiconv ] || \ + mkdir stage1-libiconv; \ + mv stage1-libiconv libiconv +@endif libiconv @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 ; \ +@if 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; \ fi -@endif cloog +@endif gold +@if 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; \ + fi +@endif ld +@if 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; \ + fi +@endif libcpp +@if 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; \ + 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 libiconv + @if test -d $(HOST_SUBDIR)/libiconv; then \ + cd $(HOST_SUBDIR); mv libiconv stage1-libiconv; \ + fi +@endif libiconv +@if 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; \ + fi +@endif lto-plugin + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); \ + fi + rm -f stage_current + +# Bubble a bug fix through all the stages up to stage 1. They are +# remade, but not reconfigured. The next stage (if any) will not be +# reconfigured either. +.PHONY: stage1-bubble +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; \ + else \ + $(MAKE) stage1-start; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \ + fi + +.PHONY: all-stage1 clean-stage1 +do-clean: clean-stage1 + +# 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 + + + + +# Rules to wipe a stage and all the following ones, also used for cleanstrap + +.PHONY: distclean-stage1 +distclean-stage1:: + @: $(MAKE); $(stage) + @test "`cat stage_last`" != stage1 || rm -f stage_last + rm -rf stage1-* + + +@endif gcc-bootstrap + + +.PHONY: stage2-start stage2-end + +stage2-start:: + @: $(MAKE); $(stage); \ + 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 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 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 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 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 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 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 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 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 stage1-isl prev-isl || test -f stage1-lean +@endif isl +@if libelf + @cd $(HOST_SUBDIR); [ -d stage2-libelf ] || \ + mkdir stage2-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 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 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 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 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 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 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 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 libiconv + @cd $(HOST_SUBDIR); [ -d stage2-libiconv ] || \ + mkdir stage2-libiconv; \ + mv stage2-libiconv libiconv; \ + mv stage1-libiconv prev-libiconv || test -f stage1-lean +@endif libiconv +@if zlib + @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \ + mkdir stage2-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 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 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; : ; \ + fi +@endif bfd +@if 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; : ; \ + 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; : ; \ + fi +@endif gas +@if 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; : ; \ + fi +@endif gmp +@if 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; : ; \ + fi +@endif mpc +@if 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 stage1-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 stage1-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 stage1-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 stage1-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 stage1-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 stage1-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 stage1-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 stage1-libiberty ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stage2-libiberty; \ + mv prev-libiberty stage1-libiberty; : ; \ fi @endif libiberty -@if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage1-zlib ; \ +@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 zlib -@if 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) ; \ - fi - rm -f stage_current - -# Bubble a bug fix through all the stages up to stage 1. They are -# remade, but not reconfigured. The next stage (if any) will not be -# reconfigured either. -.PHONY: stage1-bubble -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 ; \ - else \ - $(MAKE) stage1-start; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \ - fi - -.PHONY: all-stage1 clean-stage1 -do-clean: clean-stage1 - -# 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 - - - - -# Rules to wipe a stage and all the following ones, also used for cleanstrap - -.PHONY: distclean-stage1 -distclean-stage1:: - @: $(MAKE); $(stage) - @test "`cat stage_last`" != stage1 || rm -f stage_last - rm -rf stage1-* - - -@endif gcc-bootstrap - - -.PHONY: stage2-start stage2-end - -stage2-start:: - @: $(MAKE); $(stage); \ - 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 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 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 stage1-binutils prev-binutils || test -f stage1-lean -@endif binutils -@if gas - @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \ - mkdir stage2-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 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 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 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 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 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 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 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 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 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 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 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 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 stage1-libiberty prev-libiberty || test -f stage1-lean -@endif libiberty -@if zlib - @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \ - mkdir stage2-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 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 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 ; : ; \ - fi -@endif bfd -@if 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 ; : ; \ - fi -@endif binutils -@if 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 ; : ; \ - fi -@endif gcc -@if 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 ; : ; \ - fi -@endif mpfr -@if 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 ; : ; \ - fi -@endif isl -@if cloog - @if test -d $(HOST_SUBDIR)/cloog ; then \ - cd $(HOST_SUBDIR); mv cloog stage2-cloog ; \ - mv prev-cloog stage1-cloog ; : ; \ - fi -@endif cloog -@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 ; : ; \ +@endif libiberty-linker-plugin +@if libiconv + @if test -d $(HOST_SUBDIR)/libiconv; then \ + cd $(HOST_SUBDIR); mv libiconv stage2-libiconv; \ + mv prev-libiconv stage1-libiconv; : ; \ fi -@endif libiberty +@endif libiconv @if zlib - @if test -d $(HOST_SUBDIR)/zlib ; then \ - cd $(HOST_SUBDIR); mv zlib stage2-zlib ; \ - mv prev-zlib stage1-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 ; : ; \ + @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) ; : ; \ + @if test -d $(TARGET_SUBDIR); then \ + mv $(TARGET_SUBDIR) stage2-$(TARGET_SUBDIR); \ + mv prev-$(TARGET_SUBDIR) stage1-$(TARGET_SUBDIR); : ; \ fi rm -f stage_current @@ -44921,8 +48412,8 @@ stage2-end:: 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 ; \ + 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; \ @@ -44977,258 +48468,282 @@ distclean-stage2:: stage3-start:: @: $(MAKE); $(stage); \ - echo stage3 > stage_current ; \ + 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 libiconv + @cd $(HOST_SUBDIR); [ -d stage3-libiconv ] || \ + mkdir stage3-libiconv; \ + mv stage3-libiconv libiconv; \ + mv stage2-libiconv prev-libiconv || test -f stage2-lean +@endif libiconv @if zlib @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \ mkdir stage3-zlib; \ - mv stage3-zlib 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 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 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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @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 ; : ; \ + @if test -d $(HOST_SUBDIR)/libiberty; then \ + cd $(HOST_SUBDIR); mv libiberty stage3-libiberty; \ + mv prev-libiberty stage2-libiberty; : ; \ fi @endif libiberty +@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 libiberty-linker-plugin +@if libiconv + @if test -d $(HOST_SUBDIR)/libiconv; then \ + cd $(HOST_SUBDIR); mv libiconv stage3-libiconv; \ + mv prev-libiconv stage2-libiconv; : ; \ + fi +@endif libiconv @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 @@ -45239,13 +48754,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 @@ -45262,16 +48777,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; \ @@ -45281,16 +48796,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-*; \ @@ -45351,258 +48866,282 @@ 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 libiconv + @cd $(HOST_SUBDIR); [ -d stage4-libiconv ] || \ + mkdir stage4-libiconv; \ + mv stage4-libiconv libiconv; \ + mv stage3-libiconv prev-libiconv || test -f stage3-lean +@endif libiconv @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 libiconv + @if test -d $(HOST_SUBDIR)/libiconv; then \ + cd $(HOST_SUBDIR); mv libiconv stage4-libiconv; \ + mv prev-libiconv stage3-libiconv; : ; \ + fi +@endif libiconv @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 @@ -45613,13 +49152,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 @@ -45636,16 +49175,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; \ @@ -45655,16 +49194,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-*; \ @@ -45713,258 +49252,282 @@ 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 libiconv + @cd $(HOST_SUBDIR); [ -d stageprofile-libiconv ] || \ + mkdir stageprofile-libiconv; \ + mv stageprofile-libiconv libiconv; \ + mv stage1-libiconv prev-libiconv || test -f stage1-lean +@endif libiconv @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 libiconv + @if test -d $(HOST_SUBDIR)/libiconv; then \ + cd $(HOST_SUBDIR); mv libiconv stageprofile-libiconv; \ + mv prev-libiconv stage1-libiconv; : ; \ + fi +@endif libiconv @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 @@ -45975,8 +49538,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; \ @@ -46008,258 +49571,282 @@ 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 libiconv + @cd $(HOST_SUBDIR); [ -d stagefeedback-libiconv ] || \ + mkdir stagefeedback-libiconv; \ + mv stagefeedback-libiconv libiconv; \ + mv stageprofile-libiconv prev-libiconv || test -f stageprofile-lean +@endif libiconv @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 libiconv + @if test -d $(HOST_SUBDIR)/libiconv; then \ + cd $(HOST_SUBDIR); mv libiconv stagefeedback-libiconv; \ + mv prev-libiconv stageprofile-libiconv; : ; \ + fi +@endif libiconv @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 @@ -46270,8 +49857,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; \ @@ -46330,10 +49917,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 @@ -46376,6 +49963,12 @@ 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 @@ -46383,6 +49976,7 @@ 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 @@ -46418,8 +50012,10 @@ configure-target-libatomic: stage_last @if gcc-no-bootstrap configure-target-libstdc++-v3: 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 @@ -46467,6 +50063,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 @@ -46483,6 +50080,30 @@ 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 @@ -46531,6 +50152,14 @@ configure-stage3-gcc: maybe-all-stage3-libelf configure-stage4-gcc: maybe-all-stage4-libelf configure-stageprofile-gcc: maybe-all-stageprofile-libelf configure-stagefeedback-gcc: maybe-all-stagefeedback-libelf +configure-gcc: maybe-all-libiconv + +configure-stage1-gcc: maybe-all-stage1-libiconv +configure-stage2-gcc: maybe-all-stage2-libiconv +configure-stage3-gcc: maybe-all-stage3-libiconv +configure-stage4-gcc: maybe-all-stage4-libiconv +configure-stageprofile-gcc: maybe-all-stageprofile-libiconv +configure-stagefeedback-gcc: maybe-all-stagefeedback-libiconv all-gcc: all-libiberty all-stage1-gcc: all-stage1-libiberty @@ -46563,14 +50192,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 @@ -46611,6 +50240,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 @@ -46652,6 +50289,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 @@ -46660,6 +50304,14 @@ all-stage3-gcc: maybe-all-stage3-lto-plugin all-stage4-gcc: maybe-all-stage4-lto-plugin all-stageprofile-gcc: maybe-all-stageprofile-lto-plugin all-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin +all-gcc: maybe-all-libiconv + +all-stage1-gcc: maybe-all-stage1-libiconv +all-stage2-gcc: maybe-all-stage2-libiconv +all-stage3-gcc: maybe-all-stage3-libiconv +all-stage4-gcc: maybe-all-stage4-libiconv +all-stageprofile-gcc: maybe-all-stageprofile-libiconv +all-stagefeedback-gcc: maybe-all-stagefeedback-libiconv info-gcc: maybe-all-build-libiberty info-stage1-gcc: maybe-all-build-libiberty @@ -46712,6 +50364,14 @@ configure-stage3-libcpp: maybe-configure-stage3-intl configure-stage4-libcpp: maybe-configure-stage4-intl configure-stageprofile-libcpp: maybe-configure-stageprofile-intl configure-stagefeedback-libcpp: maybe-configure-stagefeedback-intl +configure-libcpp: maybe-all-libiconv + +configure-stage1-libcpp: maybe-all-stage1-libiconv +configure-stage2-libcpp: maybe-all-stage2-libiconv +configure-stage3-libcpp: maybe-all-stage3-libiconv +configure-stage4-libcpp: maybe-all-stage4-libiconv +configure-stageprofile-libcpp: maybe-all-stageprofile-libiconv +configure-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv all-libcpp: all-libiberty all-stage1-libcpp: all-stage1-libiberty @@ -46728,8 +50388,24 @@ all-stage3-libcpp: maybe-all-stage3-intl all-stage4-libcpp: maybe-all-stage4-intl all-stageprofile-libcpp: maybe-all-stageprofile-intl all-stagefeedback-libcpp: maybe-all-stagefeedback-intl +all-libcpp: maybe-all-libiconv + +all-stage1-libcpp: maybe-all-stage1-libiconv +all-stage2-libcpp: maybe-all-stage2-libiconv +all-stage3-libcpp: maybe-all-stage3-libiconv +all-stage4-libcpp: maybe-all-stage4-libiconv +all-stageprofile-libcpp: maybe-all-stageprofile-libiconv +all-stagefeedback-libcpp: maybe-all-stagefeedback-libiconv 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 @@ -46738,7 +50414,26 @@ 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-intl: maybe-all-libiconv + +configure-stage1-intl: maybe-all-stage1-libiconv +configure-stage2-intl: maybe-all-stage2-libiconv +configure-stage3-intl: maybe-all-stage3-libiconv +configure-stage4-intl: maybe-all-stage4-libiconv +configure-stageprofile-intl: maybe-all-stageprofile-libiconv +configure-stagefeedback-intl: maybe-all-stagefeedback-libiconv configure-mpfr: maybe-all-gmp configure-stage1-mpfr: maybe-all-stage1-gmp @@ -46763,22 +50458,14 @@ 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 +all-intl: maybe-all-libiconv + +all-stage1-intl: maybe-all-stage1-libiconv +all-stage2-intl: maybe-all-stage2-libiconv +all-stage3-intl: maybe-all-stage3-libiconv +all-stage4-intl: maybe-all-stage4-libiconv +all-stageprofile-intl: maybe-all-stageprofile-libiconv +all-stagefeedback-intl: maybe-all-stagefeedback-libiconv configure-gdb: maybe-all-intl configure-gdb: maybe-configure-sim configure-gdb: maybe-all-bfd @@ -46828,6 +50515,14 @@ all-stage3-bfd: maybe-all-stage3-intl all-stage4-bfd: maybe-all-stage4-intl all-stageprofile-bfd: maybe-all-stageprofile-intl all-stagefeedback-bfd: maybe-all-stagefeedback-intl +all-bfd: maybe-all-zlib + +all-stage1-bfd: maybe-all-stage1-zlib +all-stage2-bfd: maybe-all-stage2-zlib +all-stage3-bfd: maybe-all-stage3-zlib +all-stage4-bfd: maybe-all-stage4-zlib +all-stageprofile-bfd: maybe-all-stageprofile-zlib +all-stagefeedback-bfd: maybe-all-stagefeedback-zlib configure-opcodes: configure-libiberty configure-stage1-opcodes: configure-stage1-libiberty @@ -47022,6 +50717,14 @@ 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 @@ -47187,6 +50890,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 @@ -47211,6 +50915,7 @@ 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 @@ -47220,6 +50925,8 @@ 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 @@ -47229,6 +50936,7 @@ all-target-winsup: maybe-all-target-libtermcap configure-target-newlib: maybe-all-binutils configure-target-newlib: maybe-all-ld configure-target-libgfortran: maybe-all-target-libquadmath +configure-target-libgfortran: maybe-all-target-libbacktrace # Dependencies for target modules on other target modules are @@ -47249,6 +50957,12 @@ 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 @@ -47266,8 +50980,10 @@ configure-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libgcc @if gcc-no-bootstrap configure-target-libstdc++-v3: 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 @@ -47294,11 +51010,16 @@ configure-target-libstdc++-v3: 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 @@ -47319,6 +51040,7 @@ configure-target-winsup: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss +configure-target-libffi: maybe-all-target-libstdc++-v3 configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libjava: maybe-all-target-libstdc++-v3 @@ -47370,7 +51092,10 @@ config.status: configure # Rebuilding configure. AUTOCONF = autoconf $(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \ - $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 + $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4 \ + $(srcdir)/config/elf.m4 $(srcdir)/config/isl.m4 \ + $(srcdir)/libtool.m4 $(srcdir)/ltoptions.m4 $(srcdir)/ltsugar.m4 \ + $(srcdir)/ltversion.m4 $(srcdir)/lt~obsolete.m4 cd $(srcdir) && $(AUTOCONF) # ------------------------------