X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=Makefile.in;h=f398d893aa8a6f2f6d06b887e545af2965bdc259;hb=e764ed5ba944173f68da088e314e292a21ea51c2;hp=4cc72bb84612e7e7012ffba5611e151fc21edb96;hpb=ad681c85c3c66f8610d67a533990791c23d85b62;p=binutils-gdb.git diff --git a/Makefile.in b/Makefile.in index 4cc72bb8461..f398d893aa8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -17,7 +17,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # ------------------------------- @@ -72,44 +72,25 @@ LN_S = @LN_S@ # Miscellaneous non-standard autoconf-set variables # ------------------------------------------------- -# The file containing GCC's version number. -gcc_version_trigger = @gcc_version_trigger@ -gcc_version = @gcc_version@ - # The gcc driver likes to know the arguments it was configured with. TOPLEVEL_CONFIGURE_ARGUMENTS=@TOPLEVEL_CONFIGURE_ARGUMENTS@ -gxx_include_dir = @gxx_include_dir@ -libstdcxx_incdir = @libstdcxx_incdir@ - tooldir = @tooldir@ build_tooldir = @build_tooldir@ -# Directory in which the compiler finds executables, libraries, etc. -libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version) GDB_NLM_DEPS = # This is the name of the environment variable used for the path to # the libraries. RPATH_ENVVAR = @RPATH_ENVVAR@ -# This is set by configure to REALLY_SET_LIB_PATH if --enable-shared -# was used. -SET_LIB_PATH = @SET_LIB_PATH@ - -# configure.in sets SET_LIB_PATH to this if --enable-shared was used. -# Some platforms don't like blank entries, so we remove duplicate, -# leading and trailing colons. -REALLY_SET_LIB_PATH = \ - $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH):$(TARGET_LIB_PATH):$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); - # This is the list of directories to be built for the build system. -BUILD_CONFIGDIRS = libiberty libbanshee +BUILD_CONFIGDIRS = libiberty # Build programs are put under this directory. BUILD_SUBDIR = @build_subdir@ # This is set by the configure script to the arguments to use when configuring # directories built for the build system. -BUILD_CONFIGARGS = @build_configargs@ +BUILD_CONFIGARGS = @build_configargs@ --with-build-subdir="$(BUILD_SUBDIR)" # This is the list of variables to export in the environment when # configuring any subdirectory. It must also be exported whenever @@ -148,6 +129,9 @@ SUBDIRS = @configdirs@ # This is set by the configure script to the arguments to use when configuring # directories built for the host system. HOST_CONFIGARGS = @host_configargs@ +# Host programs are put under this directory, which is . except if building +# with srcdir=.. +HOST_SUBDIR = @host_subdir@ # This is the list of variables to export in the environment when # configuring subdirectories for the host system. HOST_EXPORTS = \ @@ -170,13 +154,19 @@ HOST_EXPORTS = \ OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \ TOPLEVEL_CONFIGURE_ARGUMENTS="$(TOPLEVEL_CONFIGURE_ARGUMENTS)"; export TOPLEVEL_CONFIGURE_ARGUMENTS; \ GMPLIBS="$(HOST_GMPLIBS)"; export GMPLIBS; \ - GMPINC="$(HOST_GMPINC)"; export GMPINC; + GMPINC="$(HOST_GMPINC)"; export GMPINC; \ + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); # Similar, for later GCC stages. -STAGE_HOST_EXPORTS = \ +POSTSTAGE1_HOST_EXPORTS = \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ $(HOST_EXPORTS) \ - CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ - CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; + CC="$(STAGE_CC_WRAPPER) $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ -B$(build_tooldir)/bin/"; export CC; \ + CC_FOR_BUILD="$(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/prev-gcc/xgcc$(exeext) \ + -B$$r/$(HOST_SUBDIR)/prev-gcc/ \ + -B$(build_tooldir)/bin/"; export CC_FOR_BUILD; # This is set by the configure script to the list of directories which # should be built using the target tools. @@ -185,7 +175,7 @@ TARGET_CONFIGDIRS = @target_configdirs@ TARGET_SUBDIR = @target_subdir@ # This is set by the configure script to the arguments to use when configuring # directories built for the target. -TARGET_CONFIGARGS = @target_configargs@ +TARGET_CONFIGARGS = @target_configargs@ --with-target-subdir="$(TARGET_SUBDIR)" # This is the list of variables to export in the environment when # configuring subdirectories for the host system. BASE_TARGET_EXPORTS = \ @@ -195,7 +185,7 @@ BASE_TARGET_EXPORTS = \ CC="$(CC_FOR_TARGET)"; export CC; \ CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \ - CPPFLAGS="$(CFLAGS_FOR_TARGET)"; export CPPFLAGS; \ + CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \ CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \ GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \ @@ -204,7 +194,8 @@ BASE_TARGET_EXPORTS = \ LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \ NM="$(NM_FOR_TARGET)"; export NM; \ RANLIB="$(RANLIB_FOR_TARGET)"; export RANLIB; \ - WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; + WINDRES="$(WINDRES_FOR_TARGET)"; export WINDRES; \ + $(RPATH_ENVVAR)=`echo "$(HOST_LIB_PATH)$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,::*,:,g;s,^:*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); RAW_CXX_TARGET_EXPORTS = \ $(BASE_TARGET_EXPORTS) \ @@ -240,43 +231,44 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ CXX_FOR_BUILD = $(CXX) -# Path to the build directory for a Canadian cross, empty otherwise. -BUILD_DIR_PREFIX = @BUILD_DIR_PREFIX@ - # Special variables passed down in EXTRA_GCC_FLAGS. They are defined # here so that they can be overridden by Makefile fragments. BUILD_PREFIX = @BUILD_PREFIX@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ +# Flags to pass to stage2 and later makes. They are defined +# here so that they can be overridden by Makefile fragments. +BOOT_CFLAGS= -g -O2 + CONFIGURED_BISON = @CONFIGURED_BISON@ -BISON = `if [ -f $$r/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \ - echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -L $$s/bison/ ; \ +BISON = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \ + echo $$r/$(BUILD_SUBDIR)/bison/tests/bison ; \ else \ echo ${CONFIGURED_BISON} ; \ fi` CONFIGURED_YACC = @CONFIGURED_YACC@ -YACC = `if [ -f $$s/$(BUILD_DIR_PREFIX)/bison/bison ] ; then \ - echo $$r/$(BUILD_DIR_PREFIX)/bison/bison -y -L $$s/bison/ ; \ - elif [ -f $$s/$(BUILD_DIR_PREFIX)/byacc/byacc ] ; then \ - echo $$r/$(BUILD_DIR_PREFIX)/byacc/byacc ; \ +YACC = `if [ -f $$r/$(BUILD_SUBDIR)/bison/tests/bison ] ; then \ + echo $$r/$(BUILD_SUBDIR)/bison/tests/bison -y ; \ + elif [ -f $$r/$(BUILD_SUBDIR)/byacc/byacc ] ; then \ + echo $$r/$(BUILD_SUBDIR)/byacc/byacc ; \ else \ echo ${CONFIGURED_YACC} ; \ fi` CONFIGURED_FLEX = @CONFIGURED_FLEX@ -FLEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \ +FLEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \ + then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \ else echo ${CONFIGURED_FLEX} ; fi` CONFIGURED_LEX = @CONFIGURED_LEX@ -LEX = `if [ -f $$r/$(BUILD_DIR_PREFIX)/flex/flex ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/flex/flex ; \ +LEX = `if [ -f $$r/$(BUILD_SUBDIR)/flex/flex ] ; \ + then echo $$r/$(BUILD_SUBDIR)/flex/flex ; \ else echo ${CONFIGURED_LEX} ; fi` CONFIGURED_M4 = @CONFIGURED_M4@ -M4 = `if [ -f $$r/$(BUILD_DIR_PREFIX)/m4/m4 ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/m4/m4 ; \ +M4 = `if [ -f $$r/$(BUILD_SUBDIR)/m4/m4 ] ; \ + then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \ else echo ${CONFIGURED_M4} ; fi` # For an installed makeinfo, we require it to be from texinfo 4.2 or @@ -284,8 +276,8 @@ M4 = `if [ -f $$r/$(BUILD_DIR_PREFIX)/m4/m4 ] ; \ # makeinfo even if only the Makefile is there, because Texinfo builds its # manual when made, and it requires its own version. CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@ -MAKEINFO = `if [ -f $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/Makefile ] ; \ - then echo $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/makeinfo ; \ +MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \ + then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \ else if (${CONFIGURED_MAKEINFO} --version \ | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \ then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi` @@ -296,8 +288,9 @@ MAKEINFO = `if [ -f $$r/$(BUILD_DIR_PREFIX)/texinfo/makeinfo/Makefile ] ; \ # (Default to avoid splitting info files by setting the threshold high.) MAKEINFOFLAGS = --split-size=5000000 -EXPECT = `if [ -f $$r/expect/expect ] ; \ - then echo $$r/expect/expect ; \ +# FIXME: expect may become a build tool? +EXPECT = `if [ -f $$r/$(HOST_SUBDIR)/expect/expect ] ; \ + then echo $$r/$(HOST_SUBDIR)/expect/expect ; \ else echo expect ; fi` RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ @@ -308,10 +301,6 @@ RUNTEST = `if [ -f $$s/dejagnu/runtest ] ; \ # Programs producing files for the HOST machine # --------------------------------------------- -# 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 = $$r/bfd:$$r/opcodes - AS = @AS@ AR = @AR@ @@ -342,17 +331,13 @@ PICFLAG = # Programs producing files for the TARGET machine # ----------------------------------------------- -# This is the list of directories that may be needed in RPATH_ENVVAR -# so that prorgams built for the target machine work. -TARGET_LIB_PATH = $$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs:$$r/$(TARGET_SUBDIR)/libmudflap/.libs - FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ AR_FOR_TARGET=@AR_FOR_TARGET@ CONFIGURED_AR_FOR_TARGET=@CONFIGURED_AR_FOR_TARGET@ USUAL_AR_FOR_TARGET = ` \ - if [ -f $$r/binutils/ar ] ; then \ - echo $$r/binutils/ar ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/ar ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/ar ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AR); \ @@ -364,10 +349,10 @@ USUAL_AR_FOR_TARGET = ` \ AS_FOR_TARGET=@AS_FOR_TARGET@ CONFIGURED_AS_FOR_TARGET=@CONFIGURED_AS_FOR_TARGET@ USUAL_AS_FOR_TARGET = ` \ - if [ -f $$r/gas/as-new ] ; then \ - echo $$r/gas/as-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ - $(CC_FOR_TARGET) -print-prog-name=as ; \ + if [ -f $$r/$(HOST_SUBDIR)/gas/as-new ] ; then \ + echo $$r/$(HOST_SUBDIR)/gas/as-new ; \ + elif [ -f $$r/$(HOST_SUBDIR)/gcc/as ]; then \ + echo $$r/$(HOST_SUBDIR)/gcc/as ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(AS); \ @@ -376,32 +361,98 @@ USUAL_AS_FOR_TARGET = ` \ fi; \ fi` -CC_FOR_TARGET = @CC_FOR_TARGET@ +CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CONFIGURED_CC_FOR_TARGET=@CONFIGURED_CC_FOR_TARGET@ +USUAL_CC_FOR_TARGET = ` \ + if [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ] ; then \ + echo $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(CC); \ + else \ + echo $(CONFIGURED_CC_FOR_TARGET) ; \ + fi; \ + fi` + # During gcc bootstrap, if we use some random cc for stage1 then # CFLAGS will be just -g. We want to ensure that TARGET libraries # (which we know are built with gcc) are built with optimizations so # prepend -O2 when setting CFLAGS_FOR_TARGET. -CFLAGS_FOR_TARGET = -O2 $(CFLAGS) +CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) +SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@ + # If GCC_FOR_TARGET is not overriden on the command line, then this # variable is passed down to the gcc Makefile, where it is used to # build libgcc2.a. We define it here so that it can itself be # overridden on the command line. GCC_FOR_TARGET=@GCC_FOR_TARGET@ -USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) $$r/gcc/xgcc -B$$r/gcc/ $(FLAGS_FOR_TARGET) +CONFIGURED_GCC_FOR_TARGET=@CONFIGURED_GCC_FOR_TARGET@ +USUAL_GCC_FOR_TARGET = $(STAGE_CC_WRAPPER) \ + $$r/$(HOST_SUBDIR)/gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/ $(FLAGS_FOR_TARGET) LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) -CXX_FOR_TARGET = @CXX_FOR_TARGET@ -RAW_CXX_FOR_TARGET = @RAW_CXX_FOR_TARGET@ -CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ -RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = @RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE@ -CXXFLAGS_FOR_TARGET = $(CXXFLAGS) +CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CONFIGURED_CXX_FOR_TARGET=@CONFIGURED_CXX_FOR_TARGET@ +USUAL_CXX_FOR_TARGET = ` \ + if [ -f $$r/$(HOST_SUBDIR)/gcc/g++ ] ; then \ + (echo $$r/$(HOST_SUBDIR)/gcc/g++ -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++; \ + test ! -f $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags || $(SHELL) $$r/$(TARGET_SUBDIR)/libstdc++-v3/scripts/testsuite_flags --build-includes; \ + echo -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs) | tr '\015\012' ' '; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(CXX); \ + else \ + echo $(CONFIGURED_CXX_FOR_TARGET) ; \ + fi; \ + fi` + +RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET) +USUAL_RAW_CXX_FOR_TARGET = ` \ + if [ -f $$r/$(HOST_SUBDIR)/gcc/xgcc ] ; then \ + echo $$r/$(HOST_SUBDIR)/gcc/xgcc -shared-libgcc -B$$r/$(HOST_SUBDIR)/gcc -nostdinc++ -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src -L$$r/$(TARGET_SUBDIR)/libstdc++-v3/src/.libs; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(CXX); \ + else \ + echo $(CONFIGURED_CXX_FOR_TARGET) ; \ + fi; \ + fi` + +CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates +GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CONFIGURED_GCJ_FOR_TARGET=@CONFIGURED_GCJ_FOR_TARGET@ +USUAL_GCJ_FOR_TARGET = ` \ + if [ -f $$r/$(HOST_SUBDIR)/gcc/gcj ] ; then \ + echo $$r/$(HOST_SUBDIR)/gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(GCJ); \ + else \ + echo $(CONFIGURED_GCJ_FOR_TARGET) ; \ + fi; \ + fi` + +GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET) +CONFIGURED_GFORTRAN_FOR_TARGET=@CONFIGURED_GFORTRAN_FOR_TARGET@ +USUAL_GFORTRAN_FOR_TARGET = ` \ + if [ -f $$r/$(HOST_SUBDIR)/gcc/gfortran ] ; then \ + echo $$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc ; \ + else \ + if [ '$(host)' = '$(target)' ] ; then \ + echo $(GFORTRAN); \ + else \ + echo $(CONFIGURED_GFORTRAN_FOR_TARGET) ; \ + fi; \ + fi` + + DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@ CONFIGURED_DLLTOOL_FOR_TARGET=@CONFIGURED_DLLTOOL_FOR_TARGET@ USUAL_DLLTOOL_FOR_TARGET = ` \ - if [ -f $$r/binutils/dlltool ] ; then \ - echo $$r/binutils/dlltool ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/dlltool ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/dlltool ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(DLLTOOL); \ @@ -410,16 +461,13 @@ USUAL_DLLTOOL_FOR_TARGET = ` \ fi; \ fi` -GCJ_FOR_TARGET = @GCJ_FOR_TARGET@ -GFORTRAN_FOR_TARGET = @GFORTRAN_FOR_TARGET@ - LD_FOR_TARGET=@LD_FOR_TARGET@ CONFIGURED_LD_FOR_TARGET=@CONFIGURED_LD_FOR_TARGET@ USUAL_LD_FOR_TARGET = ` \ - if [ -f $$r/ld/ld-new ] ; then \ - echo $$r/ld/ld-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ - $(CC_FOR_TARGET) -print-prog-name=ld ; \ + if [ -f $$r/$(HOST_SUBDIR)/ld/ld-new ] ; then \ + echo $$r/$(HOST_SUBDIR)/ld/ld-new ; \ + elif [ -f $$r/$(HOST_SUBDIR)/gcc/collect-ld ]; then \ + echo $$r/$(HOST_SUBDIR)/gcc/collect-ld ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(LD); \ @@ -433,10 +481,10 @@ LDFLAGS_FOR_TARGET = NM_FOR_TARGET=@NM_FOR_TARGET@ CONFIGURED_NM_FOR_TARGET=@CONFIGURED_NM_FOR_TARGET@ USUAL_NM_FOR_TARGET = ` \ - if [ -f $$r/binutils/nm-new ] ; then \ - echo $$r/binutils/nm-new ; \ - elif [ -f $$r/gcc/xgcc ]; then \ - $(CC_FOR_TARGET) -print-prog-name=nm ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/nm-new ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/nm-new ; \ + elif [ -f $$r/$(HOST_SUBDIR)/gcc/nm ]; then \ + echo $$r/$(HOST_SUBDIR)/gcc/nm ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(NM); \ @@ -448,8 +496,8 @@ USUAL_NM_FOR_TARGET = ` \ RANLIB_FOR_TARGET=@RANLIB_FOR_TARGET@ CONFIGURED_RANLIB_FOR_TARGET=@CONFIGURED_RANLIB_FOR_TARGET@ USUAL_RANLIB_FOR_TARGET = ` \ - if [ -f $$r/binutils/ranlib ] ; then \ - echo $$r/binutils/ranlib ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/ranlib ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/ranlib ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ if [ x'$(RANLIB)' != x ]; then \ @@ -465,8 +513,8 @@ USUAL_RANLIB_FOR_TARGET = ` \ WINDRES_FOR_TARGET=@WINDRES_FOR_TARGET@ CONFIGURED_WINDRES_FOR_TARGET=@CONFIGURED_WINDRES_FOR_TARGET@ USUAL_WINDRES_FOR_TARGET = ` \ - if [ -f $$r/binutils/windres ] ; then \ - echo $$r/binutils/windres ; \ + if [ -f $$r/$(HOST_SUBDIR)/binutils/windres ] ; then \ + echo $$r/$(HOST_SUBDIR)/binutils/windres ; \ else \ if [ '$(host)' = '$(target)' ] ; then \ echo $(WINDRES); \ @@ -481,14 +529,6 @@ PICFLAG_FOR_TARGET = # Miscellaneous targets and flag lists # ------------------------------------ -@if gcc-bootstrap -# Let's leave this as the first rule in the file until toplevel -# bootstrap is fleshed out completely. -sorry: - @echo Toplevel bootstrap temporarily out of commission. - @echo Please reconfigure without --enable-bootstrap -@endif gcc-bootstrap - # The first rule in the file had better be this one. Don't put any above it. # This lives here to allow makefile fragments to contain dependencies. @default_target@: @@ -500,6 +540,45 @@ sorry: @host_makefile_frag@ ### +# This is the list of directories that may be needed in RPATH_ENVVAR +# so that prorgams built for the target machine work. +TARGET_LIB_PATH = $(TARGET_LIB_PATH_libstdc++-v3)$(TARGET_LIB_PATH_libmudflap)$(TARGET_LIB_PATH_libssp)$(HOST_LIB_PATH_gcc) + +@if target-libstdc++-v3 +TARGET_LIB_PATH_libstdc++-v3 = $$r/$(TARGET_SUBDIR)/libstdc++-v3/.libs: +@endif target-libstdc++-v3 + +@if target-libmudflap +TARGET_LIB_PATH_libmudflap = $$r/$(TARGET_SUBDIR)/libmudflap/.libs: +@endif target-libmudflap + +@if target-libssp +TARGET_LIB_PATH_libssp = $$r/$(TARGET_SUBDIR)/libssp/.libs: +@endif target-libssp + + + +# 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_bfd)$(HOST_LIB_PATH_opcodes) + +# Define HOST_LIB_PATH_gcc here, for the sake of TARGET_LIB_PATH, ouch +@if gcc +HOST_LIB_PATH_gcc = $$r/$(HOST_SUBDIR)/gcc:$$r/$(HOST_SUBDIR)/prev-gcc: +@endif gcc + + +@if bfd +HOST_LIB_PATH_bfd = \ + $$r/$(HOST_SUBDIR)/bfd/.:$$r/$(HOST_SUBDIR)/prev-bfd/.: +@endif bfd + +@if opcodes +HOST_LIB_PATH_opcodes = \ + $$r/$(HOST_SUBDIR)/opcodes/.:$$r/$(HOST_SUBDIR)/prev-opcodes/.: +@endif opcodes + + # Flags to pass down to all sub-makes. BASE_FLAGS_TO_PASS = \ "DESTDIR=$(DESTDIR)" \ @@ -513,8 +592,6 @@ BASE_FLAGS_TO_PASS = \ "libdir=$(libdir)" \ "libexecdir=$(libexecdir)" \ "lispdir=$(lispdir)" \ - "libstdcxx_incdir=$(libstdcxx_incdir)" \ - "libsubdir=$(libsubdir)" \ "localstatedir=$(localstatedir)" \ "mandir=$(mandir)" \ "oldincludedir=$(oldincludedir)" \ @@ -524,12 +601,10 @@ BASE_FLAGS_TO_PASS = \ "sysconfdir=$(sysconfdir)" \ "tooldir=$(tooldir)" \ "build_tooldir=$(build_tooldir)" \ - "gxx_include_dir=$(gxx_include_dir)" \ - "gcc_version=$(gcc_version)" \ - "gcc_version_trigger=$(gcc_version_trigger)" \ "target_alias=$(target_alias)" \ "BISON=$(BISON)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \ "EXPECT=$(EXPECT)" \ "FLEX=$(FLEX)" \ @@ -554,12 +629,14 @@ BASE_FLAGS_TO_PASS = \ "AS_FOR_TARGET=$(AS_FOR_TARGET)" \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "CPPFLAGS_FOR_TARGET=$(CPPFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \ "GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \ "LD_FOR_TARGET=$(LD_FOR_TARGET)" \ + "LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \ "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ "LIBCXXFLAGS_FOR_TARGET=$(LIBCXXFLAGS_FOR_TARGET)" \ "NM_FOR_TARGET=$(NM_FOR_TARGET)" \ @@ -568,16 +645,8 @@ BASE_FLAGS_TO_PASS = \ "CONFIG_SHELL=$(SHELL)" \ "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" -# For any flags above that may contain shell code that varies from one -# target library to another. When doing recursive invocations of the -# top-level Makefile, we don't want the outer make to evaluate them, -# so we pass these variables down unchanged. They must not contain -# single nor double quotes. -RECURSE_FLAGS = \ - CXX_FOR_TARGET='$(CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ - RAW_CXX_FOR_TARGET='$(RAW_CXX_FOR_TARGET_FOR_RECURSIVE_MAKE)' \ - -RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) +# We leave this in just in case, but it is not needed anymore. +RECURSE_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) # Flags to pass down to most sub-makes, in which we're building with # the host environment. @@ -618,6 +687,7 @@ EXTRA_TARGET_FLAGS = \ 'CXXFLAGS=$$(CXXFLAGS_FOR_TARGET)' \ 'DLLTOOL=$$(DLLTOOL_FOR_TARGET)' \ 'LD=$$(LD_FOR_TARGET)' \ + 'LDFLAGS=$$(LDFLAGS_FOR_TARGET)' \ 'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \ 'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \ 'NM=$$(NM_FOR_TARGET)' \ @@ -636,7 +706,6 @@ EXTRA_GCC_FLAGS = \ 'BUILD_PREFIX=$(BUILD_PREFIX)' \ 'BUILD_PREFIX_1=$(BUILD_PREFIX_1)' \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ - "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ "`echo 'LANGUAGES=$(LANGUAGES)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'STMP_FIXPROTO=$(STMP_FIXPROTO)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ "`echo 'LIMITS_H_TEST=$(LIMITS_H_TEST)' | sed -e s'/[^=][^=]*=$$/XFOO=/'`" \ @@ -669,6 +738,7 @@ configure-host: \ maybe-configure-fileutils \ maybe-configure-findutils \ maybe-configure-find \ + maybe-configure-fixincludes \ maybe-configure-flex \ maybe-configure-gas \ maybe-configure-gcc \ @@ -685,7 +755,6 @@ configure-host: \ maybe-configure-ld \ maybe-configure-libcpp \ maybe-configure-libgui \ - maybe-configure-libbanshee \ maybe-configure-libiberty \ maybe-configure-libtool \ maybe-configure-m4 \ @@ -715,13 +784,14 @@ configure-host: \ maybe-configure-expect \ maybe-configure-guile \ maybe-configure-tk \ - maybe-configure-tix \ maybe-configure-libtermcap \ - maybe-configure-utils + maybe-configure-utils \ + maybe-configure-gnattools .PHONY: configure-target configure-target: \ maybe-configure-target-libstdc++-v3 \ maybe-configure-target-libmudflap \ + maybe-configure-target-libssp \ maybe-configure-target-newlib \ maybe-configure-target-libgfortran \ maybe-configure-target-libobjc \ @@ -741,17 +811,17 @@ configure-target: \ # The target built for a native non-bootstrap build. .PHONY: all -all: unstage all-build all-host all-target stage +all: unstage all-host all-target stage .PHONY: all-build all-build: \ maybe-all-build-libiberty \ - maybe-all-build-libbanshee \ maybe-all-build-bison \ maybe-all-build-byacc \ maybe-all-build-flex \ maybe-all-build-m4 \ - maybe-all-build-texinfo + maybe-all-build-texinfo \ + maybe-all-build-fixincludes .PHONY: all-host all-host: \ maybe-all-ash \ @@ -772,6 +842,7 @@ all-host: \ maybe-all-fileutils \ maybe-all-findutils \ maybe-all-find \ + maybe-all-fixincludes \ maybe-all-flex \ maybe-all-gas \ maybe-all-gcc \ @@ -788,7 +859,6 @@ all-host: \ maybe-all-ld \ maybe-all-libcpp \ maybe-all-libgui \ - maybe-all-libbanshee \ maybe-all-libiberty \ maybe-all-libtool \ maybe-all-m4 \ @@ -818,13 +888,14 @@ all-host: \ maybe-all-expect \ maybe-all-guile \ maybe-all-tk \ - maybe-all-tix \ maybe-all-libtermcap \ - maybe-all-utils + maybe-all-utils \ + maybe-all-gnattools .PHONY: all-target all-target: \ maybe-all-target-libstdc++-v3 \ maybe-all-target-libmudflap \ + maybe-all-target-libssp \ maybe-all-target-newlib \ maybe-all-target-libgfortran \ maybe-all-target-libobjc \ @@ -870,6 +941,7 @@ info-host: \ maybe-info-fileutils \ maybe-info-findutils \ maybe-info-find \ + maybe-info-fixincludes \ maybe-info-flex \ maybe-info-gas \ maybe-info-gcc \ @@ -886,7 +958,6 @@ info-host: \ maybe-info-ld \ maybe-info-libcpp \ maybe-info-libgui \ - maybe-info-libbanshee \ maybe-info-libiberty \ maybe-info-libtool \ maybe-info-m4 \ @@ -916,14 +987,15 @@ info-host: \ maybe-info-expect \ maybe-info-guile \ maybe-info-tk \ - maybe-info-tix \ maybe-info-libtermcap \ - maybe-info-utils + maybe-info-utils \ + maybe-info-gnattools .PHONY: info-target info-target: \ maybe-info-target-libstdc++-v3 \ maybe-info-target-libmudflap \ + maybe-info-target-libssp \ maybe-info-target-newlib \ maybe-info-target-libgfortran \ maybe-info-target-libobjc \ @@ -964,6 +1036,7 @@ dvi-host: \ maybe-dvi-fileutils \ maybe-dvi-findutils \ maybe-dvi-find \ + maybe-dvi-fixincludes \ maybe-dvi-flex \ maybe-dvi-gas \ maybe-dvi-gcc \ @@ -980,7 +1053,6 @@ dvi-host: \ maybe-dvi-ld \ maybe-dvi-libcpp \ maybe-dvi-libgui \ - maybe-dvi-libbanshee \ maybe-dvi-libiberty \ maybe-dvi-libtool \ maybe-dvi-m4 \ @@ -1010,14 +1082,15 @@ dvi-host: \ maybe-dvi-expect \ maybe-dvi-guile \ maybe-dvi-tk \ - maybe-dvi-tix \ maybe-dvi-libtermcap \ - maybe-dvi-utils + maybe-dvi-utils \ + maybe-dvi-gnattools .PHONY: dvi-target dvi-target: \ maybe-dvi-target-libstdc++-v3 \ maybe-dvi-target-libmudflap \ + maybe-dvi-target-libssp \ maybe-dvi-target-newlib \ maybe-dvi-target-libgfortran \ maybe-dvi-target-libobjc \ @@ -1035,6 +1108,101 @@ dvi-target: \ maybe-dvi-target-rda \ maybe-dvi-target-libada +.PHONY: do-html +do-html: unstage html-host html-target stage + +.PHONY: html-host +html-host: \ + maybe-html-ash \ + maybe-html-autoconf \ + maybe-html-automake \ + maybe-html-bash \ + maybe-html-bfd \ + maybe-html-opcodes \ + maybe-html-binutils \ + maybe-html-bison \ + maybe-html-byacc \ + maybe-html-bzip2 \ + maybe-html-dejagnu \ + maybe-html-diff \ + maybe-html-dosutils \ + maybe-html-etc \ + maybe-html-fastjar \ + maybe-html-fileutils \ + maybe-html-findutils \ + maybe-html-find \ + maybe-html-fixincludes \ + maybe-html-flex \ + maybe-html-gas \ + maybe-html-gcc \ + maybe-html-gawk \ + maybe-html-gettext \ + maybe-html-gnuserv \ + maybe-html-gprof \ + maybe-html-gzip \ + maybe-html-hello \ + maybe-html-indent \ + maybe-html-intl \ + maybe-html-tcl \ + maybe-html-itcl \ + maybe-html-ld \ + maybe-html-libcpp \ + maybe-html-libgui \ + maybe-html-libiberty \ + maybe-html-libtool \ + maybe-html-m4 \ + maybe-html-make \ + maybe-html-mmalloc \ + maybe-html-patch \ + maybe-html-perl \ + maybe-html-prms \ + maybe-html-rcs \ + maybe-html-readline \ + maybe-html-release \ + maybe-html-recode \ + maybe-html-sed \ + maybe-html-send-pr \ + maybe-html-shellutils \ + maybe-html-sid \ + maybe-html-sim \ + maybe-html-tar \ + maybe-html-texinfo \ + maybe-html-textutils \ + maybe-html-time \ + maybe-html-uudecode \ + maybe-html-wdiff \ + maybe-html-zip \ + maybe-html-zlib \ + maybe-html-gdb \ + maybe-html-expect \ + maybe-html-guile \ + maybe-html-tk \ + maybe-html-libtermcap \ + maybe-html-utils \ + maybe-html-gnattools + +.PHONY: html-target +html-target: \ + maybe-html-target-libstdc++-v3 \ + maybe-html-target-libmudflap \ + maybe-html-target-libssp \ + maybe-html-target-newlib \ + maybe-html-target-libgfortran \ + maybe-html-target-libobjc \ + maybe-html-target-libtermcap \ + maybe-html-target-winsup \ + maybe-html-target-libgloss \ + maybe-html-target-libiberty \ + maybe-html-target-gperf \ + maybe-html-target-examples \ + maybe-html-target-libffi \ + maybe-html-target-libjava \ + maybe-html-target-zlib \ + maybe-html-target-boehm-gc \ + maybe-html-target-qthreads \ + maybe-html-target-rda \ + maybe-html-target-libada + .PHONY: do-TAGS do-TAGS: unstage TAGS-host TAGS-target stage @@ -1058,6 +1226,7 @@ TAGS-host: \ maybe-TAGS-fileutils \ maybe-TAGS-findutils \ maybe-TAGS-find \ + maybe-TAGS-fixincludes \ maybe-TAGS-flex \ maybe-TAGS-gas \ maybe-TAGS-gcc \ @@ -1074,7 +1243,6 @@ TAGS-host: \ maybe-TAGS-ld \ maybe-TAGS-libcpp \ maybe-TAGS-libgui \ - maybe-TAGS-libbanshee \ maybe-TAGS-libiberty \ maybe-TAGS-libtool \ maybe-TAGS-m4 \ @@ -1104,14 +1272,15 @@ TAGS-host: \ maybe-TAGS-expect \ maybe-TAGS-guile \ maybe-TAGS-tk \ - maybe-TAGS-tix \ maybe-TAGS-libtermcap \ - maybe-TAGS-utils + maybe-TAGS-utils \ + maybe-TAGS-gnattools .PHONY: TAGS-target TAGS-target: \ maybe-TAGS-target-libstdc++-v3 \ maybe-TAGS-target-libmudflap \ + maybe-TAGS-target-libssp \ maybe-TAGS-target-newlib \ maybe-TAGS-target-libgfortran \ maybe-TAGS-target-libobjc \ @@ -1152,6 +1321,7 @@ install-info-host: \ maybe-install-info-fileutils \ maybe-install-info-findutils \ maybe-install-info-find \ + maybe-install-info-fixincludes \ maybe-install-info-flex \ maybe-install-info-gas \ maybe-install-info-gcc \ @@ -1168,7 +1338,6 @@ install-info-host: \ maybe-install-info-ld \ maybe-install-info-libcpp \ maybe-install-info-libgui \ - maybe-install-info-libbanshee \ maybe-install-info-libiberty \ maybe-install-info-libtool \ maybe-install-info-m4 \ @@ -1198,14 +1367,15 @@ install-info-host: \ maybe-install-info-expect \ maybe-install-info-guile \ maybe-install-info-tk \ - maybe-install-info-tix \ maybe-install-info-libtermcap \ - maybe-install-info-utils + maybe-install-info-utils \ + maybe-install-info-gnattools .PHONY: install-info-target install-info-target: \ maybe-install-info-target-libstdc++-v3 \ maybe-install-info-target-libmudflap \ + maybe-install-info-target-libssp \ maybe-install-info-target-newlib \ maybe-install-info-target-libgfortran \ maybe-install-info-target-libobjc \ @@ -1246,6 +1416,7 @@ installcheck-host: \ maybe-installcheck-fileutils \ maybe-installcheck-findutils \ maybe-installcheck-find \ + maybe-installcheck-fixincludes \ maybe-installcheck-flex \ maybe-installcheck-gas \ maybe-installcheck-gcc \ @@ -1262,7 +1433,6 @@ installcheck-host: \ maybe-installcheck-ld \ maybe-installcheck-libcpp \ maybe-installcheck-libgui \ - maybe-installcheck-libbanshee \ maybe-installcheck-libiberty \ maybe-installcheck-libtool \ maybe-installcheck-m4 \ @@ -1292,14 +1462,15 @@ installcheck-host: \ maybe-installcheck-expect \ maybe-installcheck-guile \ maybe-installcheck-tk \ - maybe-installcheck-tix \ maybe-installcheck-libtermcap \ - maybe-installcheck-utils + maybe-installcheck-utils \ + maybe-installcheck-gnattools .PHONY: installcheck-target installcheck-target: \ maybe-installcheck-target-libstdc++-v3 \ maybe-installcheck-target-libmudflap \ + maybe-installcheck-target-libssp \ maybe-installcheck-target-newlib \ maybe-installcheck-target-libgfortran \ maybe-installcheck-target-libobjc \ @@ -1340,6 +1511,7 @@ mostlyclean-host: \ maybe-mostlyclean-fileutils \ maybe-mostlyclean-findutils \ maybe-mostlyclean-find \ + maybe-mostlyclean-fixincludes \ maybe-mostlyclean-flex \ maybe-mostlyclean-gas \ maybe-mostlyclean-gcc \ @@ -1356,7 +1528,6 @@ mostlyclean-host: \ maybe-mostlyclean-ld \ maybe-mostlyclean-libcpp \ maybe-mostlyclean-libgui \ - maybe-mostlyclean-libbanshee \ maybe-mostlyclean-libiberty \ maybe-mostlyclean-libtool \ maybe-mostlyclean-m4 \ @@ -1386,14 +1557,15 @@ mostlyclean-host: \ maybe-mostlyclean-expect \ maybe-mostlyclean-guile \ maybe-mostlyclean-tk \ - maybe-mostlyclean-tix \ maybe-mostlyclean-libtermcap \ - maybe-mostlyclean-utils + maybe-mostlyclean-utils \ + maybe-mostlyclean-gnattools .PHONY: mostlyclean-target mostlyclean-target: \ maybe-mostlyclean-target-libstdc++-v3 \ maybe-mostlyclean-target-libmudflap \ + maybe-mostlyclean-target-libssp \ maybe-mostlyclean-target-newlib \ maybe-mostlyclean-target-libgfortran \ maybe-mostlyclean-target-libobjc \ @@ -1434,6 +1606,7 @@ clean-host: \ maybe-clean-fileutils \ maybe-clean-findutils \ maybe-clean-find \ + maybe-clean-fixincludes \ maybe-clean-flex \ maybe-clean-gas \ maybe-clean-gcc \ @@ -1450,7 +1623,6 @@ clean-host: \ maybe-clean-ld \ maybe-clean-libcpp \ maybe-clean-libgui \ - maybe-clean-libbanshee \ maybe-clean-libiberty \ maybe-clean-libtool \ maybe-clean-m4 \ @@ -1480,14 +1652,15 @@ clean-host: \ maybe-clean-expect \ maybe-clean-guile \ maybe-clean-tk \ - maybe-clean-tix \ maybe-clean-libtermcap \ - maybe-clean-utils + maybe-clean-utils \ + maybe-clean-gnattools .PHONY: clean-target clean-target: \ maybe-clean-target-libstdc++-v3 \ maybe-clean-target-libmudflap \ + maybe-clean-target-libssp \ maybe-clean-target-newlib \ maybe-clean-target-libgfortran \ maybe-clean-target-libobjc \ @@ -1528,6 +1701,7 @@ distclean-host: \ maybe-distclean-fileutils \ maybe-distclean-findutils \ maybe-distclean-find \ + maybe-distclean-fixincludes \ maybe-distclean-flex \ maybe-distclean-gas \ maybe-distclean-gcc \ @@ -1544,7 +1718,6 @@ distclean-host: \ maybe-distclean-ld \ maybe-distclean-libcpp \ maybe-distclean-libgui \ - maybe-distclean-libbanshee \ maybe-distclean-libiberty \ maybe-distclean-libtool \ maybe-distclean-m4 \ @@ -1574,14 +1747,15 @@ distclean-host: \ maybe-distclean-expect \ maybe-distclean-guile \ maybe-distclean-tk \ - maybe-distclean-tix \ maybe-distclean-libtermcap \ - maybe-distclean-utils + maybe-distclean-utils \ + maybe-distclean-gnattools .PHONY: distclean-target distclean-target: \ maybe-distclean-target-libstdc++-v3 \ maybe-distclean-target-libmudflap \ + maybe-distclean-target-libssp \ maybe-distclean-target-newlib \ maybe-distclean-target-libgfortran \ maybe-distclean-target-libobjc \ @@ -1622,6 +1796,7 @@ maintainer-clean-host: \ maybe-maintainer-clean-fileutils \ maybe-maintainer-clean-findutils \ maybe-maintainer-clean-find \ + maybe-maintainer-clean-fixincludes \ maybe-maintainer-clean-flex \ maybe-maintainer-clean-gas \ maybe-maintainer-clean-gcc \ @@ -1638,7 +1813,6 @@ maintainer-clean-host: \ maybe-maintainer-clean-ld \ maybe-maintainer-clean-libcpp \ maybe-maintainer-clean-libgui \ - maybe-maintainer-clean-libbanshee \ maybe-maintainer-clean-libiberty \ maybe-maintainer-clean-libtool \ maybe-maintainer-clean-m4 \ @@ -1668,14 +1842,15 @@ maintainer-clean-host: \ maybe-maintainer-clean-expect \ maybe-maintainer-clean-guile \ maybe-maintainer-clean-tk \ - maybe-maintainer-clean-tix \ maybe-maintainer-clean-libtermcap \ - maybe-maintainer-clean-utils + maybe-maintainer-clean-utils \ + maybe-maintainer-clean-gnattools .PHONY: maintainer-clean-target maintainer-clean-target: \ maybe-maintainer-clean-target-libstdc++-v3 \ maybe-maintainer-clean-target-libmudflap \ + maybe-maintainer-clean-target-libssp \ maybe-maintainer-clean-target-newlib \ maybe-maintainer-clean-target-libgfortran \ maybe-maintainer-clean-target-libobjc \ @@ -1696,12 +1871,13 @@ maintainer-clean-target: \ # Here are the targets which correspond to the do-X targets. -.PHONY: info installcheck dvi install-info +.PHONY: info installcheck dvi html install-info .PHONY: clean distclean mostlyclean maintainer-clean realclean .PHONY: local-clean local-distclean local-maintainer-clean info: do-info installcheck: do-installcheck dvi: do-dvi +html: do-html # Make sure makeinfo is built before we do a `make info', if we're # in fact building texinfo. @@ -1723,6 +1899,9 @@ local-distclean: rm -rf $(TARGET_SUBDIR); \ else true; fi -rm -rf $(BUILD_SUBDIR) + -if [ "$(HOST_SUBDIR)" != "." ]; then \ + rm -rf $(HOST_SUBDIR); \ + else true; fi -rm -f texinfo/po/Makefile texinfo/po/Makefile.in texinfo/info/Makefile -rm -f texinfo/doc/Makefile texinfo/po/POTFILES -rmdir texinfo/doc texinfo/info texinfo/intl texinfo/lib 2>/dev/null @@ -1747,6 +1926,7 @@ clean-target-libgcc: (cd gcc/libgcc && find . -type d -print) | \ while read d; do rm -f gcc/$$d/libgcc.a || : ; done -rm -rf gcc/libgcc + -rm -f gcc/stmp-dirs # Check target. @@ -1773,6 +1953,7 @@ do-check: unstage \ maybe-check-fileutils \ maybe-check-findutils \ maybe-check-find \ + maybe-check-fixincludes \ maybe-check-flex \ maybe-check-gas \ maybe-check-gcc \ @@ -1789,7 +1970,6 @@ do-check: unstage \ maybe-check-ld \ maybe-check-libcpp \ maybe-check-libgui \ - maybe-check-libbanshee \ maybe-check-libiberty \ maybe-check-libtool \ maybe-check-m4 \ @@ -1819,11 +1999,12 @@ do-check: unstage \ maybe-check-expect \ maybe-check-guile \ maybe-check-tk \ - maybe-check-tix \ maybe-check-libtermcap \ maybe-check-utils \ + maybe-check-gnattools \ maybe-check-target-libstdc++-v3 \ maybe-check-target-libmudflap \ + maybe-check-target-libssp \ maybe-check-target-newlib \ maybe-check-target-libgfortran \ maybe-check-target-libobjc \ @@ -1887,6 +2068,7 @@ install-host-nogcc: \ maybe-install-fileutils \ maybe-install-findutils \ maybe-install-find \ + maybe-install-fixincludes \ maybe-install-flex \ maybe-install-gas \ maybe-install-gawk \ @@ -1902,7 +2084,6 @@ install-host-nogcc: \ maybe-install-ld \ maybe-install-libcpp \ maybe-install-libgui \ - maybe-install-libbanshee \ maybe-install-libiberty \ maybe-install-libtool \ maybe-install-m4 \ @@ -1932,9 +2113,9 @@ install-host-nogcc: \ maybe-install-expect \ maybe-install-guile \ maybe-install-tk \ - maybe-install-tix \ maybe-install-libtermcap \ - maybe-install-utils + maybe-install-utils \ + maybe-install-gnattools .PHONY: install-host install-host: \ @@ -1956,6 +2137,7 @@ install-host: \ maybe-install-fileutils \ maybe-install-findutils \ maybe-install-find \ + maybe-install-fixincludes \ maybe-install-flex \ maybe-install-gas \ maybe-install-gcc \ @@ -1972,7 +2154,6 @@ install-host: \ maybe-install-ld \ maybe-install-libcpp \ maybe-install-libgui \ - maybe-install-libbanshee \ maybe-install-libiberty \ maybe-install-libtool \ maybe-install-m4 \ @@ -2002,14 +2183,15 @@ install-host: \ maybe-install-expect \ maybe-install-guile \ maybe-install-tk \ - maybe-install-tix \ maybe-install-libtermcap \ - maybe-install-utils + maybe-install-utils \ + maybe-install-gnattools .PHONY: install-target install-target: \ maybe-install-target-libstdc++-v3 \ maybe-install-target-libmudflap \ + maybe-install-target-libssp \ maybe-install-target-newlib \ maybe-install-target-libgfortran \ maybe-install-target-libobjc \ @@ -2034,7 +2216,6 @@ uninstall: install.all: install-no-fixedincludes @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD_COMMAND}` ; export r ; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd ./gcc && \ $(MAKE) $(FLAGS_TO_PASS) install-headers) ; \ @@ -2078,15 +2259,24 @@ etags tags: TAGS # built are. TAGS: do-TAGS +# ------------------------------------ +# Macros for configure and all targets +# ------------------------------------ + + + + + # -------------------------------------- # Modules which run on the build machine # -------------------------------------- + .PHONY: configure-build-libiberty maybe-configure-build-libiberty maybe-configure-build-libiberty: @if build-libiberty maybe-configure-build-libiberty: configure-build-libiberty -configure-build-libiberty: +configure-build-libiberty: @test ! -f $(BUILD_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \ r=`${PWD_COMMAND}`; export r; \ @@ -2095,124 +2285,44 @@ configure-build-libiberty: echo Configuring in $(BUILD_SUBDIR)/libiberty; \ cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/libiberty/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/libiberty "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/libiberty"; \ + libsrcdir="$$s/libiberty"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif build-libiberty + + + + .PHONY: all-build-libiberty maybe-all-build-libiberty maybe-all-build-libiberty: @if build-libiberty +TARGET-build-libiberty=all maybe-all-build-libiberty: all-build-libiberty all-build-libiberty: configure-build-libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/libiberty && $(MAKE) all) + (cd $(BUILD_SUBDIR)/libiberty && \ + $(MAKE) $(TARGET-build-libiberty)) @endif build-libiberty -.PHONY: configure-build-libbanshee maybe-configure-build-libbanshee -maybe-configure-build-libbanshee: -@if build-libbanshee -maybe-configure-build-libbanshee: configure-build-libbanshee -configure-build-libbanshee: - @test ! -f $(BUILD_SUBDIR)/libbanshee/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libbanshee ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(BUILD_EXPORTS) \ - echo Configuring in $(BUILD_SUBDIR)/libbanshee; \ - cd "$(BUILD_SUBDIR)/libbanshee" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ - esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/libbanshee "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/libbanshee"; \ - libsrcdir="$$s/libbanshee"; \ - fi; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ - || exit 1 -@endif build-libbanshee -.PHONY: all-build-libbanshee maybe-all-build-libbanshee -maybe-all-build-libbanshee: -@if build-libbanshee -maybe-all-build-libbanshee: all-build-libbanshee -all-build-libbanshee: configure-build-libbanshee - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/libbanshee && $(MAKE) all) -@endif build-libbanshee + + .PHONY: configure-build-bison maybe-configure-build-bison maybe-configure-build-bison: @if build-bison maybe-configure-build-bison: configure-build-bison -configure-build-bison: +configure-build-bison: @test ! -f $(BUILD_SUBDIR)/bison/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \ r=`${PWD_COMMAND}`; export r; \ @@ -2221,61 +2331,44 @@ configure-build-bison: echo Configuring in $(BUILD_SUBDIR)/bison; \ cd "$(BUILD_SUBDIR)/bison" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/bison/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/bison "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/bison"; \ - libsrcdir="$$s/bison"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/bison"; \ + libsrcdir="$$s/bison"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif build-bison + + + + .PHONY: all-build-bison maybe-all-build-bison maybe-all-build-bison: @if build-bison +TARGET-build-bison=all maybe-all-build-bison: all-build-bison all-build-bison: configure-build-bison @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/bison && $(MAKE) all) + (cd $(BUILD_SUBDIR)/bison && \ + $(MAKE) $(TARGET-build-bison)) @endif build-bison + + + + .PHONY: configure-build-byacc maybe-configure-build-byacc maybe-configure-build-byacc: @if build-byacc maybe-configure-build-byacc: configure-build-byacc -configure-build-byacc: +configure-build-byacc: @test ! -f $(BUILD_SUBDIR)/byacc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/byacc ; \ r=`${PWD_COMMAND}`; export r; \ @@ -2284,61 +2377,44 @@ configure-build-byacc: echo Configuring in $(BUILD_SUBDIR)/byacc; \ cd "$(BUILD_SUBDIR)/byacc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/byacc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/byacc "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/byacc"; \ - libsrcdir="$$s/byacc"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/byacc"; \ + libsrcdir="$$s/byacc"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif build-byacc + + + + .PHONY: all-build-byacc maybe-all-build-byacc maybe-all-build-byacc: @if build-byacc +TARGET-build-byacc=all maybe-all-build-byacc: all-build-byacc all-build-byacc: configure-build-byacc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/byacc && $(MAKE) all) + (cd $(BUILD_SUBDIR)/byacc && \ + $(MAKE) $(TARGET-build-byacc)) @endif build-byacc + + + + .PHONY: configure-build-flex maybe-configure-build-flex maybe-configure-build-flex: @if build-flex maybe-configure-build-flex: configure-build-flex -configure-build-flex: +configure-build-flex: @test ! -f $(BUILD_SUBDIR)/flex/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \ r=`${PWD_COMMAND}`; export r; \ @@ -2347,61 +2423,44 @@ configure-build-flex: echo Configuring in $(BUILD_SUBDIR)/flex; \ cd "$(BUILD_SUBDIR)/flex" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/flex/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/flex "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/flex"; \ - libsrcdir="$$s/flex"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/flex"; \ + libsrcdir="$$s/flex"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif build-flex + + + + .PHONY: all-build-flex maybe-all-build-flex maybe-all-build-flex: @if build-flex +TARGET-build-flex=all maybe-all-build-flex: all-build-flex all-build-flex: configure-build-flex @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/flex && $(MAKE) all) + (cd $(BUILD_SUBDIR)/flex && \ + $(MAKE) $(TARGET-build-flex)) @endif build-flex + + + + .PHONY: configure-build-m4 maybe-configure-build-m4 maybe-configure-build-m4: @if build-m4 maybe-configure-build-m4: configure-build-m4 -configure-build-m4: +configure-build-m4: @test ! -f $(BUILD_SUBDIR)/m4/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \ r=`${PWD_COMMAND}`; export r; \ @@ -2410,61 +2469,44 @@ configure-build-m4: echo Configuring in $(BUILD_SUBDIR)/m4; \ cd "$(BUILD_SUBDIR)/m4" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/m4/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/m4 "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/m4"; \ - libsrcdir="$$s/m4"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/m4"; \ + libsrcdir="$$s/m4"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif build-m4 + + + + .PHONY: all-build-m4 maybe-all-build-m4 maybe-all-build-m4: @if build-m4 +TARGET-build-m4=all maybe-all-build-m4: all-build-m4 all-build-m4: configure-build-m4 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/m4 && $(MAKE) all) + (cd $(BUILD_SUBDIR)/m4 && \ + $(MAKE) $(TARGET-build-m4)) @endif build-m4 + + + + .PHONY: configure-build-texinfo maybe-configure-build-texinfo maybe-configure-build-texinfo: @if build-texinfo maybe-configure-build-texinfo: configure-build-texinfo -configure-build-texinfo: +configure-build-texinfo: @test ! -f $(BUILD_SUBDIR)/texinfo/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \ r=`${PWD_COMMAND}`; export r; \ @@ -2473,101 +2515,134 @@ configure-build-texinfo: echo Configuring in $(BUILD_SUBDIR)/texinfo; \ cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(BUILD_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/texinfo/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(BUILD_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/texinfo "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/texinfo"; \ - libsrcdir="$$s/texinfo"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/texinfo"; \ + libsrcdir="$$s/texinfo"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(BUILD_CONFIGARGS) $${srcdiroption} \ - --with-build-subdir="$(BUILD_SUBDIR)" \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif build-texinfo + + + + .PHONY: all-build-texinfo maybe-all-build-texinfo maybe-all-build-texinfo: @if build-texinfo +TARGET-build-texinfo=all maybe-all-build-texinfo: all-build-texinfo all-build-texinfo: configure-build-texinfo @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(BUILD_EXPORTS) \ - (cd $(BUILD_SUBDIR)/texinfo && $(MAKE) all) + (cd $(BUILD_SUBDIR)/texinfo && \ + $(MAKE) $(TARGET-build-texinfo)) @endif build-texinfo + + + +.PHONY: configure-build-fixincludes maybe-configure-build-fixincludes +maybe-configure-build-fixincludes: +@if build-fixincludes +maybe-configure-build-fixincludes: configure-build-fixincludes +configure-build-fixincludes: + @test ! -f $(BUILD_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(BUILD_EXPORTS) \ + echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ + cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(BUILD_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/fixincludes"; \ + libsrcdir="$$s/fixincludes"; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + $(BUILD_CONFIGARGS) $${srcdiroption} \ + || exit 1 +@endif build-fixincludes + + + + + +.PHONY: all-build-fixincludes maybe-all-build-fixincludes +maybe-all-build-fixincludes: +@if build-fixincludes +TARGET-build-fixincludes=all +maybe-all-build-fixincludes: all-build-fixincludes +all-build-fixincludes: configure-build-fixincludes + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(BUILD_EXPORTS) \ + (cd $(BUILD_SUBDIR)/fixincludes && \ + $(MAKE) $(TARGET-build-fixincludes)) +@endif build-fixincludes + + + + + # -------------------------------------- # Modules which run on the host machine # -------------------------------------- + .PHONY: configure-ash maybe-configure-ash maybe-configure-ash: @if ash maybe-configure-ash: configure-ash -configure-ash: - @test ! -f ash/Makefile || exit 0; \ - [ -d ash ] || mkdir ash; \ +configure-ash: + @test ! -f $(HOST_SUBDIR)/ash/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ash ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in ash; \ - cd ash || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/ash; \ + cd "$(HOST_SUBDIR)/ash" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/ash"; \ - libsrcdir="$$s/ash";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/ash"; \ - libsrcdir="$$s/ash";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/ash/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/ash"; \ + libsrcdir="$$s/ash"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif ash + + + + .PHONY: all-ash maybe-all-ash maybe-all-ash: @if ash +TARGET-ash=all maybe-all-ash: all-ash all-ash: configure-ash @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ash && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/ash && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ash)) @endif ash + + + .PHONY: check-ash maybe-check-ash maybe-check-ash: @if ash @@ -2576,9 +2651,9 @@ maybe-check-ash: check-ash check-ash: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ash && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/ash && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif ash @@ -2590,9 +2665,9 @@ maybe-install-ash: install-ash install-ash: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ash && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/ash && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif ash @@ -2608,13 +2683,12 @@ info-ash: \ @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2634,13 +2708,12 @@ dvi-ash: \ @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2650,6 +2723,31 @@ dvi-ash: \ @endif ash +.PHONY: maybe-html-ash html-ash +maybe-html-ash: +@if ash +maybe-html-ash: html-ash + +html-ash: \ + configure-ash + @[ -f ./ash/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 ash" ; \ + (cd $(HOST_SUBDIR)/ash && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif ash + .PHONY: maybe-TAGS-ash TAGS-ash maybe-TAGS-ash: @if ash @@ -2660,13 +2758,12 @@ TAGS-ash: \ @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2687,13 +2784,12 @@ install-info-ash: \ @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2713,13 +2809,12 @@ installcheck-ash: \ @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2738,13 +2833,12 @@ mostlyclean-ash: @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2763,13 +2857,12 @@ clean-ash: @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2788,13 +2881,12 @@ distclean-ash: @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2813,13 +2905,12 @@ maintainer-clean-ash: @[ -f ./ash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 ash" ; \ - (cd ash && \ + (cd $(HOST_SUBDIR)/ash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2830,46 +2921,51 @@ maintainer-clean-ash: @endif ash + .PHONY: configure-autoconf maybe-configure-autoconf maybe-configure-autoconf: @if autoconf maybe-configure-autoconf: configure-autoconf -configure-autoconf: - @test ! -f autoconf/Makefile || exit 0; \ - [ -d autoconf ] || mkdir autoconf; \ +configure-autoconf: + @test ! -f $(HOST_SUBDIR)/autoconf/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/autoconf ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in autoconf; \ - cd autoconf || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/autoconf; \ + cd "$(HOST_SUBDIR)/autoconf" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/autoconf"; \ - libsrcdir="$$s/autoconf";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/autoconf"; \ - libsrcdir="$$s/autoconf";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/autoconf/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/autoconf"; \ + libsrcdir="$$s/autoconf"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif autoconf + + + + .PHONY: all-autoconf maybe-all-autoconf maybe-all-autoconf: @if autoconf +TARGET-autoconf=all maybe-all-autoconf: all-autoconf all-autoconf: configure-autoconf @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/autoconf && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-autoconf)) @endif autoconf + + + .PHONY: check-autoconf maybe-check-autoconf maybe-check-autoconf: @if autoconf @@ -2878,9 +2974,9 @@ maybe-check-autoconf: check-autoconf check-autoconf: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/autoconf && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif autoconf @@ -2892,9 +2988,9 @@ maybe-install-autoconf: install-autoconf install-autoconf: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd autoconf && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/autoconf && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif autoconf @@ -2910,13 +3006,12 @@ info-autoconf: \ @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2936,13 +3031,12 @@ dvi-autoconf: \ @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2952,6 +3046,31 @@ dvi-autoconf: \ @endif autoconf +.PHONY: maybe-html-autoconf html-autoconf +maybe-html-autoconf: +@if autoconf +maybe-html-autoconf: html-autoconf + +html-autoconf: \ + configure-autoconf + @[ -f ./autoconf/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 autoconf" ; \ + (cd $(HOST_SUBDIR)/autoconf && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif autoconf + .PHONY: maybe-TAGS-autoconf TAGS-autoconf maybe-TAGS-autoconf: @if autoconf @@ -2962,13 +3081,12 @@ TAGS-autoconf: \ @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -2989,13 +3107,12 @@ install-info-autoconf: \ @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3015,13 +3132,12 @@ installcheck-autoconf: \ @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3040,13 +3156,12 @@ mostlyclean-autoconf: @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3065,13 +3180,12 @@ clean-autoconf: @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3090,13 +3204,12 @@ distclean-autoconf: @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3115,13 +3228,12 @@ maintainer-clean-autoconf: @[ -f ./autoconf/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 autoconf" ; \ - (cd autoconf && \ + (cd $(HOST_SUBDIR)/autoconf && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3132,46 +3244,51 @@ maintainer-clean-autoconf: @endif autoconf + .PHONY: configure-automake maybe-configure-automake maybe-configure-automake: @if automake maybe-configure-automake: configure-automake -configure-automake: - @test ! -f automake/Makefile || exit 0; \ - [ -d automake ] || mkdir automake; \ +configure-automake: + @test ! -f $(HOST_SUBDIR)/automake/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/automake ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in automake; \ - cd automake || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/automake; \ + cd "$(HOST_SUBDIR)/automake" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/automake"; \ - libsrcdir="$$s/automake";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/automake"; \ - libsrcdir="$$s/automake";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/automake/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/automake"; \ + libsrcdir="$$s/automake"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif automake + + + + .PHONY: all-automake maybe-all-automake maybe-all-automake: @if automake +TARGET-automake=all maybe-all-automake: all-automake all-automake: configure-automake @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd automake && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/automake && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-automake)) @endif automake + + + .PHONY: check-automake maybe-check-automake maybe-check-automake: @if automake @@ -3180,9 +3297,9 @@ maybe-check-automake: check-automake check-automake: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd automake && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/automake && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif automake @@ -3194,9 +3311,9 @@ maybe-install-automake: install-automake install-automake: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd automake && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/automake && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif automake @@ -3212,13 +3329,12 @@ info-automake: \ @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3238,13 +3354,12 @@ dvi-automake: \ @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3254,50 +3369,73 @@ dvi-automake: \ @endif automake -.PHONY: maybe-TAGS-automake TAGS-automake -maybe-TAGS-automake: +.PHONY: maybe-html-automake html-automake +maybe-html-automake: @if automake -maybe-TAGS-automake: TAGS-automake +maybe-html-automake: html-automake -TAGS-automake: \ +html-automake: \ configure-automake @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in automake" ; \ - (cd automake && \ + echo "Doing html in automake" ; \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ + html) \ || exit 1 @endif automake -.PHONY: maybe-install-info-automake install-info-automake -maybe-install-info-automake: +.PHONY: maybe-TAGS-automake TAGS-automake +maybe-TAGS-automake: @if automake -maybe-install-info-automake: install-info-automake +maybe-TAGS-automake: TAGS-automake -install-info-automake: \ - configure-automake \ - info-automake - @[ -f ./automake/Makefile ] || exit 0; \ +TAGS-automake: \ + configure-automake + @[ -f ./automake/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 automake" ; \ + (cd $(HOST_SUBDIR)/automake && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + TAGS) \ + || exit 1 + +@endif automake + +.PHONY: maybe-install-info-automake install-info-automake +maybe-install-info-automake: +@if automake +maybe-install-info-automake: install-info-automake + +install-info-automake: \ + configure-automake \ + info-automake + @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3317,13 +3455,12 @@ installcheck-automake: \ @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3342,13 +3479,12 @@ mostlyclean-automake: @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3367,13 +3503,12 @@ clean-automake: @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3392,13 +3527,12 @@ distclean-automake: @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3417,13 +3551,12 @@ maintainer-clean-automake: @[ -f ./automake/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 automake" ; \ - (cd automake && \ + (cd $(HOST_SUBDIR)/automake && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3434,46 +3567,51 @@ maintainer-clean-automake: @endif automake + .PHONY: configure-bash maybe-configure-bash maybe-configure-bash: @if bash maybe-configure-bash: configure-bash -configure-bash: - @test ! -f bash/Makefile || exit 0; \ - [ -d bash ] || mkdir bash; \ +configure-bash: + @test ! -f $(HOST_SUBDIR)/bash/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bash ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in bash; \ - cd bash || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/bash; \ + cd "$(HOST_SUBDIR)/bash" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/bash"; \ - libsrcdir="$$s/bash";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/bash"; \ - libsrcdir="$$s/bash";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/bash/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/bash"; \ + libsrcdir="$$s/bash"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bash + + + + .PHONY: all-bash maybe-all-bash maybe-all-bash: @if bash +TARGET-bash=all maybe-all-bash: all-bash all-bash: configure-bash @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bash && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/bash && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bash)) @endif bash + + + .PHONY: check-bash maybe-check-bash maybe-check-bash: @if bash @@ -3482,9 +3620,9 @@ maybe-check-bash: check-bash check-bash: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bash && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/bash && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif bash @@ -3496,9 +3634,9 @@ maybe-install-bash: install-bash install-bash: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bash && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/bash && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif bash @@ -3514,13 +3652,12 @@ info-bash: \ @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3540,13 +3677,12 @@ dvi-bash: \ @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3556,6 +3692,31 @@ dvi-bash: \ @endif bash +.PHONY: maybe-html-bash html-bash +maybe-html-bash: +@if bash +maybe-html-bash: html-bash + +html-bash: \ + configure-bash + @[ -f ./bash/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 bash" ; \ + (cd $(HOST_SUBDIR)/bash && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif bash + .PHONY: maybe-TAGS-bash TAGS-bash maybe-TAGS-bash: @if bash @@ -3566,13 +3727,12 @@ TAGS-bash: \ @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3593,13 +3753,12 @@ install-info-bash: \ @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3619,13 +3778,12 @@ installcheck-bash: \ @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3644,13 +3802,12 @@ mostlyclean-bash: @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3669,13 +3826,12 @@ clean-bash: @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3694,13 +3850,12 @@ distclean-bash: @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3719,13 +3874,12 @@ maintainer-clean-bash: @[ -f ./bash/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bash" ; \ - (cd bash && \ + (cd $(HOST_SUBDIR)/bash && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3736,46 +3890,378 @@ maintainer-clean-bash: @endif bash + .PHONY: configure-bfd maybe-configure-bfd maybe-configure-bfd: @if bfd maybe-configure-bfd: configure-bfd -configure-bfd: - @test ! -f bfd/Makefile || exit 0; \ - [ -d bfd ] || mkdir bfd; \ +configure-bfd: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in bfd; \ - cd bfd || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/bfd; \ + cd "$(HOST_SUBDIR)/bfd" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/bfd"; \ - libsrcdir="$$s/bfd";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/bfd"; \ - libsrcdir="$$s/bfd";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bfd + + +.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd +maybe-configure-stage1-bfd: +@if bfd-bootstrap +maybe-configure-stage1-bfd: configure-stage1-bfd +configure-stage1-bfd: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif bfd-bootstrap + +.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd +maybe-configure-stage2-bfd: +@if bfd-bootstrap +maybe-configure-stage2-bfd: configure-stage2-bfd +configure-stage2-bfd: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif bfd-bootstrap + +.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd +maybe-configure-stage3-bfd: +@if bfd-bootstrap +maybe-configure-stage3-bfd: configure-stage3-bfd +configure-stage3-bfd: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif bfd-bootstrap + +.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd +maybe-configure-stage4-bfd: +@if bfd-bootstrap +maybe-configure-stage4-bfd: configure-stage4-bfd +configure-stage4-bfd: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif bfd-bootstrap + +.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd +maybe-configure-stageprofile-bfd: +@if bfd-bootstrap +maybe-configure-stageprofile-bfd: configure-stageprofile-bfd +configure-stageprofile-bfd: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif bfd-bootstrap + +.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd +maybe-configure-stagefeedback-bfd: +@if bfd-bootstrap +maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd +configure-stagefeedback-bfd: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif bfd-bootstrap + + + + + .PHONY: all-bfd maybe-all-bfd maybe-all-bfd: @if bfd +TARGET-bfd=all maybe-all-bfd: all-bfd all-bfd: configure-bfd - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bfd)) @endif bfd + + +.PHONY: all-stage1-bfd maybe-all-stage1-bfd +.PHONY: clean-stage1-bfd maybe-clean-stage1-bfd +maybe-all-stage1-bfd: +maybe-clean-stage1-bfd: +@if bfd-bootstrap +maybe-all-stage1-bfd: all-stage1-bfd +all-stage1: all-stage1-bfd +all-stage1-bfd: configure-stage1-bfd + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-bfd: clean-stage1-bfd +clean-stage1: clean-stage1-bfd +clean-stage1-bfd: + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-bfd/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif bfd-bootstrap + + +.PHONY: all-stage2-bfd maybe-all-stage2-bfd +.PHONY: clean-stage2-bfd maybe-clean-stage2-bfd +maybe-all-stage2-bfd: +maybe-clean-stage2-bfd: +@if bfd-bootstrap +maybe-all-stage2-bfd: all-stage2-bfd +all-stage2: all-stage2-bfd +all-stage2-bfd: configure-stage2-bfd + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-bfd: clean-stage2-bfd +clean-stage2: clean-stage2-bfd +clean-stage2-bfd: + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-bfd/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + +.PHONY: all-stage3-bfd maybe-all-stage3-bfd +.PHONY: clean-stage3-bfd maybe-clean-stage3-bfd +maybe-all-stage3-bfd: +maybe-clean-stage3-bfd: +@if bfd-bootstrap +maybe-all-stage3-bfd: all-stage3-bfd +all-stage3: all-stage3-bfd +all-stage3-bfd: configure-stage3-bfd + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-bfd: clean-stage3-bfd +clean-stage3: clean-stage3-bfd +clean-stage3-bfd: + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-bfd/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + +.PHONY: all-stage4-bfd maybe-all-stage4-bfd +.PHONY: clean-stage4-bfd maybe-clean-stage4-bfd +maybe-all-stage4-bfd: +maybe-clean-stage4-bfd: +@if bfd-bootstrap +maybe-all-stage4-bfd: all-stage4-bfd +all-stage4: all-stage4-bfd +all-stage4-bfd: configure-stage4-bfd + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-bfd: clean-stage4-bfd +clean-stage4: clean-stage4-bfd +clean-stage4-bfd: + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-bfd/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif bfd-bootstrap + + +.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd +.PHONY: clean-stageprofile-bfd maybe-clean-stageprofile-bfd +maybe-all-stageprofile-bfd: +maybe-clean-stageprofile-bfd: +@if bfd-bootstrap +maybe-all-stageprofile-bfd: all-stageprofile-bfd +all-stageprofile: all-stageprofile-bfd +all-stageprofile-bfd: configure-stageprofile-bfd + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-bfd: clean-stageprofile-bfd +clean-stageprofile: clean-stageprofile-bfd +clean-stageprofile-bfd: + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-bfd/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif bfd-bootstrap + + +.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd +.PHONY: clean-stagefeedback-bfd maybe-clean-stagefeedback-bfd +maybe-all-stagefeedback-bfd: +maybe-clean-stagefeedback-bfd: +@if bfd-bootstrap +maybe-all-stagefeedback-bfd: all-stagefeedback-bfd +all-stagefeedback: all-stagefeedback-bfd +all-stagefeedback-bfd: configure-stagefeedback-bfd + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd +clean-stagefeedback: clean-stagefeedback-bfd +clean-stagefeedback-bfd: + @[ -f $(HOST_SUBDIR)/bfd/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-bfd/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/bfd/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif bfd-bootstrap + + + + + .PHONY: check-bfd maybe-check-bfd maybe-check-bfd: @if bfd @@ -3784,9 +4270,9 @@ maybe-check-bfd: check-bfd check-bfd: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bfd && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif bfd @@ -3798,9 +4284,9 @@ maybe-install-bfd: install-bfd install-bfd: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bfd && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif bfd @@ -3816,13 +4302,12 @@ info-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3842,13 +4327,12 @@ dvi-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3858,6 +4342,31 @@ dvi-bfd: \ @endif bfd +.PHONY: maybe-html-bfd html-bfd +maybe-html-bfd: +@if bfd +maybe-html-bfd: html-bfd + +html-bfd: \ + configure-bfd + @[ -f ./bfd/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 bfd" ; \ + (cd $(HOST_SUBDIR)/bfd && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif bfd + .PHONY: maybe-TAGS-bfd TAGS-bfd maybe-TAGS-bfd: @if bfd @@ -3868,13 +4377,12 @@ TAGS-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3895,13 +4403,12 @@ install-info-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3921,13 +4428,12 @@ installcheck-bfd: \ @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3946,13 +4452,12 @@ mostlyclean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3971,13 +4476,12 @@ clean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -3996,13 +4500,12 @@ distclean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4021,13 +4524,12 @@ maintainer-clean-bfd: @[ -f ./bfd/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bfd" ; \ - (cd bfd && \ + (cd $(HOST_SUBDIR)/bfd && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4038,46 +4540,378 @@ maintainer-clean-bfd: @endif bfd + .PHONY: configure-opcodes maybe-configure-opcodes maybe-configure-opcodes: @if opcodes maybe-configure-opcodes: configure-opcodes -configure-opcodes: - @test ! -f opcodes/Makefile || exit 0; \ - [ -d opcodes ] || mkdir opcodes; \ +configure-opcodes: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in opcodes; \ - cd opcodes || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/opcodes; \ + cd "$(HOST_SUBDIR)/opcodes" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/opcodes"; \ - libsrcdir="$$s/opcodes";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/opcodes"; \ - libsrcdir="$$s/opcodes";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif opcodes + + +.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes +maybe-configure-stage1-opcodes: +@if opcodes-bootstrap +maybe-configure-stage1-opcodes: configure-stage1-opcodes +configure-stage1-opcodes: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif opcodes-bootstrap + +.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes +maybe-configure-stage2-opcodes: +@if opcodes-bootstrap +maybe-configure-stage2-opcodes: configure-stage2-opcodes +configure-stage2-opcodes: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif opcodes-bootstrap + +.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes +maybe-configure-stage3-opcodes: +@if opcodes-bootstrap +maybe-configure-stage3-opcodes: configure-stage3-opcodes +configure-stage3-opcodes: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif opcodes-bootstrap + +.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes +maybe-configure-stage4-opcodes: +@if opcodes-bootstrap +maybe-configure-stage4-opcodes: configure-stage4-opcodes +configure-stage4-opcodes: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif opcodes-bootstrap + +.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes +maybe-configure-stageprofile-opcodes: +@if opcodes-bootstrap +maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes +configure-stageprofile-opcodes: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif opcodes-bootstrap + +.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes +maybe-configure-stagefeedback-opcodes: +@if opcodes-bootstrap +maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes +configure-stagefeedback-opcodes: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif opcodes-bootstrap + + + + + .PHONY: all-opcodes maybe-all-opcodes maybe-all-opcodes: @if opcodes +TARGET-opcodes=all maybe-all-opcodes: all-opcodes all-opcodes: configure-opcodes - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-opcodes)) @endif opcodes + + +.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes +.PHONY: clean-stage1-opcodes maybe-clean-stage1-opcodes +maybe-all-stage1-opcodes: +maybe-clean-stage1-opcodes: +@if opcodes-bootstrap +maybe-all-stage1-opcodes: all-stage1-opcodes +all-stage1: all-stage1-opcodes +all-stage1-opcodes: configure-stage1-opcodes + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-opcodes: clean-stage1-opcodes +clean-stage1: clean-stage1-opcodes +clean-stage1-opcodes: + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif opcodes-bootstrap + + +.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes +.PHONY: clean-stage2-opcodes maybe-clean-stage2-opcodes +maybe-all-stage2-opcodes: +maybe-clean-stage2-opcodes: +@if opcodes-bootstrap +maybe-all-stage2-opcodes: all-stage2-opcodes +all-stage2: all-stage2-opcodes +all-stage2-opcodes: configure-stage2-opcodes + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-opcodes: clean-stage2-opcodes +clean-stage2: clean-stage2-opcodes +clean-stage2-opcodes: + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + +.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes +.PHONY: clean-stage3-opcodes maybe-clean-stage3-opcodes +maybe-all-stage3-opcodes: +maybe-clean-stage3-opcodes: +@if opcodes-bootstrap +maybe-all-stage3-opcodes: all-stage3-opcodes +all-stage3: all-stage3-opcodes +all-stage3-opcodes: configure-stage3-opcodes + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-opcodes: clean-stage3-opcodes +clean-stage3: clean-stage3-opcodes +clean-stage3-opcodes: + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + +.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes +.PHONY: clean-stage4-opcodes maybe-clean-stage4-opcodes +maybe-all-stage4-opcodes: +maybe-clean-stage4-opcodes: +@if opcodes-bootstrap +maybe-all-stage4-opcodes: all-stage4-opcodes +all-stage4: all-stage4-opcodes +all-stage4-opcodes: configure-stage4-opcodes + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-opcodes: clean-stage4-opcodes +clean-stage4: clean-stage4-opcodes +clean-stage4-opcodes: + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif opcodes-bootstrap + + +.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes +.PHONY: clean-stageprofile-opcodes maybe-clean-stageprofile-opcodes +maybe-all-stageprofile-opcodes: +maybe-clean-stageprofile-opcodes: +@if opcodes-bootstrap +maybe-all-stageprofile-opcodes: all-stageprofile-opcodes +all-stageprofile: all-stageprofile-opcodes +all-stageprofile-opcodes: configure-stageprofile-opcodes + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes +clean-stageprofile: clean-stageprofile-opcodes +clean-stageprofile-opcodes: + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif opcodes-bootstrap + + +.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes +.PHONY: clean-stagefeedback-opcodes maybe-clean-stagefeedback-opcodes +maybe-all-stagefeedback-opcodes: +maybe-clean-stagefeedback-opcodes: +@if opcodes-bootstrap +maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes +all-stagefeedback: all-stagefeedback-opcodes +all-stagefeedback-opcodes: configure-stagefeedback-opcodes + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes +clean-stagefeedback: clean-stagefeedback-opcodes +clean-stagefeedback-opcodes: + @[ -f $(HOST_SUBDIR)/opcodes/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-opcodes/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/opcodes/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif opcodes-bootstrap + + + + + .PHONY: check-opcodes maybe-check-opcodes maybe-check-opcodes: @if opcodes @@ -4086,9 +4920,9 @@ maybe-check-opcodes: check-opcodes check-opcodes: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif opcodes @@ -4100,9 +4934,9 @@ maybe-install-opcodes: install-opcodes install-opcodes: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif opcodes @@ -4118,13 +4952,12 @@ info-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4144,13 +4977,12 @@ dvi-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4160,6 +4992,31 @@ dvi-opcodes: \ @endif opcodes +.PHONY: maybe-html-opcodes html-opcodes +maybe-html-opcodes: +@if opcodes +maybe-html-opcodes: html-opcodes + +html-opcodes: \ + configure-opcodes + @[ -f ./opcodes/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 opcodes" ; \ + (cd $(HOST_SUBDIR)/opcodes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif opcodes + .PHONY: maybe-TAGS-opcodes TAGS-opcodes maybe-TAGS-opcodes: @if opcodes @@ -4170,13 +5027,12 @@ TAGS-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4197,13 +5053,12 @@ install-info-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4223,13 +5078,12 @@ installcheck-opcodes: \ @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4248,13 +5102,12 @@ mostlyclean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4273,13 +5126,12 @@ clean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4298,13 +5150,12 @@ distclean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4323,13 +5174,12 @@ maintainer-clean-opcodes: @[ -f ./opcodes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 opcodes" ; \ - (cd opcodes && \ + (cd $(HOST_SUBDIR)/opcodes && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4340,46 +5190,378 @@ maintainer-clean-opcodes: @endif opcodes + .PHONY: configure-binutils maybe-configure-binutils maybe-configure-binutils: @if binutils maybe-configure-binutils: configure-binutils -configure-binutils: - @test ! -f binutils/Makefile || exit 0; \ - [ -d binutils ] || mkdir binutils; \ +configure-binutils: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in binutils; \ - cd binutils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/binutils; \ + cd "$(HOST_SUBDIR)/binutils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/binutils"; \ - libsrcdir="$$s/binutils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/binutils"; \ - libsrcdir="$$s/binutils";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif binutils -.PHONY: all-binutils maybe-all-binutils -maybe-all-binutils: -@if binutils -maybe-all-binutils: all-binutils -all-binutils: configure-binutils - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ + + +.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils +maybe-configure-stage1-binutils: +@if binutils-bootstrap +maybe-configure-stage1-binutils: configure-stage1-binutils +configure-stage1-binutils: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif binutils-bootstrap + +.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils +maybe-configure-stage2-binutils: +@if binutils-bootstrap +maybe-configure-stage2-binutils: configure-stage2-binutils +configure-stage2-binutils: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif binutils-bootstrap + +.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils +maybe-configure-stage3-binutils: +@if binutils-bootstrap +maybe-configure-stage3-binutils: configure-stage3-binutils +configure-stage3-binutils: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif binutils-bootstrap + +.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils +maybe-configure-stage4-binutils: +@if binutils-bootstrap +maybe-configure-stage4-binutils: configure-stage4-binutils +configure-stage4-binutils: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif binutils-bootstrap + +.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils +maybe-configure-stageprofile-binutils: +@if binutils-bootstrap +maybe-configure-stageprofile-binutils: configure-stageprofile-binutils +configure-stageprofile-binutils: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif binutils-bootstrap + +.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils +maybe-configure-stagefeedback-binutils: +@if binutils-bootstrap +maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils +configure-stagefeedback-binutils: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif binutils-bootstrap + + + + + +.PHONY: all-binutils maybe-all-binutils +maybe-all-binutils: +@if binutils +TARGET-binutils=all +maybe-all-binutils: all-binutils +all-binutils: configure-binutils + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-binutils)) @endif binutils + + +.PHONY: all-stage1-binutils maybe-all-stage1-binutils +.PHONY: clean-stage1-binutils maybe-clean-stage1-binutils +maybe-all-stage1-binutils: +maybe-clean-stage1-binutils: +@if binutils-bootstrap +maybe-all-stage1-binutils: all-stage1-binutils +all-stage1: all-stage1-binutils +all-stage1-binutils: configure-stage1-binutils + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-binutils: clean-stage1-binutils +clean-stage1: clean-stage1-binutils +clean-stage1-binutils: + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-binutils/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif binutils-bootstrap + + +.PHONY: all-stage2-binutils maybe-all-stage2-binutils +.PHONY: clean-stage2-binutils maybe-clean-stage2-binutils +maybe-all-stage2-binutils: +maybe-clean-stage2-binutils: +@if binutils-bootstrap +maybe-all-stage2-binutils: all-stage2-binutils +all-stage2: all-stage2-binutils +all-stage2-binutils: configure-stage2-binutils + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-binutils: clean-stage2-binutils +clean-stage2: clean-stage2-binutils +clean-stage2-binutils: + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-binutils/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + +.PHONY: all-stage3-binutils maybe-all-stage3-binutils +.PHONY: clean-stage3-binutils maybe-clean-stage3-binutils +maybe-all-stage3-binutils: +maybe-clean-stage3-binutils: +@if binutils-bootstrap +maybe-all-stage3-binutils: all-stage3-binutils +all-stage3: all-stage3-binutils +all-stage3-binutils: configure-stage3-binutils + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-binutils: clean-stage3-binutils +clean-stage3: clean-stage3-binutils +clean-stage3-binutils: + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-binutils/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + +.PHONY: all-stage4-binutils maybe-all-stage4-binutils +.PHONY: clean-stage4-binutils maybe-clean-stage4-binutils +maybe-all-stage4-binutils: +maybe-clean-stage4-binutils: +@if binutils-bootstrap +maybe-all-stage4-binutils: all-stage4-binutils +all-stage4: all-stage4-binutils +all-stage4-binutils: configure-stage4-binutils + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-binutils: clean-stage4-binutils +clean-stage4: clean-stage4-binutils +clean-stage4-binutils: + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-binutils/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif binutils-bootstrap + + +.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils +.PHONY: clean-stageprofile-binutils maybe-clean-stageprofile-binutils +maybe-all-stageprofile-binutils: +maybe-clean-stageprofile-binutils: +@if binutils-bootstrap +maybe-all-stageprofile-binutils: all-stageprofile-binutils +all-stageprofile: all-stageprofile-binutils +all-stageprofile-binutils: configure-stageprofile-binutils + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-binutils: clean-stageprofile-binutils +clean-stageprofile: clean-stageprofile-binutils +clean-stageprofile-binutils: + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-binutils/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif binutils-bootstrap + + +.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils +.PHONY: clean-stagefeedback-binutils maybe-clean-stagefeedback-binutils +maybe-all-stagefeedback-binutils: +maybe-clean-stagefeedback-binutils: +@if binutils-bootstrap +maybe-all-stagefeedback-binutils: all-stagefeedback-binutils +all-stagefeedback: all-stagefeedback-binutils +all-stagefeedback-binutils: configure-stagefeedback-binutils + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils +clean-stagefeedback: clean-stagefeedback-binutils +clean-stagefeedback-binutils: + @[ -f $(HOST_SUBDIR)/binutils/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-binutils/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/binutils/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif binutils-bootstrap + + + + + .PHONY: check-binutils maybe-check-binutils maybe-check-binutils: @if binutils @@ -4388,9 +5570,9 @@ maybe-check-binutils: check-binutils check-binutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd binutils && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif binutils @@ -4402,9 +5584,9 @@ maybe-install-binutils: install-binutils install-binutils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd binutils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif binutils @@ -4420,13 +5602,12 @@ info-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4446,13 +5627,12 @@ dvi-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4462,6 +5642,31 @@ dvi-binutils: \ @endif binutils +.PHONY: maybe-html-binutils html-binutils +maybe-html-binutils: +@if binutils +maybe-html-binutils: html-binutils + +html-binutils: \ + configure-binutils + @[ -f ./binutils/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 binutils" ; \ + (cd $(HOST_SUBDIR)/binutils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif binutils + .PHONY: maybe-TAGS-binutils TAGS-binutils maybe-TAGS-binutils: @if binutils @@ -4472,13 +5677,12 @@ TAGS-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4499,13 +5703,12 @@ install-info-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4525,13 +5728,12 @@ installcheck-binutils: \ @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4550,13 +5752,12 @@ mostlyclean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4575,13 +5776,12 @@ clean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4600,13 +5800,12 @@ distclean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4625,13 +5824,12 @@ maintainer-clean-binutils: @[ -f ./binutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 binutils" ; \ - (cd binutils && \ + (cd $(HOST_SUBDIR)/binutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4642,46 +5840,51 @@ maintainer-clean-binutils: @endif binutils + .PHONY: configure-bison maybe-configure-bison maybe-configure-bison: @if bison maybe-configure-bison: configure-bison -configure-bison: - @test ! -f bison/Makefile || exit 0; \ - [ -d bison ] || mkdir bison; \ +configure-bison: + @test ! -f $(HOST_SUBDIR)/bison/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in bison; \ - cd bison || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/bison; \ + cd "$(HOST_SUBDIR)/bison" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/bison"; \ - libsrcdir="$$s/bison";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/bison"; \ - libsrcdir="$$s/bison";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/bison/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/bison"; \ + libsrcdir="$$s/bison"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bison + + + + .PHONY: all-bison maybe-all-bison maybe-all-bison: @if bison +TARGET-bison=all maybe-all-bison: all-bison all-bison: configure-bison @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bison && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/bison && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bison)) @endif bison + + + .PHONY: check-bison maybe-check-bison maybe-check-bison: @if bison @@ -4692,9 +5895,9 @@ check-bison: @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bison && $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd $(HOST_SUBDIR)/bison && \ + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif bison @@ -4707,9 +5910,9 @@ maybe-install-bison: install-bison install-bison: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bison && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/bison && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif bison @@ -4725,13 +5928,12 @@ info-bison: \ @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4751,13 +5953,12 @@ dvi-bison: \ @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4767,6 +5968,31 @@ dvi-bison: \ @endif bison +.PHONY: maybe-html-bison html-bison +maybe-html-bison: +@if bison +maybe-html-bison: html-bison + +html-bison: \ + configure-bison + @[ -f ./bison/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 bison" ; \ + (cd $(HOST_SUBDIR)/bison && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif bison + .PHONY: maybe-TAGS-bison TAGS-bison maybe-TAGS-bison: @if bison @@ -4777,13 +6003,12 @@ TAGS-bison: \ @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4804,13 +6029,12 @@ install-info-bison: \ @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4830,13 +6054,12 @@ installcheck-bison: \ @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4855,13 +6078,12 @@ mostlyclean-bison: @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4880,13 +6102,12 @@ clean-bison: @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4905,13 +6126,12 @@ distclean-bison: @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4930,13 +6150,12 @@ maintainer-clean-bison: @[ -f ./bison/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bison" ; \ - (cd bison && \ + (cd $(HOST_SUBDIR)/bison && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -4947,46 +6166,51 @@ maintainer-clean-bison: @endif bison + .PHONY: configure-byacc maybe-configure-byacc maybe-configure-byacc: @if byacc maybe-configure-byacc: configure-byacc -configure-byacc: - @test ! -f byacc/Makefile || exit 0; \ - [ -d byacc ] || mkdir byacc; \ +configure-byacc: + @test ! -f $(HOST_SUBDIR)/byacc/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/byacc ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in byacc; \ - cd byacc || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/byacc; \ + cd "$(HOST_SUBDIR)/byacc" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/byacc"; \ - libsrcdir="$$s/byacc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/byacc"; \ - libsrcdir="$$s/byacc";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/byacc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/byacc"; \ + libsrcdir="$$s/byacc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif byacc + + + + .PHONY: all-byacc maybe-all-byacc maybe-all-byacc: @if byacc +TARGET-byacc=all maybe-all-byacc: all-byacc all-byacc: configure-byacc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd byacc && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/byacc && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-byacc)) @endif byacc + + + .PHONY: check-byacc maybe-check-byacc maybe-check-byacc: @if byacc @@ -4997,9 +6221,9 @@ check-byacc: @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd byacc && $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd $(HOST_SUBDIR)/byacc && \ + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif byacc @@ -5012,9 +6236,9 @@ maybe-install-byacc: install-byacc install-byacc: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd byacc && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/byacc && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif byacc @@ -5030,13 +6254,12 @@ info-byacc: \ @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5056,13 +6279,12 @@ dvi-byacc: \ @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5072,6 +6294,31 @@ dvi-byacc: \ @endif byacc +.PHONY: maybe-html-byacc html-byacc +maybe-html-byacc: +@if byacc +maybe-html-byacc: html-byacc + +html-byacc: \ + configure-byacc + @[ -f ./byacc/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 byacc" ; \ + (cd $(HOST_SUBDIR)/byacc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif byacc + .PHONY: maybe-TAGS-byacc TAGS-byacc maybe-TAGS-byacc: @if byacc @@ -5082,13 +6329,12 @@ TAGS-byacc: \ @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5109,13 +6355,12 @@ install-info-byacc: \ @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5135,13 +6380,12 @@ installcheck-byacc: \ @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5160,13 +6404,12 @@ mostlyclean-byacc: @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5185,13 +6428,12 @@ clean-byacc: @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5210,13 +6452,12 @@ distclean-byacc: @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5235,13 +6476,12 @@ maintainer-clean-byacc: @[ -f ./byacc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 byacc" ; \ - (cd byacc && \ + (cd $(HOST_SUBDIR)/byacc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5252,46 +6492,51 @@ maintainer-clean-byacc: @endif byacc + .PHONY: configure-bzip2 maybe-configure-bzip2 maybe-configure-bzip2: @if bzip2 maybe-configure-bzip2: configure-bzip2 -configure-bzip2: - @test ! -f bzip2/Makefile || exit 0; \ - [ -d bzip2 ] || mkdir bzip2; \ +configure-bzip2: + @test ! -f $(HOST_SUBDIR)/bzip2/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bzip2 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in bzip2; \ - cd bzip2 || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/bzip2; \ + cd "$(HOST_SUBDIR)/bzip2" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/bzip2"; \ - libsrcdir="$$s/bzip2";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/bzip2"; \ - libsrcdir="$$s/bzip2";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/bzip2/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/bzip2"; \ + libsrcdir="$$s/bzip2"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif bzip2 + + + + .PHONY: all-bzip2 maybe-all-bzip2 maybe-all-bzip2: @if bzip2 +TARGET-bzip2=all maybe-all-bzip2: all-bzip2 all-bzip2: configure-bzip2 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/bzip2 && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-bzip2)) @endif bzip2 + + + .PHONY: check-bzip2 maybe-check-bzip2 maybe-check-bzip2: @if bzip2 @@ -5300,9 +6545,9 @@ maybe-check-bzip2: check-bzip2 check-bzip2: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/bzip2 && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif bzip2 @@ -5314,9 +6559,9 @@ maybe-install-bzip2: install-bzip2 install-bzip2: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bzip2 && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/bzip2 && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif bzip2 @@ -5332,13 +6577,12 @@ info-bzip2: \ @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5358,13 +6602,12 @@ dvi-bzip2: \ @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5374,6 +6617,31 @@ dvi-bzip2: \ @endif bzip2 +.PHONY: maybe-html-bzip2 html-bzip2 +maybe-html-bzip2: +@if bzip2 +maybe-html-bzip2: html-bzip2 + +html-bzip2: \ + configure-bzip2 + @[ -f ./bzip2/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 bzip2" ; \ + (cd $(HOST_SUBDIR)/bzip2 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif bzip2 + .PHONY: maybe-TAGS-bzip2 TAGS-bzip2 maybe-TAGS-bzip2: @if bzip2 @@ -5384,13 +6652,12 @@ TAGS-bzip2: \ @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5411,13 +6678,12 @@ install-info-bzip2: \ @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5437,13 +6703,12 @@ installcheck-bzip2: \ @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5462,13 +6727,12 @@ mostlyclean-bzip2: @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5487,13 +6751,12 @@ clean-bzip2: @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5512,13 +6775,12 @@ distclean-bzip2: @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5537,13 +6799,12 @@ maintainer-clean-bzip2: @[ -f ./bzip2/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 bzip2" ; \ - (cd bzip2 && \ + (cd $(HOST_SUBDIR)/bzip2 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5554,46 +6815,51 @@ maintainer-clean-bzip2: @endif bzip2 + .PHONY: configure-dejagnu maybe-configure-dejagnu maybe-configure-dejagnu: @if dejagnu maybe-configure-dejagnu: configure-dejagnu -configure-dejagnu: - @test ! -f dejagnu/Makefile || exit 0; \ - [ -d dejagnu ] || mkdir dejagnu; \ +configure-dejagnu: + @test ! -f $(HOST_SUBDIR)/dejagnu/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in dejagnu; \ - cd dejagnu || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/dejagnu; \ + cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/dejagnu"; \ - libsrcdir="$$s/dejagnu";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/dejagnu"; \ - libsrcdir="$$s/dejagnu";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/dejagnu/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/dejagnu"; \ + libsrcdir="$$s/dejagnu"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif dejagnu + + + + .PHONY: all-dejagnu maybe-all-dejagnu maybe-all-dejagnu: @if dejagnu +TARGET-dejagnu=all maybe-all-dejagnu: all-dejagnu all-dejagnu: configure-dejagnu @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/dejagnu && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dejagnu)) @endif dejagnu + + + .PHONY: check-dejagnu maybe-check-dejagnu maybe-check-dejagnu: @if dejagnu @@ -5602,9 +6868,9 @@ maybe-check-dejagnu: check-dejagnu check-dejagnu: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/dejagnu && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif dejagnu @@ -5616,9 +6882,9 @@ maybe-install-dejagnu: install-dejagnu install-dejagnu: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd dejagnu && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/dejagnu && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif dejagnu @@ -5634,13 +6900,12 @@ info-dejagnu: \ @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5660,13 +6925,12 @@ dvi-dejagnu: \ @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5676,6 +6940,31 @@ dvi-dejagnu: \ @endif dejagnu +.PHONY: maybe-html-dejagnu html-dejagnu +maybe-html-dejagnu: +@if dejagnu +maybe-html-dejagnu: html-dejagnu + +html-dejagnu: \ + configure-dejagnu + @[ -f ./dejagnu/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 dejagnu" ; \ + (cd $(HOST_SUBDIR)/dejagnu && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif dejagnu + .PHONY: maybe-TAGS-dejagnu TAGS-dejagnu maybe-TAGS-dejagnu: @if dejagnu @@ -5686,13 +6975,12 @@ TAGS-dejagnu: \ @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5713,13 +7001,12 @@ install-info-dejagnu: \ @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5739,13 +7026,12 @@ installcheck-dejagnu: \ @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5764,13 +7050,12 @@ mostlyclean-dejagnu: @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5789,13 +7074,12 @@ clean-dejagnu: @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5814,13 +7098,12 @@ distclean-dejagnu: @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5839,13 +7122,12 @@ maintainer-clean-dejagnu: @[ -f ./dejagnu/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 dejagnu" ; \ - (cd dejagnu && \ + (cd $(HOST_SUBDIR)/dejagnu && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5856,46 +7138,51 @@ maintainer-clean-dejagnu: @endif dejagnu + .PHONY: configure-diff maybe-configure-diff maybe-configure-diff: @if diff maybe-configure-diff: configure-diff -configure-diff: - @test ! -f diff/Makefile || exit 0; \ - [ -d diff ] || mkdir diff; \ +configure-diff: + @test ! -f $(HOST_SUBDIR)/diff/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/diff ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in diff; \ - cd diff || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/diff; \ + cd "$(HOST_SUBDIR)/diff" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/diff"; \ - libsrcdir="$$s/diff";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/diff"; \ - libsrcdir="$$s/diff";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/diff/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/diff"; \ + libsrcdir="$$s/diff"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif diff + + + + .PHONY: all-diff maybe-all-diff maybe-all-diff: @if diff +TARGET-diff=all maybe-all-diff: all-diff all-diff: configure-diff @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd diff && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/diff && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-diff)) @endif diff + + + .PHONY: check-diff maybe-check-diff maybe-check-diff: @if diff @@ -5904,9 +7191,9 @@ maybe-check-diff: check-diff check-diff: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd diff && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/diff && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif diff @@ -5918,9 +7205,9 @@ maybe-install-diff: install-diff install-diff: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd diff && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/diff && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif diff @@ -5936,13 +7223,12 @@ info-diff: \ @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5962,13 +7248,12 @@ dvi-diff: \ @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -5978,6 +7263,31 @@ dvi-diff: \ @endif diff +.PHONY: maybe-html-diff html-diff +maybe-html-diff: +@if diff +maybe-html-diff: html-diff + +html-diff: \ + configure-diff + @[ -f ./diff/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 diff" ; \ + (cd $(HOST_SUBDIR)/diff && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif diff + .PHONY: maybe-TAGS-diff TAGS-diff maybe-TAGS-diff: @if diff @@ -5988,13 +7298,12 @@ TAGS-diff: \ @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6015,13 +7324,12 @@ install-info-diff: \ @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6041,13 +7349,12 @@ installcheck-diff: \ @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6066,13 +7373,12 @@ mostlyclean-diff: @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6091,13 +7397,12 @@ clean-diff: @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6116,13 +7421,12 @@ distclean-diff: @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6141,13 +7445,12 @@ maintainer-clean-diff: @[ -f ./diff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 diff" ; \ - (cd diff && \ + (cd $(HOST_SUBDIR)/diff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6158,46 +7461,51 @@ maintainer-clean-diff: @endif diff + .PHONY: configure-dosutils maybe-configure-dosutils maybe-configure-dosutils: @if dosutils maybe-configure-dosutils: configure-dosutils -configure-dosutils: - @test ! -f dosutils/Makefile || exit 0; \ - [ -d dosutils ] || mkdir dosutils; \ +configure-dosutils: + @test ! -f $(HOST_SUBDIR)/dosutils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dosutils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in dosutils; \ - cd dosutils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/dosutils; \ + cd "$(HOST_SUBDIR)/dosutils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/dosutils"; \ - libsrcdir="$$s/dosutils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/dosutils"; \ - libsrcdir="$$s/dosutils";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/dosutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/dosutils"; \ + libsrcdir="$$s/dosutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif dosutils + + + + .PHONY: all-dosutils maybe-all-dosutils maybe-all-dosutils: @if dosutils +TARGET-dosutils=all maybe-all-dosutils: all-dosutils all-dosutils: configure-dosutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/dosutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-dosutils)) @endif dosutils + + + .PHONY: check-dosutils maybe-check-dosutils maybe-check-dosutils: @if dosutils @@ -6215,9 +7523,9 @@ maybe-install-dosutils: install-dosutils install-dosutils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd dosutils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/dosutils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif dosutils @@ -6233,13 +7541,12 @@ info-dosutils: \ @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6259,13 +7566,12 @@ dvi-dosutils: \ @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6275,50 +7581,73 @@ dvi-dosutils: \ @endif dosutils -.PHONY: maybe-TAGS-dosutils TAGS-dosutils -maybe-TAGS-dosutils: +.PHONY: maybe-html-dosutils html-dosutils +maybe-html-dosutils: @if dosutils -maybe-TAGS-dosutils: TAGS-dosutils +maybe-html-dosutils: html-dosutils -TAGS-dosutils: \ +html-dosutils: \ configure-dosutils @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in dosutils" ; \ - (cd dosutils && \ + echo "Doing html in dosutils" ; \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ + html) \ || exit 1 @endif dosutils -.PHONY: maybe-install-info-dosutils install-info-dosutils -maybe-install-info-dosutils: +.PHONY: maybe-TAGS-dosutils TAGS-dosutils +maybe-TAGS-dosutils: @if dosutils -maybe-install-info-dosutils: install-info-dosutils +maybe-TAGS-dosutils: TAGS-dosutils -install-info-dosutils: \ - configure-dosutils \ - info-dosutils +TAGS-dosutils: \ + configure-dosutils + @[ -f ./dosutils/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 dosutils" ; \ + (cd $(HOST_SUBDIR)/dosutils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + TAGS) \ + || exit 1 + +@endif dosutils + +.PHONY: maybe-install-info-dosutils install-info-dosutils +maybe-install-info-dosutils: +@if dosutils +maybe-install-info-dosutils: install-info-dosutils + +install-info-dosutils: \ + configure-dosutils \ + info-dosutils @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6338,13 +7667,12 @@ installcheck-dosutils: \ @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6363,13 +7691,12 @@ mostlyclean-dosutils: @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6388,13 +7715,12 @@ clean-dosutils: @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6413,13 +7739,12 @@ distclean-dosutils: @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6438,13 +7763,12 @@ maintainer-clean-dosutils: @[ -f ./dosutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 dosutils" ; \ - (cd dosutils && \ + (cd $(HOST_SUBDIR)/dosutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6455,46 +7779,51 @@ maintainer-clean-dosutils: @endif dosutils + .PHONY: configure-etc maybe-configure-etc maybe-configure-etc: @if etc maybe-configure-etc: configure-etc -configure-etc: - @test ! -f etc/Makefile || exit 0; \ - [ -d etc ] || mkdir etc; \ +configure-etc: + @test ! -f $(HOST_SUBDIR)/etc/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in etc; \ - cd etc || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/etc; \ + cd "$(HOST_SUBDIR)/etc" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/etc"; \ - libsrcdir="$$s/etc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/etc"; \ - libsrcdir="$$s/etc";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/etc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/etc"; \ + libsrcdir="$$s/etc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif etc + + + + .PHONY: all-etc maybe-all-etc maybe-all-etc: @if etc +TARGET-etc=all maybe-all-etc: all-etc all-etc: configure-etc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd etc && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/etc && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-etc)) @endif etc + + + .PHONY: check-etc maybe-check-etc maybe-check-etc: @if etc @@ -6503,9 +7832,9 @@ maybe-check-etc: check-etc check-etc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd etc && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/etc && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif etc @@ -6517,9 +7846,9 @@ maybe-install-etc: install-etc install-etc: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd etc && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/etc && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif etc @@ -6535,13 +7864,12 @@ info-etc: \ @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6561,13 +7889,12 @@ dvi-etc: \ @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6577,6 +7904,31 @@ dvi-etc: \ @endif etc +.PHONY: maybe-html-etc html-etc +maybe-html-etc: +@if etc +maybe-html-etc: html-etc + +html-etc: \ + configure-etc + @[ -f ./etc/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 etc" ; \ + (cd $(HOST_SUBDIR)/etc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif etc + .PHONY: maybe-TAGS-etc TAGS-etc maybe-TAGS-etc: @if etc @@ -6587,13 +7939,12 @@ TAGS-etc: \ @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6614,13 +7965,12 @@ install-info-etc: \ @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6640,13 +7990,12 @@ installcheck-etc: \ @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6665,13 +8014,12 @@ mostlyclean-etc: @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6690,13 +8038,12 @@ clean-etc: @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6715,13 +8062,12 @@ distclean-etc: @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6740,13 +8086,12 @@ maintainer-clean-etc: @[ -f ./etc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 etc" ; \ - (cd etc && \ + (cd $(HOST_SUBDIR)/etc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6757,46 +8102,51 @@ maintainer-clean-etc: @endif etc + .PHONY: configure-fastjar maybe-configure-fastjar maybe-configure-fastjar: @if fastjar maybe-configure-fastjar: configure-fastjar -configure-fastjar: - @test ! -f fastjar/Makefile || exit 0; \ - [ -d fastjar ] || mkdir fastjar; \ +configure-fastjar: + @test ! -f $(HOST_SUBDIR)/fastjar/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in fastjar; \ - cd fastjar || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/fastjar; \ + cd "$(HOST_SUBDIR)/fastjar" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/fastjar"; \ - libsrcdir="$$s/fastjar";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/fastjar"; \ - libsrcdir="$$s/fastjar";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fastjar/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/fastjar"; \ + libsrcdir="$$s/fastjar"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif fastjar + + + + .PHONY: all-fastjar maybe-all-fastjar maybe-all-fastjar: @if fastjar +TARGET-fastjar=all maybe-all-fastjar: all-fastjar all-fastjar: configure-fastjar @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/fastjar && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fastjar)) @endif fastjar + + + .PHONY: check-fastjar maybe-check-fastjar maybe-check-fastjar: @if fastjar @@ -6807,9 +8157,9 @@ check-fastjar: @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd $(HOST_SUBDIR)/fastjar && \ + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif fastjar @@ -6822,9 +8172,9 @@ maybe-install-fastjar: install-fastjar install-fastjar: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd fastjar && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/fastjar && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif fastjar @@ -6840,13 +8190,12 @@ info-fastjar: \ @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6866,13 +8215,12 @@ dvi-fastjar: \ @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6882,6 +8230,31 @@ dvi-fastjar: \ @endif fastjar +.PHONY: maybe-html-fastjar html-fastjar +maybe-html-fastjar: +@if fastjar +maybe-html-fastjar: html-fastjar + +html-fastjar: \ + configure-fastjar + @[ -f ./fastjar/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 fastjar" ; \ + (cd $(HOST_SUBDIR)/fastjar && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif fastjar + .PHONY: maybe-TAGS-fastjar TAGS-fastjar maybe-TAGS-fastjar: @if fastjar @@ -6892,13 +8265,12 @@ TAGS-fastjar: \ @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6919,13 +8291,12 @@ install-info-fastjar: \ @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6945,13 +8316,12 @@ installcheck-fastjar: \ @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6970,13 +8340,12 @@ mostlyclean-fastjar: @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -6995,13 +8364,12 @@ clean-fastjar: @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7020,13 +8388,12 @@ distclean-fastjar: @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7045,13 +8412,12 @@ maintainer-clean-fastjar: @[ -f ./fastjar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 fastjar" ; \ - (cd fastjar && \ + (cd $(HOST_SUBDIR)/fastjar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7062,46 +8428,51 @@ maintainer-clean-fastjar: @endif fastjar + .PHONY: configure-fileutils maybe-configure-fileutils maybe-configure-fileutils: @if fileutils maybe-configure-fileutils: configure-fileutils -configure-fileutils: - @test ! -f fileutils/Makefile || exit 0; \ - [ -d fileutils ] || mkdir fileutils; \ +configure-fileutils: + @test ! -f $(HOST_SUBDIR)/fileutils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fileutils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in fileutils; \ - cd fileutils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/fileutils; \ + cd "$(HOST_SUBDIR)/fileutils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/fileutils"; \ - libsrcdir="$$s/fileutils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/fileutils"; \ - libsrcdir="$$s/fileutils";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fileutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/fileutils"; \ + libsrcdir="$$s/fileutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif fileutils + + + + .PHONY: all-fileutils maybe-all-fileutils maybe-all-fileutils: @if fileutils +TARGET-fileutils=all maybe-all-fileutils: all-fileutils all-fileutils: configure-fileutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/fileutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fileutils)) @endif fileutils + + + .PHONY: check-fileutils maybe-check-fileutils maybe-check-fileutils: @if fileutils @@ -7110,9 +8481,9 @@ maybe-check-fileutils: check-fileutils check-fileutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/fileutils && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif fileutils @@ -7124,9 +8495,9 @@ maybe-install-fileutils: install-fileutils install-fileutils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd fileutils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/fileutils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif fileutils @@ -7142,13 +8513,12 @@ info-fileutils: \ @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7168,13 +8538,12 @@ dvi-fileutils: \ @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7184,6 +8553,31 @@ dvi-fileutils: \ @endif fileutils +.PHONY: maybe-html-fileutils html-fileutils +maybe-html-fileutils: +@if fileutils +maybe-html-fileutils: html-fileutils + +html-fileutils: \ + configure-fileutils + @[ -f ./fileutils/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 fileutils" ; \ + (cd $(HOST_SUBDIR)/fileutils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif fileutils + .PHONY: maybe-TAGS-fileutils TAGS-fileutils maybe-TAGS-fileutils: @if fileutils @@ -7194,13 +8588,12 @@ TAGS-fileutils: \ @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7221,13 +8614,12 @@ install-info-fileutils: \ @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7247,13 +8639,12 @@ installcheck-fileutils: \ @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7272,13 +8663,12 @@ mostlyclean-fileutils: @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7297,13 +8687,12 @@ clean-fileutils: @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7322,13 +8711,12 @@ distclean-fileutils: @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7347,13 +8735,12 @@ maintainer-clean-fileutils: @[ -f ./fileutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 fileutils" ; \ - (cd fileutils && \ + (cd $(HOST_SUBDIR)/fileutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7364,46 +8751,51 @@ maintainer-clean-fileutils: @endif fileutils + .PHONY: configure-findutils maybe-configure-findutils maybe-configure-findutils: @if findutils maybe-configure-findutils: configure-findutils -configure-findutils: - @test ! -f findutils/Makefile || exit 0; \ - [ -d findutils ] || mkdir findutils; \ +configure-findutils: + @test ! -f $(HOST_SUBDIR)/findutils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/findutils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in findutils; \ - cd findutils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/findutils; \ + cd "$(HOST_SUBDIR)/findutils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/findutils"; \ - libsrcdir="$$s/findutils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/findutils"; \ - libsrcdir="$$s/findutils";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/findutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/findutils"; \ + libsrcdir="$$s/findutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif findutils + + + + .PHONY: all-findutils maybe-all-findutils maybe-all-findutils: @if findutils +TARGET-findutils=all maybe-all-findutils: all-findutils all-findutils: configure-findutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd findutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/findutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-findutils)) @endif findutils + + + .PHONY: check-findutils maybe-check-findutils maybe-check-findutils: @if findutils @@ -7412,9 +8804,9 @@ maybe-check-findutils: check-findutils check-findutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd findutils && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/findutils && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif findutils @@ -7426,9 +8818,9 @@ maybe-install-findutils: install-findutils install-findutils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd findutils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/findutils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif findutils @@ -7444,13 +8836,12 @@ info-findutils: \ @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7470,13 +8861,12 @@ dvi-findutils: \ @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7486,6 +8876,31 @@ dvi-findutils: \ @endif findutils +.PHONY: maybe-html-findutils html-findutils +maybe-html-findutils: +@if findutils +maybe-html-findutils: html-findutils + +html-findutils: \ + configure-findutils + @[ -f ./findutils/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 findutils" ; \ + (cd $(HOST_SUBDIR)/findutils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif findutils + .PHONY: maybe-TAGS-findutils TAGS-findutils maybe-TAGS-findutils: @if findutils @@ -7496,13 +8911,12 @@ TAGS-findutils: \ @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7523,13 +8937,12 @@ install-info-findutils: \ @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7549,13 +8962,12 @@ installcheck-findutils: \ @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7574,13 +8986,12 @@ mostlyclean-findutils: @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7599,13 +9010,12 @@ clean-findutils: @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7624,13 +9034,12 @@ distclean-findutils: @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7649,13 +9058,12 @@ maintainer-clean-findutils: @[ -f ./findutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 findutils" ; \ - (cd findutils && \ + (cd $(HOST_SUBDIR)/findutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7666,46 +9074,51 @@ maintainer-clean-findutils: @endif findutils + .PHONY: configure-find maybe-configure-find maybe-configure-find: @if find maybe-configure-find: configure-find -configure-find: - @test ! -f find/Makefile || exit 0; \ - [ -d find ] || mkdir find; \ +configure-find: + @test ! -f $(HOST_SUBDIR)/find/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/find ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in find; \ - cd find || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/find; \ + cd "$(HOST_SUBDIR)/find" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/find"; \ - libsrcdir="$$s/find";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/find"; \ - libsrcdir="$$s/find";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/find/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/find"; \ + libsrcdir="$$s/find"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif find + + + + .PHONY: all-find maybe-all-find maybe-all-find: @if find +TARGET-find=all maybe-all-find: all-find all-find: configure-find @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd find && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/find && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-find)) @endif find + + + .PHONY: check-find maybe-check-find maybe-check-find: @if find @@ -7714,9 +9127,9 @@ maybe-check-find: check-find check-find: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd find && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/find && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif find @@ -7728,9 +9141,9 @@ maybe-install-find: install-find install-find: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd find && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/find && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif find @@ -7746,13 +9159,12 @@ info-find: \ @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7772,13 +9184,12 @@ dvi-find: \ @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7788,6 +9199,31 @@ dvi-find: \ @endif find +.PHONY: maybe-html-find html-find +maybe-html-find: +@if find +maybe-html-find: html-find + +html-find: \ + configure-find + @[ -f ./find/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 find" ; \ + (cd $(HOST_SUBDIR)/find && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif find + .PHONY: maybe-TAGS-find TAGS-find maybe-TAGS-find: @if find @@ -7798,13 +9234,12 @@ TAGS-find: \ @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7825,13 +9260,12 @@ install-info-find: \ @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7851,13 +9285,12 @@ installcheck-find: \ @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7876,13 +9309,12 @@ mostlyclean-find: @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7901,13 +9333,12 @@ clean-find: @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7926,13 +9357,12 @@ distclean-find: @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7951,13 +9381,12 @@ maintainer-clean-find: @[ -f ./find/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 find" ; \ - (cd find && \ + (cd $(HOST_SUBDIR)/find && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -7968,186 +9397,459 @@ maintainer-clean-find: @endif find -.PHONY: configure-flex maybe-configure-flex -maybe-configure-flex: -@if flex -maybe-configure-flex: configure-flex -configure-flex: - @test ! -f flex/Makefile || exit 0; \ - [ -d flex ] || mkdir flex; \ + +.PHONY: configure-fixincludes maybe-configure-fixincludes +maybe-configure-fixincludes: +@if fixincludes +maybe-configure-fixincludes: configure-fixincludes +configure-fixincludes: + @test ! -f $(HOST_SUBDIR)/fixincludes/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in flex; \ - cd flex || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/fixincludes; \ + cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/flex"; \ - libsrcdir="$$s/flex";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/flex"; \ - libsrcdir="$$s/flex";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/fixincludes/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/fixincludes"; \ + libsrcdir="$$s/fixincludes"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 -@endif flex +@endif fixincludes -.PHONY: all-flex maybe-all-flex -maybe-all-flex: -@if flex -maybe-all-flex: all-flex -all-flex: configure-flex + + + + +.PHONY: all-fixincludes maybe-all-fixincludes +maybe-all-fixincludes: +@if fixincludes +TARGET-fixincludes=all +maybe-all-fixincludes: all-fixincludes +all-fixincludes: configure-fixincludes @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd flex && $(MAKE) $(FLAGS_TO_PASS) all) -@endif flex + (cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-fixincludes)) +@endif fixincludes -.PHONY: check-flex maybe-check-flex -maybe-check-flex: -@if flex -maybe-check-flex: check-flex -# This module is only tested in a native toolchain. -check-flex: - @if [ '$(host)' = '$(target)' ] ; then \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd flex && $(MAKE) $(FLAGS_TO_PASS) check); \ - fi -@endif flex -.PHONY: install-flex maybe-install-flex -maybe-install-flex: -@if flex -maybe-install-flex: install-flex +.PHONY: check-fixincludes maybe-check-fixincludes +maybe-check-fixincludes: +@if fixincludes +maybe-check-fixincludes: check-fixincludes -install-flex: installdirs +check-fixincludes: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd flex && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(FLAGS_TO_PASS) check) -@endif flex +@endif fixincludes + +.PHONY: install-fixincludes maybe-install-fixincludes +maybe-install-fixincludes: +@if fixincludes +maybe-install-fixincludes: install-fixincludes + +install-fixincludes: installdirs + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif fixincludes # Other targets (info, dvi, etc.) -.PHONY: maybe-info-flex info-flex -maybe-info-flex: -@if flex -maybe-info-flex: info-flex +.PHONY: maybe-info-fixincludes info-fixincludes +maybe-info-fixincludes: +@if fixincludes +maybe-info-fixincludes: info-fixincludes -info-flex: \ - configure-flex - @[ -f ./flex/Makefile ] || exit 0; \ +# fixincludes doesn't support info. +info-fixincludes: + +@endif fixincludes + +.PHONY: maybe-dvi-fixincludes dvi-fixincludes +maybe-dvi-fixincludes: +@if fixincludes +maybe-dvi-fixincludes: dvi-fixincludes + +# fixincludes doesn't support dvi. +dvi-fixincludes: + +@endif fixincludes + +.PHONY: maybe-html-fixincludes html-fixincludes +maybe-html-fixincludes: +@if fixincludes +maybe-html-fixincludes: html-fixincludes + +html-fixincludes: \ + configure-fixincludes + @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in flex" ; \ - (cd flex && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ + html) \ || exit 1 -@endif flex +@endif fixincludes -.PHONY: maybe-dvi-flex dvi-flex -maybe-dvi-flex: -@if flex -maybe-dvi-flex: dvi-flex +.PHONY: maybe-TAGS-fixincludes TAGS-fixincludes +maybe-TAGS-fixincludes: +@if fixincludes +maybe-TAGS-fixincludes: TAGS-fixincludes -dvi-flex: \ - configure-flex - @[ -f ./flex/Makefile ] || exit 0; \ +# fixincludes doesn't support TAGS. +TAGS-fixincludes: + +@endif fixincludes + +.PHONY: maybe-install-info-fixincludes install-info-fixincludes +maybe-install-info-fixincludes: +@if fixincludes +maybe-install-info-fixincludes: install-info-fixincludes + +# fixincludes doesn't support install-info. +install-info-fixincludes: + +@endif fixincludes + +.PHONY: maybe-installcheck-fixincludes installcheck-fixincludes +maybe-installcheck-fixincludes: +@if fixincludes +maybe-installcheck-fixincludes: installcheck-fixincludes + +# fixincludes doesn't support installcheck. +installcheck-fixincludes: + +@endif fixincludes + +.PHONY: maybe-mostlyclean-fixincludes mostlyclean-fixincludes +maybe-mostlyclean-fixincludes: +@if fixincludes +maybe-mostlyclean-fixincludes: mostlyclean-fixincludes + +mostlyclean-fixincludes: + @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in flex" ; \ - (cd flex && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + mostlyclean) \ || exit 1 -@endif flex +@endif fixincludes -.PHONY: maybe-TAGS-flex TAGS-flex -maybe-TAGS-flex: -@if flex -maybe-TAGS-flex: TAGS-flex +.PHONY: maybe-clean-fixincludes clean-fixincludes +maybe-clean-fixincludes: +@if fixincludes +maybe-clean-fixincludes: clean-fixincludes -TAGS-flex: \ - configure-flex - @[ -f ./flex/Makefile ] || exit 0; \ +clean-fixincludes: + @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing TAGS in flex" ; \ - (cd flex && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ + clean) \ || exit 1 -@endif flex +@endif fixincludes -.PHONY: maybe-install-info-flex install-info-flex -maybe-install-info-flex: -@if flex -maybe-install-info-flex: install-info-flex +.PHONY: maybe-distclean-fixincludes distclean-fixincludes +maybe-distclean-fixincludes: +@if fixincludes +maybe-distclean-fixincludes: distclean-fixincludes -install-info-flex: \ - configure-flex \ - info-flex - @[ -f ./flex/Makefile ] || exit 0; \ +distclean-fixincludes: + @[ -f ./fixincludes/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 flex" ; \ - (cd flex && \ + 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ + distclean) \ || exit 1 -@endif flex +@endif fixincludes -.PHONY: maybe-installcheck-flex installcheck-flex -maybe-installcheck-flex: +.PHONY: maybe-maintainer-clean-fixincludes maintainer-clean-fixincludes +maybe-maintainer-clean-fixincludes: +@if fixincludes +maybe-maintainer-clean-fixincludes: maintainer-clean-fixincludes + +maintainer-clean-fixincludes: + @[ -f ./fixincludes/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 fixincludes" ; \ + (cd $(HOST_SUBDIR)/fixincludes && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + maintainer-clean) \ + || exit 1 + +@endif fixincludes + + + +.PHONY: configure-flex maybe-configure-flex +maybe-configure-flex: +@if flex +maybe-configure-flex: configure-flex +configure-flex: + @test ! -f $(HOST_SUBDIR)/flex/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/flex; \ + cd "$(HOST_SUBDIR)/flex" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/flex/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/flex"; \ + libsrcdir="$$s/flex"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + || exit 1 +@endif flex + + + + + +.PHONY: all-flex maybe-all-flex +maybe-all-flex: +@if flex +TARGET-flex=all +maybe-all-flex: all-flex +all-flex: configure-flex + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-flex)) +@endif flex + + + + +.PHONY: check-flex maybe-check-flex +maybe-check-flex: +@if flex +maybe-check-flex: check-flex + +# This module is only tested in a native toolchain. +check-flex: + @if [ '$(host)' = '$(target)' ] ; then \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(FLAGS_TO_PASS) check); \ + fi + +@endif flex + +.PHONY: install-flex maybe-install-flex +maybe-install-flex: +@if flex +maybe-install-flex: install-flex + +install-flex: installdirs + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif flex + +# Other targets (info, dvi, etc.) + +.PHONY: maybe-info-flex info-flex +maybe-info-flex: +@if flex +maybe-info-flex: info-flex + +info-flex: \ + configure-flex + @[ -f ./flex/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 flex" ; \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + info) \ + || exit 1 + +@endif flex + +.PHONY: maybe-dvi-flex dvi-flex +maybe-dvi-flex: +@if flex +maybe-dvi-flex: dvi-flex + +dvi-flex: \ + configure-flex + @[ -f ./flex/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 flex" ; \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + dvi) \ + || exit 1 + +@endif flex + +.PHONY: maybe-html-flex html-flex +maybe-html-flex: +@if flex +maybe-html-flex: html-flex + +html-flex: \ + configure-flex + @[ -f ./flex/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 flex" ; \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif flex + +.PHONY: maybe-TAGS-flex TAGS-flex +maybe-TAGS-flex: +@if flex +maybe-TAGS-flex: TAGS-flex + +TAGS-flex: \ + configure-flex + @[ -f ./flex/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 flex" ; \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + TAGS) \ + || exit 1 + +@endif flex + +.PHONY: maybe-install-info-flex install-info-flex +maybe-install-info-flex: +@if flex +maybe-install-info-flex: install-info-flex + +install-info-flex: \ + configure-flex \ + info-flex + @[ -f ./flex/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 flex" ; \ + (cd $(HOST_SUBDIR)/flex && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + install-info) \ + || exit 1 + +@endif flex + +.PHONY: maybe-installcheck-flex installcheck-flex +maybe-installcheck-flex: @if flex maybe-installcheck-flex: installcheck-flex @@ -8156,13 +9858,12 @@ installcheck-flex: \ @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in flex" ; \ - (cd flex && \ + (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8181,13 +9882,12 @@ mostlyclean-flex: @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in flex" ; \ - (cd flex && \ + (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8206,13 +9906,12 @@ clean-flex: @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in flex" ; \ - (cd flex && \ + (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8231,13 +9930,12 @@ distclean-flex: @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in flex" ; \ - (cd flex && \ + (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8256,13 +9954,12 @@ maintainer-clean-flex: @[ -f ./flex/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 flex" ; \ - (cd flex && \ + (cd $(HOST_SUBDIR)/flex && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8273,46 +9970,378 @@ maintainer-clean-flex: @endif flex + .PHONY: configure-gas maybe-configure-gas maybe-configure-gas: @if gas maybe-configure-gas: configure-gas -configure-gas: - @test ! -f gas/Makefile || exit 0; \ - [ -d gas ] || mkdir gas; \ +configure-gas: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gas; \ - cd gas || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gas; \ + cd "$(HOST_SUBDIR)/gas" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gas"; \ - libsrcdir="$$s/gas";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gas"; \ - libsrcdir="$$s/gas";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gas + + +.PHONY: configure-stage1-gas maybe-configure-stage1-gas +maybe-configure-stage1-gas: +@if gas-bootstrap +maybe-configure-stage1-gas: configure-stage1-gas +configure-stage1-gas: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif gas-bootstrap + +.PHONY: configure-stage2-gas maybe-configure-stage2-gas +maybe-configure-stage2-gas: +@if gas-bootstrap +maybe-configure-stage2-gas: configure-stage2-gas +configure-stage2-gas: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gas-bootstrap + +.PHONY: configure-stage3-gas maybe-configure-stage3-gas +maybe-configure-stage3-gas: +@if gas-bootstrap +maybe-configure-stage3-gas: configure-stage3-gas +configure-stage3-gas: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gas-bootstrap + +.PHONY: configure-stage4-gas maybe-configure-stage4-gas +maybe-configure-stage4-gas: +@if gas-bootstrap +maybe-configure-stage4-gas: configure-stage4-gas +configure-stage4-gas: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gas-bootstrap + +.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas +maybe-configure-stageprofile-gas: +@if gas-bootstrap +maybe-configure-stageprofile-gas: configure-stageprofile-gas +configure-stageprofile-gas: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gas-bootstrap + +.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas +maybe-configure-stagefeedback-gas: +@if gas-bootstrap +maybe-configure-stagefeedback-gas: configure-stagefeedback-gas +configure-stagefeedback-gas: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/gas/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gas-bootstrap + + + + + .PHONY: all-gas maybe-all-gas maybe-all-gas: @if gas +TARGET-gas=all maybe-all-gas: all-gas all-gas: configure-gas - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gas && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gas)) @endif gas + + +.PHONY: all-stage1-gas maybe-all-stage1-gas +.PHONY: clean-stage1-gas maybe-clean-stage1-gas +maybe-all-stage1-gas: +maybe-clean-stage1-gas: +@if gas-bootstrap +maybe-all-stage1-gas: all-stage1-gas +all-stage1: all-stage1-gas +all-stage1-gas: configure-stage1-gas + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-gas: clean-stage1-gas +clean-stage1: clean-stage1-gas +clean-stage1-gas: + @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gas/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif gas-bootstrap + + +.PHONY: all-stage2-gas maybe-all-stage2-gas +.PHONY: clean-stage2-gas maybe-clean-stage2-gas +maybe-all-stage2-gas: +maybe-clean-stage2-gas: +@if gas-bootstrap +maybe-all-stage2-gas: all-stage2-gas +all-stage2: all-stage2-gas +all-stage2-gas: configure-stage2-gas + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-gas: clean-stage2-gas +clean-stage2: clean-stage2-gas +clean-stage2-gas: + @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gas/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + +.PHONY: all-stage3-gas maybe-all-stage3-gas +.PHONY: clean-stage3-gas maybe-clean-stage3-gas +maybe-all-stage3-gas: +maybe-clean-stage3-gas: +@if gas-bootstrap +maybe-all-stage3-gas: all-stage3-gas +all-stage3: all-stage3-gas +all-stage3-gas: configure-stage3-gas + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-gas: clean-stage3-gas +clean-stage3: clean-stage3-gas +clean-stage3-gas: + @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gas/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + +.PHONY: all-stage4-gas maybe-all-stage4-gas +.PHONY: clean-stage4-gas maybe-clean-stage4-gas +maybe-all-stage4-gas: +maybe-clean-stage4-gas: +@if gas-bootstrap +maybe-all-stage4-gas: all-stage4-gas +all-stage4: all-stage4-gas +all-stage4-gas: configure-stage4-gas + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-gas: clean-stage4-gas +clean-stage4: clean-stage4-gas +clean-stage4-gas: + @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gas/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif gas-bootstrap + + +.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas +.PHONY: clean-stageprofile-gas maybe-clean-stageprofile-gas +maybe-all-stageprofile-gas: +maybe-clean-stageprofile-gas: +@if gas-bootstrap +maybe-all-stageprofile-gas: all-stageprofile-gas +all-stageprofile: all-stageprofile-gas +all-stageprofile-gas: configure-stageprofile-gas + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-gas: clean-stageprofile-gas +clean-stageprofile: clean-stageprofile-gas +clean-stageprofile-gas: + @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gas/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif gas-bootstrap + + +.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas +.PHONY: clean-stagefeedback-gas maybe-clean-stagefeedback-gas +maybe-all-stagefeedback-gas: +maybe-clean-stagefeedback-gas: +@if gas-bootstrap +maybe-all-stagefeedback-gas: all-stagefeedback-gas +all-stagefeedback: all-stagefeedback-gas +all-stagefeedback-gas: configure-stagefeedback-gas + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-gas: clean-stagefeedback-gas +clean-stagefeedback: clean-stagefeedback-gas +clean-stagefeedback-gas: + @[ -f $(HOST_SUBDIR)/gas/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gas/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gas/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif gas-bootstrap + + + + + .PHONY: check-gas maybe-check-gas maybe-check-gas: @if gas @@ -8321,9 +10350,9 @@ maybe-check-gas: check-gas check-gas: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gas && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif gas @@ -8335,9 +10364,9 @@ maybe-install-gas: install-gas install-gas: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gas && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif gas @@ -8353,13 +10382,12 @@ info-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8379,13 +10407,12 @@ dvi-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8395,6 +10422,31 @@ dvi-gas: \ @endif gas +.PHONY: maybe-html-gas html-gas +maybe-html-gas: +@if gas +maybe-html-gas: html-gas + +html-gas: \ + configure-gas + @[ -f ./gas/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 gas" ; \ + (cd $(HOST_SUBDIR)/gas && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gas + .PHONY: maybe-TAGS-gas TAGS-gas maybe-TAGS-gas: @if gas @@ -8405,13 +10457,12 @@ TAGS-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8432,13 +10483,12 @@ install-info-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8458,13 +10508,12 @@ installcheck-gas: \ @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8483,13 +10532,12 @@ mostlyclean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8508,13 +10556,12 @@ clean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8533,13 +10580,12 @@ distclean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8558,13 +10604,12 @@ maintainer-clean-gas: @[ -f ./gas/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gas" ; \ - (cd gas && \ + (cd $(HOST_SUBDIR)/gas && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8575,47 +10620,378 @@ maintainer-clean-gas: @endif gas + .PHONY: configure-gcc maybe-configure-gcc maybe-configure-gcc: @if gcc maybe-configure-gcc: configure-gcc -configure-gcc: - @test ! -f gcc/Makefile || exit 0; \ - [ -d gcc ] || mkdir gcc; \ +configure-gcc: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gcc; \ - cd gcc || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gcc; \ + cd "$(HOST_SUBDIR)/gcc" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gcc + + +.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc +maybe-configure-stage1-gcc: +@if gcc-bootstrap +maybe-configure-stage1-gcc: configure-stage1-gcc +configure-stage1-gcc: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif gcc-bootstrap + +.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc +maybe-configure-stage2-gcc: +@if gcc-bootstrap +maybe-configure-stage2-gcc: configure-stage2-gcc +configure-stage2-gcc: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gcc-bootstrap + +.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc +maybe-configure-stage3-gcc: +@if gcc-bootstrap +maybe-configure-stage3-gcc: configure-stage3-gcc +configure-stage3-gcc: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gcc-bootstrap + +.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc +maybe-configure-stage4-gcc: +@if gcc-bootstrap +maybe-configure-stage4-gcc: configure-stage4-gcc +configure-stage4-gcc: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gcc-bootstrap + +.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc +maybe-configure-stageprofile-gcc: +@if gcc-bootstrap +maybe-configure-stageprofile-gcc: configure-stageprofile-gcc +configure-stageprofile-gcc: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gcc-bootstrap + +.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc +maybe-configure-stagefeedback-gcc: +@if gcc-bootstrap +maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc +configure-stagefeedback-gcc: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif gcc-bootstrap + + + + + .PHONY: all-gcc maybe-all-gcc maybe-all-gcc: @if gcc +TARGET-gcc=`if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` maybe-all-gcc: all-gcc all-gcc: configure-gcc - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ - `if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` ) + (cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(TARGET-gcc)) @endif gcc + + +.PHONY: all-stage1-gcc maybe-all-stage1-gcc +.PHONY: clean-stage1-gcc maybe-clean-stage1-gcc +maybe-all-stage1-gcc: +maybe-clean-stage1-gcc: +@if gcc-bootstrap +maybe-all-stage1-gcc: all-stage1-gcc +all-stage1: all-stage1-gcc +all-stage1-gcc: configure-stage1-gcc + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) + +maybe-clean-stage1-gcc: clean-stage1-gcc +clean-stage1: clean-stage1-gcc +clean-stage1-gcc: + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-gcc/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: all-stage2-gcc maybe-all-stage2-gcc +.PHONY: clean-stage2-gcc maybe-clean-stage2-gcc +maybe-all-stage2-gcc: +maybe-clean-stage2-gcc: +@if gcc-bootstrap +maybe-all-stage2-gcc: all-stage2-gcc +all-stage2: all-stage2-gcc +all-stage2-gcc: configure-stage2-gcc + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) + +maybe-clean-stage2-gcc: clean-stage2-gcc +clean-stage2: clean-stage2-gcc +clean-stage2-gcc: + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-gcc/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: all-stage3-gcc maybe-all-stage3-gcc +.PHONY: clean-stage3-gcc maybe-clean-stage3-gcc +maybe-all-stage3-gcc: +maybe-clean-stage3-gcc: +@if gcc-bootstrap +maybe-all-stage3-gcc: all-stage3-gcc +all-stage3: all-stage3-gcc +all-stage3-gcc: configure-stage3-gcc + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) + +maybe-clean-stage3-gcc: clean-stage3-gcc +clean-stage3: clean-stage3-gcc +clean-stage3-gcc: + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-gcc/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: all-stage4-gcc maybe-all-stage4-gcc +.PHONY: clean-stage4-gcc maybe-clean-stage4-gcc +maybe-all-stage4-gcc: +maybe-clean-stage4-gcc: +@if gcc-bootstrap +maybe-all-stage4-gcc: all-stage4-gcc +all-stage4: all-stage4-gcc +all-stage4-gcc: configure-stage4-gcc + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) + +maybe-clean-stage4-gcc: clean-stage4-gcc +clean-stage4: clean-stage4-gcc +clean-stage4-gcc: + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-gcc/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc +.PHONY: clean-stageprofile-gcc maybe-clean-stageprofile-gcc +maybe-all-stageprofile-gcc: +maybe-clean-stageprofile-gcc: +@if gcc-bootstrap +maybe-all-stageprofile-gcc: all-stageprofile-gcc +all-stageprofile: all-stageprofile-gcc +all-stageprofile-gcc: configure-stageprofile-gcc + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) + +maybe-clean-stageprofile-gcc: clean-stageprofile-gcc +clean-stageprofile: clean-stageprofile-gcc +clean-stageprofile-gcc: + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-gcc/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + +.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc +.PHONY: clean-stagefeedback-gcc maybe-clean-stagefeedback-gcc +maybe-all-stagefeedback-gcc: +maybe-clean-stagefeedback-gcc: +@if gcc-bootstrap +maybe-all-stagefeedback-gcc: all-stagefeedback-gcc +all-stagefeedback: all-stagefeedback-gcc +all-stagefeedback-gcc: configure-stagefeedback-gcc + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) + +maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc +clean-stagefeedback: clean-stagefeedback-gcc +clean-stagefeedback-gcc: + @[ -f $(HOST_SUBDIR)/gcc/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-gcc/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/gcc/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) clean +@endif gcc-bootstrap + + + + + .PHONY: check-gcc maybe-check-gcc maybe-check-gcc: @if gcc @@ -8624,9 +11000,9 @@ maybe-check-gcc: check-gcc check-gcc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check) + (cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check) @endif gcc @@ -8638,9 +11014,9 @@ maybe-install-gcc: install-gcc install-gcc: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install) + (cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install) @endif gcc @@ -8656,13 +11032,12 @@ info-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8682,13 +11057,12 @@ dvi-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8698,6 +11072,31 @@ dvi-gcc: \ @endif gcc +.PHONY: maybe-html-gcc html-gcc +maybe-html-gcc: +@if gcc +maybe-html-gcc: html-gcc + +html-gcc: \ + configure-gcc + @[ -f ./gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + 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" ; \ + (cd $(HOST_SUBDIR)/gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gcc + .PHONY: maybe-TAGS-gcc TAGS-gcc maybe-TAGS-gcc: @if gcc @@ -8708,13 +11107,12 @@ TAGS-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8735,13 +11133,12 @@ install-info-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8761,13 +11158,12 @@ installcheck-gcc: \ @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8786,13 +11182,12 @@ mostlyclean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8811,13 +11206,12 @@ clean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8836,13 +11230,12 @@ distclean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8861,13 +11254,12 @@ maintainer-clean-gcc: @[ -f ./gcc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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" ; \ - (cd gcc && \ + (cd $(HOST_SUBDIR)/gcc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8878,46 +11270,51 @@ maintainer-clean-gcc: @endif gcc + .PHONY: configure-gawk maybe-configure-gawk maybe-configure-gawk: @if gawk maybe-configure-gawk: configure-gawk -configure-gawk: - @test ! -f gawk/Makefile || exit 0; \ - [ -d gawk ] || mkdir gawk; \ +configure-gawk: + @test ! -f $(HOST_SUBDIR)/gawk/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gawk ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gawk; \ - cd gawk || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gawk; \ + cd "$(HOST_SUBDIR)/gawk" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gawk"; \ - libsrcdir="$$s/gawk";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gawk"; \ - libsrcdir="$$s/gawk";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gawk/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/gawk"; \ + libsrcdir="$$s/gawk"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gawk + + + + .PHONY: all-gawk maybe-all-gawk maybe-all-gawk: @if gawk +TARGET-gawk=all maybe-all-gawk: all-gawk all-gawk: configure-gawk @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gawk && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gawk && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gawk)) @endif gawk + + + .PHONY: check-gawk maybe-check-gawk maybe-check-gawk: @if gawk @@ -8926,9 +11323,9 @@ maybe-check-gawk: check-gawk check-gawk: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gawk && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gawk && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif gawk @@ -8940,9 +11337,9 @@ maybe-install-gawk: install-gawk install-gawk: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gawk && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gawk && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif gawk @@ -8958,13 +11355,12 @@ info-gawk: \ @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -8984,13 +11380,12 @@ dvi-gawk: \ @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9000,6 +11395,31 @@ dvi-gawk: \ @endif gawk +.PHONY: maybe-html-gawk html-gawk +maybe-html-gawk: +@if gawk +maybe-html-gawk: html-gawk + +html-gawk: \ + configure-gawk + @[ -f ./gawk/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 gawk" ; \ + (cd $(HOST_SUBDIR)/gawk && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gawk + .PHONY: maybe-TAGS-gawk TAGS-gawk maybe-TAGS-gawk: @if gawk @@ -9010,13 +11430,12 @@ TAGS-gawk: \ @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9037,13 +11456,12 @@ install-info-gawk: \ @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9063,13 +11481,12 @@ installcheck-gawk: \ @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9088,13 +11505,12 @@ mostlyclean-gawk: @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9113,13 +11529,12 @@ clean-gawk: @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9138,13 +11553,12 @@ distclean-gawk: @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9163,13 +11577,12 @@ maintainer-clean-gawk: @[ -f ./gawk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gawk" ; \ - (cd gawk && \ + (cd $(HOST_SUBDIR)/gawk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9180,46 +11593,51 @@ maintainer-clean-gawk: @endif gawk + .PHONY: configure-gettext maybe-configure-gettext maybe-configure-gettext: @if gettext maybe-configure-gettext: configure-gettext -configure-gettext: - @test ! -f gettext/Makefile || exit 0; \ - [ -d gettext ] || mkdir gettext; \ +configure-gettext: + @test ! -f $(HOST_SUBDIR)/gettext/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gettext ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gettext; \ - cd gettext || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gettext; \ + cd "$(HOST_SUBDIR)/gettext" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gettext"; \ - libsrcdir="$$s/gettext";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gettext"; \ - libsrcdir="$$s/gettext";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gettext/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/gettext"; \ + libsrcdir="$$s/gettext"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gettext + + + + .PHONY: all-gettext maybe-all-gettext maybe-all-gettext: @if gettext +TARGET-gettext=all maybe-all-gettext: all-gettext all-gettext: configure-gettext @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gettext && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gettext && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gettext)) @endif gettext + + + .PHONY: check-gettext maybe-check-gettext maybe-check-gettext: @if gettext @@ -9228,9 +11646,9 @@ maybe-check-gettext: check-gettext check-gettext: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gettext && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gettext && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif gettext @@ -9242,9 +11660,9 @@ maybe-install-gettext: install-gettext install-gettext: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gettext && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gettext && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif gettext @@ -9260,13 +11678,12 @@ info-gettext: \ @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9286,13 +11703,12 @@ dvi-gettext: \ @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9302,6 +11718,31 @@ dvi-gettext: \ @endif gettext +.PHONY: maybe-html-gettext html-gettext +maybe-html-gettext: +@if gettext +maybe-html-gettext: html-gettext + +html-gettext: \ + configure-gettext + @[ -f ./gettext/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 gettext" ; \ + (cd $(HOST_SUBDIR)/gettext && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gettext + .PHONY: maybe-TAGS-gettext TAGS-gettext maybe-TAGS-gettext: @if gettext @@ -9312,13 +11753,12 @@ TAGS-gettext: \ @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9339,13 +11779,12 @@ install-info-gettext: \ @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9365,13 +11804,12 @@ installcheck-gettext: \ @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9390,13 +11828,12 @@ mostlyclean-gettext: @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9415,13 +11852,12 @@ clean-gettext: @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9440,13 +11876,12 @@ distclean-gettext: @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9465,13 +11900,12 @@ maintainer-clean-gettext: @[ -f ./gettext/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gettext" ; \ - (cd gettext && \ + (cd $(HOST_SUBDIR)/gettext && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9482,46 +11916,51 @@ maintainer-clean-gettext: @endif gettext + .PHONY: configure-gnuserv maybe-configure-gnuserv maybe-configure-gnuserv: @if gnuserv maybe-configure-gnuserv: configure-gnuserv -configure-gnuserv: - @test ! -f gnuserv/Makefile || exit 0; \ - [ -d gnuserv ] || mkdir gnuserv; \ +configure-gnuserv: + @test ! -f $(HOST_SUBDIR)/gnuserv/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnuserv ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gnuserv; \ - cd gnuserv || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gnuserv; \ + cd "$(HOST_SUBDIR)/gnuserv" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gnuserv"; \ - libsrcdir="$$s/gnuserv";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gnuserv"; \ - libsrcdir="$$s/gnuserv";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gnuserv/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/gnuserv"; \ + libsrcdir="$$s/gnuserv"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gnuserv + + + + .PHONY: all-gnuserv maybe-all-gnuserv maybe-all-gnuserv: @if gnuserv +TARGET-gnuserv=all maybe-all-gnuserv: all-gnuserv all-gnuserv: configure-gnuserv @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gnuserv && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gnuserv)) @endif gnuserv + + + .PHONY: check-gnuserv maybe-check-gnuserv maybe-check-gnuserv: @if gnuserv @@ -9530,9 +11969,9 @@ maybe-check-gnuserv: check-gnuserv check-gnuserv: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gnuserv && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif gnuserv @@ -9544,9 +11983,9 @@ maybe-install-gnuserv: install-gnuserv install-gnuserv: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gnuserv && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gnuserv && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif gnuserv @@ -9562,13 +12001,12 @@ info-gnuserv: \ @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9588,13 +12026,12 @@ dvi-gnuserv: \ @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9604,6 +12041,31 @@ dvi-gnuserv: \ @endif gnuserv +.PHONY: maybe-html-gnuserv html-gnuserv +maybe-html-gnuserv: +@if gnuserv +maybe-html-gnuserv: html-gnuserv + +html-gnuserv: \ + configure-gnuserv + @[ -f ./gnuserv/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 gnuserv" ; \ + (cd $(HOST_SUBDIR)/gnuserv && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gnuserv + .PHONY: maybe-TAGS-gnuserv TAGS-gnuserv maybe-TAGS-gnuserv: @if gnuserv @@ -9614,13 +12076,12 @@ TAGS-gnuserv: \ @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9641,13 +12102,12 @@ install-info-gnuserv: \ @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9667,13 +12127,12 @@ installcheck-gnuserv: \ @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9692,13 +12151,12 @@ mostlyclean-gnuserv: @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9717,13 +12175,12 @@ clean-gnuserv: @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9742,13 +12199,12 @@ distclean-gnuserv: @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9767,13 +12223,12 @@ maintainer-clean-gnuserv: @[ -f ./gnuserv/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gnuserv" ; \ - (cd gnuserv && \ + (cd $(HOST_SUBDIR)/gnuserv && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9784,46 +12239,51 @@ maintainer-clean-gnuserv: @endif gnuserv + .PHONY: configure-gprof maybe-configure-gprof maybe-configure-gprof: @if gprof maybe-configure-gprof: configure-gprof -configure-gprof: - @test ! -f gprof/Makefile || exit 0; \ - [ -d gprof ] || mkdir gprof; \ +configure-gprof: + @test ! -f $(HOST_SUBDIR)/gprof/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gprof; \ - cd gprof || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gprof; \ + cd "$(HOST_SUBDIR)/gprof" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gprof"; \ - libsrcdir="$$s/gprof";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gprof"; \ - libsrcdir="$$s/gprof";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gprof/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/gprof"; \ + libsrcdir="$$s/gprof"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gprof + + + + .PHONY: all-gprof maybe-all-gprof maybe-all-gprof: @if gprof +TARGET-gprof=all maybe-all-gprof: all-gprof all-gprof: configure-gprof @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gprof && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gprof && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gprof)) @endif gprof + + + .PHONY: check-gprof maybe-check-gprof maybe-check-gprof: @if gprof @@ -9832,9 +12292,9 @@ maybe-check-gprof: check-gprof check-gprof: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gprof && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gprof && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif gprof @@ -9846,9 +12306,9 @@ maybe-install-gprof: install-gprof install-gprof: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gprof && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gprof && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif gprof @@ -9864,13 +12324,12 @@ info-gprof: \ @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9890,13 +12349,12 @@ dvi-gprof: \ @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9906,6 +12364,31 @@ dvi-gprof: \ @endif gprof +.PHONY: maybe-html-gprof html-gprof +maybe-html-gprof: +@if gprof +maybe-html-gprof: html-gprof + +html-gprof: \ + configure-gprof + @[ -f ./gprof/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 gprof" ; \ + (cd $(HOST_SUBDIR)/gprof && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gprof + .PHONY: maybe-TAGS-gprof TAGS-gprof maybe-TAGS-gprof: @if gprof @@ -9916,13 +12399,12 @@ TAGS-gprof: \ @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9943,13 +12425,12 @@ install-info-gprof: \ @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9969,13 +12450,12 @@ installcheck-gprof: \ @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -9994,13 +12474,12 @@ mostlyclean-gprof: @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10019,13 +12498,12 @@ clean-gprof: @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10044,13 +12522,12 @@ distclean-gprof: @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10069,13 +12546,12 @@ maintainer-clean-gprof: @[ -f ./gprof/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gprof" ; \ - (cd gprof && \ + (cd $(HOST_SUBDIR)/gprof && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10086,46 +12562,51 @@ maintainer-clean-gprof: @endif gprof + .PHONY: configure-gzip maybe-configure-gzip maybe-configure-gzip: @if gzip maybe-configure-gzip: configure-gzip -configure-gzip: - @test ! -f gzip/Makefile || exit 0; \ - [ -d gzip ] || mkdir gzip; \ +configure-gzip: + @test ! -f $(HOST_SUBDIR)/gzip/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gzip ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gzip; \ - cd gzip || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gzip; \ + cd "$(HOST_SUBDIR)/gzip" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gzip"; \ - libsrcdir="$$s/gzip";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gzip"; \ - libsrcdir="$$s/gzip";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gzip/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/gzip"; \ + libsrcdir="$$s/gzip"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gzip + + + + .PHONY: all-gzip maybe-all-gzip maybe-all-gzip: @if gzip +TARGET-gzip=all maybe-all-gzip: all-gzip all-gzip: configure-gzip @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gzip && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gzip && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-gzip)) @endif gzip + + + .PHONY: check-gzip maybe-check-gzip maybe-check-gzip: @if gzip @@ -10134,9 +12615,9 @@ maybe-check-gzip: check-gzip check-gzip: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gzip && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gzip && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif gzip @@ -10148,9 +12629,9 @@ maybe-install-gzip: install-gzip install-gzip: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gzip && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gzip && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif gzip @@ -10166,13 +12647,12 @@ info-gzip: \ @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10192,13 +12672,12 @@ dvi-gzip: \ @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10208,6 +12687,31 @@ dvi-gzip: \ @endif gzip +.PHONY: maybe-html-gzip html-gzip +maybe-html-gzip: +@if gzip +maybe-html-gzip: html-gzip + +html-gzip: \ + configure-gzip + @[ -f ./gzip/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 gzip" ; \ + (cd $(HOST_SUBDIR)/gzip && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gzip + .PHONY: maybe-TAGS-gzip TAGS-gzip maybe-TAGS-gzip: @if gzip @@ -10218,13 +12722,12 @@ TAGS-gzip: \ @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10245,13 +12748,12 @@ install-info-gzip: \ @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10271,13 +12773,12 @@ installcheck-gzip: \ @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10296,13 +12797,12 @@ mostlyclean-gzip: @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10321,13 +12821,12 @@ clean-gzip: @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10346,13 +12845,12 @@ distclean-gzip: @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10371,13 +12869,12 @@ maintainer-clean-gzip: @[ -f ./gzip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 gzip" ; \ - (cd gzip && \ + (cd $(HOST_SUBDIR)/gzip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10388,46 +12885,51 @@ maintainer-clean-gzip: @endif gzip + .PHONY: configure-hello maybe-configure-hello maybe-configure-hello: @if hello maybe-configure-hello: configure-hello -configure-hello: - @test ! -f hello/Makefile || exit 0; \ - [ -d hello ] || mkdir hello; \ +configure-hello: + @test ! -f $(HOST_SUBDIR)/hello/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/hello ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in hello; \ - cd hello || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/hello; \ + cd "$(HOST_SUBDIR)/hello" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/hello"; \ - libsrcdir="$$s/hello";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/hello"; \ - libsrcdir="$$s/hello";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/hello/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/hello"; \ + libsrcdir="$$s/hello"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif hello + + + + .PHONY: all-hello maybe-all-hello maybe-all-hello: @if hello +TARGET-hello=all maybe-all-hello: all-hello all-hello: configure-hello @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd hello && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/hello && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-hello)) @endif hello + + + .PHONY: check-hello maybe-check-hello maybe-check-hello: @if hello @@ -10436,9 +12938,9 @@ maybe-check-hello: check-hello check-hello: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd hello && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/hello && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif hello @@ -10450,9 +12952,9 @@ maybe-install-hello: install-hello install-hello: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd hello && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/hello && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif hello @@ -10468,13 +12970,12 @@ info-hello: \ @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10494,13 +12995,12 @@ dvi-hello: \ @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10510,6 +13010,31 @@ dvi-hello: \ @endif hello +.PHONY: maybe-html-hello html-hello +maybe-html-hello: +@if hello +maybe-html-hello: html-hello + +html-hello: \ + configure-hello + @[ -f ./hello/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 hello" ; \ + (cd $(HOST_SUBDIR)/hello && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif hello + .PHONY: maybe-TAGS-hello TAGS-hello maybe-TAGS-hello: @if hello @@ -10520,13 +13045,12 @@ TAGS-hello: \ @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10547,13 +13071,12 @@ install-info-hello: \ @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10573,13 +13096,12 @@ installcheck-hello: \ @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10598,13 +13120,12 @@ mostlyclean-hello: @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10623,13 +13144,12 @@ clean-hello: @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10648,13 +13168,12 @@ distclean-hello: @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10673,13 +13192,12 @@ maintainer-clean-hello: @[ -f ./hello/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 hello" ; \ - (cd hello && \ + (cd $(HOST_SUBDIR)/hello && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10690,46 +13208,51 @@ maintainer-clean-hello: @endif hello + .PHONY: configure-indent maybe-configure-indent maybe-configure-indent: @if indent maybe-configure-indent: configure-indent -configure-indent: - @test ! -f indent/Makefile || exit 0; \ - [ -d indent ] || mkdir indent; \ +configure-indent: + @test ! -f $(HOST_SUBDIR)/indent/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/indent ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in indent; \ - cd indent || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/indent; \ + cd "$(HOST_SUBDIR)/indent" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/indent"; \ - libsrcdir="$$s/indent";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/indent"; \ - libsrcdir="$$s/indent";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/indent/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/indent"; \ + libsrcdir="$$s/indent"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif indent + + + + .PHONY: all-indent maybe-all-indent maybe-all-indent: @if indent +TARGET-indent=all maybe-all-indent: all-indent all-indent: configure-indent @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd indent && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/indent && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-indent)) @endif indent + + + .PHONY: check-indent maybe-check-indent maybe-check-indent: @if indent @@ -10738,9 +13261,9 @@ maybe-check-indent: check-indent check-indent: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd indent && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/indent && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif indent @@ -10752,9 +13275,9 @@ maybe-install-indent: install-indent install-indent: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd indent && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/indent && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif indent @@ -10770,13 +13293,12 @@ info-indent: \ @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10796,13 +13318,12 @@ dvi-indent: \ @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10812,6 +13333,31 @@ dvi-indent: \ @endif indent +.PHONY: maybe-html-indent html-indent +maybe-html-indent: +@if indent +maybe-html-indent: html-indent + +html-indent: \ + configure-indent + @[ -f ./indent/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 indent" ; \ + (cd $(HOST_SUBDIR)/indent && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif indent + .PHONY: maybe-TAGS-indent TAGS-indent maybe-TAGS-indent: @if indent @@ -10822,13 +13368,12 @@ TAGS-indent: \ @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10849,13 +13394,12 @@ install-info-indent: \ @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10875,13 +13419,12 @@ installcheck-indent: \ @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10900,13 +13443,12 @@ mostlyclean-indent: @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10925,13 +13467,12 @@ clean-indent: @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10950,13 +13491,12 @@ distclean-indent: @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10975,13 +13515,12 @@ maintainer-clean-indent: @[ -f ./indent/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 indent" ; \ - (cd indent && \ + (cd $(HOST_SUBDIR)/indent && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -10992,46 +13531,378 @@ maintainer-clean-indent: @endif indent + .PHONY: configure-intl maybe-configure-intl maybe-configure-intl: @if intl maybe-configure-intl: configure-intl -configure-intl: - @test ! -f intl/Makefile || exit 0; \ - [ -d intl ] || mkdir intl; \ +configure-intl: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in intl; \ - cd intl || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/intl; \ + cd "$(HOST_SUBDIR)/intl" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/intl"; \ - libsrcdir="$$s/intl";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/intl"; \ - libsrcdir="$$s/intl";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif intl + + +.PHONY: configure-stage1-intl maybe-configure-stage1-intl +maybe-configure-stage1-intl: +@if intl-bootstrap +maybe-configure-stage1-intl: configure-stage1-intl +configure-stage1-intl: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif intl-bootstrap + +.PHONY: configure-stage2-intl maybe-configure-stage2-intl +maybe-configure-stage2-intl: +@if intl-bootstrap +maybe-configure-stage2-intl: configure-stage2-intl +configure-stage2-intl: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif intl-bootstrap + +.PHONY: configure-stage3-intl maybe-configure-stage3-intl +maybe-configure-stage3-intl: +@if intl-bootstrap +maybe-configure-stage3-intl: configure-stage3-intl +configure-stage3-intl: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif intl-bootstrap + +.PHONY: configure-stage4-intl maybe-configure-stage4-intl +maybe-configure-stage4-intl: +@if intl-bootstrap +maybe-configure-stage4-intl: configure-stage4-intl +configure-stage4-intl: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif intl-bootstrap + +.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl +maybe-configure-stageprofile-intl: +@if intl-bootstrap +maybe-configure-stageprofile-intl: configure-stageprofile-intl +configure-stageprofile-intl: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif intl-bootstrap + +.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl +maybe-configure-stagefeedback-intl: +@if intl-bootstrap +maybe-configure-stagefeedback-intl: configure-stagefeedback-intl +configure-stagefeedback-intl: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/intl/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif intl-bootstrap + + + + + .PHONY: all-intl maybe-all-intl maybe-all-intl: @if intl +TARGET-intl=all maybe-all-intl: all-intl all-intl: configure-intl - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd intl && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-intl)) @endif intl + + +.PHONY: all-stage1-intl maybe-all-stage1-intl +.PHONY: clean-stage1-intl maybe-clean-stage1-intl +maybe-all-stage1-intl: +maybe-clean-stage1-intl: +@if intl-bootstrap +maybe-all-stage1-intl: all-stage1-intl +all-stage1: all-stage1-intl +all-stage1-intl: configure-stage1-intl + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-intl: clean-stage1-intl +clean-stage1: clean-stage1-intl +clean-stage1-intl: + @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-intl/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif intl-bootstrap + + +.PHONY: all-stage2-intl maybe-all-stage2-intl +.PHONY: clean-stage2-intl maybe-clean-stage2-intl +maybe-all-stage2-intl: +maybe-clean-stage2-intl: +@if intl-bootstrap +maybe-all-stage2-intl: all-stage2-intl +all-stage2: all-stage2-intl +all-stage2-intl: configure-stage2-intl + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-intl: clean-stage2-intl +clean-stage2: clean-stage2-intl +clean-stage2-intl: + @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-intl/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + +.PHONY: all-stage3-intl maybe-all-stage3-intl +.PHONY: clean-stage3-intl maybe-clean-stage3-intl +maybe-all-stage3-intl: +maybe-clean-stage3-intl: +@if intl-bootstrap +maybe-all-stage3-intl: all-stage3-intl +all-stage3: all-stage3-intl +all-stage3-intl: configure-stage3-intl + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-intl: clean-stage3-intl +clean-stage3: clean-stage3-intl +clean-stage3-intl: + @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-intl/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + +.PHONY: all-stage4-intl maybe-all-stage4-intl +.PHONY: clean-stage4-intl maybe-clean-stage4-intl +maybe-all-stage4-intl: +maybe-clean-stage4-intl: +@if intl-bootstrap +maybe-all-stage4-intl: all-stage4-intl +all-stage4: all-stage4-intl +all-stage4-intl: configure-stage4-intl + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-intl: clean-stage4-intl +clean-stage4: clean-stage4-intl +clean-stage4-intl: + @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-intl/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif intl-bootstrap + + +.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl +.PHONY: clean-stageprofile-intl maybe-clean-stageprofile-intl +maybe-all-stageprofile-intl: +maybe-clean-stageprofile-intl: +@if intl-bootstrap +maybe-all-stageprofile-intl: all-stageprofile-intl +all-stageprofile: all-stageprofile-intl +all-stageprofile-intl: configure-stageprofile-intl + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-intl: clean-stageprofile-intl +clean-stageprofile: clean-stageprofile-intl +clean-stageprofile-intl: + @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-intl/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif intl-bootstrap + + +.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl +.PHONY: clean-stagefeedback-intl maybe-clean-stagefeedback-intl +maybe-all-stagefeedback-intl: +maybe-clean-stagefeedback-intl: +@if intl-bootstrap +maybe-all-stagefeedback-intl: all-stagefeedback-intl +all-stagefeedback: all-stagefeedback-intl +all-stagefeedback-intl: configure-stagefeedback-intl + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-intl: clean-stagefeedback-intl +clean-stagefeedback: clean-stagefeedback-intl +clean-stagefeedback-intl: + @[ -f $(HOST_SUBDIR)/intl/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-intl/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/intl/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif intl-bootstrap + + + + + .PHONY: check-intl maybe-check-intl maybe-check-intl: @if intl @@ -11040,9 +13911,9 @@ maybe-check-intl: check-intl check-intl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd intl && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif intl @@ -11054,9 +13925,9 @@ maybe-install-intl: install-intl install-intl: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd intl && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif intl @@ -11072,13 +13943,12 @@ info-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11098,13 +13968,12 @@ dvi-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11114,6 +13983,31 @@ dvi-intl: \ @endif intl +.PHONY: maybe-html-intl html-intl +maybe-html-intl: +@if intl +maybe-html-intl: html-intl + +html-intl: \ + configure-intl + @[ -f ./intl/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 intl" ; \ + (cd $(HOST_SUBDIR)/intl && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif intl + .PHONY: maybe-TAGS-intl TAGS-intl maybe-TAGS-intl: @if intl @@ -11124,13 +14018,12 @@ TAGS-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11151,13 +14044,12 @@ install-info-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11177,13 +14069,12 @@ installcheck-intl: \ @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11202,13 +14093,12 @@ mostlyclean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11227,13 +14117,12 @@ clean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11252,13 +14141,12 @@ distclean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11277,13 +14165,12 @@ maintainer-clean-intl: @[ -f ./intl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 intl" ; \ - (cd intl && \ + (cd $(HOST_SUBDIR)/intl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11294,46 +14181,51 @@ maintainer-clean-intl: @endif intl + .PHONY: configure-tcl maybe-configure-tcl maybe-configure-tcl: @if tcl maybe-configure-tcl: configure-tcl -configure-tcl: - @test ! -f tcl/Makefile || exit 0; \ - [ -d tcl ] || mkdir tcl; \ +configure-tcl: + @test ! -f $(HOST_SUBDIR)/tcl/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in tcl; \ - cd tcl || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/tcl; \ + cd "$(HOST_SUBDIR)/tcl" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/tcl"; \ - libsrcdir="$$s/tcl";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/tcl"; \ - libsrcdir="$$s/tcl";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/tcl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/tcl"; \ + libsrcdir="$$s/tcl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif tcl + + + + .PHONY: all-tcl maybe-all-tcl maybe-all-tcl: @if tcl +TARGET-tcl=all maybe-all-tcl: all-tcl all-tcl: configure-tcl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tcl && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/tcl && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tcl)) @endif tcl + + + .PHONY: check-tcl maybe-check-tcl maybe-check-tcl: @if tcl @@ -11342,9 +14234,9 @@ maybe-check-tcl: check-tcl check-tcl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tcl && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/tcl && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif tcl @@ -11356,9 +14248,9 @@ maybe-install-tcl: install-tcl install-tcl: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tcl && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/tcl && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif tcl @@ -11374,13 +14266,12 @@ info-tcl: \ @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11393,25 +14284,49 @@ info-tcl: \ .PHONY: maybe-dvi-tcl dvi-tcl maybe-dvi-tcl: @if tcl -maybe-dvi-tcl: dvi-tcl +maybe-dvi-tcl: dvi-tcl + +dvi-tcl: \ + configure-tcl + @[ -f ./tcl/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 tcl" ; \ + (cd $(HOST_SUBDIR)/tcl && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + dvi) \ + || exit 1 + +@endif tcl + +.PHONY: maybe-html-tcl html-tcl +maybe-html-tcl: +@if tcl +maybe-html-tcl: html-tcl -dvi-tcl: \ +html-tcl: \ configure-tcl @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in tcl" ; \ - (cd 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif tcl @@ -11426,13 +14341,12 @@ TAGS-tcl: \ @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11453,13 +14367,12 @@ install-info-tcl: \ @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11479,13 +14392,12 @@ installcheck-tcl: \ @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11514,13 +14426,12 @@ clean-tcl: @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11539,13 +14450,12 @@ distclean-tcl: @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11564,13 +14474,12 @@ maintainer-clean-tcl: @[ -f ./tcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 tcl" ; \ - (cd tcl && \ + (cd $(HOST_SUBDIR)/tcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11581,46 +14490,51 @@ maintainer-clean-tcl: @endif tcl + .PHONY: configure-itcl maybe-configure-itcl maybe-configure-itcl: @if itcl maybe-configure-itcl: configure-itcl -configure-itcl: - @test ! -f itcl/Makefile || exit 0; \ - [ -d itcl ] || mkdir itcl; \ +configure-itcl: + @test ! -f $(HOST_SUBDIR)/itcl/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in itcl; \ - cd itcl || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/itcl; \ + cd "$(HOST_SUBDIR)/itcl" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/itcl"; \ - libsrcdir="$$s/itcl";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/itcl"; \ - libsrcdir="$$s/itcl";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/itcl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/itcl"; \ + libsrcdir="$$s/itcl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif itcl + + + + .PHONY: all-itcl maybe-all-itcl maybe-all-itcl: @if itcl +TARGET-itcl=all maybe-all-itcl: all-itcl all-itcl: configure-itcl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd itcl && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/itcl && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-itcl)) @endif itcl + + + .PHONY: check-itcl maybe-check-itcl maybe-check-itcl: @if itcl @@ -11629,9 +14543,9 @@ maybe-check-itcl: check-itcl check-itcl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd itcl && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/itcl && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif itcl @@ -11643,9 +14557,9 @@ maybe-install-itcl: install-itcl install-itcl: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd itcl && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/itcl && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif itcl @@ -11661,13 +14575,12 @@ info-itcl: \ @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11687,13 +14600,12 @@ dvi-itcl: \ @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11703,6 +14615,31 @@ dvi-itcl: \ @endif itcl +.PHONY: maybe-html-itcl html-itcl +maybe-html-itcl: +@if itcl +maybe-html-itcl: html-itcl + +html-itcl: \ + configure-itcl + @[ -f ./itcl/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 itcl" ; \ + (cd $(HOST_SUBDIR)/itcl && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif itcl + .PHONY: maybe-TAGS-itcl TAGS-itcl maybe-TAGS-itcl: @if itcl @@ -11713,13 +14650,12 @@ TAGS-itcl: \ @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11740,13 +14676,12 @@ install-info-itcl: \ @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11766,13 +14701,12 @@ installcheck-itcl: \ @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11791,13 +14725,12 @@ mostlyclean-itcl: @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11816,13 +14749,12 @@ clean-itcl: @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11841,13 +14773,12 @@ distclean-itcl: @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11866,13 +14797,12 @@ maintainer-clean-itcl: @[ -f ./itcl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 itcl" ; \ - (cd itcl && \ + (cd $(HOST_SUBDIR)/itcl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11883,46 +14813,378 @@ maintainer-clean-itcl: @endif itcl + .PHONY: configure-ld maybe-configure-ld maybe-configure-ld: @if ld maybe-configure-ld: configure-ld -configure-ld: - @test ! -f ld/Makefile || exit 0; \ - [ -d ld ] || mkdir ld; \ +configure-ld: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in ld; \ - cd ld || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/ld; \ + cd "$(HOST_SUBDIR)/ld" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/ld"; \ - libsrcdir="$$s/ld";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/ld"; \ - libsrcdir="$$s/ld";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif ld + + +.PHONY: configure-stage1-ld maybe-configure-stage1-ld +maybe-configure-stage1-ld: +@if ld-bootstrap +maybe-configure-stage1-ld: configure-stage1-ld +configure-stage1-ld: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif ld-bootstrap + +.PHONY: configure-stage2-ld maybe-configure-stage2-ld +maybe-configure-stage2-ld: +@if ld-bootstrap +maybe-configure-stage2-ld: configure-stage2-ld +configure-stage2-ld: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif ld-bootstrap + +.PHONY: configure-stage3-ld maybe-configure-stage3-ld +maybe-configure-stage3-ld: +@if ld-bootstrap +maybe-configure-stage3-ld: configure-stage3-ld +configure-stage3-ld: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif ld-bootstrap + +.PHONY: configure-stage4-ld maybe-configure-stage4-ld +maybe-configure-stage4-ld: +@if ld-bootstrap +maybe-configure-stage4-ld: configure-stage4-ld +configure-stage4-ld: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif ld-bootstrap + +.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld +maybe-configure-stageprofile-ld: +@if ld-bootstrap +maybe-configure-stageprofile-ld: configure-stageprofile-ld +configure-stageprofile-ld: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif ld-bootstrap + +.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld +maybe-configure-stagefeedback-ld: +@if ld-bootstrap +maybe-configure-stagefeedback-ld: configure-stagefeedback-ld +configure-stagefeedback-ld: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/ld/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif ld-bootstrap + + + + + .PHONY: all-ld maybe-all-ld maybe-all-ld: @if ld +TARGET-ld=all maybe-all-ld: all-ld all-ld: configure-ld - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ld && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-ld)) @endif ld + + +.PHONY: all-stage1-ld maybe-all-stage1-ld +.PHONY: clean-stage1-ld maybe-clean-stage1-ld +maybe-all-stage1-ld: +maybe-clean-stage1-ld: +@if ld-bootstrap +maybe-all-stage1-ld: all-stage1-ld +all-stage1: all-stage1-ld +all-stage1-ld: configure-stage1-ld + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-ld: clean-stage1-ld +clean-stage1: clean-stage1-ld +clean-stage1-ld: + @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-ld/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif ld-bootstrap + + +.PHONY: all-stage2-ld maybe-all-stage2-ld +.PHONY: clean-stage2-ld maybe-clean-stage2-ld +maybe-all-stage2-ld: +maybe-clean-stage2-ld: +@if ld-bootstrap +maybe-all-stage2-ld: all-stage2-ld +all-stage2: all-stage2-ld +all-stage2-ld: configure-stage2-ld + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-ld: clean-stage2-ld +clean-stage2: clean-stage2-ld +clean-stage2-ld: + @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-ld/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + +.PHONY: all-stage3-ld maybe-all-stage3-ld +.PHONY: clean-stage3-ld maybe-clean-stage3-ld +maybe-all-stage3-ld: +maybe-clean-stage3-ld: +@if ld-bootstrap +maybe-all-stage3-ld: all-stage3-ld +all-stage3: all-stage3-ld +all-stage3-ld: configure-stage3-ld + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-ld: clean-stage3-ld +clean-stage3: clean-stage3-ld +clean-stage3-ld: + @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-ld/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + +.PHONY: all-stage4-ld maybe-all-stage4-ld +.PHONY: clean-stage4-ld maybe-clean-stage4-ld +maybe-all-stage4-ld: +maybe-clean-stage4-ld: +@if ld-bootstrap +maybe-all-stage4-ld: all-stage4-ld +all-stage4: all-stage4-ld +all-stage4-ld: configure-stage4-ld + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-ld: clean-stage4-ld +clean-stage4: clean-stage4-ld +clean-stage4-ld: + @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-ld/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif ld-bootstrap + + +.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld +.PHONY: clean-stageprofile-ld maybe-clean-stageprofile-ld +maybe-all-stageprofile-ld: +maybe-clean-stageprofile-ld: +@if ld-bootstrap +maybe-all-stageprofile-ld: all-stageprofile-ld +all-stageprofile: all-stageprofile-ld +all-stageprofile-ld: configure-stageprofile-ld + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-ld: clean-stageprofile-ld +clean-stageprofile: clean-stageprofile-ld +clean-stageprofile-ld: + @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-ld/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif ld-bootstrap + + +.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld +.PHONY: clean-stagefeedback-ld maybe-clean-stagefeedback-ld +maybe-all-stagefeedback-ld: +maybe-clean-stagefeedback-ld: +@if ld-bootstrap +maybe-all-stagefeedback-ld: all-stagefeedback-ld +all-stagefeedback: all-stagefeedback-ld +all-stagefeedback-ld: configure-stagefeedback-ld + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-ld: clean-stagefeedback-ld +clean-stagefeedback: clean-stagefeedback-ld +clean-stagefeedback-ld: + @[ -f $(HOST_SUBDIR)/ld/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-ld/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/ld/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif ld-bootstrap + + + + + .PHONY: check-ld maybe-check-ld maybe-check-ld: @if ld @@ -11931,9 +15193,9 @@ maybe-check-ld: check-ld check-ld: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ld && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif ld @@ -11945,9 +15207,9 @@ maybe-install-ld: install-ld install-ld: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ld && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif ld @@ -11963,13 +15225,12 @@ info-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -11989,13 +15250,12 @@ dvi-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12005,6 +15265,31 @@ dvi-ld: \ @endif ld +.PHONY: maybe-html-ld html-ld +maybe-html-ld: +@if ld +maybe-html-ld: html-ld + +html-ld: \ + configure-ld + @[ -f ./ld/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 ld" ; \ + (cd $(HOST_SUBDIR)/ld && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif ld + .PHONY: maybe-TAGS-ld TAGS-ld maybe-TAGS-ld: @if ld @@ -12015,13 +15300,12 @@ TAGS-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12042,13 +15326,12 @@ install-info-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12068,13 +15351,12 @@ installcheck-ld: \ @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12093,13 +15375,12 @@ mostlyclean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12118,13 +15399,12 @@ clean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12143,13 +15423,12 @@ distclean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12168,13 +15447,12 @@ maintainer-clean-ld: @[ -f ./ld/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 ld" ; \ - (cd ld && \ + (cd $(HOST_SUBDIR)/ld && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12185,46 +15463,378 @@ maintainer-clean-ld: @endif ld + .PHONY: configure-libcpp maybe-configure-libcpp maybe-configure-libcpp: @if libcpp maybe-configure-libcpp: configure-libcpp -configure-libcpp: - @test ! -f libcpp/Makefile || exit 0; \ - [ -d libcpp ] || mkdir libcpp; \ +configure-libcpp: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in libcpp; \ - cd libcpp || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libcpp; \ + cd "$(HOST_SUBDIR)/libcpp" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libcpp"; \ - libsrcdir="$$s/libcpp";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libcpp"; \ - libsrcdir="$$s/libcpp";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libcpp + + +.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp +maybe-configure-stage1-libcpp: +@if libcpp-bootstrap +maybe-configure-stage1-libcpp: configure-stage1-libcpp +configure-stage1-libcpp: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif libcpp-bootstrap + +.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp +maybe-configure-stage2-libcpp: +@if libcpp-bootstrap +maybe-configure-stage2-libcpp: configure-stage2-libcpp +configure-stage2-libcpp: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libcpp-bootstrap + +.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp +maybe-configure-stage3-libcpp: +@if libcpp-bootstrap +maybe-configure-stage3-libcpp: configure-stage3-libcpp +configure-stage3-libcpp: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libcpp-bootstrap + +.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp +maybe-configure-stage4-libcpp: +@if libcpp-bootstrap +maybe-configure-stage4-libcpp: configure-stage4-libcpp +configure-stage4-libcpp: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libcpp-bootstrap + +.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp +maybe-configure-stageprofile-libcpp: +@if libcpp-bootstrap +maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp +configure-stageprofile-libcpp: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libcpp-bootstrap + +.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp +maybe-configure-stagefeedback-libcpp: +@if libcpp-bootstrap +maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp +configure-stagefeedback-libcpp: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libcpp-bootstrap + + + + + .PHONY: all-libcpp maybe-all-libcpp maybe-all-libcpp: @if libcpp +TARGET-libcpp=all maybe-all-libcpp: all-libcpp all-libcpp: configure-libcpp - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libcpp)) @endif libcpp + + +.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp +.PHONY: clean-stage1-libcpp maybe-clean-stage1-libcpp +maybe-all-stage1-libcpp: +maybe-clean-stage1-libcpp: +@if libcpp-bootstrap +maybe-all-stage1-libcpp: all-stage1-libcpp +all-stage1: all-stage1-libcpp +all-stage1-libcpp: configure-stage1-libcpp + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-libcpp: clean-stage1-libcpp +clean-stage1: clean-stage1-libcpp +clean-stage1-libcpp: + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif libcpp-bootstrap + + +.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp +.PHONY: clean-stage2-libcpp maybe-clean-stage2-libcpp +maybe-all-stage2-libcpp: +maybe-clean-stage2-libcpp: +@if libcpp-bootstrap +maybe-all-stage2-libcpp: all-stage2-libcpp +all-stage2: all-stage2-libcpp +all-stage2-libcpp: configure-stage2-libcpp + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-libcpp: clean-stage2-libcpp +clean-stage2: clean-stage2-libcpp +clean-stage2-libcpp: + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + +.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp +.PHONY: clean-stage3-libcpp maybe-clean-stage3-libcpp +maybe-all-stage3-libcpp: +maybe-clean-stage3-libcpp: +@if libcpp-bootstrap +maybe-all-stage3-libcpp: all-stage3-libcpp +all-stage3: all-stage3-libcpp +all-stage3-libcpp: configure-stage3-libcpp + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-libcpp: clean-stage3-libcpp +clean-stage3: clean-stage3-libcpp +clean-stage3-libcpp: + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + +.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp +.PHONY: clean-stage4-libcpp maybe-clean-stage4-libcpp +maybe-all-stage4-libcpp: +maybe-clean-stage4-libcpp: +@if libcpp-bootstrap +maybe-all-stage4-libcpp: all-stage4-libcpp +all-stage4: all-stage4-libcpp +all-stage4-libcpp: configure-stage4-libcpp + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-libcpp: clean-stage4-libcpp +clean-stage4: clean-stage4-libcpp +clean-stage4-libcpp: + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libcpp-bootstrap + + +.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp +.PHONY: clean-stageprofile-libcpp maybe-clean-stageprofile-libcpp +maybe-all-stageprofile-libcpp: +maybe-clean-stageprofile-libcpp: +@if libcpp-bootstrap +maybe-all-stageprofile-libcpp: all-stageprofile-libcpp +all-stageprofile: all-stageprofile-libcpp +all-stageprofile-libcpp: configure-stageprofile-libcpp + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp +clean-stageprofile: clean-stageprofile-libcpp +clean-stageprofile-libcpp: + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif libcpp-bootstrap + + +.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp +.PHONY: clean-stagefeedback-libcpp maybe-clean-stagefeedback-libcpp +maybe-all-stagefeedback-libcpp: +maybe-clean-stagefeedback-libcpp: +@if libcpp-bootstrap +maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp +all-stagefeedback: all-stagefeedback-libcpp +all-stagefeedback-libcpp: configure-stagefeedback-libcpp + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp +clean-stagefeedback: clean-stagefeedback-libcpp +clean-stagefeedback-libcpp: + @[ -f $(HOST_SUBDIR)/libcpp/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libcpp/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libcpp/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif libcpp-bootstrap + + + + + .PHONY: check-libcpp maybe-check-libcpp maybe-check-libcpp: @if libcpp @@ -12233,9 +15843,9 @@ maybe-check-libcpp: check-libcpp check-libcpp: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif libcpp @@ -12247,9 +15857,9 @@ maybe-install-libcpp: install-libcpp install-libcpp: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif libcpp @@ -12265,13 +15875,12 @@ info-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12291,13 +15900,12 @@ dvi-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12307,6 +15915,31 @@ dvi-libcpp: \ @endif libcpp +.PHONY: maybe-html-libcpp html-libcpp +maybe-html-libcpp: +@if libcpp +maybe-html-libcpp: html-libcpp + +html-libcpp: \ + configure-libcpp + @[ -f ./libcpp/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 libcpp" ; \ + (cd $(HOST_SUBDIR)/libcpp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif libcpp + .PHONY: maybe-TAGS-libcpp TAGS-libcpp maybe-TAGS-libcpp: @if libcpp @@ -12317,13 +15950,12 @@ TAGS-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12344,13 +15976,12 @@ install-info-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12370,13 +16001,12 @@ installcheck-libcpp: \ @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12395,13 +16025,12 @@ mostlyclean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12420,13 +16049,12 @@ clean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12445,13 +16073,12 @@ distclean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12470,13 +16097,12 @@ maintainer-clean-libcpp: @[ -f ./libcpp/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libcpp" ; \ - (cd libcpp && \ + (cd $(HOST_SUBDIR)/libcpp && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12487,46 +16113,51 @@ maintainer-clean-libcpp: @endif libcpp + .PHONY: configure-libgui maybe-configure-libgui maybe-configure-libgui: @if libgui maybe-configure-libgui: configure-libgui -configure-libgui: - @test ! -f libgui/Makefile || exit 0; \ - [ -d libgui ] || mkdir libgui; \ +configure-libgui: + @test ! -f $(HOST_SUBDIR)/libgui/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in libgui; \ - cd libgui || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libgui; \ + cd "$(HOST_SUBDIR)/libgui" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libgui"; \ - libsrcdir="$$s/libgui";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libgui"; \ - libsrcdir="$$s/libgui";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libgui/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/libgui"; \ + libsrcdir="$$s/libgui"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libgui + + + + .PHONY: all-libgui maybe-all-libgui maybe-all-libgui: @if libgui +TARGET-libgui=all maybe-all-libgui: all-libgui all-libgui: configure-libgui @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libgui && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/libgui && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgui)) @endif libgui + + + .PHONY: check-libgui maybe-check-libgui maybe-check-libgui: @if libgui @@ -12535,9 +16166,9 @@ maybe-check-libgui: check-libgui check-libgui: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libgui && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/libgui && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif libgui @@ -12549,9 +16180,9 @@ maybe-install-libgui: install-libgui install-libgui: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libgui && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/libgui && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif libgui @@ -12567,13 +16198,12 @@ info-libgui: \ @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12583,28 +16213,52 @@ info-libgui: \ @endif libgui -.PHONY: maybe-dvi-libgui dvi-libgui -maybe-dvi-libgui: +.PHONY: maybe-dvi-libgui dvi-libgui +maybe-dvi-libgui: +@if libgui +maybe-dvi-libgui: dvi-libgui + +dvi-libgui: \ + configure-libgui + @[ -f ./libgui/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 libgui" ; \ + (cd $(HOST_SUBDIR)/libgui && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + dvi) \ + || exit 1 + +@endif libgui + +.PHONY: maybe-html-libgui html-libgui +maybe-html-libgui: @if libgui -maybe-dvi-libgui: dvi-libgui +maybe-html-libgui: html-libgui -dvi-libgui: \ +html-libgui: \ configure-libgui @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in libgui" ; \ - (cd 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}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif libgui @@ -12619,13 +16273,12 @@ TAGS-libgui: \ @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12646,13 +16299,12 @@ install-info-libgui: \ @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12672,13 +16324,12 @@ installcheck-libgui: \ @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12697,13 +16348,12 @@ mostlyclean-libgui: @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12722,13 +16372,12 @@ clean-libgui: @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12747,13 +16396,12 @@ distclean-libgui: @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12772,13 +16420,12 @@ maintainer-clean-libgui: @[ -f ./libgui/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libgui" ; \ - (cd libgui && \ + (cd $(HOST_SUBDIR)/libgui && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -12789,342 +16436,377 @@ maintainer-clean-libgui: @endif libgui -.PHONY: configure-libbanshee maybe-configure-libbanshee -maybe-configure-libbanshee: -@if libbanshee -maybe-configure-libbanshee: configure-libbanshee -configure-libbanshee: - @test ! -f libbanshee/Makefile || exit 0; \ - [ -d libbanshee ] || mkdir libbanshee; \ + +.PHONY: configure-libiberty maybe-configure-libiberty +maybe-configure-libiberty: +@if libiberty +maybe-configure-libiberty: configure-libiberty +configure-libiberty: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in libbanshee; \ - cd libbanshee || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libiberty; \ + cd "$(HOST_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libbanshee"; \ - libsrcdir="$$s/libbanshee";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 -@endif libbanshee +@endif libiberty -.PHONY: all-libbanshee maybe-all-libbanshee -maybe-all-libbanshee: -@if libbanshee -maybe-all-libbanshee: all-libbanshee -all-libbanshee: configure-libbanshee - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) all) -@endif libbanshee -.PHONY: check-libbanshee maybe-check-libbanshee -maybe-check-libbanshee: -@if libbanshee -maybe-check-libbanshee: check-libbanshee -check-libbanshee: - @r=`${PWD_COMMAND}`; export r; \ +.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty +maybe-configure-stage1-libiberty: +@if libiberty-bootstrap +maybe-configure-stage1-libiberty: configure-stage1-libiberty +configure-stage1-libiberty: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libbanshee && $(MAKE) $(FLAGS_TO_PASS) check) - -@endif libbanshee - -.PHONY: install-libbanshee maybe-install-libbanshee -maybe-install-libbanshee: -@if libbanshee -maybe-install-libbanshee: install-libbanshee - -install-libbanshee: - -@endif libbanshee - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-libbanshee info-libbanshee -maybe-info-libbanshee: -@if libbanshee -maybe-info-libbanshee: info-libbanshee + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif libiberty-bootstrap -info-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ +.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty +maybe-configure-stage2-libiberty: +@if libiberty-bootstrap +maybe-configure-stage2-libiberty: configure-stage2-libiberty +configure-stage2-libiberty: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-dvi-libbanshee dvi-libbanshee -maybe-dvi-libbanshee: -@if libbanshee -maybe-dvi-libbanshee: dvi-libbanshee + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libiberty-bootstrap -dvi-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ +.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty +maybe-configure-stage3-libiberty: +@if libiberty-bootstrap +maybe-configure-stage3-libiberty: configure-stage3-libiberty +configure-stage3-libiberty: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-TAGS-libbanshee TAGS-libbanshee -maybe-TAGS-libbanshee: -@if libbanshee -maybe-TAGS-libbanshee: TAGS-libbanshee + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libiberty-bootstrap -TAGS-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ +.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty +maybe-configure-stage4-libiberty: +@if libiberty-bootstrap +maybe-configure-stage4-libiberty: configure-stage4-libiberty +configure-stage4-libiberty: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-install-info-libbanshee install-info-libbanshee -maybe-install-info-libbanshee: -@if libbanshee -maybe-install-info-libbanshee: install-info-libbanshee + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libiberty-bootstrap -install-info-libbanshee: \ - configure-libbanshee \ - info-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ +.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty +maybe-configure-stageprofile-libiberty: +@if libiberty-bootstrap +maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty +configure-stageprofile-libiberty: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif libbanshee - -.PHONY: maybe-installcheck-libbanshee installcheck-libbanshee -maybe-installcheck-libbanshee: -@if libbanshee -maybe-installcheck-libbanshee: installcheck-libbanshee + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libiberty-bootstrap -installcheck-libbanshee: \ - configure-libbanshee - @[ -f ./libbanshee/Makefile ] || exit 0; \ +.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty +maybe-configure-stagefeedback-libiberty: +@if libiberty-bootstrap +maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty +configure-stagefeedback-libiberty: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] && exit 0 || : ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif libbanshee + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif libiberty-bootstrap -.PHONY: maybe-mostlyclean-libbanshee mostlyclean-libbanshee -maybe-mostlyclean-libbanshee: -@if libbanshee -maybe-mostlyclean-libbanshee: mostlyclean-libbanshee -mostlyclean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 -@endif libbanshee -.PHONY: maybe-clean-libbanshee clean-libbanshee -maybe-clean-libbanshee: -@if libbanshee -maybe-clean-libbanshee: clean-libbanshee -clean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ +.PHONY: all-libiberty maybe-all-libiberty +maybe-all-libiberty: +@if libiberty +TARGET-libiberty=all +maybe-all-libiberty: all-libiberty +all-libiberty: configure-libiberty + @test -f stage_last && exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 + (cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libiberty)) +@endif libiberty -@endif libbanshee -.PHONY: maybe-distclean-libbanshee distclean-libbanshee -maybe-distclean-libbanshee: -@if libbanshee -maybe-distclean-libbanshee: distclean-libbanshee -distclean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ +.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty +.PHONY: clean-stage1-libiberty maybe-clean-stage1-libiberty +maybe-all-stage1-libiberty: +maybe-clean-stage1-libiberty: +@if libiberty-bootstrap +maybe-all-stage1-libiberty: all-stage1-libiberty +all-stage1: all-stage1-libiberty +all-stage1-libiberty: configure-stage1-libiberty + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" -@endif libbanshee +maybe-clean-stage1-libiberty: clean-stage1-libiberty +clean-stage1: clean-stage1-libiberty +clean-stage1-libiberty: + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif libiberty-bootstrap -.PHONY: maybe-maintainer-clean-libbanshee maintainer-clean-libbanshee -maybe-maintainer-clean-libbanshee: -@if libbanshee -maybe-maintainer-clean-libbanshee: maintainer-clean-libbanshee -maintainer-clean-libbanshee: - @[ -f ./libbanshee/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ +.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty +.PHONY: clean-stage2-libiberty maybe-clean-stage2-libiberty +maybe-all-stage2-libiberty: +maybe-clean-stage2-libiberty: +@if libiberty-bootstrap +maybe-all-stage2-libiberty: all-stage2-libiberty +all-stage2: all-stage2-libiberty +all-stage2-libiberty: configure-stage2-libiberty + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libbanshee" ; \ - (cd libbanshee && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-libiberty: clean-stage2-libiberty +clean-stage2: clean-stage2-libiberty +clean-stage2-libiberty: + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + +.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty +.PHONY: clean-stage3-libiberty maybe-clean-stage3-libiberty +maybe-all-stage3-libiberty: +maybe-clean-stage3-libiberty: +@if libiberty-bootstrap +maybe-all-stage3-libiberty: all-stage3-libiberty +all-stage3: all-stage3-libiberty +all-stage3-libiberty: configure-stage3-libiberty + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-libiberty: clean-stage3-libiberty +clean-stage3: clean-stage3-libiberty +clean-stage3-libiberty: + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + +.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty +.PHONY: clean-stage4-libiberty maybe-clean-stage4-libiberty +maybe-all-stage4-libiberty: +maybe-clean-stage4-libiberty: +@if libiberty-bootstrap +maybe-all-stage4-libiberty: all-stage4-libiberty +all-stage4: all-stage4-libiberty +all-stage4-libiberty: configure-stage4-libiberty + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-libiberty: clean-stage4-libiberty +clean-stage4: clean-stage4-libiberty +clean-stage4-libiberty: + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif libiberty-bootstrap + + +.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty +.PHONY: clean-stageprofile-libiberty maybe-clean-stageprofile-libiberty +maybe-all-stageprofile-libiberty: +maybe-clean-stageprofile-libiberty: +@if libiberty-bootstrap +maybe-all-stageprofile-libiberty: all-stageprofile-libiberty +all-stageprofile: all-stageprofile-libiberty +all-stageprofile-libiberty: configure-stageprofile-libiberty + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty +clean-stageprofile: clean-stageprofile-libiberty +clean-stageprofile-libiberty: + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif libiberty-bootstrap + + +.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty +.PHONY: clean-stagefeedback-libiberty maybe-clean-stagefeedback-libiberty +maybe-all-stagefeedback-libiberty: +maybe-clean-stagefeedback-libiberty: +@if libiberty-bootstrap +maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty +all-stagefeedback: all-stagefeedback-libiberty +all-stagefeedback-libiberty: configure-stagefeedback-libiberty + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty +clean-stagefeedback: clean-stagefeedback-libiberty +clean-stagefeedback-libiberty: + @[ -f $(HOST_SUBDIR)/libiberty/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-libiberty/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/libiberty/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif libiberty-bootstrap -@endif libbanshee -.PHONY: configure-libiberty maybe-configure-libiberty -maybe-configure-libiberty: -@if libiberty -maybe-configure-libiberty: configure-libiberty -configure-libiberty: - @test ! -f libiberty/Makefile || exit 0; \ - [ -d libiberty ] || mkdir libiberty; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in libiberty; \ - cd libiberty || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libiberty"; \ - libsrcdir="$$s/libiberty";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libiberty"; \ - libsrcdir="$$s/libiberty";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif libiberty -.PHONY: all-libiberty maybe-all-libiberty -maybe-all-libiberty: -@if libiberty -maybe-all-libiberty: all-libiberty -all-libiberty: configure-libiberty - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all) -@endif libiberty .PHONY: check-libiberty maybe-check-libiberty maybe-check-libiberty: @@ -13134,9 +16816,9 @@ maybe-check-libiberty: check-libiberty check-libiberty: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif libiberty @@ -13148,9 +16830,9 @@ maybe-install-libiberty: install-libiberty install-libiberty: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif libiberty @@ -13166,13 +16848,12 @@ info-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13192,13 +16873,12 @@ dvi-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13208,6 +16888,31 @@ dvi-libiberty: \ @endif libiberty +.PHONY: maybe-html-libiberty html-libiberty +maybe-html-libiberty: +@if libiberty +maybe-html-libiberty: html-libiberty + +html-libiberty: \ + configure-libiberty + @[ -f ./libiberty/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 libiberty" ; \ + (cd $(HOST_SUBDIR)/libiberty && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif libiberty + .PHONY: maybe-TAGS-libiberty TAGS-libiberty maybe-TAGS-libiberty: @if libiberty @@ -13218,13 +16923,12 @@ TAGS-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13245,13 +16949,12 @@ install-info-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13271,13 +16974,12 @@ installcheck-libiberty: \ @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13296,13 +16998,12 @@ mostlyclean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13321,13 +17022,12 @@ clean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13346,13 +17046,12 @@ distclean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13371,13 +17070,12 @@ maintainer-clean-libiberty: @[ -f ./libiberty/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libiberty" ; \ - (cd libiberty && \ + (cd $(HOST_SUBDIR)/libiberty && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13388,46 +17086,51 @@ maintainer-clean-libiberty: @endif libiberty + .PHONY: configure-libtool maybe-configure-libtool maybe-configure-libtool: @if libtool maybe-configure-libtool: configure-libtool -configure-libtool: - @test ! -f libtool/Makefile || exit 0; \ - [ -d libtool ] || mkdir libtool; \ +configure-libtool: + @test ! -f $(HOST_SUBDIR)/libtool/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtool ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in libtool; \ - cd libtool || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libtool; \ + cd "$(HOST_SUBDIR)/libtool" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libtool"; \ - libsrcdir="$$s/libtool";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libtool"; \ - libsrcdir="$$s/libtool";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/libtool/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/libtool"; \ + libsrcdir="$$s/libtool"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif libtool + + + + .PHONY: all-libtool maybe-all-libtool maybe-all-libtool: @if libtool +TARGET-libtool=all maybe-all-libtool: all-libtool all-libtool: configure-libtool @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libtool && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/libtool && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtool)) @endif libtool + + + .PHONY: check-libtool maybe-check-libtool maybe-check-libtool: @if libtool @@ -13436,9 +17139,9 @@ maybe-check-libtool: check-libtool check-libtool: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libtool && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/libtool && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif libtool @@ -13450,9 +17153,9 @@ maybe-install-libtool: install-libtool install-libtool: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libtool && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/libtool && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif libtool @@ -13468,13 +17171,12 @@ info-libtool: \ @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13494,13 +17196,12 @@ dvi-libtool: \ @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13510,6 +17211,31 @@ dvi-libtool: \ @endif libtool +.PHONY: maybe-html-libtool html-libtool +maybe-html-libtool: +@if libtool +maybe-html-libtool: html-libtool + +html-libtool: \ + configure-libtool + @[ -f ./libtool/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 libtool" ; \ + (cd $(HOST_SUBDIR)/libtool && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif libtool + .PHONY: maybe-TAGS-libtool TAGS-libtool maybe-TAGS-libtool: @if libtool @@ -13520,13 +17246,12 @@ TAGS-libtool: \ @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13547,13 +17272,12 @@ install-info-libtool: \ @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13573,13 +17297,12 @@ installcheck-libtool: \ @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13598,13 +17321,12 @@ mostlyclean-libtool: @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13623,13 +17345,12 @@ clean-libtool: @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13648,13 +17369,12 @@ distclean-libtool: @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13673,13 +17393,12 @@ maintainer-clean-libtool: @[ -f ./libtool/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtool" ; \ - (cd libtool && \ + (cd $(HOST_SUBDIR)/libtool && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13690,46 +17409,51 @@ maintainer-clean-libtool: @endif libtool + .PHONY: configure-m4 maybe-configure-m4 maybe-configure-m4: @if m4 maybe-configure-m4: configure-m4 -configure-m4: - @test ! -f m4/Makefile || exit 0; \ - [ -d m4 ] || mkdir m4; \ +configure-m4: + @test ! -f $(HOST_SUBDIR)/m4/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in m4; \ - cd m4 || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/m4; \ + cd "$(HOST_SUBDIR)/m4" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/m4"; \ - libsrcdir="$$s/m4";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/m4"; \ - libsrcdir="$$s/m4";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/m4/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/m4"; \ + libsrcdir="$$s/m4"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif m4 + + + + .PHONY: all-m4 maybe-all-m4 maybe-all-m4: @if m4 +TARGET-m4=all maybe-all-m4: all-m4 all-m4: configure-m4 @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd m4 && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-m4)) @endif m4 + + + .PHONY: check-m4 maybe-check-m4 maybe-check-m4: @if m4 @@ -13738,9 +17462,9 @@ maybe-check-m4: check-m4 check-m4: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd m4 && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif m4 @@ -13752,9 +17476,9 @@ maybe-install-m4: install-m4 install-m4: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd m4 && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/m4 && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif m4 @@ -13770,13 +17494,12 @@ info-m4: \ @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13796,13 +17519,12 @@ dvi-m4: \ @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13812,6 +17534,31 @@ dvi-m4: \ @endif m4 +.PHONY: maybe-html-m4 html-m4 +maybe-html-m4: +@if m4 +maybe-html-m4: html-m4 + +html-m4: \ + configure-m4 + @[ -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}" \ + html) \ + || exit 1 + +@endif m4 + .PHONY: maybe-TAGS-m4 TAGS-m4 maybe-TAGS-m4: @if m4 @@ -13822,13 +17569,12 @@ TAGS-m4: \ @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13849,13 +17595,12 @@ install-info-m4: \ @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13875,13 +17620,12 @@ installcheck-m4: \ @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in m4" ; \ - (cd m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13900,13 +17644,12 @@ mostlyclean-m4: @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in m4" ; \ - (cd m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13925,13 +17668,12 @@ clean-m4: @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in m4" ; \ - (cd m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13950,13 +17692,12 @@ distclean-m4: @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in m4" ; \ - (cd m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13975,13 +17716,12 @@ maintainer-clean-m4: @[ -f ./m4/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 m4" ; \ - (cd m4 && \ + (cd $(HOST_SUBDIR)/m4 && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -13992,46 +17732,51 @@ maintainer-clean-m4: @endif m4 + .PHONY: configure-make maybe-configure-make maybe-configure-make: @if make maybe-configure-make: configure-make -configure-make: - @test ! -f make/Makefile || exit 0; \ - [ -d make ] || mkdir make; \ +configure-make: + @test ! -f $(HOST_SUBDIR)/make/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/make ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in make; \ - cd make || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/make; \ + cd "$(HOST_SUBDIR)/make" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/make"; \ - libsrcdir="$$s/make";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/make"; \ - libsrcdir="$$s/make";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/make/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/make"; \ + libsrcdir="$$s/make"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif make + + + + .PHONY: all-make maybe-all-make maybe-all-make: @if make +TARGET-make=all maybe-all-make: all-make all-make: configure-make @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd make && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/make && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-make)) @endif make + + + .PHONY: check-make maybe-check-make maybe-check-make: @if make @@ -14040,9 +17785,9 @@ maybe-check-make: check-make check-make: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd make && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/make && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif make @@ -14054,9 +17799,9 @@ maybe-install-make: install-make install-make: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd make && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/make && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif make @@ -14072,13 +17817,12 @@ info-make: \ @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14098,13 +17842,12 @@ dvi-make: \ @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14114,6 +17857,31 @@ dvi-make: \ @endif make +.PHONY: maybe-html-make html-make +maybe-html-make: +@if make +maybe-html-make: html-make + +html-make: \ + configure-make + @[ -f ./make/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 make" ; \ + (cd $(HOST_SUBDIR)/make && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif make + .PHONY: maybe-TAGS-make TAGS-make maybe-TAGS-make: @if make @@ -14124,13 +17892,12 @@ TAGS-make: \ @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14151,13 +17918,12 @@ install-info-make: \ @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14177,13 +17943,12 @@ installcheck-make: \ @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14202,13 +17967,12 @@ mostlyclean-make: @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14227,13 +17991,12 @@ clean-make: @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14252,13 +18015,12 @@ distclean-make: @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14277,13 +18039,12 @@ maintainer-clean-make: @[ -f ./make/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 make" ; \ - (cd make && \ + (cd $(HOST_SUBDIR)/make && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14294,46 +18055,51 @@ maintainer-clean-make: @endif make + .PHONY: configure-mmalloc maybe-configure-mmalloc maybe-configure-mmalloc: @if mmalloc maybe-configure-mmalloc: configure-mmalloc -configure-mmalloc: - @test ! -f mmalloc/Makefile || exit 0; \ - [ -d mmalloc ] || mkdir mmalloc; \ +configure-mmalloc: + @test ! -f $(HOST_SUBDIR)/mmalloc/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mmalloc ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in mmalloc; \ - cd mmalloc || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/mmalloc; \ + cd "$(HOST_SUBDIR)/mmalloc" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/mmalloc"; \ - libsrcdir="$$s/mmalloc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/mmalloc"; \ - libsrcdir="$$s/mmalloc";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/mmalloc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/mmalloc"; \ + libsrcdir="$$s/mmalloc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif mmalloc + + + + .PHONY: all-mmalloc maybe-all-mmalloc maybe-all-mmalloc: @if mmalloc +TARGET-mmalloc=all maybe-all-mmalloc: all-mmalloc all-mmalloc: configure-mmalloc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/mmalloc && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-mmalloc)) @endif mmalloc + + + .PHONY: check-mmalloc maybe-check-mmalloc maybe-check-mmalloc: @if mmalloc @@ -14351,9 +18117,9 @@ maybe-install-mmalloc: install-mmalloc install-mmalloc: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd mmalloc && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/mmalloc && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif mmalloc @@ -14369,13 +18135,12 @@ info-mmalloc: \ @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14395,13 +18160,12 @@ dvi-mmalloc: \ @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14411,6 +18175,31 @@ dvi-mmalloc: \ @endif mmalloc +.PHONY: maybe-html-mmalloc html-mmalloc +maybe-html-mmalloc: +@if mmalloc +maybe-html-mmalloc: html-mmalloc + +html-mmalloc: \ + configure-mmalloc + @[ -f ./mmalloc/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 mmalloc" ; \ + (cd $(HOST_SUBDIR)/mmalloc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif mmalloc + .PHONY: maybe-TAGS-mmalloc TAGS-mmalloc maybe-TAGS-mmalloc: @if mmalloc @@ -14421,13 +18210,12 @@ TAGS-mmalloc: \ @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14448,13 +18236,12 @@ install-info-mmalloc: \ @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14474,13 +18261,12 @@ installcheck-mmalloc: \ @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14499,13 +18285,12 @@ mostlyclean-mmalloc: @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14524,13 +18309,12 @@ clean-mmalloc: @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14549,13 +18333,12 @@ distclean-mmalloc: @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14574,13 +18357,12 @@ maintainer-clean-mmalloc: @[ -f ./mmalloc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 mmalloc" ; \ - (cd mmalloc && \ + (cd $(HOST_SUBDIR)/mmalloc && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14591,46 +18373,51 @@ maintainer-clean-mmalloc: @endif mmalloc + .PHONY: configure-patch maybe-configure-patch maybe-configure-patch: @if patch maybe-configure-patch: configure-patch -configure-patch: - @test ! -f patch/Makefile || exit 0; \ - [ -d patch ] || mkdir patch; \ +configure-patch: + @test ! -f $(HOST_SUBDIR)/patch/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/patch ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in patch; \ - cd patch || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/patch; \ + cd "$(HOST_SUBDIR)/patch" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/patch"; \ - libsrcdir="$$s/patch";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/patch"; \ - libsrcdir="$$s/patch";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/patch/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/patch"; \ + libsrcdir="$$s/patch"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif patch + + + + .PHONY: all-patch maybe-all-patch maybe-all-patch: @if patch +TARGET-patch=all maybe-all-patch: all-patch all-patch: configure-patch @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd patch && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/patch && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-patch)) @endif patch + + + .PHONY: check-patch maybe-check-patch maybe-check-patch: @if patch @@ -14639,9 +18426,9 @@ maybe-check-patch: check-patch check-patch: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd patch && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/patch && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif patch @@ -14653,9 +18440,9 @@ maybe-install-patch: install-patch install-patch: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd patch && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/patch && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif patch @@ -14671,13 +18458,12 @@ info-patch: \ @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14697,13 +18483,12 @@ dvi-patch: \ @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14713,6 +18498,31 @@ dvi-patch: \ @endif patch +.PHONY: maybe-html-patch html-patch +maybe-html-patch: +@if patch +maybe-html-patch: html-patch + +html-patch: \ + configure-patch + @[ -f ./patch/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 patch" ; \ + (cd $(HOST_SUBDIR)/patch && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif patch + .PHONY: maybe-TAGS-patch TAGS-patch maybe-TAGS-patch: @if patch @@ -14723,13 +18533,12 @@ TAGS-patch: \ @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14750,13 +18559,12 @@ install-info-patch: \ @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14776,13 +18584,12 @@ installcheck-patch: \ @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14801,13 +18608,12 @@ mostlyclean-patch: @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14826,13 +18632,12 @@ clean-patch: @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14851,13 +18656,12 @@ distclean-patch: @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14876,13 +18680,12 @@ maintainer-clean-patch: @[ -f ./patch/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 patch" ; \ - (cd patch && \ + (cd $(HOST_SUBDIR)/patch && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14893,46 +18696,51 @@ maintainer-clean-patch: @endif patch + .PHONY: configure-perl maybe-configure-perl maybe-configure-perl: @if perl maybe-configure-perl: configure-perl -configure-perl: - @test ! -f perl/Makefile || exit 0; \ - [ -d perl ] || mkdir perl; \ +configure-perl: + @test ! -f $(HOST_SUBDIR)/perl/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/perl ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in perl; \ - cd perl || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/perl; \ + cd "$(HOST_SUBDIR)/perl" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/perl"; \ - libsrcdir="$$s/perl";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/perl"; \ - libsrcdir="$$s/perl";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/perl/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/perl"; \ + libsrcdir="$$s/perl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif perl + + + + .PHONY: all-perl maybe-all-perl maybe-all-perl: @if perl +TARGET-perl=all maybe-all-perl: all-perl all-perl: configure-perl @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd perl && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/perl && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-perl)) @endif perl + + + .PHONY: check-perl maybe-check-perl maybe-check-perl: @if perl @@ -14941,9 +18749,9 @@ maybe-check-perl: check-perl check-perl: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd perl && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/perl && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif perl @@ -14955,9 +18763,9 @@ maybe-install-perl: install-perl install-perl: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd perl && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/perl && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif perl @@ -14973,13 +18781,12 @@ info-perl: \ @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -14999,13 +18806,12 @@ dvi-perl: \ @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15015,6 +18821,31 @@ dvi-perl: \ @endif perl +.PHONY: maybe-html-perl html-perl +maybe-html-perl: +@if perl +maybe-html-perl: html-perl + +html-perl: \ + configure-perl + @[ -f ./perl/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 perl" ; \ + (cd $(HOST_SUBDIR)/perl && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif perl + .PHONY: maybe-TAGS-perl TAGS-perl maybe-TAGS-perl: @if perl @@ -15025,13 +18856,12 @@ TAGS-perl: \ @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15052,13 +18882,12 @@ install-info-perl: \ @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15078,13 +18907,12 @@ installcheck-perl: \ @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15103,13 +18931,12 @@ mostlyclean-perl: @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15128,13 +18955,12 @@ clean-perl: @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15153,13 +18979,12 @@ distclean-perl: @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15178,13 +19003,12 @@ maintainer-clean-perl: @[ -f ./perl/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 perl" ; \ - (cd perl && \ + (cd $(HOST_SUBDIR)/perl && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15195,46 +19019,51 @@ maintainer-clean-perl: @endif perl + .PHONY: configure-prms maybe-configure-prms maybe-configure-prms: @if prms maybe-configure-prms: configure-prms -configure-prms: - @test ! -f prms/Makefile || exit 0; \ - [ -d prms ] || mkdir prms; \ +configure-prms: + @test ! -f $(HOST_SUBDIR)/prms/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/prms ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in prms; \ - cd prms || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/prms; \ + cd "$(HOST_SUBDIR)/prms" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/prms"; \ - libsrcdir="$$s/prms";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/prms"; \ - libsrcdir="$$s/prms";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/prms/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/prms"; \ + libsrcdir="$$s/prms"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif prms + + + + .PHONY: all-prms maybe-all-prms maybe-all-prms: @if prms +TARGET-prms=all maybe-all-prms: all-prms all-prms: configure-prms @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd prms && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/prms && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-prms)) @endif prms + + + .PHONY: check-prms maybe-check-prms maybe-check-prms: @if prms @@ -15243,9 +19072,9 @@ maybe-check-prms: check-prms check-prms: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd prms && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/prms && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif prms @@ -15257,9 +19086,9 @@ maybe-install-prms: install-prms install-prms: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd prms && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/prms && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif prms @@ -15275,13 +19104,12 @@ info-prms: \ @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15301,13 +19129,12 @@ dvi-prms: \ @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15317,6 +19144,31 @@ dvi-prms: \ @endif prms +.PHONY: maybe-html-prms html-prms +maybe-html-prms: +@if prms +maybe-html-prms: html-prms + +html-prms: \ + configure-prms + @[ -f ./prms/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 prms" ; \ + (cd $(HOST_SUBDIR)/prms && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif prms + .PHONY: maybe-TAGS-prms TAGS-prms maybe-TAGS-prms: @if prms @@ -15327,13 +19179,12 @@ TAGS-prms: \ @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15354,13 +19205,12 @@ install-info-prms: \ @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15380,13 +19230,12 @@ installcheck-prms: \ @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15405,13 +19254,12 @@ mostlyclean-prms: @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15430,13 +19278,12 @@ clean-prms: @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15455,13 +19302,12 @@ distclean-prms: @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15480,13 +19326,12 @@ maintainer-clean-prms: @[ -f ./prms/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 prms" ; \ - (cd prms && \ + (cd $(HOST_SUBDIR)/prms && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15497,46 +19342,51 @@ maintainer-clean-prms: @endif prms + .PHONY: configure-rcs maybe-configure-rcs maybe-configure-rcs: @if rcs maybe-configure-rcs: configure-rcs -configure-rcs: - @test ! -f rcs/Makefile || exit 0; \ - [ -d rcs ] || mkdir rcs; \ +configure-rcs: + @test ! -f $(HOST_SUBDIR)/rcs/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/rcs ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in rcs; \ - cd rcs || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/rcs; \ + cd "$(HOST_SUBDIR)/rcs" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/rcs"; \ - libsrcdir="$$s/rcs";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/rcs"; \ - libsrcdir="$$s/rcs";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/rcs/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/rcs"; \ + libsrcdir="$$s/rcs"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif rcs + + + + .PHONY: all-rcs maybe-all-rcs maybe-all-rcs: @if rcs +TARGET-rcs=all maybe-all-rcs: all-rcs all-rcs: configure-rcs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd rcs && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/rcs && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-rcs)) @endif rcs + + + .PHONY: check-rcs maybe-check-rcs maybe-check-rcs: @if rcs @@ -15545,9 +19395,9 @@ maybe-check-rcs: check-rcs check-rcs: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd rcs && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/rcs && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif rcs @@ -15559,9 +19409,9 @@ maybe-install-rcs: install-rcs install-rcs: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd rcs && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/rcs && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif rcs @@ -15577,13 +19427,12 @@ info-rcs: \ @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15603,13 +19452,12 @@ dvi-rcs: \ @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15619,6 +19467,31 @@ dvi-rcs: \ @endif rcs +.PHONY: maybe-html-rcs html-rcs +maybe-html-rcs: +@if rcs +maybe-html-rcs: html-rcs + +html-rcs: \ + configure-rcs + @[ -f ./rcs/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 rcs" ; \ + (cd $(HOST_SUBDIR)/rcs && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif rcs + .PHONY: maybe-TAGS-rcs TAGS-rcs maybe-TAGS-rcs: @if rcs @@ -15629,13 +19502,12 @@ TAGS-rcs: \ @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15656,13 +19528,12 @@ install-info-rcs: \ @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15682,13 +19553,12 @@ installcheck-rcs: \ @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15707,13 +19577,12 @@ mostlyclean-rcs: @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15732,13 +19601,12 @@ clean-rcs: @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15757,13 +19625,12 @@ distclean-rcs: @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15782,13 +19649,12 @@ maintainer-clean-rcs: @[ -f ./rcs/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 rcs" ; \ - (cd rcs && \ + (cd $(HOST_SUBDIR)/rcs && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15799,46 +19665,51 @@ maintainer-clean-rcs: @endif rcs + .PHONY: configure-readline maybe-configure-readline maybe-configure-readline: @if readline maybe-configure-readline: configure-readline -configure-readline: - @test ! -f readline/Makefile || exit 0; \ - [ -d readline ] || mkdir readline; \ +configure-readline: + @test ! -f $(HOST_SUBDIR)/readline/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in readline; \ - cd readline || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/readline; \ + cd "$(HOST_SUBDIR)/readline" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/readline"; \ - libsrcdir="$$s/readline";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/readline"; \ - libsrcdir="$$s/readline";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/readline/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/readline"; \ + libsrcdir="$$s/readline"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif readline + + + + .PHONY: all-readline maybe-all-readline maybe-all-readline: @if readline +TARGET-readline=all maybe-all-readline: all-readline all-readline: configure-readline @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd readline && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/readline && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-readline)) @endif readline + + + .PHONY: check-readline maybe-check-readline maybe-check-readline: @if readline @@ -15847,9 +19718,9 @@ maybe-check-readline: check-readline check-readline: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd readline && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/readline && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif readline @@ -15861,9 +19732,9 @@ maybe-install-readline: install-readline install-readline: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd readline && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/readline && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif readline @@ -15879,13 +19750,12 @@ info-readline: \ @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15905,13 +19775,12 @@ dvi-readline: \ @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15921,6 +19790,31 @@ dvi-readline: \ @endif readline +.PHONY: maybe-html-readline html-readline +maybe-html-readline: +@if readline +maybe-html-readline: html-readline + +html-readline: \ + configure-readline + @[ -f ./readline/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 readline" ; \ + (cd $(HOST_SUBDIR)/readline && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif readline + .PHONY: maybe-TAGS-readline TAGS-readline maybe-TAGS-readline: @if readline @@ -15931,13 +19825,12 @@ TAGS-readline: \ @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15958,13 +19851,12 @@ install-info-readline: \ @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -15984,13 +19876,12 @@ installcheck-readline: \ @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16009,13 +19900,12 @@ mostlyclean-readline: @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16034,13 +19924,12 @@ clean-readline: @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16059,13 +19948,12 @@ distclean-readline: @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16084,13 +19972,12 @@ maintainer-clean-readline: @[ -f ./readline/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 readline" ; \ - (cd readline && \ + (cd $(HOST_SUBDIR)/readline && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16101,46 +19988,51 @@ maintainer-clean-readline: @endif readline + .PHONY: configure-release maybe-configure-release maybe-configure-release: @if release maybe-configure-release: configure-release -configure-release: - @test ! -f release/Makefile || exit 0; \ - [ -d release ] || mkdir release; \ +configure-release: + @test ! -f $(HOST_SUBDIR)/release/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/release ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in release; \ - cd release || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/release; \ + cd "$(HOST_SUBDIR)/release" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/release"; \ - libsrcdir="$$s/release";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/release"; \ - libsrcdir="$$s/release";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/release/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/release"; \ + libsrcdir="$$s/release"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif release + + + + .PHONY: all-release maybe-all-release maybe-all-release: @if release +TARGET-release=all maybe-all-release: all-release all-release: configure-release @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd release && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/release && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-release)) @endif release + + + .PHONY: check-release maybe-check-release maybe-check-release: @if release @@ -16171,13 +20063,12 @@ info-release: \ @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16197,13 +20088,12 @@ dvi-release: \ @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16213,6 +20103,31 @@ dvi-release: \ @endif release +.PHONY: maybe-html-release html-release +maybe-html-release: +@if release +maybe-html-release: html-release + +html-release: \ + configure-release + @[ -f ./release/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 release" ; \ + (cd $(HOST_SUBDIR)/release && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif release + .PHONY: maybe-TAGS-release TAGS-release maybe-TAGS-release: @if release @@ -16223,13 +20138,12 @@ TAGS-release: \ @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16250,13 +20164,12 @@ install-info-release: \ @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16276,13 +20189,12 @@ installcheck-release: \ @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16301,13 +20213,12 @@ mostlyclean-release: @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16326,13 +20237,12 @@ clean-release: @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16351,13 +20261,12 @@ distclean-release: @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16376,13 +20285,12 @@ maintainer-clean-release: @[ -f ./release/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 release" ; \ - (cd release && \ + (cd $(HOST_SUBDIR)/release && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16393,46 +20301,51 @@ maintainer-clean-release: @endif release + .PHONY: configure-recode maybe-configure-recode maybe-configure-recode: @if recode maybe-configure-recode: configure-recode -configure-recode: - @test ! -f recode/Makefile || exit 0; \ - [ -d recode ] || mkdir recode; \ +configure-recode: + @test ! -f $(HOST_SUBDIR)/recode/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/recode ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in recode; \ - cd recode || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/recode; \ + cd "$(HOST_SUBDIR)/recode" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/recode"; \ - libsrcdir="$$s/recode";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/recode"; \ - libsrcdir="$$s/recode";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/recode/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/recode"; \ + libsrcdir="$$s/recode"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif recode + + + + .PHONY: all-recode maybe-all-recode maybe-all-recode: @if recode +TARGET-recode=all maybe-all-recode: all-recode all-recode: configure-recode @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd recode && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/recode && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-recode)) @endif recode + + + .PHONY: check-recode maybe-check-recode maybe-check-recode: @if recode @@ -16441,9 +20354,9 @@ maybe-check-recode: check-recode check-recode: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd recode && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/recode && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif recode @@ -16455,9 +20368,9 @@ maybe-install-recode: install-recode install-recode: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd recode && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/recode && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif recode @@ -16473,13 +20386,12 @@ info-recode: \ @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16499,13 +20411,12 @@ dvi-recode: \ @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16515,6 +20426,31 @@ dvi-recode: \ @endif recode +.PHONY: maybe-html-recode html-recode +maybe-html-recode: +@if recode +maybe-html-recode: html-recode + +html-recode: \ + configure-recode + @[ -f ./recode/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 recode" ; \ + (cd $(HOST_SUBDIR)/recode && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif recode + .PHONY: maybe-TAGS-recode TAGS-recode maybe-TAGS-recode: @if recode @@ -16525,13 +20461,12 @@ TAGS-recode: \ @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16552,13 +20487,12 @@ install-info-recode: \ @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16578,13 +20512,12 @@ installcheck-recode: \ @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16603,13 +20536,12 @@ mostlyclean-recode: @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16628,13 +20560,12 @@ clean-recode: @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16653,13 +20584,12 @@ distclean-recode: @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16678,13 +20608,12 @@ maintainer-clean-recode: @[ -f ./recode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 recode" ; \ - (cd recode && \ + (cd $(HOST_SUBDIR)/recode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16695,46 +20624,51 @@ maintainer-clean-recode: @endif recode + .PHONY: configure-sed maybe-configure-sed maybe-configure-sed: @if sed maybe-configure-sed: configure-sed -configure-sed: - @test ! -f sed/Makefile || exit 0; \ - [ -d sed ] || mkdir sed; \ +configure-sed: + @test ! -f $(HOST_SUBDIR)/sed/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sed ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in sed; \ - cd sed || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/sed; \ + cd "$(HOST_SUBDIR)/sed" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/sed"; \ - libsrcdir="$$s/sed";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/sed"; \ - libsrcdir="$$s/sed";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/sed/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/sed"; \ + libsrcdir="$$s/sed"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif sed + + + + .PHONY: all-sed maybe-all-sed maybe-all-sed: @if sed +TARGET-sed=all maybe-all-sed: all-sed all-sed: configure-sed @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sed && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/sed && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sed)) @endif sed + + + .PHONY: check-sed maybe-check-sed maybe-check-sed: @if sed @@ -16743,9 +20677,9 @@ maybe-check-sed: check-sed check-sed: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sed && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/sed && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif sed @@ -16757,9 +20691,9 @@ maybe-install-sed: install-sed install-sed: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sed && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/sed && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif sed @@ -16768,51 +20702,74 @@ install-sed: installdirs .PHONY: maybe-info-sed info-sed maybe-info-sed: @if sed -maybe-info-sed: info-sed +maybe-info-sed: info-sed + +info-sed: \ + configure-sed + @[ -f ./sed/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 sed" ; \ + (cd $(HOST_SUBDIR)/sed && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + info) \ + || exit 1 + +@endif sed + +.PHONY: maybe-dvi-sed dvi-sed +maybe-dvi-sed: +@if sed +maybe-dvi-sed: dvi-sed -info-sed: \ +dvi-sed: \ configure-sed @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing info in sed" ; \ - (cd sed && \ + echo "Doing dvi in sed" ; \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ + dvi) \ || exit 1 @endif sed -.PHONY: maybe-dvi-sed dvi-sed -maybe-dvi-sed: +.PHONY: maybe-html-sed html-sed +maybe-html-sed: @if sed -maybe-dvi-sed: dvi-sed +maybe-html-sed: html-sed -dvi-sed: \ +html-sed: \ configure-sed @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in sed" ; \ - (cd sed && \ + echo "Doing html in sed" ; \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif sed @@ -16827,13 +20784,12 @@ TAGS-sed: \ @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16854,13 +20810,12 @@ install-info-sed: \ @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16880,13 +20835,12 @@ installcheck-sed: \ @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16905,13 +20859,12 @@ mostlyclean-sed: @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16930,13 +20883,12 @@ clean-sed: @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16955,13 +20907,12 @@ distclean-sed: @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16980,13 +20931,12 @@ maintainer-clean-sed: @[ -f ./sed/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 sed" ; \ - (cd sed && \ + (cd $(HOST_SUBDIR)/sed && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -16997,46 +20947,51 @@ maintainer-clean-sed: @endif sed + .PHONY: configure-send-pr maybe-configure-send-pr maybe-configure-send-pr: @if send-pr maybe-configure-send-pr: configure-send-pr -configure-send-pr: - @test ! -f send-pr/Makefile || exit 0; \ - [ -d send-pr ] || mkdir send-pr; \ +configure-send-pr: + @test ! -f $(HOST_SUBDIR)/send-pr/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/send-pr ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in send-pr; \ - cd send-pr || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/send-pr; \ + cd "$(HOST_SUBDIR)/send-pr" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/send-pr"; \ - libsrcdir="$$s/send-pr";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/send-pr"; \ - libsrcdir="$$s/send-pr";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/send-pr/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/send-pr"; \ + libsrcdir="$$s/send-pr"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif send-pr + + + + .PHONY: all-send-pr maybe-all-send-pr maybe-all-send-pr: @if send-pr +TARGET-send-pr=all maybe-all-send-pr: all-send-pr all-send-pr: configure-send-pr @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/send-pr && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-send-pr)) @endif send-pr + + + .PHONY: check-send-pr maybe-check-send-pr maybe-check-send-pr: @if send-pr @@ -17045,9 +21000,9 @@ maybe-check-send-pr: check-send-pr check-send-pr: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/send-pr && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif send-pr @@ -17059,9 +21014,9 @@ maybe-install-send-pr: install-send-pr install-send-pr: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd send-pr && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/send-pr && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif send-pr @@ -17077,13 +21032,12 @@ info-send-pr: \ @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17103,13 +21057,12 @@ dvi-send-pr: \ @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17119,6 +21072,31 @@ dvi-send-pr: \ @endif send-pr +.PHONY: maybe-html-send-pr html-send-pr +maybe-html-send-pr: +@if send-pr +maybe-html-send-pr: html-send-pr + +html-send-pr: \ + configure-send-pr + @[ -f ./send-pr/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 send-pr" ; \ + (cd $(HOST_SUBDIR)/send-pr && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif send-pr + .PHONY: maybe-TAGS-send-pr TAGS-send-pr maybe-TAGS-send-pr: @if send-pr @@ -17129,13 +21107,12 @@ TAGS-send-pr: \ @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17156,13 +21133,12 @@ install-info-send-pr: \ @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17182,13 +21158,12 @@ installcheck-send-pr: \ @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17207,13 +21182,12 @@ mostlyclean-send-pr: @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17232,13 +21206,12 @@ clean-send-pr: @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17257,13 +21230,12 @@ distclean-send-pr: @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17282,13 +21254,12 @@ maintainer-clean-send-pr: @[ -f ./send-pr/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 send-pr" ; \ - (cd send-pr && \ + (cd $(HOST_SUBDIR)/send-pr && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17299,46 +21270,51 @@ maintainer-clean-send-pr: @endif send-pr + .PHONY: configure-shellutils maybe-configure-shellutils maybe-configure-shellutils: @if shellutils maybe-configure-shellutils: configure-shellutils -configure-shellutils: - @test ! -f shellutils/Makefile || exit 0; \ - [ -d shellutils ] || mkdir shellutils; \ +configure-shellutils: + @test ! -f $(HOST_SUBDIR)/shellutils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/shellutils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in shellutils; \ - cd shellutils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/shellutils; \ + cd "$(HOST_SUBDIR)/shellutils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/shellutils"; \ - libsrcdir="$$s/shellutils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/shellutils"; \ - libsrcdir="$$s/shellutils";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/shellutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/shellutils"; \ + libsrcdir="$$s/shellutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif shellutils + + + + .PHONY: all-shellutils maybe-all-shellutils maybe-all-shellutils: @if shellutils +TARGET-shellutils=all maybe-all-shellutils: all-shellutils all-shellutils: configure-shellutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/shellutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-shellutils)) @endif shellutils + + + .PHONY: check-shellutils maybe-check-shellutils maybe-check-shellutils: @if shellutils @@ -17347,9 +21323,9 @@ maybe-check-shellutils: check-shellutils check-shellutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/shellutils && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif shellutils @@ -17361,9 +21337,9 @@ maybe-install-shellutils: install-shellutils install-shellutils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd shellutils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/shellutils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif shellutils @@ -17379,13 +21355,12 @@ info-shellutils: \ @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17405,13 +21380,12 @@ dvi-shellutils: \ @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17421,6 +21395,31 @@ dvi-shellutils: \ @endif shellutils +.PHONY: maybe-html-shellutils html-shellutils +maybe-html-shellutils: +@if shellutils +maybe-html-shellutils: html-shellutils + +html-shellutils: \ + configure-shellutils + @[ -f ./shellutils/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 shellutils" ; \ + (cd $(HOST_SUBDIR)/shellutils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif shellutils + .PHONY: maybe-TAGS-shellutils TAGS-shellutils maybe-TAGS-shellutils: @if shellutils @@ -17431,13 +21430,12 @@ TAGS-shellutils: \ @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17458,13 +21456,12 @@ install-info-shellutils: \ @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17484,13 +21481,12 @@ installcheck-shellutils: \ @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17509,13 +21505,12 @@ mostlyclean-shellutils: @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17534,13 +21529,12 @@ clean-shellutils: @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17559,13 +21553,12 @@ distclean-shellutils: @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17584,13 +21577,12 @@ maintainer-clean-shellutils: @[ -f ./shellutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 shellutils" ; \ - (cd shellutils && \ + (cd $(HOST_SUBDIR)/shellutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17601,46 +21593,51 @@ maintainer-clean-shellutils: @endif shellutils + .PHONY: configure-sid maybe-configure-sid maybe-configure-sid: @if sid maybe-configure-sid: configure-sid -configure-sid: - @test ! -f sid/Makefile || exit 0; \ - [ -d sid ] || mkdir sid; \ +configure-sid: + @test ! -f $(HOST_SUBDIR)/sid/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in sid; \ - cd sid || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/sid; \ + cd "$(HOST_SUBDIR)/sid" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/sid"; \ - libsrcdir="$$s/sid";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/sid"; \ - libsrcdir="$$s/sid";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/sid/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/sid"; \ + libsrcdir="$$s/sid"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif sid + + + + .PHONY: all-sid maybe-all-sid maybe-all-sid: @if sid +TARGET-sid=all maybe-all-sid: all-sid all-sid: configure-sid @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sid && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/sid && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sid)) @endif sid + + + .PHONY: check-sid maybe-check-sid maybe-check-sid: @if sid @@ -17649,9 +21646,9 @@ maybe-check-sid: check-sid check-sid: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sid && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/sid && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif sid @@ -17663,9 +21660,9 @@ maybe-install-sid: install-sid install-sid: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sid && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/sid && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif sid @@ -17681,13 +21678,12 @@ info-sid: \ @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17707,13 +21703,12 @@ dvi-sid: \ @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17723,6 +21718,31 @@ dvi-sid: \ @endif sid +.PHONY: maybe-html-sid html-sid +maybe-html-sid: +@if sid +maybe-html-sid: html-sid + +html-sid: \ + configure-sid + @[ -f ./sid/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 sid" ; \ + (cd $(HOST_SUBDIR)/sid && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif sid + .PHONY: maybe-TAGS-sid TAGS-sid maybe-TAGS-sid: @if sid @@ -17733,13 +21753,12 @@ TAGS-sid: \ @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17760,13 +21779,12 @@ install-info-sid: \ @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17786,13 +21804,12 @@ installcheck-sid: \ @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17811,13 +21828,12 @@ mostlyclean-sid: @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17836,13 +21852,12 @@ clean-sid: @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17861,13 +21876,12 @@ distclean-sid: @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17886,13 +21900,12 @@ maintainer-clean-sid: @[ -f ./sid/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 sid" ; \ - (cd sid && \ + (cd $(HOST_SUBDIR)/sid && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -17903,46 +21916,51 @@ maintainer-clean-sid: @endif sid + .PHONY: configure-sim maybe-configure-sim maybe-configure-sim: @if sim maybe-configure-sim: configure-sim -configure-sim: - @test ! -f sim/Makefile || exit 0; \ - [ -d sim ] || mkdir sim; \ +configure-sim: + @test ! -f $(HOST_SUBDIR)/sim/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in sim; \ - cd sim || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/sim; \ + cd "$(HOST_SUBDIR)/sim" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/sim"; \ - libsrcdir="$$s/sim";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/sim"; \ - libsrcdir="$$s/sim";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/sim/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/sim"; \ + libsrcdir="$$s/sim"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif sim + + + + .PHONY: all-sim maybe-all-sim maybe-all-sim: @if sim +TARGET-sim=all maybe-all-sim: all-sim all-sim: configure-sim @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sim && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/sim && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-sim)) @endif sim + + + .PHONY: check-sim maybe-check-sim maybe-check-sim: @if sim @@ -17951,9 +21969,9 @@ maybe-check-sim: check-sim check-sim: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sim && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/sim && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif sim @@ -17965,9 +21983,9 @@ maybe-install-sim: install-sim install-sim: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd sim && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/sim && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif sim @@ -17983,13 +22001,12 @@ info-sim: \ @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18009,13 +22026,12 @@ dvi-sim: \ @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18025,6 +22041,31 @@ dvi-sim: \ @endif sim +.PHONY: maybe-html-sim html-sim +maybe-html-sim: +@if sim +maybe-html-sim: html-sim + +html-sim: \ + configure-sim + @[ -f ./sim/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 sim" ; \ + (cd $(HOST_SUBDIR)/sim && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif sim + .PHONY: maybe-TAGS-sim TAGS-sim maybe-TAGS-sim: @if sim @@ -18035,13 +22076,12 @@ TAGS-sim: \ @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18062,13 +22102,12 @@ install-info-sim: \ @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18088,13 +22127,12 @@ installcheck-sim: \ @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18113,13 +22151,12 @@ mostlyclean-sim: @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18138,13 +22175,12 @@ clean-sim: @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18163,13 +22199,12 @@ distclean-sim: @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18188,13 +22223,12 @@ maintainer-clean-sim: @[ -f ./sim/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 sim" ; \ - (cd sim && \ + (cd $(HOST_SUBDIR)/sim && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18205,46 +22239,51 @@ maintainer-clean-sim: @endif sim + .PHONY: configure-tar maybe-configure-tar maybe-configure-tar: @if tar maybe-configure-tar: configure-tar -configure-tar: - @test ! -f tar/Makefile || exit 0; \ - [ -d tar ] || mkdir tar; \ +configure-tar: + @test ! -f $(HOST_SUBDIR)/tar/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tar ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in tar; \ - cd tar || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/tar; \ + cd "$(HOST_SUBDIR)/tar" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/tar"; \ - libsrcdir="$$s/tar";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/tar"; \ - libsrcdir="$$s/tar";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/tar/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/tar"; \ + libsrcdir="$$s/tar"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif tar + + + + .PHONY: all-tar maybe-all-tar maybe-all-tar: @if tar +TARGET-tar=all maybe-all-tar: all-tar all-tar: configure-tar @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tar && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/tar && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-tar)) @endif tar + + + .PHONY: check-tar maybe-check-tar maybe-check-tar: @if tar @@ -18253,9 +22292,9 @@ maybe-check-tar: check-tar check-tar: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tar && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/tar && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif tar @@ -18267,9 +22306,9 @@ maybe-install-tar: install-tar install-tar: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tar && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/tar && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif tar @@ -18285,13 +22324,12 @@ info-tar: \ @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18311,13 +22349,12 @@ dvi-tar: \ @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18327,6 +22364,31 @@ dvi-tar: \ @endif tar +.PHONY: maybe-html-tar html-tar +maybe-html-tar: +@if tar +maybe-html-tar: html-tar + +html-tar: \ + configure-tar + @[ -f ./tar/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 tar" ; \ + (cd $(HOST_SUBDIR)/tar && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif tar + .PHONY: maybe-TAGS-tar TAGS-tar maybe-TAGS-tar: @if tar @@ -18337,13 +22399,12 @@ TAGS-tar: \ @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18364,13 +22425,12 @@ install-info-tar: \ @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18390,13 +22450,12 @@ installcheck-tar: \ @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18415,13 +22474,12 @@ mostlyclean-tar: @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18440,13 +22498,12 @@ clean-tar: @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18465,13 +22522,12 @@ distclean-tar: @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18490,13 +22546,12 @@ maintainer-clean-tar: @[ -f ./tar/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 tar" ; \ - (cd tar && \ + (cd $(HOST_SUBDIR)/tar && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18507,46 +22562,51 @@ maintainer-clean-tar: @endif tar + .PHONY: configure-texinfo maybe-configure-texinfo maybe-configure-texinfo: @if texinfo maybe-configure-texinfo: configure-texinfo -configure-texinfo: - @test ! -f texinfo/Makefile || exit 0; \ - [ -d texinfo ] || mkdir texinfo; \ +configure-texinfo: + @test ! -f $(HOST_SUBDIR)/texinfo/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in texinfo; \ - cd texinfo || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/texinfo; \ + cd "$(HOST_SUBDIR)/texinfo" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/texinfo"; \ - libsrcdir="$$s/texinfo";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/texinfo"; \ - libsrcdir="$$s/texinfo";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/texinfo/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/texinfo"; \ + libsrcdir="$$s/texinfo"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif texinfo + + + + .PHONY: all-texinfo maybe-all-texinfo maybe-all-texinfo: @if texinfo +TARGET-texinfo=all maybe-all-texinfo: all-texinfo all-texinfo: configure-texinfo @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/texinfo && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-texinfo)) @endif texinfo + + + .PHONY: check-texinfo maybe-check-texinfo maybe-check-texinfo: @if texinfo @@ -18555,9 +22615,9 @@ maybe-check-texinfo: check-texinfo check-texinfo: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd texinfo && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/texinfo && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif texinfo @@ -18582,13 +22642,12 @@ info-texinfo: \ @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18608,13 +22667,12 @@ dvi-texinfo: \ @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18624,6 +22682,31 @@ dvi-texinfo: \ @endif texinfo +.PHONY: maybe-html-texinfo html-texinfo +maybe-html-texinfo: +@if texinfo +maybe-html-texinfo: html-texinfo + +html-texinfo: \ + configure-texinfo + @[ -f ./texinfo/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 texinfo" ; \ + (cd $(HOST_SUBDIR)/texinfo && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif texinfo + .PHONY: maybe-TAGS-texinfo TAGS-texinfo maybe-TAGS-texinfo: @if texinfo @@ -18634,13 +22717,12 @@ TAGS-texinfo: \ @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18661,13 +22743,12 @@ install-info-texinfo: \ @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18687,13 +22768,12 @@ installcheck-texinfo: \ @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18712,13 +22792,12 @@ mostlyclean-texinfo: @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18737,13 +22816,12 @@ clean-texinfo: @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18762,13 +22840,12 @@ distclean-texinfo: @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18787,13 +22864,12 @@ maintainer-clean-texinfo: @[ -f ./texinfo/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 texinfo" ; \ - (cd texinfo && \ + (cd $(HOST_SUBDIR)/texinfo && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18804,46 +22880,51 @@ maintainer-clean-texinfo: @endif texinfo + .PHONY: configure-textutils maybe-configure-textutils maybe-configure-textutils: @if textutils maybe-configure-textutils: configure-textutils -configure-textutils: - @test ! -f textutils/Makefile || exit 0; \ - [ -d textutils ] || mkdir textutils; \ +configure-textutils: + @test ! -f $(HOST_SUBDIR)/textutils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/textutils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in textutils; \ - cd textutils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/textutils; \ + cd "$(HOST_SUBDIR)/textutils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/textutils"; \ - libsrcdir="$$s/textutils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/textutils"; \ - libsrcdir="$$s/textutils";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/textutils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/textutils"; \ + libsrcdir="$$s/textutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif textutils + + + + .PHONY: all-textutils maybe-all-textutils maybe-all-textutils: @if textutils +TARGET-textutils=all maybe-all-textutils: all-textutils all-textutils: configure-textutils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd textutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/textutils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-textutils)) @endif textutils + + + .PHONY: check-textutils maybe-check-textutils maybe-check-textutils: @if textutils @@ -18852,9 +22933,9 @@ maybe-check-textutils: check-textutils check-textutils: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd textutils && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/textutils && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif textutils @@ -18866,9 +22947,9 @@ maybe-install-textutils: install-textutils install-textutils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd textutils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/textutils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif textutils @@ -18884,13 +22965,12 @@ info-textutils: \ @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18910,13 +22990,12 @@ dvi-textutils: \ @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18926,6 +23005,31 @@ dvi-textutils: \ @endif textutils +.PHONY: maybe-html-textutils html-textutils +maybe-html-textutils: +@if textutils +maybe-html-textutils: html-textutils + +html-textutils: \ + configure-textutils + @[ -f ./textutils/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 textutils" ; \ + (cd $(HOST_SUBDIR)/textutils && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif textutils + .PHONY: maybe-TAGS-textutils TAGS-textutils maybe-TAGS-textutils: @if textutils @@ -18936,13 +23040,12 @@ TAGS-textutils: \ @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18963,13 +23066,12 @@ install-info-textutils: \ @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -18989,13 +23091,12 @@ installcheck-textutils: \ @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19014,13 +23115,12 @@ mostlyclean-textutils: @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19039,13 +23139,12 @@ clean-textutils: @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19064,13 +23163,12 @@ distclean-textutils: @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19089,13 +23187,12 @@ maintainer-clean-textutils: @[ -f ./textutils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 textutils" ; \ - (cd textutils && \ + (cd $(HOST_SUBDIR)/textutils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19106,46 +23203,51 @@ maintainer-clean-textutils: @endif textutils + .PHONY: configure-time maybe-configure-time maybe-configure-time: @if time maybe-configure-time: configure-time -configure-time: - @test ! -f time/Makefile || exit 0; \ - [ -d time ] || mkdir time; \ +configure-time: + @test ! -f $(HOST_SUBDIR)/time/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/time ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in time; \ - cd time || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/time; \ + cd "$(HOST_SUBDIR)/time" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/time"; \ - libsrcdir="$$s/time";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/time"; \ - libsrcdir="$$s/time";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/time/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/time"; \ + libsrcdir="$$s/time"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif time + + + + .PHONY: all-time maybe-all-time maybe-all-time: @if time +TARGET-time=all maybe-all-time: all-time all-time: configure-time @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd time && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/time && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-time)) @endif time + + + .PHONY: check-time maybe-check-time maybe-check-time: @if time @@ -19154,9 +23256,9 @@ maybe-check-time: check-time check-time: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd time && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/time && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif time @@ -19168,9 +23270,9 @@ maybe-install-time: install-time install-time: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd time && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/time && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif time @@ -19186,13 +23288,12 @@ info-time: \ @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19212,13 +23313,12 @@ dvi-time: \ @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19228,6 +23328,31 @@ dvi-time: \ @endif time +.PHONY: maybe-html-time html-time +maybe-html-time: +@if time +maybe-html-time: html-time + +html-time: \ + configure-time + @[ -f ./time/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 time" ; \ + (cd $(HOST_SUBDIR)/time && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif time + .PHONY: maybe-TAGS-time TAGS-time maybe-TAGS-time: @if time @@ -19238,13 +23363,12 @@ TAGS-time: \ @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19265,13 +23389,12 @@ install-info-time: \ @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19291,13 +23414,12 @@ installcheck-time: \ @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19316,13 +23438,12 @@ mostlyclean-time: @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19341,13 +23462,12 @@ clean-time: @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19366,13 +23486,12 @@ distclean-time: @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19391,13 +23510,12 @@ maintainer-clean-time: @[ -f ./time/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 time" ; \ - (cd time && \ + (cd $(HOST_SUBDIR)/time && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19408,46 +23526,51 @@ maintainer-clean-time: @endif time + .PHONY: configure-uudecode maybe-configure-uudecode maybe-configure-uudecode: @if uudecode maybe-configure-uudecode: configure-uudecode -configure-uudecode: - @test ! -f uudecode/Makefile || exit 0; \ - [ -d uudecode ] || mkdir uudecode; \ +configure-uudecode: + @test ! -f $(HOST_SUBDIR)/uudecode/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/uudecode ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in uudecode; \ - cd uudecode || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/uudecode; \ + cd "$(HOST_SUBDIR)/uudecode" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/uudecode"; \ - libsrcdir="$$s/uudecode";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/uudecode"; \ - libsrcdir="$$s/uudecode";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/uudecode/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/uudecode"; \ + libsrcdir="$$s/uudecode"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif uudecode + + + + .PHONY: all-uudecode maybe-all-uudecode maybe-all-uudecode: @if uudecode +TARGET-uudecode=all maybe-all-uudecode: all-uudecode all-uudecode: configure-uudecode @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/uudecode && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-uudecode)) @endif uudecode + + + .PHONY: check-uudecode maybe-check-uudecode maybe-check-uudecode: @if uudecode @@ -19456,9 +23579,9 @@ maybe-check-uudecode: check-uudecode check-uudecode: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/uudecode && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif uudecode @@ -19470,9 +23593,9 @@ maybe-install-uudecode: install-uudecode install-uudecode: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd uudecode && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/uudecode && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif uudecode @@ -19488,44 +23611,67 @@ info-uudecode: \ @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + info) \ + || exit 1 + +@endif uudecode + +.PHONY: maybe-dvi-uudecode dvi-uudecode +maybe-dvi-uudecode: +@if uudecode +maybe-dvi-uudecode: dvi-uudecode + +dvi-uudecode: \ + configure-uudecode + @[ -f ./uudecode/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 uudecode" ; \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ + dvi) \ || exit 1 @endif uudecode -.PHONY: maybe-dvi-uudecode dvi-uudecode -maybe-dvi-uudecode: +.PHONY: maybe-html-uudecode html-uudecode +maybe-html-uudecode: @if uudecode -maybe-dvi-uudecode: dvi-uudecode +maybe-html-uudecode: html-uudecode -dvi-uudecode: \ +html-uudecode: \ configure-uudecode @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ - echo "Doing dvi in uudecode" ; \ - (cd uudecode && \ + echo "Doing html in uudecode" ; \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif uudecode @@ -19540,13 +23686,12 @@ TAGS-uudecode: \ @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19567,13 +23712,12 @@ install-info-uudecode: \ @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19593,13 +23737,12 @@ installcheck-uudecode: \ @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19618,13 +23761,12 @@ mostlyclean-uudecode: @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19643,13 +23785,12 @@ clean-uudecode: @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19668,13 +23809,12 @@ distclean-uudecode: @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19693,13 +23833,12 @@ maintainer-clean-uudecode: @[ -f ./uudecode/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 uudecode" ; \ - (cd uudecode && \ + (cd $(HOST_SUBDIR)/uudecode && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19710,46 +23849,51 @@ maintainer-clean-uudecode: @endif uudecode + .PHONY: configure-wdiff maybe-configure-wdiff maybe-configure-wdiff: @if wdiff maybe-configure-wdiff: configure-wdiff -configure-wdiff: - @test ! -f wdiff/Makefile || exit 0; \ - [ -d wdiff ] || mkdir wdiff; \ +configure-wdiff: + @test ! -f $(HOST_SUBDIR)/wdiff/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/wdiff ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in wdiff; \ - cd wdiff || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/wdiff; \ + cd "$(HOST_SUBDIR)/wdiff" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/wdiff"; \ - libsrcdir="$$s/wdiff";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/wdiff"; \ - libsrcdir="$$s/wdiff";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/wdiff/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/wdiff"; \ + libsrcdir="$$s/wdiff"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif wdiff + + + + .PHONY: all-wdiff maybe-all-wdiff maybe-all-wdiff: @if wdiff +TARGET-wdiff=all maybe-all-wdiff: all-wdiff all-wdiff: configure-wdiff @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/wdiff && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-wdiff)) @endif wdiff + + + .PHONY: check-wdiff maybe-check-wdiff maybe-check-wdiff: @if wdiff @@ -19758,9 +23902,9 @@ maybe-check-wdiff: check-wdiff check-wdiff: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/wdiff && \ + $(MAKE) $(FLAGS_TO_PASS) check) @endif wdiff @@ -19772,9 +23916,9 @@ maybe-install-wdiff: install-wdiff install-wdiff: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd wdiff && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/wdiff && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif wdiff @@ -19790,13 +23934,12 @@ info-wdiff: \ @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19816,13 +23959,12 @@ dvi-wdiff: \ @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19832,6 +23974,31 @@ dvi-wdiff: \ @endif wdiff +.PHONY: maybe-html-wdiff html-wdiff +maybe-html-wdiff: +@if wdiff +maybe-html-wdiff: html-wdiff + +html-wdiff: \ + configure-wdiff + @[ -f ./wdiff/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 wdiff" ; \ + (cd $(HOST_SUBDIR)/wdiff && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif wdiff + .PHONY: maybe-TAGS-wdiff TAGS-wdiff maybe-TAGS-wdiff: @if wdiff @@ -19842,13 +24009,12 @@ TAGS-wdiff: \ @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19869,13 +24035,12 @@ install-info-wdiff: \ @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19895,13 +24060,12 @@ installcheck-wdiff: \ @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19920,13 +24084,12 @@ mostlyclean-wdiff: @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19945,13 +24108,12 @@ clean-wdiff: @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19970,13 +24132,12 @@ distclean-wdiff: @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -19995,13 +24156,12 @@ maintainer-clean-wdiff: @[ -f ./wdiff/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 wdiff" ; \ - (cd wdiff && \ + (cd $(HOST_SUBDIR)/wdiff && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20012,46 +24172,51 @@ maintainer-clean-wdiff: @endif wdiff + .PHONY: configure-zip maybe-configure-zip maybe-configure-zip: @if zip maybe-configure-zip: configure-zip -configure-zip: - @test ! -f zip/Makefile || exit 0; \ - [ -d zip ] || mkdir zip; \ +configure-zip: + @test ! -f $(HOST_SUBDIR)/zip/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zip ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in zip; \ - cd zip || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/zip; \ + cd "$(HOST_SUBDIR)/zip" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/zip"; \ - libsrcdir="$$s/zip";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/zip"; \ - libsrcdir="$$s/zip";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/zip/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/zip"; \ + libsrcdir="$$s/zip"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif zip + + + + .PHONY: all-zip maybe-all-zip maybe-all-zip: @if zip +TARGET-zip=all maybe-all-zip: all-zip all-zip: configure-zip @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd zip && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/zip && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zip)) @endif zip + + + .PHONY: check-zip maybe-check-zip maybe-check-zip: @if zip @@ -20062,9 +24227,9 @@ check-zip: @if [ '$(host)' = '$(target)' ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd zip && $(MAKE) $(FLAGS_TO_PASS) check); \ + (cd $(HOST_SUBDIR)/zip && \ + $(MAKE) $(FLAGS_TO_PASS) check); \ fi @endif zip @@ -20077,9 +24242,9 @@ maybe-install-zip: install-zip install-zip: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd zip && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/zip && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif zip @@ -20095,13 +24260,12 @@ info-zip: \ @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20121,13 +24285,12 @@ dvi-zip: \ @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20137,6 +24300,31 @@ dvi-zip: \ @endif zip +.PHONY: maybe-html-zip html-zip +maybe-html-zip: +@if zip +maybe-html-zip: html-zip + +html-zip: \ + configure-zip + @[ -f ./zip/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 zip" ; \ + (cd $(HOST_SUBDIR)/zip && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif zip + .PHONY: maybe-TAGS-zip TAGS-zip maybe-TAGS-zip: @if zip @@ -20147,13 +24335,12 @@ TAGS-zip: \ @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20174,13 +24361,12 @@ install-info-zip: \ @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20200,13 +24386,12 @@ installcheck-zip: \ @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20225,13 +24410,12 @@ mostlyclean-zip: @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20250,13 +24434,12 @@ clean-zip: @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20275,13 +24458,12 @@ distclean-zip: @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20300,13 +24482,12 @@ maintainer-clean-zip: @[ -f ./zip/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 zip" ; \ - (cd zip && \ + (cd $(HOST_SUBDIR)/zip && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20317,46 +24498,378 @@ maintainer-clean-zip: @endif zip + .PHONY: configure-zlib maybe-configure-zlib maybe-configure-zlib: @if zlib maybe-configure-zlib: configure-zlib -configure-zlib: - @test ! -f zlib/Makefile || exit 0; \ - [ -d zlib ] || mkdir zlib; \ +configure-zlib: + @test -f stage_last && exit 0; \ + test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in zlib; \ - cd zlib || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/zlib; \ + cd "$(HOST_SUBDIR)/zlib" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/zlib"; \ - libsrcdir="$$s/zlib";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/zlib"; \ - libsrcdir="$$s/zlib";; \ + /* | [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 \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif zlib + + +.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib +maybe-configure-stage1-zlib: +@if zlib-bootstrap +maybe-configure-stage1-zlib: configure-stage1-zlib +configure-stage1-zlib: + @$(MAKE) stage1-start + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + echo Configuring stage 1 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" +@endif zlib-bootstrap + +.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib +maybe-configure-stage2-zlib: +@if zlib-bootstrap +maybe-configure-stage2-zlib: configure-stage2-zlib +configure-stage2-zlib: + @$(MAKE) stage2-start + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 2 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif zlib-bootstrap + +.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib +maybe-configure-stage3-zlib: +@if zlib-bootstrap +maybe-configure-stage3-zlib: configure-stage3-zlib +configure-stage3-zlib: + @$(MAKE) stage3-start + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 3 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif zlib-bootstrap + +.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib +maybe-configure-stage4-zlib: +@if zlib-bootstrap +maybe-configure-stage4-zlib: configure-stage4-zlib +configure-stage4-zlib: + @$(MAKE) stage4-start + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage 4 in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif zlib-bootstrap + +.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib +maybe-configure-stageprofile-zlib: +@if zlib-bootstrap +maybe-configure-stageprofile-zlib: configure-stageprofile-zlib +configure-stageprofile-zlib: + @$(MAKE) stageprofile-start + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage profile in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif zlib-bootstrap + +.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib +maybe-configure-stagefeedback-zlib: +@if zlib-bootstrap +maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib +configure-stagefeedback-zlib: + @$(MAKE) stagefeedback-start + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] && exit 0 || : ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + echo Configuring stage feedback in $(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 \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + @stage2_werror_flag@ +@endif zlib-bootstrap + + + + + .PHONY: all-zlib maybe-all-zlib maybe-all-zlib: @if zlib +TARGET-zlib=all maybe-all-zlib: all-zlib all-zlib: configure-zlib - @r=`${PWD_COMMAND}`; export r; \ + @test -f stage_last && exit 0; \ + r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-zlib)) @endif zlib + + +.PHONY: all-stage1-zlib maybe-all-stage1-zlib +.PHONY: clean-stage1-zlib maybe-clean-stage1-zlib +maybe-all-stage1-zlib: +maybe-clean-stage1-zlib: +@if zlib-bootstrap +maybe-all-stage1-zlib: all-stage1-zlib +all-stage1: all-stage1-zlib +all-stage1-zlib: configure-stage1-zlib + @$(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) CFLAGS="$(STAGE1_CFLAGS)" + +maybe-clean-stage1-zlib: clean-stage1-zlib +clean-stage1: clean-stage1-zlib +clean-stage1-zlib: + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage1-zlib/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage1-start ; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + CFLAGS="$(STAGE1_CFLAGS)" clean +@endif zlib-bootstrap + + +.PHONY: all-stage2-zlib maybe-all-stage2-zlib +.PHONY: clean-stage2-zlib maybe-clean-stage2-zlib +maybe-all-stage2-zlib: +maybe-clean-stage2-zlib: +@if zlib-bootstrap +maybe-all-stage2-zlib: all-stage2-zlib +all-stage2: all-stage2-zlib +all-stage2-zlib: configure-stage2-zlib + @$(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage2-zlib: clean-stage2-zlib +clean-stage2: clean-stage2-zlib +clean-stage2-zlib: + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage2-zlib/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage2-start ; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + +.PHONY: all-stage3-zlib maybe-all-stage3-zlib +.PHONY: clean-stage3-zlib maybe-clean-stage3-zlib +maybe-all-stage3-zlib: +maybe-clean-stage3-zlib: +@if zlib-bootstrap +maybe-all-stage3-zlib: all-stage3-zlib +all-stage3: all-stage3-zlib +all-stage3-zlib: configure-stage3-zlib + @$(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage3-zlib: clean-stage3-zlib +clean-stage3: clean-stage3-zlib +clean-stage3-zlib: + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage3-zlib/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage3-start ; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + +.PHONY: all-stage4-zlib maybe-all-stage4-zlib +.PHONY: clean-stage4-zlib maybe-clean-stage4-zlib +maybe-all-stage4-zlib: +maybe-clean-stage4-zlib: +@if zlib-bootstrap +maybe-all-stage4-zlib: all-stage4-zlib +all-stage4: all-stage4-zlib +all-stage4-zlib: configure-stage4-zlib + @$(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) + +maybe-clean-stage4-zlib: clean-stage4-zlib +clean-stage4: clean-stage4-zlib +clean-stage4-zlib: + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stage4-zlib/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stage4-start ; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + clean +@endif zlib-bootstrap + + +.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib +.PHONY: clean-stageprofile-zlib maybe-clean-stageprofile-zlib +maybe-all-stageprofile-zlib: +maybe-clean-stageprofile-zlib: +@if zlib-bootstrap +maybe-all-stageprofile-zlib: all-stageprofile-zlib +all-stageprofile: all-stageprofile-zlib +all-stageprofile-zlib: configure-stageprofile-zlib + @$(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" + +maybe-clean-stageprofile-zlib: clean-stageprofile-zlib +clean-stageprofile: clean-stageprofile-zlib +clean-stageprofile-zlib: + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stageprofile-zlib/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stageprofile-start ; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" clean +@endif zlib-bootstrap + + +.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib +.PHONY: clean-stagefeedback-zlib maybe-clean-stagefeedback-zlib +maybe-all-stagefeedback-zlib: +maybe-clean-stagefeedback-zlib: +@if zlib-bootstrap +maybe-all-stagefeedback-zlib: all-stagefeedback-zlib +all-stagefeedback: all-stagefeedback-zlib +all-stagefeedback-zlib: configure-stagefeedback-zlib + @$(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + $(POSTSTAGE1_HOST_EXPORTS) \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) $(POSTSTAGE1_FLAGS_TO_PASS) CFLAGS="$(BOOT_CFLAGS) -fprofile-use" + +maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib +clean-stagefeedback: clean-stagefeedback-zlib +clean-stagefeedback-zlib: + @[ -f $(HOST_SUBDIR)/zlib/Makefile ] || [ -f $(HOST_SUBDIR)/stagefeedback-zlib/Makefile ] \ + || exit 0 ; \ + [ -f $(HOST_SUBDIR)/zlib/Makefile ] || $(MAKE) stagefeedback-start ; \ + cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(FLAGS_TO_PASS) \ + $(POSTSTAGE1_FLAGS_TO_PASS) \ + CFLAGS="$(BOOT_CFLAGS) -fprofile-use" clean +@endif zlib-bootstrap + + + + + .PHONY: check-zlib maybe-check-zlib maybe-check-zlib: @if zlib @@ -20387,13 +24900,12 @@ info-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20413,13 +24925,12 @@ dvi-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20429,6 +24940,31 @@ dvi-zlib: \ @endif zlib +.PHONY: maybe-html-zlib html-zlib +maybe-html-zlib: +@if zlib +maybe-html-zlib: html-zlib + +html-zlib: \ + configure-zlib + @[ -f ./zlib/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 zlib" ; \ + (cd $(HOST_SUBDIR)/zlib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif zlib + .PHONY: maybe-TAGS-zlib TAGS-zlib maybe-TAGS-zlib: @if zlib @@ -20439,13 +24975,12 @@ TAGS-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20466,13 +25001,12 @@ install-info-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20492,13 +25026,12 @@ installcheck-zlib: \ @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20517,13 +25050,12 @@ mostlyclean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20542,13 +25074,12 @@ clean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20567,13 +25098,12 @@ distclean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ for flag in $(EXTRA_HOST_FLAGS) ; do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20592,13 +25122,12 @@ maintainer-clean-zlib: @[ -f ./zlib/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 zlib" ; \ - (cd zlib && \ + (cd $(HOST_SUBDIR)/zlib && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20609,46 +25138,51 @@ maintainer-clean-zlib: @endif zlib + .PHONY: configure-gdb maybe-configure-gdb maybe-configure-gdb: @if gdb maybe-configure-gdb: configure-gdb -configure-gdb: - @test ! -f gdb/Makefile || exit 0; \ - [ -d gdb ] || mkdir gdb; \ +configure-gdb: + @test ! -f $(HOST_SUBDIR)/gdb/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in gdb; \ - cd gdb || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/gdb; \ + cd "$(HOST_SUBDIR)/gdb" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gdb"; \ - libsrcdir="$$s/gdb";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gdb"; \ - libsrcdir="$$s/gdb";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gdb/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/gdb"; \ + libsrcdir="$$s/gdb"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif gdb + + + + .PHONY: all-gdb maybe-all-gdb maybe-all-gdb: @if gdb +TARGET-gdb=all maybe-all-gdb: all-gdb all-gdb: configure-gdb @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/gdb && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-gdb)) @endif gdb + + + .PHONY: check-gdb maybe-check-gdb maybe-check-gdb: @if gdb @@ -20657,9 +25191,9 @@ maybe-check-gdb: check-gdb check-gdb: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/gdb && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) @endif gdb @@ -20671,9 +25205,9 @@ maybe-install-gdb: install-gdb install-gdb: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/gdb && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) @endif gdb @@ -20689,13 +25223,12 @@ info-gdb: \ @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20715,13 +25248,12 @@ dvi-gdb: \ @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20731,6 +25263,31 @@ dvi-gdb: \ @endif gdb +.PHONY: maybe-html-gdb html-gdb +maybe-html-gdb: +@if gdb +maybe-html-gdb: html-gdb + +html-gdb: \ + configure-gdb + @[ -f ./gdb/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + 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}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif gdb + .PHONY: maybe-TAGS-gdb TAGS-gdb maybe-TAGS-gdb: @if gdb @@ -20741,13 +25298,12 @@ TAGS-gdb: \ @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20768,13 +25324,12 @@ install-info-gdb: \ @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20794,13 +25349,12 @@ installcheck-gdb: \ @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20819,13 +25373,12 @@ mostlyclean-gdb: @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20844,13 +25397,12 @@ clean-gdb: @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20869,13 +25421,12 @@ distclean-gdb: @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20894,13 +25445,12 @@ maintainer-clean-gdb: @[ -f ./gdb/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in gdb" ; \ - (cd gdb && \ + (cd $(HOST_SUBDIR)/gdb && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -20911,46 +25461,51 @@ maintainer-clean-gdb: @endif gdb + .PHONY: configure-expect maybe-configure-expect maybe-configure-expect: @if expect maybe-configure-expect: configure-expect -configure-expect: - @test ! -f expect/Makefile || exit 0; \ - [ -d expect ] || mkdir expect; \ +configure-expect: + @test ! -f $(HOST_SUBDIR)/expect/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in expect; \ - cd expect || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/expect; \ + cd "$(HOST_SUBDIR)/expect" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/expect"; \ - libsrcdir="$$s/expect";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/expect"; \ - libsrcdir="$$s/expect";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/expect/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/expect"; \ + libsrcdir="$$s/expect"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif expect + + + + .PHONY: all-expect maybe-all-expect maybe-all-expect: @if expect +TARGET-expect=all maybe-all-expect: all-expect all-expect: configure-expect @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/expect && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-expect)) @endif expect + + + .PHONY: check-expect maybe-check-expect maybe-check-expect: @if expect @@ -20959,9 +25514,9 @@ maybe-check-expect: check-expect check-expect: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/expect && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) @endif expect @@ -20973,9 +25528,9 @@ maybe-install-expect: install-expect install-expect: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/expect && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) @endif expect @@ -20991,13 +25546,12 @@ info-expect: \ @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21017,13 +25571,12 @@ dvi-expect: \ @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21033,6 +25586,31 @@ dvi-expect: \ @endif expect +.PHONY: maybe-html-expect html-expect +maybe-html-expect: +@if expect +maybe-html-expect: html-expect + +html-expect: \ + configure-expect + @[ -f ./expect/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + 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}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif expect + .PHONY: maybe-TAGS-expect TAGS-expect maybe-TAGS-expect: @if expect @@ -21043,13 +25621,12 @@ TAGS-expect: \ @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21070,13 +25647,12 @@ install-info-expect: \ @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21096,13 +25672,12 @@ installcheck-expect: \ @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21121,13 +25696,12 @@ mostlyclean-expect: @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21146,13 +25720,12 @@ clean-expect: @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21171,13 +25744,12 @@ distclean-expect: @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21196,13 +25768,12 @@ maintainer-clean-expect: @[ -f ./expect/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in expect" ; \ - (cd expect && \ + (cd $(HOST_SUBDIR)/expect && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21213,46 +25784,51 @@ maintainer-clean-expect: @endif expect + .PHONY: configure-guile maybe-configure-guile maybe-configure-guile: @if guile maybe-configure-guile: configure-guile -configure-guile: - @test ! -f guile/Makefile || exit 0; \ - [ -d guile ] || mkdir guile; \ +configure-guile: + @test ! -f $(HOST_SUBDIR)/guile/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in guile; \ - cd guile || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/guile; \ + cd "$(HOST_SUBDIR)/guile" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/guile"; \ - libsrcdir="$$s/guile";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/guile"; \ - libsrcdir="$$s/guile";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/guile/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/guile"; \ + libsrcdir="$$s/guile"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif guile + + + + .PHONY: all-guile maybe-all-guile maybe-all-guile: @if guile +TARGET-guile=all maybe-all-guile: all-guile all-guile: configure-guile @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/guile && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-guile)) @endif guile + + + .PHONY: check-guile maybe-check-guile maybe-check-guile: @if guile @@ -21261,9 +25837,9 @@ maybe-check-guile: check-guile check-guile: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/guile && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) @endif guile @@ -21275,9 +25851,9 @@ maybe-install-guile: install-guile install-guile: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/guile && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) @endif guile @@ -21293,13 +25869,12 @@ info-guile: \ @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21319,13 +25894,12 @@ dvi-guile: \ @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21335,6 +25909,31 @@ dvi-guile: \ @endif guile +.PHONY: maybe-html-guile html-guile +maybe-html-guile: +@if guile +maybe-html-guile: html-guile + +html-guile: \ + configure-guile + @[ -f ./guile/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + 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}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif guile + .PHONY: maybe-TAGS-guile TAGS-guile maybe-TAGS-guile: @if guile @@ -21345,13 +25944,12 @@ TAGS-guile: \ @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21372,13 +25970,12 @@ install-info-guile: \ @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21398,13 +25995,12 @@ installcheck-guile: \ @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21423,13 +26019,12 @@ mostlyclean-guile: @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21448,13 +26043,12 @@ clean-guile: @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21473,13 +26067,12 @@ distclean-guile: @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21498,13 +26091,12 @@ maintainer-clean-guile: @[ -f ./guile/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in guile" ; \ - (cd guile && \ + (cd $(HOST_SUBDIR)/guile && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21515,46 +26107,51 @@ maintainer-clean-guile: @endif guile + .PHONY: configure-tk maybe-configure-tk maybe-configure-tk: @if tk maybe-configure-tk: configure-tk -configure-tk: - @test ! -f tk/Makefile || exit 0; \ - [ -d tk ] || mkdir tk; \ +configure-tk: + @test ! -f $(HOST_SUBDIR)/tk/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in tk; \ - cd tk || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/tk; \ + cd "$(HOST_SUBDIR)/tk" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/tk"; \ - libsrcdir="$$s/tk";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/tk"; \ - libsrcdir="$$s/tk";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/tk/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/tk"; \ + libsrcdir="$$s/tk"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif tk + + + + .PHONY: all-tk maybe-all-tk maybe-all-tk: @if tk +TARGET-tk=all maybe-all-tk: all-tk all-tk: configure-tk @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/tk && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) $(TARGET-tk)) @endif tk + + + .PHONY: check-tk maybe-check-tk maybe-check-tk: @if tk @@ -21563,9 +26160,9 @@ maybe-check-tk: check-tk check-tk: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) + (cd $(HOST_SUBDIR)/tk && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) @endif tk @@ -21577,9 +26174,9 @@ maybe-install-tk: install-tk install-tk: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/tk && \ + $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) @endif tk @@ -21595,13 +26192,12 @@ info-tk: \ @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing info in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21621,13 +26217,12 @@ dvi-tk: \ @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing dvi in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21637,6 +26232,31 @@ dvi-tk: \ @endif tk +.PHONY: maybe-html-tk html-tk +maybe-html-tk: +@if tk +maybe-html-tk: html-tk + +html-tk: \ + configure-tk + @[ -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) $(X11_FLAGS_TO_PASS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + 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}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif tk + .PHONY: maybe-TAGS-tk TAGS-tk maybe-TAGS-tk: @if tk @@ -21647,13 +26267,12 @@ TAGS-tk: \ @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing TAGS in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21674,13 +26293,12 @@ install-info-tk: \ @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing install-info in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21700,13 +26318,12 @@ installcheck-tk: \ @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing installcheck in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21725,13 +26342,12 @@ mostlyclean-tk: @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing mostlyclean in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21750,13 +26366,12 @@ clean-tk: @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing clean in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21775,13 +26390,12 @@ distclean-tk: @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing distclean in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21800,13 +26414,12 @@ maintainer-clean-tk: @[ -f ./tk/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ + for flag in $(EXTRA_HOST_FLAGS) $(X11_FLAGS_TO_PASS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ echo "Doing maintainer-clean in tk" ; \ - (cd tk && \ + (cd $(HOST_SUBDIR)/tk && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -21817,348 +26430,51 @@ maintainer-clean-tk: @endif tk -.PHONY: configure-tix maybe-configure-tix -maybe-configure-tix: -@if tix -maybe-configure-tix: configure-tix -configure-tix: - @test ! -f tix/Makefile || exit 0; \ - [ -d tix ] || mkdir tix; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring in tix; \ - cd tix || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/tix"; \ - libsrcdir="$$s/tix";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/tix"; \ - libsrcdir="$$s/tix";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - || exit 1 -@endif tix - -.PHONY: all-tix maybe-all-tix -maybe-all-tix: -@if tix -maybe-all-tix: all-tix -all-tix: configure-tix - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all) -@endif tix - -.PHONY: check-tix maybe-check-tix -maybe-check-tix: -@if tix -maybe-check-tix: check-tix - -check-tix: - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check) - -@endif tix - -.PHONY: install-tix maybe-install-tix -maybe-install-tix: -@if tix -maybe-install-tix: install-tix - -install-tix: installdirs - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install) - -@endif tix - -# Other targets (info, dvi, etc.) - -.PHONY: maybe-info-tix info-tix -maybe-info-tix: -@if tix -maybe-info-tix: info-tix - -info-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing info in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ - || exit 1 - -@endif tix - -.PHONY: maybe-dvi-tix dvi-tix -maybe-dvi-tix: -@if tix -maybe-dvi-tix: dvi-tix - -dvi-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing dvi in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ - || exit 1 - -@endif tix - -.PHONY: maybe-TAGS-tix TAGS-tix -maybe-TAGS-tix: -@if tix -maybe-TAGS-tix: TAGS-tix - -TAGS-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing TAGS in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - TAGS) \ - || exit 1 - -@endif tix - -.PHONY: maybe-install-info-tix install-info-tix -maybe-install-info-tix: -@if tix -maybe-install-info-tix: install-info-tix - -install-info-tix: \ - configure-tix \ - info-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(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 tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - install-info) \ - || exit 1 - -@endif tix - -.PHONY: maybe-installcheck-tix installcheck-tix -maybe-installcheck-tix: -@if tix -maybe-installcheck-tix: installcheck-tix - -installcheck-tix: \ - configure-tix - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing installcheck in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - installcheck) \ - || exit 1 - -@endif tix - -.PHONY: maybe-mostlyclean-tix mostlyclean-tix -maybe-mostlyclean-tix: -@if tix -maybe-mostlyclean-tix: mostlyclean-tix - -mostlyclean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing mostlyclean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - mostlyclean) \ - || exit 1 - -@endif tix - -.PHONY: maybe-clean-tix clean-tix -maybe-clean-tix: -@if tix -maybe-clean-tix: clean-tix - -clean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing clean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - clean) \ - || exit 1 - -@endif tix - -.PHONY: maybe-distclean-tix distclean-tix -maybe-distclean-tix: -@if tix -maybe-distclean-tix: distclean-tix - -distclean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - for flag in $(EXTRA_HOST_FLAGS) ; do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - echo "Doing distclean in tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - distclean) \ - || exit 1 - -@endif tix - -.PHONY: maybe-maintainer-clean-tix maintainer-clean-tix -maybe-maintainer-clean-tix: -@if tix -maybe-maintainer-clean-tix: maintainer-clean-tix - -maintainer-clean-tix: - @[ -f ./tix/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(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 tix" ; \ - (cd tix && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - maintainer-clean) \ - || exit 1 - -@endif tix - .PHONY: configure-libtermcap maybe-configure-libtermcap maybe-configure-libtermcap: @if libtermcap maybe-configure-libtermcap: configure-libtermcap -configure-libtermcap: - @test ! -f libtermcap/Makefile || exit 0; \ - [ -d libtermcap ] || mkdir libtermcap; \ +configure-libtermcap: + @test ! -f $(HOST_SUBDIR)/libtermcap/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in libtermcap; \ - cd libtermcap || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/libtermcap; \ + cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/libtermcap"; \ - libsrcdir="$$s/libtermcap";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/libtermcap"; \ - libsrcdir="$$s/libtermcap";; \ + /* | [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) $${srcdiroption} \ || exit 1 @endif libtermcap + + + + .PHONY: all-libtermcap maybe-all-libtermcap maybe-all-libtermcap: @if libtermcap +TARGET-libtermcap=all maybe-all-libtermcap: all-libtermcap all-libtermcap: configure-libtermcap @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/libtermcap && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libtermcap)) @endif libtermcap + + + .PHONY: check-libtermcap maybe-check-libtermcap maybe-check-libtermcap: @if libtermcap @@ -22176,9 +26492,9 @@ maybe-install-libtermcap: install-libtermcap install-libtermcap: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libtermcap && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/libtermcap && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif libtermcap @@ -22194,13 +26510,12 @@ info-libtermcap: \ @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtermcap && \ + (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22220,13 +26535,12 @@ dvi-libtermcap: \ @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtermcap && \ + (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22236,6 +26550,31 @@ dvi-libtermcap: \ @endif libtermcap +.PHONY: maybe-html-libtermcap html-libtermcap +maybe-html-libtermcap: +@if libtermcap +maybe-html-libtermcap: html-libtermcap + +html-libtermcap: \ + configure-libtermcap + @[ -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}" \ + html) \ + || exit 1 + +@endif libtermcap + .PHONY: maybe-TAGS-libtermcap TAGS-libtermcap maybe-TAGS-libtermcap: @if libtermcap @@ -22246,13 +26585,12 @@ TAGS-libtermcap: \ @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtermcap && \ + (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22273,13 +26611,12 @@ install-info-libtermcap: \ @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtermcap && \ + (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22299,13 +26636,12 @@ installcheck-libtermcap: \ @[ -f ./libtermcap/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 libtermcap && \ + (cd $(HOST_SUBDIR)/libtermcap && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22356,46 +26692,51 @@ maintainer-clean-libtermcap: @endif libtermcap + .PHONY: configure-utils maybe-configure-utils maybe-configure-utils: @if utils maybe-configure-utils: configure-utils -configure-utils: - @test ! -f utils/Makefile || exit 0; \ - [ -d utils ] || mkdir utils; \ +configure-utils: + @test ! -f $(HOST_SUBDIR)/utils/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(HOST_EXPORTS) \ - echo Configuring in utils; \ - cd utils || exit 1; \ + echo Configuring in $(HOST_SUBDIR)/utils; \ + cd "$(HOST_SUBDIR)/utils" || exit 1; \ case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/utils"; \ - libsrcdir="$$s/utils";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/utils"; \ - libsrcdir="$$s/utils";; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/utils/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ + srcdiroption="--srcdir=$${topdir}/utils"; \ + libsrcdir="$$s/utils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif utils + + + + .PHONY: all-utils maybe-all-utils maybe-all-utils: @if utils +TARGET-utils=all maybe-all-utils: all-utils all-utils: configure-utils @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd utils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd $(HOST_SUBDIR)/utils && \ + $(MAKE) $(FLAGS_TO_PASS) $(TARGET-utils)) @endif utils + + + .PHONY: check-utils maybe-check-utils maybe-check-utils: @if utils @@ -22413,9 +26754,9 @@ maybe-install-utils: install-utils install-utils: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd utils && $(MAKE) $(FLAGS_TO_PASS) install) + (cd $(HOST_SUBDIR)/utils && \ + $(MAKE) $(FLAGS_TO_PASS) install) @endif utils @@ -22426,49 +26767,72 @@ maybe-info-utils: @if utils maybe-info-utils: info-utils -info-utils: \ +info-utils: \ + configure-utils + @[ -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}" \ + 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 @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + echo "Doing dvi in utils" ; \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ + dvi) \ || exit 1 @endif utils -.PHONY: maybe-dvi-utils dvi-utils -maybe-dvi-utils: +.PHONY: maybe-html-utils html-utils +maybe-html-utils: @if utils -maybe-dvi-utils: dvi-utils +maybe-html-utils: html-utils -dvi-utils: \ +html-utils: \ configure-utils @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + echo "Doing html in utils" ; \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif utils @@ -22483,13 +26847,12 @@ TAGS-utils: \ @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22510,13 +26873,12 @@ install-info-utils: \ @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22536,13 +26898,12 @@ installcheck-utils: \ @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22561,13 +26922,12 @@ mostlyclean-utils: @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22586,13 +26946,12 @@ clean-utils: @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22611,13 +26970,12 @@ distclean-utils: @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22636,13 +26994,12 @@ maintainer-clean-utils: @[ -f ./utils/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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 utils && \ + (cd $(HOST_SUBDIR)/utils && \ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ @@ -22654,61 +27011,390 @@ maintainer-clean-utils: +.PHONY: configure-gnattools maybe-configure-gnattools +maybe-configure-gnattools: +@if gnattools +maybe-configure-gnattools: configure-gnattools +configure-gnattools: + @test ! -f $(HOST_SUBDIR)/gnattools/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(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; \ + srcdiroption="--srcdir=$${topdir}/gnattools"; \ + libsrcdir="$$s/gnattools"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) $${srcdiroption} \ + || exit 1 +@endif gnattools + + + + + +.PHONY: all-gnattools maybe-all-gnattools +maybe-all-gnattools: +@if gnattools +TARGET-gnattools=all +maybe-all-gnattools: all-gnattools +all-gnattools: configure-gnattools + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/gnattools && \ + $(MAKE) $(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: + @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 + @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 + +# Other targets (info, dvi, etc.) + +.PHONY: maybe-info-gnattools info-gnattools +maybe-info-gnattools: +@if gnattools +maybe-info-gnattools: info-gnattools + +info-gnattools: \ + configure-gnattools + @[ -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}" \ + 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 + @[ -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}" \ + dvi) \ + || exit 1 + +@endif gnattools + +.PHONY: maybe-html-gnattools html-gnattools +maybe-html-gnattools: +@if gnattools +maybe-html-gnattools: html-gnattools + +html-gnattools: \ + configure-gnattools + @[ -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}" \ + 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 + @[ -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}" \ + 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 + @[ -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}" \ + install-info) \ + || exit 1 + +@endif gnattools + +.PHONY: maybe-installcheck-gnattools installcheck-gnattools +maybe-installcheck-gnattools: +@if gnattools +maybe-installcheck-gnattools: installcheck-gnattools + +installcheck-gnattools: \ + configure-gnattools + @[ -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}" \ + installcheck) \ + || exit 1 + +@endif gnattools + +.PHONY: maybe-mostlyclean-gnattools mostlyclean-gnattools +maybe-mostlyclean-gnattools: +@if gnattools +maybe-mostlyclean-gnattools: mostlyclean-gnattools + +mostlyclean-gnattools: + @[ -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}" \ + mostlyclean) \ + || exit 1 + +@endif gnattools + +.PHONY: maybe-clean-gnattools clean-gnattools +maybe-clean-gnattools: +@if gnattools +maybe-clean-gnattools: clean-gnattools + +clean-gnattools: + @[ -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}" \ + clean) \ + || exit 1 + +@endif gnattools + +.PHONY: maybe-distclean-gnattools distclean-gnattools +maybe-distclean-gnattools: +@if gnattools +maybe-distclean-gnattools: distclean-gnattools + +distclean-gnattools: + @[ -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}" \ + 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: + @[ -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}" \ + maintainer-clean) \ + || exit 1 + +@endif gnattools + + + # --------------------------------------- # Modules which run on the target machine # --------------------------------------- -.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3 -maybe-configure-target-libstdc++-v3: -@if target-libstdc++-v3 -maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libstdc++-v3 $(TARGET_SUBDIR)/libstdc++-v3/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ rm -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libstdc++-v3/multilib.out +@endif target-libstdc++-v3 + + +.PHONY: configure-target-libstdc++-v3 maybe-configure-target-libstdc++-v3 +maybe-configure-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-configure-target-libstdc++-v3: configure-target-libstdc++-v3 configure-target-libstdc++-v3: $(TARGET_SUBDIR)/libstdc++-v3/multilib.out @test ! -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libstdc++-v3/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ - libsrcdir="$$s/libstdc++-v3"; \ + srcdiroption="--srcdir=$${topdir}/libstdc++-v3"; \ + libsrcdir="$$s/libstdc++-v3"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libstdc++-v3 + + + + .PHONY: all-target-libstdc++-v3 maybe-all-target-libstdc++-v3 maybe-all-target-libstdc++-v3: @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; \ - $(SET_LIB_PATH) \ $(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)' all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libstdc++-v3)) @endif target-libstdc++-v3 + + + + .PHONY: check-target-libstdc++-v3 maybe-check-target-libstdc++-v3 maybe-check-target-libstdc++-v3: @if target-libstdc++-v3 @@ -22717,7 +27403,6 @@ maybe-check-target-libstdc++-v3: check-target-libstdc++-v3 check-target-libstdc++-v3: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(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) @@ -22732,7 +27417,6 @@ maybe-install-target-libstdc++-v3: install-target-libstdc++-v3 install-target-libstdc++-v3: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -22751,7 +27435,6 @@ info-target-libstdc++-v3: \ @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22777,7 +27460,6 @@ dvi-target-libstdc++-v3: \ @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22793,6 +27475,31 @@ dvi-target-libstdc++-v3: \ @endif target-libstdc++-v3 +.PHONY: maybe-html-target-libstdc++-v3 html-target-libstdc++-v3 +maybe-html-target-libstdc++-v3: +@if target-libstdc++-v3 +maybe-html-target-libstdc++-v3: html-target-libstdc++-v3 + +html-target-libstdc++-v3: \ + configure-target-libstdc++-v3 + @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(RAW_CXX_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/libstdc++-v3" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libstdc++-v3 && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libstdc++-v3 + .PHONY: maybe-TAGS-target-libstdc++-v3 TAGS-target-libstdc++-v3 maybe-TAGS-target-libstdc++-v3: @if target-libstdc++-v3 @@ -22803,7 +27510,6 @@ TAGS-target-libstdc++-v3: \ @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22830,7 +27536,6 @@ install-info-target-libstdc++-v3: \ @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22856,7 +27561,6 @@ installcheck-target-libstdc++-v3: \ @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22881,7 +27585,6 @@ mostlyclean-target-libstdc++-v3: @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22906,7 +27609,6 @@ clean-target-libstdc++-v3: @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22931,7 +27633,6 @@ distclean-target-libstdc++-v3: @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22956,7 +27657,6 @@ maintainer-clean-target-libstdc++-v3: @[ -f $(TARGET_SUBDIR)/libstdc++-v3/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libstdc++-v3" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -22973,57 +27673,63 @@ maintainer-clean-target-libstdc++-v3: @endif target-libstdc++-v3 -.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap -maybe-configure-target-libmudflap: -@if target-libmudflap -maybe-configure-target-libmudflap: configure-target-libmudflap # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libmudflap $(TARGET_SUBDIR)/libmudflap/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ rm -f $(TARGET_SUBDIR)/libmudflap/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libmudflap/multilib.out +@endif target-libmudflap + + +.PHONY: configure-target-libmudflap maybe-configure-target-libmudflap +maybe-configure-target-libmudflap: +@if target-libmudflap +maybe-configure-target-libmudflap: configure-target-libmudflap configure-target-libmudflap: $(TARGET_SUBDIR)/libmudflap/multilib.out @test ! -f $(TARGET_SUBDIR)/libmudflap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libmudflap ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libmudflap; \ cd "$(TARGET_SUBDIR)/libmudflap" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libmudflap/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libmudflap"; \ - libsrcdir="$$s/libmudflap"; \ + srcdiroption="--srcdir=$${topdir}/libmudflap"; \ + libsrcdir="$$s/libmudflap"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libmudflap + + + + .PHONY: all-target-libmudflap maybe-all-target-libmudflap maybe-all-target-libmudflap: @if target-libmudflap +TARGET-target-libmudflap=all maybe-all-target-libmudflap: all-target-libmudflap all-target-libmudflap: configure-target-libmudflap @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libmudflap)) @endif target-libmudflap + + + + .PHONY: check-target-libmudflap maybe-check-target-libmudflap maybe-check-target-libmudflap: @if target-libmudflap @@ -23032,7 +27738,6 @@ maybe-check-target-libmudflap: check-target-libmudflap check-target-libmudflap: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -23047,7 +27752,6 @@ maybe-install-target-libmudflap: install-target-libmudflap install-target-libmudflap: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libmudflap && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -23066,7 +27770,6 @@ info-target-libmudflap: \ @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23092,7 +27795,6 @@ dvi-target-libmudflap: \ @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23108,6 +27810,31 @@ dvi-target-libmudflap: \ @endif target-libmudflap +.PHONY: maybe-html-target-libmudflap html-target-libmudflap +maybe-html-target-libmudflap: +@if target-libmudflap +maybe-html-target-libmudflap: html-target-libmudflap + +html-target-libmudflap: \ + configure-target-libmudflap + @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/libmudflap" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libmudflap && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libmudflap + .PHONY: maybe-TAGS-target-libmudflap TAGS-target-libmudflap maybe-TAGS-target-libmudflap: @if target-libmudflap @@ -23118,7 +27845,6 @@ TAGS-target-libmudflap: \ @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23145,7 +27871,6 @@ install-info-target-libmudflap: \ @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23171,7 +27896,6 @@ installcheck-target-libmudflap: \ @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23196,7 +27920,6 @@ mostlyclean-target-libmudflap: @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23221,7 +27944,6 @@ clean-target-libmudflap: @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23246,7 +27968,6 @@ distclean-target-libmudflap: @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23271,7 +27992,6 @@ maintainer-clean-target-libmudflap: @[ -f $(TARGET_SUBDIR)/libmudflap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libmudflap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23288,57 +28008,398 @@ maintainer-clean-target-libmudflap: @endif target-libmudflap -.PHONY: configure-target-newlib maybe-configure-target-newlib -maybe-configure-target-newlib: -@if target-newlib -maybe-configure-target-newlib: configure-target-newlib # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libssp +$(TARGET_SUBDIR)/libssp/multilib.out: multilib.out + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ + rm -f $(TARGET_SUBDIR)/libssp/Makefile || : ; \ + cp multilib.out $(TARGET_SUBDIR)/libssp/multilib.out +@endif target-libssp + + + +.PHONY: configure-target-libssp maybe-configure-target-libssp +maybe-configure-target-libssp: +@if target-libssp +maybe-configure-target-libssp: configure-target-libssp +configure-target-libssp: $(TARGET_SUBDIR)/libssp/multilib.out + @test ! -f $(TARGET_SUBDIR)/libssp/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo Configuring in $(TARGET_SUBDIR)/libssp; \ + cd "$(TARGET_SUBDIR)/libssp" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libssp/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/libssp"; \ + libsrcdir="$$s/libssp"; \ + rm -f no-such-file || : ; \ + CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ + || exit 1 +@endif target-libssp + + + + + +.PHONY: all-target-libssp maybe-all-target-libssp +maybe-all-target-libssp: +@if target-libssp +TARGET-target-libssp=all +maybe-all-target-libssp: all-target-libssp +all-target-libssp: configure-target-libssp + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libssp)) +@endif target-libssp + + + + + +.PHONY: check-target-libssp maybe-check-target-libssp +maybe-check-target-libssp: +@if target-libssp +maybe-check-target-libssp: check-target-libssp + +check-target-libssp: + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) check) + +@endif target-libssp + +.PHONY: install-target-libssp maybe-install-target-libssp +maybe-install-target-libssp: +@if target-libssp +maybe-install-target-libssp: install-target-libssp + +install-target-libssp: installdirs + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(TARGET_FLAGS_TO_PASS) install) + +@endif target-libssp + +# Other targets (info, dvi, etc.) + +.PHONY: maybe-info-target-libssp info-target-libssp +maybe-info-target-libssp: +@if target-libssp +maybe-info-target-libssp: info-target-libssp + +info-target-libssp: \ + configure-target-libssp + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + info) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-dvi-target-libssp dvi-target-libssp +maybe-dvi-target-libssp: +@if target-libssp +maybe-dvi-target-libssp: dvi-target-libssp + +dvi-target-libssp: \ + configure-target-libssp + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + dvi) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-html-target-libssp html-target-libssp +maybe-html-target-libssp: +@if target-libssp +maybe-html-target-libssp: html-target-libssp + +html-target-libssp: \ + configure-target-libssp + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-TAGS-target-libssp TAGS-target-libssp +maybe-TAGS-target-libssp: +@if target-libssp +maybe-TAGS-target-libssp: TAGS-target-libssp + +TAGS-target-libssp: \ + configure-target-libssp + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + TAGS) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-install-info-target-libssp install-info-target-libssp +maybe-install-info-target-libssp: +@if target-libssp +maybe-install-info-target-libssp: install-info-target-libssp + +install-info-target-libssp: \ + configure-target-libssp \ + info-target-libssp + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + install-info) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-installcheck-target-libssp installcheck-target-libssp +maybe-installcheck-target-libssp: +@if target-libssp +maybe-installcheck-target-libssp: installcheck-target-libssp + +installcheck-target-libssp: \ + configure-target-libssp + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + installcheck) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-mostlyclean-target-libssp mostlyclean-target-libssp +maybe-mostlyclean-target-libssp: +@if target-libssp +maybe-mostlyclean-target-libssp: mostlyclean-target-libssp + +mostlyclean-target-libssp: + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + mostlyclean) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-clean-target-libssp clean-target-libssp +maybe-clean-target-libssp: +@if target-libssp +maybe-clean-target-libssp: clean-target-libssp + +clean-target-libssp: + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + clean) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-distclean-target-libssp distclean-target-libssp +maybe-distclean-target-libssp: +@if target-libssp +maybe-distclean-target-libssp: distclean-target-libssp + +distclean-target-libssp: + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + distclean) \ + || exit 1 + +@endif target-libssp + +.PHONY: maybe-maintainer-clean-target-libssp maintainer-clean-target-libssp +maybe-maintainer-clean-target-libssp: +@if target-libssp +maybe-maintainer-clean-target-libssp: maintainer-clean-target-libssp + +maintainer-clean-target-libssp: + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libssp && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + maintainer-clean) \ + || exit 1 + +@endif target-libssp + + + +# There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-newlib $(TARGET_SUBDIR)/newlib/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ rm -f $(TARGET_SUBDIR)/newlib/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/newlib/multilib.out +@endif target-newlib + + +.PHONY: configure-target-newlib maybe-configure-target-newlib +maybe-configure-target-newlib: +@if target-newlib +maybe-configure-target-newlib: configure-target-newlib configure-target-newlib: $(TARGET_SUBDIR)/newlib/multilib.out @test ! -f $(TARGET_SUBDIR)/newlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/newlib; \ cd "$(TARGET_SUBDIR)/newlib" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/newlib/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/newlib"; \ - libsrcdir="$$s/newlib"; \ + srcdiroption="--srcdir=$${topdir}/newlib"; \ + libsrcdir="$$s/newlib"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-newlib + + + + .PHONY: all-target-newlib maybe-all-target-newlib maybe-all-target-newlib: @if target-newlib +TARGET-target-newlib=all maybe-all-target-newlib: all-target-newlib all-target-newlib: configure-target-newlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-newlib)) @endif target-newlib + + + + .PHONY: check-target-newlib maybe-check-target-newlib maybe-check-target-newlib: @if target-newlib @@ -23347,7 +28408,6 @@ maybe-check-target-newlib: check-target-newlib check-target-newlib: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -23362,7 +28422,6 @@ maybe-install-target-newlib: install-target-newlib install-target-newlib: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/newlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -23374,16 +28433,40 @@ install-target-newlib: installdirs .PHONY: maybe-info-target-newlib info-target-newlib maybe-info-target-newlib: @if target-newlib -maybe-info-target-newlib: info-target-newlib +maybe-info-target-newlib: info-target-newlib + +info-target-newlib: \ + configure-target-newlib + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/newlib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + info) \ + || exit 1 + +@endif target-newlib + +.PHONY: maybe-dvi-target-newlib dvi-target-newlib +maybe-dvi-target-newlib: +@if target-newlib +maybe-dvi-target-newlib: dvi-target-newlib -info-target-newlib: \ +dvi-target-newlib: \ configure-target-newlib @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info 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; \ @@ -23392,24 +28475,23 @@ info-target-newlib: \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ + dvi) \ || exit 1 @endif target-newlib -.PHONY: maybe-dvi-target-newlib dvi-target-newlib -maybe-dvi-target-newlib: +.PHONY: maybe-html-target-newlib html-target-newlib +maybe-html-target-newlib: @if target-newlib -maybe-dvi-target-newlib: dvi-target-newlib +maybe-html-target-newlib: html-target-newlib -dvi-target-newlib: \ +html-target-newlib: \ configure-target-newlib @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi 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; \ @@ -23418,7 +28500,7 @@ dvi-target-newlib: \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif target-newlib @@ -23433,7 +28515,6 @@ TAGS-target-newlib: \ @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23460,7 +28541,6 @@ install-info-target-newlib: \ @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23486,7 +28566,6 @@ installcheck-target-newlib: \ @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23511,7 +28590,6 @@ mostlyclean-target-newlib: @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23536,7 +28614,6 @@ clean-target-newlib: @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23561,7 +28638,6 @@ distclean-target-newlib: @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23586,7 +28662,6 @@ maintainer-clean-target-newlib: @[ -f $(TARGET_SUBDIR)/newlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/newlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23603,57 +28678,63 @@ maintainer-clean-target-newlib: @endif target-newlib -.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran -maybe-configure-target-libgfortran: -@if target-libgfortran -maybe-configure-target-libgfortran: configure-target-libgfortran # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libgfortran $(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out +@endif target-libgfortran + + +.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran +maybe-configure-target-libgfortran: +@if target-libgfortran +maybe-configure-target-libgfortran: configure-target-libgfortran configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out @test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgfortran"; \ - libsrcdir="$$s/libgfortran"; \ + srcdiroption="--srcdir=$${topdir}/libgfortran"; \ + libsrcdir="$$s/libgfortran"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libgfortran + + + + .PHONY: all-target-libgfortran maybe-all-target-libgfortran maybe-all-target-libgfortran: @if target-libgfortran +TARGET-target-libgfortran=all maybe-all-target-libgfortran: all-target-libgfortran all-target-libgfortran: configure-target-libgfortran @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgfortran)) @endif target-libgfortran + + + + .PHONY: check-target-libgfortran maybe-check-target-libgfortran maybe-check-target-libgfortran: @if target-libgfortran @@ -23662,7 +28743,6 @@ maybe-check-target-libgfortran: check-target-libgfortran check-target-libgfortran: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -23677,7 +28757,6 @@ maybe-install-target-libgfortran: install-target-libgfortran install-target-libgfortran: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgfortran && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -23696,7 +28775,6 @@ info-target-libgfortran: \ @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23722,7 +28800,6 @@ dvi-target-libgfortran: \ @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23738,6 +28815,31 @@ dvi-target-libgfortran: \ @endif target-libgfortran +.PHONY: maybe-html-target-libgfortran html-target-libgfortran +maybe-html-target-libgfortran: +@if target-libgfortran +maybe-html-target-libgfortran: html-target-libgfortran + +html-target-libgfortran: \ + configure-target-libgfortran + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libgfortran && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libgfortran + .PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran maybe-TAGS-target-libgfortran: @if target-libgfortran @@ -23748,7 +28850,6 @@ TAGS-target-libgfortran: \ @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23775,7 +28876,6 @@ install-info-target-libgfortran: \ @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23801,7 +28901,6 @@ installcheck-target-libgfortran: \ @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23826,7 +28925,6 @@ mostlyclean-target-libgfortran: @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23851,7 +28949,6 @@ clean-target-libgfortran: @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23876,7 +28973,6 @@ distclean-target-libgfortran: @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23901,7 +28997,6 @@ maintainer-clean-target-libgfortran: @[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -23918,57 +29013,63 @@ maintainer-clean-target-libgfortran: @endif target-libgfortran -.PHONY: configure-target-libobjc maybe-configure-target-libobjc -maybe-configure-target-libobjc: -@if target-libobjc -maybe-configure-target-libobjc: configure-target-libobjc # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libobjc $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ rm -f $(TARGET_SUBDIR)/libobjc/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libobjc/multilib.out +@endif target-libobjc + + +.PHONY: configure-target-libobjc maybe-configure-target-libobjc +maybe-configure-target-libobjc: +@if target-libobjc +maybe-configure-target-libobjc: configure-target-libobjc configure-target-libobjc: $(TARGET_SUBDIR)/libobjc/multilib.out @test ! -f $(TARGET_SUBDIR)/libobjc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libobjc; \ cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libobjc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libobjc"; \ - libsrcdir="$$s/libobjc"; \ + srcdiroption="--srcdir=$${topdir}/libobjc"; \ + libsrcdir="$$s/libobjc"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libobjc + + + + .PHONY: all-target-libobjc maybe-all-target-libobjc maybe-all-target-libobjc: @if target-libobjc +TARGET-target-libobjc=all maybe-all-target-libobjc: all-target-libobjc all-target-libobjc: configure-target-libobjc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libobjc)) @endif target-libobjc + + + + .PHONY: check-target-libobjc maybe-check-target-libobjc maybe-check-target-libobjc: @if target-libobjc @@ -23977,7 +29078,6 @@ maybe-check-target-libobjc: check-target-libobjc check-target-libobjc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -23992,7 +29092,6 @@ maybe-install-target-libobjc: install-target-libobjc install-target-libobjc: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libobjc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -24011,7 +29110,6 @@ info-target-libobjc: \ @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24037,7 +29135,6 @@ dvi-target-libobjc: \ @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24053,6 +29150,31 @@ dvi-target-libobjc: \ @endif target-libobjc +.PHONY: maybe-html-target-libobjc html-target-libobjc +maybe-html-target-libobjc: +@if target-libobjc +maybe-html-target-libobjc: html-target-libobjc + +html-target-libobjc: \ + configure-target-libobjc + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libobjc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libobjc + .PHONY: maybe-TAGS-target-libobjc TAGS-target-libobjc maybe-TAGS-target-libobjc: @if target-libobjc @@ -24063,7 +29185,6 @@ TAGS-target-libobjc: \ @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24090,7 +29211,6 @@ install-info-target-libobjc: \ @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24116,7 +29236,6 @@ installcheck-target-libobjc: \ @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24141,7 +29260,6 @@ mostlyclean-target-libobjc: @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24166,7 +29284,6 @@ clean-target-libobjc: @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24191,7 +29308,6 @@ distclean-target-libobjc: @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24216,7 +29332,6 @@ maintainer-clean-target-libobjc: @[ -f $(TARGET_SUBDIR)/libobjc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libobjc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24233,79 +29348,63 @@ maintainer-clean-target-libobjc: @endif target-libobjc -.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap -maybe-configure-target-libtermcap: -@if target-libtermcap -maybe-configure-target-libtermcap: configure-target-libtermcap # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libtermcap $(TARGET_SUBDIR)/libtermcap/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ rm -f $(TARGET_SUBDIR)/libtermcap/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libtermcap/multilib.out +@endif target-libtermcap + + +.PHONY: configure-target-libtermcap maybe-configure-target-libtermcap +maybe-configure-target-libtermcap: +@if target-libtermcap +maybe-configure-target-libtermcap: configure-target-libtermcap configure-target-libtermcap: $(TARGET_SUBDIR)/libtermcap/multilib.out @test ! -f $(TARGET_SUBDIR)/libtermcap/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libtermcap; \ cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libtermcap/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/libtermcap "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/libtermcap"; \ - libsrcdir="$$s/libtermcap"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/libtermcap"; \ + libsrcdir="$$s/libtermcap"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libtermcap + + + + .PHONY: all-target-libtermcap maybe-all-target-libtermcap maybe-all-target-libtermcap: @if target-libtermcap +TARGET-target-libtermcap=all maybe-all-target-libtermcap: all-target-libtermcap all-target-libtermcap: configure-target-libtermcap @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libtermcap)) @endif target-libtermcap + + + + .PHONY: check-target-libtermcap maybe-check-target-libtermcap maybe-check-target-libtermcap: @if target-libtermcap @@ -24324,7 +29423,6 @@ maybe-install-target-libtermcap: install-target-libtermcap install-target-libtermcap: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libtermcap && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -24343,7 +29441,6 @@ info-target-libtermcap: \ @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24369,7 +29466,6 @@ dvi-target-libtermcap: \ @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24385,6 +29481,31 @@ dvi-target-libtermcap: \ @endif target-libtermcap +.PHONY: maybe-html-target-libtermcap html-target-libtermcap +maybe-html-target-libtermcap: +@if target-libtermcap +maybe-html-target-libtermcap: html-target-libtermcap + +html-target-libtermcap: \ + configure-target-libtermcap + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_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}" \ + html) \ + || exit 1 + +@endif target-libtermcap + .PHONY: maybe-TAGS-target-libtermcap TAGS-target-libtermcap maybe-TAGS-target-libtermcap: @if target-libtermcap @@ -24395,7 +29516,6 @@ TAGS-target-libtermcap: \ @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24422,7 +29542,6 @@ install-info-target-libtermcap: \ @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24448,7 +29567,6 @@ installcheck-target-libtermcap: \ @[ -f $(TARGET_SUBDIR)/libtermcap/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libtermcap" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24505,57 +29623,63 @@ maintainer-clean-target-libtermcap: @endif target-libtermcap -.PHONY: configure-target-winsup maybe-configure-target-winsup -maybe-configure-target-winsup: -@if target-winsup -maybe-configure-target-winsup: configure-target-winsup # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-winsup $(TARGET_SUBDIR)/winsup/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ rm -f $(TARGET_SUBDIR)/winsup/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/winsup/multilib.out +@endif target-winsup + + +.PHONY: configure-target-winsup maybe-configure-target-winsup +maybe-configure-target-winsup: +@if target-winsup +maybe-configure-target-winsup: configure-target-winsup configure-target-winsup: $(TARGET_SUBDIR)/winsup/multilib.out @test ! -f $(TARGET_SUBDIR)/winsup/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/winsup; \ cd "$(TARGET_SUBDIR)/winsup" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/winsup/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/winsup"; \ - libsrcdir="$$s/winsup"; \ + srcdiroption="--srcdir=$${topdir}/winsup"; \ + libsrcdir="$$s/winsup"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-winsup + + + + .PHONY: all-target-winsup maybe-all-target-winsup maybe-all-target-winsup: @if target-winsup +TARGET-target-winsup=all maybe-all-target-winsup: all-target-winsup all-target-winsup: configure-target-winsup @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-winsup)) @endif target-winsup + + + + .PHONY: check-target-winsup maybe-check-target-winsup maybe-check-target-winsup: @if target-winsup @@ -24564,7 +29688,6 @@ maybe-check-target-winsup: check-target-winsup check-target-winsup: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -24579,7 +29702,6 @@ maybe-install-target-winsup: install-target-winsup install-target-winsup: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/winsup && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -24598,7 +29720,6 @@ info-target-winsup: \ @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24624,7 +29745,6 @@ dvi-target-winsup: \ @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24640,6 +29760,31 @@ dvi-target-winsup: \ @endif target-winsup +.PHONY: maybe-html-target-winsup html-target-winsup +maybe-html-target-winsup: +@if target-winsup +maybe-html-target-winsup: html-target-winsup + +html-target-winsup: \ + configure-target-winsup + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/winsup && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-winsup + .PHONY: maybe-TAGS-target-winsup TAGS-target-winsup maybe-TAGS-target-winsup: @if target-winsup @@ -24650,7 +29795,6 @@ TAGS-target-winsup: \ @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24677,7 +29821,6 @@ install-info-target-winsup: \ @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24703,7 +29846,6 @@ installcheck-target-winsup: \ @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24728,7 +29870,6 @@ mostlyclean-target-winsup: @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24753,7 +29894,6 @@ clean-target-winsup: @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24778,7 +29918,6 @@ distclean-target-winsup: @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24803,7 +29942,6 @@ maintainer-clean-target-winsup: @[ -f $(TARGET_SUBDIR)/winsup/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/winsup" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24820,57 +29958,63 @@ maintainer-clean-target-winsup: @endif target-winsup -.PHONY: configure-target-libgloss maybe-configure-target-libgloss -maybe-configure-target-libgloss: -@if target-libgloss -maybe-configure-target-libgloss: configure-target-libgloss # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libgloss $(TARGET_SUBDIR)/libgloss/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ rm -f $(TARGET_SUBDIR)/libgloss/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libgloss/multilib.out +@endif target-libgloss + + +.PHONY: configure-target-libgloss maybe-configure-target-libgloss +maybe-configure-target-libgloss: +@if target-libgloss +maybe-configure-target-libgloss: configure-target-libgloss configure-target-libgloss: $(TARGET_SUBDIR)/libgloss/multilib.out @test ! -f $(TARGET_SUBDIR)/libgloss/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgloss; \ cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libgloss/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libgloss"; \ - libsrcdir="$$s/libgloss"; \ + srcdiroption="--srcdir=$${topdir}/libgloss"; \ + libsrcdir="$$s/libgloss"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libgloss + + + + .PHONY: all-target-libgloss maybe-all-target-libgloss maybe-all-target-libgloss: @if target-libgloss +TARGET-target-libgloss=all maybe-all-target-libgloss: all-target-libgloss all-target-libgloss: configure-target-libgloss @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgloss)) @endif target-libgloss + + + + .PHONY: check-target-libgloss maybe-check-target-libgloss maybe-check-target-libgloss: @if target-libgloss @@ -24889,7 +30033,6 @@ maybe-install-target-libgloss: install-target-libgloss install-target-libgloss: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libgloss && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -24908,7 +30051,6 @@ info-target-libgloss: \ @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24934,7 +30076,6 @@ dvi-target-libgloss: \ @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24950,6 +30091,31 @@ dvi-target-libgloss: \ @endif target-libgloss +.PHONY: maybe-html-target-libgloss html-target-libgloss +maybe-html-target-libgloss: +@if target-libgloss +maybe-html-target-libgloss: html-target-libgloss + +html-target-libgloss: \ + configure-target-libgloss + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libgloss && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libgloss + .PHONY: maybe-TAGS-target-libgloss TAGS-target-libgloss maybe-TAGS-target-libgloss: @if target-libgloss @@ -24960,7 +30126,6 @@ TAGS-target-libgloss: \ @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -24987,7 +30152,6 @@ install-info-target-libgloss: \ @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25013,7 +30177,6 @@ installcheck-target-libgloss: \ @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25038,7 +30201,6 @@ mostlyclean-target-libgloss: @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25063,7 +30225,6 @@ clean-target-libgloss: @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25088,7 +30249,6 @@ distclean-target-libgloss: @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25113,7 +30273,6 @@ maintainer-clean-target-libgloss: @[ -f $(TARGET_SUBDIR)/libgloss/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgloss" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25130,57 +30289,63 @@ maintainer-clean-target-libgloss: @endif target-libgloss -.PHONY: configure-target-libiberty maybe-configure-target-libiberty -maybe-configure-target-libiberty: -@if target-libiberty -maybe-configure-target-libiberty: configure-target-libiberty # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libiberty $(TARGET_SUBDIR)/libiberty/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \ rm -f $(TARGET_SUBDIR)/libiberty/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libiberty/multilib.out +@endif target-libiberty + + +.PHONY: configure-target-libiberty maybe-configure-target-libiberty +maybe-configure-target-libiberty: +@if target-libiberty +maybe-configure-target-libiberty: configure-target-libiberty configure-target-libiberty: $(TARGET_SUBDIR)/libiberty/multilib.out @test ! -f $(TARGET_SUBDIR)/libiberty/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libiberty ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libiberty; \ cd "$(TARGET_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libiberty/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libiberty"; \ - libsrcdir="$$s/libiberty"; \ + srcdiroption="--srcdir=$${topdir}/libiberty"; \ + libsrcdir="$$s/libiberty"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libiberty + + + + .PHONY: all-target-libiberty maybe-all-target-libiberty maybe-all-target-libiberty: @if target-libiberty +TARGET-target-libiberty=all maybe-all-target-libiberty: all-target-libiberty all-target-libiberty: configure-target-libiberty @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libiberty)) @endif target-libiberty + + + + .PHONY: check-target-libiberty maybe-check-target-libiberty maybe-check-target-libiberty: @if target-libiberty @@ -25189,7 +30354,6 @@ maybe-check-target-libiberty: check-target-libiberty check-target-libiberty: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -25204,7 +30368,6 @@ maybe-install-target-libiberty: install-target-libiberty install-target-libiberty: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libiberty && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -25218,14 +30381,38 @@ maybe-info-target-libiberty: @if target-libiberty maybe-info-target-libiberty: info-target-libiberty -info-target-libiberty: \ +info-target-libiberty: \ + configure-target-libiberty + @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libiberty && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + info) \ + || exit 1 + +@endif target-libiberty + +.PHONY: maybe-dvi-target-libiberty dvi-target-libiberty +maybe-dvi-target-libiberty: +@if target-libiberty +maybe-dvi-target-libiberty: dvi-target-libiberty + +dvi-target-libiberty: \ configure-target-libiberty @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libiberty" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -25234,24 +30421,23 @@ info-target-libiberty: \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - info) \ + dvi) \ || exit 1 @endif target-libiberty -.PHONY: maybe-dvi-target-libiberty dvi-target-libiberty -maybe-dvi-target-libiberty: +.PHONY: maybe-html-target-libiberty html-target-libiberty +maybe-html-target-libiberty: @if target-libiberty -maybe-dvi-target-libiberty: dvi-target-libiberty +maybe-html-target-libiberty: html-target-libiberty -dvi-target-libiberty: \ +html-target-libiberty: \ configure-target-libiberty @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libiberty" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -25260,7 +30446,7 @@ dvi-target-libiberty: \ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ "RANLIB=$${RANLIB}" \ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ - dvi) \ + html) \ || exit 1 @endif target-libiberty @@ -25275,7 +30461,6 @@ TAGS-target-libiberty: \ @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25302,7 +30487,6 @@ install-info-target-libiberty: \ @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25328,7 +30512,6 @@ installcheck-target-libiberty: \ @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25353,7 +30536,6 @@ mostlyclean-target-libiberty: @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25378,7 +30560,6 @@ clean-target-libiberty: @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25403,7 +30584,6 @@ distclean-target-libiberty: @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25428,7 +30608,6 @@ maintainer-clean-target-libiberty: @[ -f $(TARGET_SUBDIR)/libiberty/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libiberty" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25445,57 +30624,63 @@ maintainer-clean-target-libiberty: @endif target-libiberty -.PHONY: configure-target-gperf maybe-configure-target-gperf -maybe-configure-target-gperf: -@if target-gperf -maybe-configure-target-gperf: configure-target-gperf # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-gperf $(TARGET_SUBDIR)/gperf/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \ rm -f $(TARGET_SUBDIR)/gperf/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/gperf/multilib.out +@endif target-gperf + + +.PHONY: configure-target-gperf maybe-configure-target-gperf +maybe-configure-target-gperf: +@if target-gperf +maybe-configure-target-gperf: configure-target-gperf configure-target-gperf: $(TARGET_SUBDIR)/gperf/multilib.out @test ! -f $(TARGET_SUBDIR)/gperf/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/gperf ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/gperf; \ cd "$(TARGET_SUBDIR)/gperf" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/gperf/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/gperf"; \ - libsrcdir="$$s/gperf"; \ + srcdiroption="--srcdir=$${topdir}/gperf"; \ + libsrcdir="$$s/gperf"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-gperf + + + + .PHONY: all-target-gperf maybe-all-target-gperf maybe-all-target-gperf: @if target-gperf +TARGET-target-gperf=all maybe-all-target-gperf: all-target-gperf all-target-gperf: configure-target-gperf @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-gperf)) @endif target-gperf + + + + .PHONY: check-target-gperf maybe-check-target-gperf maybe-check-target-gperf: @if target-gperf @@ -25504,7 +30689,6 @@ maybe-check-target-gperf: check-target-gperf check-target-gperf: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -25519,7 +30703,6 @@ maybe-install-target-gperf: install-target-gperf install-target-gperf: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/gperf && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -25538,7 +30721,6 @@ info-target-gperf: \ @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25564,7 +30746,6 @@ dvi-target-gperf: \ @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25580,6 +30761,31 @@ dvi-target-gperf: \ @endif target-gperf +.PHONY: maybe-html-target-gperf html-target-gperf +maybe-html-target-gperf: +@if target-gperf +maybe-html-target-gperf: html-target-gperf + +html-target-gperf: \ + configure-target-gperf + @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/gperf" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/gperf && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-gperf + .PHONY: maybe-TAGS-target-gperf TAGS-target-gperf maybe-TAGS-target-gperf: @if target-gperf @@ -25590,7 +30796,6 @@ TAGS-target-gperf: \ @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25617,7 +30822,6 @@ install-info-target-gperf: \ @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25643,7 +30847,6 @@ installcheck-target-gperf: \ @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25668,7 +30871,6 @@ mostlyclean-target-gperf: @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25693,7 +30895,6 @@ clean-target-gperf: @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25718,7 +30919,6 @@ distclean-target-gperf: @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25743,7 +30943,6 @@ maintainer-clean-target-gperf: @[ -f $(TARGET_SUBDIR)/gperf/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/gperf" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25760,57 +30959,63 @@ maintainer-clean-target-gperf: @endif target-gperf -.PHONY: configure-target-examples maybe-configure-target-examples -maybe-configure-target-examples: -@if target-examples -maybe-configure-target-examples: configure-target-examples # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-examples $(TARGET_SUBDIR)/examples/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \ rm -f $(TARGET_SUBDIR)/examples/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/examples/multilib.out +@endif target-examples + + +.PHONY: configure-target-examples maybe-configure-target-examples +maybe-configure-target-examples: +@if target-examples +maybe-configure-target-examples: configure-target-examples configure-target-examples: $(TARGET_SUBDIR)/examples/multilib.out @test ! -f $(TARGET_SUBDIR)/examples/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/examples ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/examples; \ cd "$(TARGET_SUBDIR)/examples" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/examples/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/examples"; \ - libsrcdir="$$s/examples"; \ + srcdiroption="--srcdir=$${topdir}/examples"; \ + libsrcdir="$$s/examples"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-examples + + + + .PHONY: all-target-examples maybe-all-target-examples maybe-all-target-examples: @if target-examples +TARGET-target-examples=all maybe-all-target-examples: all-target-examples all-target-examples: configure-target-examples @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/examples && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-examples)) @endif target-examples + + + + .PHONY: check-target-examples maybe-check-target-examples maybe-check-target-examples: @if target-examples @@ -25843,7 +31048,6 @@ info-target-examples: \ @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25869,7 +31073,6 @@ dvi-target-examples: \ @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25885,6 +31088,31 @@ dvi-target-examples: \ @endif target-examples +.PHONY: maybe-html-target-examples html-target-examples +maybe-html-target-examples: +@if target-examples +maybe-html-target-examples: html-target-examples + +html-target-examples: \ + configure-target-examples + @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/examples" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/examples && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-examples + .PHONY: maybe-TAGS-target-examples TAGS-target-examples maybe-TAGS-target-examples: @if target-examples @@ -25895,7 +31123,6 @@ TAGS-target-examples: \ @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25922,7 +31149,6 @@ install-info-target-examples: \ @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25948,7 +31174,6 @@ installcheck-target-examples: \ @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25973,7 +31198,6 @@ mostlyclean-target-examples: @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -25998,7 +31222,6 @@ clean-target-examples: @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26023,7 +31246,6 @@ distclean-target-examples: @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26048,7 +31270,6 @@ maintainer-clean-target-examples: @[ -f $(TARGET_SUBDIR)/examples/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/examples" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26065,57 +31286,63 @@ maintainer-clean-target-examples: @endif target-examples -.PHONY: configure-target-libffi maybe-configure-target-libffi -maybe-configure-target-libffi: -@if target-libffi -maybe-configure-target-libffi: configure-target-libffi # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libffi $(TARGET_SUBDIR)/libffi/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ rm -f $(TARGET_SUBDIR)/libffi/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libffi/multilib.out +@endif target-libffi + + +.PHONY: configure-target-libffi maybe-configure-target-libffi +maybe-configure-target-libffi: +@if target-libffi +maybe-configure-target-libffi: configure-target-libffi configure-target-libffi: $(TARGET_SUBDIR)/libffi/multilib.out @test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libffi; \ cd "$(TARGET_SUBDIR)/libffi" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libffi"; \ - libsrcdir="$$s/libffi"; \ + srcdiroption="--srcdir=$${topdir}/libffi"; \ + libsrcdir="$$s/libffi"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libffi + + + + .PHONY: all-target-libffi maybe-all-target-libffi maybe-all-target-libffi: @if target-libffi +TARGET-target-libffi=all maybe-all-target-libffi: all-target-libffi all-target-libffi: configure-target-libffi @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libffi)) @endif target-libffi + + + + .PHONY: check-target-libffi maybe-check-target-libffi maybe-check-target-libffi: @if target-libffi @@ -26124,7 +31351,6 @@ maybe-check-target-libffi: check-target-libffi check-target-libffi: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -26139,7 +31365,6 @@ maybe-install-target-libffi: install-target-libffi install-target-libffi: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libffi && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -26158,7 +31383,6 @@ info-target-libffi: \ @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26184,7 +31408,6 @@ dvi-target-libffi: \ @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26200,6 +31423,31 @@ dvi-target-libffi: \ @endif target-libffi +.PHONY: maybe-html-target-libffi html-target-libffi +maybe-html-target-libffi: +@if target-libffi +maybe-html-target-libffi: html-target-libffi + +html-target-libffi: \ + configure-target-libffi + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libffi + .PHONY: maybe-TAGS-target-libffi TAGS-target-libffi maybe-TAGS-target-libffi: @if target-libffi @@ -26210,7 +31458,6 @@ TAGS-target-libffi: \ @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26237,7 +31484,6 @@ install-info-target-libffi: \ @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26263,7 +31509,6 @@ installcheck-target-libffi: \ @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26288,7 +31533,6 @@ mostlyclean-target-libffi: @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26313,7 +31557,6 @@ clean-target-libffi: @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26338,7 +31581,6 @@ distclean-target-libffi: @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26363,7 +31605,6 @@ maintainer-clean-target-libffi: @[ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libffi" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26380,57 +31621,63 @@ maintainer-clean-target-libffi: @endif target-libffi -.PHONY: configure-target-libjava maybe-configure-target-libjava -maybe-configure-target-libjava: -@if target-libjava -maybe-configure-target-libjava: configure-target-libjava # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libjava $(TARGET_SUBDIR)/libjava/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ rm -f $(TARGET_SUBDIR)/libjava/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libjava/multilib.out +@endif target-libjava + + +.PHONY: configure-target-libjava maybe-configure-target-libjava +maybe-configure-target-libjava: +@if target-libjava +maybe-configure-target-libjava: configure-target-libjava configure-target-libjava: $(TARGET_SUBDIR)/libjava/multilib.out @test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libjava; \ cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libjava"; \ - libsrcdir="$$s/libjava"; \ + srcdiroption="--srcdir=$${topdir}/libjava"; \ + libsrcdir="$$s/libjava"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libjava + + + + .PHONY: all-target-libjava maybe-all-target-libjava maybe-all-target-libjava: @if target-libjava +TARGET-target-libjava=all maybe-all-target-libjava: all-target-libjava all-target-libjava: configure-target-libjava @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' $(TARGET-target-libjava)) @endif target-libjava + + + + .PHONY: check-target-libjava maybe-check-target-libjava maybe-check-target-libjava: @if target-libjava @@ -26439,7 +31686,6 @@ maybe-check-target-libjava: check-target-libjava check-target-libjava: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) @@ -26454,7 +31700,6 @@ maybe-install-target-libjava: install-target-libjava install-target-libjava: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libjava && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -26473,7 +31718,6 @@ info-target-libjava: \ @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26499,7 +31743,6 @@ dvi-target-libjava: \ @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26515,6 +31758,31 @@ dvi-target-libjava: \ @endif target-libjava +.PHONY: maybe-html-target-libjava html-target-libjava +maybe-html-target-libjava: +@if target-libjava +maybe-html-target-libjava: html-target-libjava + +html-target-libjava: \ + configure-target-libjava + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libjava && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libjava + .PHONY: maybe-TAGS-target-libjava TAGS-target-libjava maybe-TAGS-target-libjava: @if target-libjava @@ -26525,7 +31793,6 @@ TAGS-target-libjava: \ @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26552,7 +31819,6 @@ install-info-target-libjava: \ @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26578,7 +31844,6 @@ installcheck-target-libjava: \ @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26603,7 +31868,6 @@ mostlyclean-target-libjava: @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26628,7 +31892,6 @@ clean-target-libjava: @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26653,7 +31916,6 @@ distclean-target-libjava: @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26678,7 +31940,6 @@ maintainer-clean-target-libjava: @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(RAW_CXX_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26695,79 +31956,63 @@ maintainer-clean-target-libjava: @endif target-libjava -.PHONY: configure-target-zlib maybe-configure-target-zlib -maybe-configure-target-zlib: -@if target-zlib -maybe-configure-target-zlib: configure-target-zlib # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-zlib $(TARGET_SUBDIR)/zlib/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ rm -f $(TARGET_SUBDIR)/zlib/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/zlib/multilib.out +@endif target-zlib + + +.PHONY: configure-target-zlib maybe-configure-target-zlib +maybe-configure-target-zlib: +@if target-zlib +maybe-configure-target-zlib: configure-target-zlib configure-target-zlib: $(TARGET_SUBDIR)/zlib/multilib.out @test ! -f $(TARGET_SUBDIR)/zlib/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/zlib; \ cd "$(TARGET_SUBDIR)/zlib" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/zlib/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - if [ "$(srcdir)" = "." ] ; then \ - if [ "$(TARGET_SUBDIR)" != "." ] ; then \ - if $(SHELL) $$s/symlink-tree $${topdir}/zlib "no-such-file" ; then \ - if [ -f Makefile ]; then \ - if $(MAKE) distclean; then \ - true; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - else \ - exit 1; \ - fi; \ - else \ - true; \ - fi; \ - srcdiroption="--srcdir=."; \ - libsrcdir="."; \ - else \ - srcdiroption="--srcdir=$${topdir}/zlib"; \ - libsrcdir="$$s/zlib"; \ - fi; \ + srcdiroption="--srcdir=$${topdir}/zlib"; \ + libsrcdir="$$s/zlib"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-zlib + + + + .PHONY: all-target-zlib maybe-all-target-zlib maybe-all-target-zlib: @if target-zlib +TARGET-target-zlib=all maybe-all-target-zlib: all-target-zlib all-target-zlib: configure-target-zlib @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-zlib)) @endif target-zlib + + + + .PHONY: check-target-zlib maybe-check-target-zlib maybe-check-target-zlib: @if target-zlib @@ -26776,7 +32021,6 @@ maybe-check-target-zlib: check-target-zlib check-target-zlib: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -26791,7 +32035,6 @@ maybe-install-target-zlib: install-target-zlib install-target-zlib: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/zlib && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -26810,7 +32053,6 @@ info-target-zlib: \ @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26836,7 +32078,6 @@ dvi-target-zlib: \ @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26852,6 +32093,31 @@ dvi-target-zlib: \ @endif target-zlib +.PHONY: maybe-html-target-zlib html-target-zlib +maybe-html-target-zlib: +@if target-zlib +maybe-html-target-zlib: html-target-zlib + +html-target-zlib: \ + configure-target-zlib + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/zlib && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-zlib + .PHONY: maybe-TAGS-target-zlib TAGS-target-zlib maybe-TAGS-target-zlib: @if target-zlib @@ -26862,7 +32128,6 @@ TAGS-target-zlib: \ @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26889,7 +32154,6 @@ install-info-target-zlib: \ @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26915,7 +32179,6 @@ installcheck-target-zlib: \ @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26940,7 +32203,6 @@ mostlyclean-target-zlib: @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26965,7 +32227,6 @@ clean-target-zlib: @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -26990,7 +32251,6 @@ distclean-target-zlib: @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27015,7 +32275,6 @@ maintainer-clean-target-zlib: @[ -f $(TARGET_SUBDIR)/zlib/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/zlib" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27032,57 +32291,63 @@ maintainer-clean-target-zlib: @endif target-zlib -.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc -maybe-configure-target-boehm-gc: -@if target-boehm-gc -maybe-configure-target-boehm-gc: configure-target-boehm-gc # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-boehm-gc $(TARGET_SUBDIR)/boehm-gc/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ rm -f $(TARGET_SUBDIR)/boehm-gc/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/boehm-gc/multilib.out +@endif target-boehm-gc + + +.PHONY: configure-target-boehm-gc maybe-configure-target-boehm-gc +maybe-configure-target-boehm-gc: +@if target-boehm-gc +maybe-configure-target-boehm-gc: configure-target-boehm-gc configure-target-boehm-gc: $(TARGET_SUBDIR)/boehm-gc/multilib.out @test ! -f $(TARGET_SUBDIR)/boehm-gc/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \ cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/boehm-gc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/boehm-gc"; \ - libsrcdir="$$s/boehm-gc"; \ + srcdiroption="--srcdir=$${topdir}/boehm-gc"; \ + libsrcdir="$$s/boehm-gc"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-boehm-gc + + + + .PHONY: all-target-boehm-gc maybe-all-target-boehm-gc maybe-all-target-boehm-gc: @if target-boehm-gc +TARGET-target-boehm-gc=all maybe-all-target-boehm-gc: all-target-boehm-gc all-target-boehm-gc: configure-target-boehm-gc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-boehm-gc)) @endif target-boehm-gc + + + + .PHONY: check-target-boehm-gc maybe-check-target-boehm-gc maybe-check-target-boehm-gc: @if target-boehm-gc @@ -27091,7 +32356,6 @@ maybe-check-target-boehm-gc: check-target-boehm-gc check-target-boehm-gc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -27106,7 +32370,6 @@ maybe-install-target-boehm-gc: install-target-boehm-gc install-target-boehm-gc: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/boehm-gc && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -27125,7 +32388,6 @@ info-target-boehm-gc: \ @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27151,7 +32413,6 @@ dvi-target-boehm-gc: \ @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27167,6 +32428,31 @@ dvi-target-boehm-gc: \ @endif target-boehm-gc +.PHONY: maybe-html-target-boehm-gc html-target-boehm-gc +maybe-html-target-boehm-gc: +@if target-boehm-gc +maybe-html-target-boehm-gc: html-target-boehm-gc + +html-target-boehm-gc: \ + configure-target-boehm-gc + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/boehm-gc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-boehm-gc + .PHONY: maybe-TAGS-target-boehm-gc TAGS-target-boehm-gc maybe-TAGS-target-boehm-gc: @if target-boehm-gc @@ -27177,7 +32463,6 @@ TAGS-target-boehm-gc: \ @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27204,7 +32489,6 @@ install-info-target-boehm-gc: \ @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27230,7 +32514,6 @@ installcheck-target-boehm-gc: \ @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27255,7 +32538,6 @@ mostlyclean-target-boehm-gc: @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27280,7 +32562,6 @@ clean-target-boehm-gc: @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27305,7 +32586,6 @@ distclean-target-boehm-gc: @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27330,7 +32610,6 @@ maintainer-clean-target-boehm-gc: @[ -f $(TARGET_SUBDIR)/boehm-gc/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/boehm-gc" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27344,60 +32623,66 @@ maintainer-clean-target-boehm-gc: maintainer-clean) \ || exit 1 -@endif target-boehm-gc - - -.PHONY: configure-target-qthreads maybe-configure-target-qthreads -maybe-configure-target-qthreads: -@if target-qthreads -maybe-configure-target-qthreads: configure-target-qthreads +@endif target-boehm-gc + + # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-qthreads $(TARGET_SUBDIR)/qthreads/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \ rm -f $(TARGET_SUBDIR)/qthreads/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/qthreads/multilib.out +@endif target-qthreads + + +.PHONY: configure-target-qthreads maybe-configure-target-qthreads +maybe-configure-target-qthreads: +@if target-qthreads +maybe-configure-target-qthreads: configure-target-qthreads configure-target-qthreads: $(TARGET_SUBDIR)/qthreads/multilib.out @test ! -f $(TARGET_SUBDIR)/qthreads/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/qthreads ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/qthreads; \ cd "$(TARGET_SUBDIR)/qthreads" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/qthreads/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/qthreads"; \ - libsrcdir="$$s/qthreads"; \ + srcdiroption="--srcdir=$${topdir}/qthreads"; \ + libsrcdir="$$s/qthreads"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-qthreads + + + + .PHONY: all-target-qthreads maybe-all-target-qthreads maybe-all-target-qthreads: @if target-qthreads +TARGET-target-qthreads=all maybe-all-target-qthreads: all-target-qthreads all-target-qthreads: configure-target-qthreads @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-qthreads)) @endif target-qthreads + + + + .PHONY: check-target-qthreads maybe-check-target-qthreads maybe-check-target-qthreads: @if target-qthreads @@ -27406,7 +32691,6 @@ maybe-check-target-qthreads: check-target-qthreads check-target-qthreads: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -27421,7 +32705,6 @@ maybe-install-target-qthreads: install-target-qthreads install-target-qthreads: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/qthreads && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -27440,7 +32723,6 @@ info-target-qthreads: \ @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27466,7 +32748,6 @@ dvi-target-qthreads: \ @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27482,6 +32763,31 @@ dvi-target-qthreads: \ @endif target-qthreads +.PHONY: maybe-html-target-qthreads html-target-qthreads +maybe-html-target-qthreads: +@if target-qthreads +maybe-html-target-qthreads: html-target-qthreads + +html-target-qthreads: \ + configure-target-qthreads + @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(NORMAL_TARGET_EXPORTS) \ + echo "Doing html in $(TARGET_SUBDIR)/qthreads" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/qthreads && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-qthreads + .PHONY: maybe-TAGS-target-qthreads TAGS-target-qthreads maybe-TAGS-target-qthreads: @if target-qthreads @@ -27492,7 +32798,6 @@ TAGS-target-qthreads: \ @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27519,7 +32824,6 @@ install-info-target-qthreads: \ @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27545,7 +32849,6 @@ installcheck-target-qthreads: \ @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27570,7 +32873,6 @@ mostlyclean-target-qthreads: @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27595,7 +32897,6 @@ clean-target-qthreads: @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27620,7 +32921,6 @@ distclean-target-qthreads: @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27645,7 +32945,6 @@ maintainer-clean-target-qthreads: @[ -f $(TARGET_SUBDIR)/qthreads/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/qthreads" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27662,57 +32961,63 @@ maintainer-clean-target-qthreads: @endif target-qthreads -.PHONY: configure-target-rda maybe-configure-target-rda -maybe-configure-target-rda: -@if target-rda -maybe-configure-target-rda: configure-target-rda # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-rda $(TARGET_SUBDIR)/rda/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ rm -f $(TARGET_SUBDIR)/rda/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/rda/multilib.out +@endif target-rda + + +.PHONY: configure-target-rda maybe-configure-target-rda +maybe-configure-target-rda: +@if target-rda +maybe-configure-target-rda: configure-target-rda configure-target-rda: $(TARGET_SUBDIR)/rda/multilib.out @test ! -f $(TARGET_SUBDIR)/rda/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/rda; \ cd "$(TARGET_SUBDIR)/rda" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/rda/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/rda"; \ - libsrcdir="$$s/rda"; \ + srcdiroption="--srcdir=$${topdir}/rda"; \ + libsrcdir="$$s/rda"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-rda + + + + .PHONY: all-target-rda maybe-all-target-rda maybe-all-target-rda: @if target-rda +TARGET-target-rda=all maybe-all-target-rda: all-target-rda all-target-rda: configure-target-rda @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-rda)) @endif target-rda + + + + .PHONY: check-target-rda maybe-check-target-rda maybe-check-target-rda: @if target-rda @@ -27721,7 +33026,6 @@ maybe-check-target-rda: check-target-rda check-target-rda: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -27736,7 +33040,6 @@ maybe-install-target-rda: install-target-rda install-target-rda: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/rda && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -27755,7 +33058,6 @@ info-target-rda: \ @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27781,7 +33083,6 @@ dvi-target-rda: \ @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27797,6 +33098,31 @@ dvi-target-rda: \ @endif target-rda +.PHONY: maybe-html-target-rda html-target-rda +maybe-html-target-rda: +@if target-rda +maybe-html-target-rda: html-target-rda + +html-target-rda: \ + configure-target-rda + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/rda && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-rda + .PHONY: maybe-TAGS-target-rda TAGS-target-rda maybe-TAGS-target-rda: @if target-rda @@ -27807,7 +33133,6 @@ TAGS-target-rda: \ @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27834,7 +33159,6 @@ install-info-target-rda: \ @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27860,7 +33184,6 @@ installcheck-target-rda: \ @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27885,7 +33208,6 @@ mostlyclean-target-rda: @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27910,7 +33232,6 @@ clean-target-rda: @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27935,7 +33256,6 @@ distclean-target-rda: @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27960,7 +33280,6 @@ maintainer-clean-target-rda: @[ -f $(TARGET_SUBDIR)/rda/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/rda" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -27977,57 +33296,63 @@ maintainer-clean-target-rda: @endif target-rda -.PHONY: configure-target-libada maybe-configure-target-libada -maybe-configure-target-libada: -@if target-libada -maybe-configure-target-libada: configure-target-libada # There's only one multilib.out. Cleverer subdirs shouldn't need it copied. +@if target-libada $(TARGET_SUBDIR)/libada/multilib.out: multilib.out $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ rm -f $(TARGET_SUBDIR)/libada/Makefile || : ; \ cp multilib.out $(TARGET_SUBDIR)/libada/multilib.out +@endif target-libada + + +.PHONY: configure-target-libada maybe-configure-target-libada +maybe-configure-target-libada: +@if target-libada +maybe-configure-target-libada: configure-target-libada configure-target-libada: $(TARGET_SUBDIR)/libada/multilib.out @test ! -f $(TARGET_SUBDIR)/libada/Makefile || exit 0; \ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libada; \ cd "$(TARGET_SUBDIR)/libada" || exit 1; \ case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) \ - topdir=$(srcdir) ;; \ - *) \ - case "$(TARGET_SUBDIR)" in \ - .) topdir="../$(srcdir)" ;; \ - *) topdir="../../$(srcdir)" ;; \ - esac ;; \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libada/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/libada"; \ - libsrcdir="$$s/libada"; \ + srcdiroption="--srcdir=$${topdir}/libada"; \ + libsrcdir="$$s/libada"; \ rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ - $(TARGET_CONFIGARGS) $${srcdiroption} \ - --with-target-subdir="$(TARGET_SUBDIR)" \ + $(TARGET_CONFIGARGS) $${srcdiroption} \ || exit 1 @endif target-libada + + + + .PHONY: all-target-libada maybe-all-target-libada maybe-all-target-libada: @if target-libada +TARGET-target-libada=all maybe-all-target-libada: all-target-libada all-target-libada: configure-target-libada @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) all) + $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libada)) @endif target-libada + + + + .PHONY: check-target-libada maybe-check-target-libada maybe-check-target-libada: @if target-libada @@ -28036,7 +33361,6 @@ maybe-check-target-libada: check-target-libada check-target-libada: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check) @@ -28051,7 +33375,6 @@ maybe-install-target-libada: install-target-libada install-target-libada: installdirs @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ (cd $(TARGET_SUBDIR)/libada && \ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) @@ -28070,7 +33393,6 @@ info-target-libada: \ @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing info in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28096,7 +33418,6 @@ dvi-target-libada: \ @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28112,6 +33433,31 @@ dvi-target-libada: \ @endif target-libada +.PHONY: maybe-html-target-libada html-target-libada +maybe-html-target-libada: +@if target-libada +maybe-html-target-libada: html-target-libada + +html-target-libada: \ + configure-target-libada + @[ -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" ; \ + for flag in $(EXTRA_TARGET_FLAGS); do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + (cd $(TARGET_SUBDIR)/libada && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \ + html) \ + || exit 1 + +@endif target-libada + .PHONY: maybe-TAGS-target-libada TAGS-target-libada maybe-TAGS-target-libada: @if target-libada @@ -28122,7 +33468,6 @@ TAGS-target-libada: \ @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28149,7 +33494,6 @@ install-info-target-libada: \ @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28175,7 +33519,6 @@ installcheck-target-libada: \ @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28200,7 +33543,6 @@ mostlyclean-target-libada: @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28225,7 +33567,6 @@ clean-target-libada: @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing clean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28250,7 +33591,6 @@ distclean-target-libada: @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing distclean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28275,7 +33615,6 @@ maintainer-clean-target-libada: @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(NORMAL_TARGET_EXPORTS) \ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libada" ; \ for flag in $(EXTRA_TARGET_FLAGS); do \ @@ -28307,9 +33646,9 @@ GCC_STRAP_TARGETS = bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstra $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Bootstrapping the compiler"; \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $@ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ @@ -28327,46 +33666,40 @@ $(GCC_STRAP_TARGETS): all-prebootstrap configure-gcc msg="Comparing stage2 and stage3 of the compiler"; \ compare=compare ;; \ esac; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "$$msg"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all profiledbootstrap: all-prebootstrap configure-gcc @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ + $(RPATH_ENVVAR)=`echo "$(TARGET_LIB_PATH)$$$(RPATH_ENVVAR)" | sed 's,:[ :]*,:,g;s,^[ :]*,,;s,:*$$,,'`; export $(RPATH_ENVVAR); \ echo "Bootstrapping training compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stageprofile_build @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ echo "Building feedback based compiler"; \ cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) stagefeedback_build @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all .PHONY: cross -cross: all-texinfo all-bison all-byacc all-binutils all-gas all-ld +cross: all-build all-gas all-ld @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ 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; \ - $(SET_LIB_PATH) \ echo "Building runtime libraries"; \ $(MAKE) $(RECURSE_FLAGS_TO_PASS) LANGUAGES="c c++" all @endif gcc-no-bootstrap @@ -28377,7 +33710,6 @@ check-gcc-c++: @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ else \ @@ -28401,7 +33733,6 @@ gcc-no-fixedincludes: rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ (cd ./gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) install); \ @@ -28430,7 +33761,6 @@ stage: @$(MAKE) `cat stage_current`-end @endif gcc-bootstrap -@if gcc-bootstrap # We name the build directories for the various stages "stage1-gcc", # "stage2-gcc","stage3-gcc", etc. @@ -28451,7 +33781,9 @@ stage: # (both in a combined tree, or separately). This however requires some # change to the gcc driver, again in order to avoid comparison failures. -# Bugs: This is almost certainly not parallel-make safe. +# Bugs: This is crippled when doing parallel make, the `make all-host' +# and `make all-target' phases can be parallelized. + # 'touch' doesn't work right on some platforms. STAMP = echo timestamp > @@ -28468,17 +33800,10 @@ STAGE1_LANGUAGES=@stage1_languages@ # We only want to compare .o files, so set this! objext = .o -# Real targets act phony if they depend on phony targets; this hack -# prevents gratuitous rebuilding of stage 1. -prebootstrap: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-prebootstrap - $(STAMP) prebootstrap - # Flags to pass to stage2 and later makes. -BOOT_CFLAGS= -g -O2 POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/stage-gcc/ \ + STAGE_PREFIX=$$r/prev-gcc/ \ CFLAGS="$(BOOT_CFLAGS)" \ ADAC="\$$(CC)" @@ -28495,282 +33820,508 @@ POSTSTAGE1_FLAGS_TO_PASS = \ .PHONY: stage1-start stage1-end stage1-start:: - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage1 > stage_current ; \ - echo stage1 > stage_last ; \ - [ -d stage1-gcc ] || mkdir stage1-gcc; \ - set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@ + echo stage1 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stage1-bfd ] || \ + mkdir stage1-bfd; \ + set stage1-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stage1-opcodes ] || \ + mkdir stage1-opcodes; \ + set stage1-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stage1-binutils ] || \ + mkdir stage1-binutils; \ + set stage1-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stage1-gas ] || \ + mkdir stage1-gas; \ + set stage1-gas gas ; \ + @CREATE_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stage1-gcc ] || \ + mkdir stage1-gcc; \ + set stage1-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); [ -d stage1-intl ] || \ + mkdir stage1-intl; \ + set stage1-intl intl ; \ + @CREATE_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stage1-ld ] || \ + mkdir stage1-ld; \ + set stage1-ld ld ; \ + @CREATE_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stage1-libcpp ] || \ + mkdir stage1-libcpp; \ + set stage1-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); [ -d stage1-libiberty ] || \ + mkdir stage1-libiberty; \ + set stage1-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stage1-zlib ] || \ + mkdir stage1-zlib; \ + set stage1-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ +@endif zlib stage1-end:: - rm -f stage_current ; \ - set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ + @rm -f stage_current +@if bfd + @cd $(HOST_SUBDIR); set bfd stage1-bfd ; \ + @UNDO_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); set opcodes stage1-opcodes ; \ + @UNDO_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); set binutils stage1-binutils ; \ + @UNDO_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); set gas stage1-gas ; \ + @UNDO_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); set gcc stage1-gcc ; \ + @UNDO_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); set intl stage1-intl ; \ + @UNDO_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); set ld stage1-ld ; \ + @UNDO_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); set libcpp stage1-libcpp ; \ + @UNDO_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); set libiberty stage1-libiberty ; \ + @UNDO_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); set zlib stage1-zlib ; \ + @UNDO_LINK_TO_DIR@ +@endif zlib # Bubble a bugfix through all the stages up to stage 1. They # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage1-bubble stage1-bubble:: - @if [ -f all-stage1-gcc ] ; then \ - echo Remaking stage 1 ; \ - rm -f all-stage1-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1-gcc - - - -configure-stage1-gcc: prebootstrap - $(MAKE) stage1-start - @if [ -f stage1-gcc/Makefile ] ; then \ - $(STAMP) configure-stage1-gcc ; \ - exit 0; \ + @if test -f stage1-lean ; then \ + echo Skipping rebuild of stage1 ; \ else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - echo Configuring stage 1 in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \ - $(STAMP) ../configure-stage1-gcc - -all-stage1-gcc: configure-stage1-gcc - $(MAKE) stage1-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= 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 -.PHONY: restage1 touch-stage1 distclean-stage1 -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap +.PHONY: distclean-stage1 distclean-stage1:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : - rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc - -# Rules to renew the timestamp on a stage and all the following ones - -touch-stage1:: - @[ -f configure-stage1-gcc ] && \ - echo '$(STAMP) configure-stage1-gcc' && \ - $(STAMP) configure-stage1-gcc; \ - [ -f all-stage1-gcc ] && \ - echo '$(STAMP) all-stage1-gcc' && \ - $(STAMP) all-stage1-gcc; \ - : - -# After building a stage, touch the following ones - -restage1:: - rm -rf all-stage1-gcc - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1-gcc + rm -rf stage1-* +@endif gcc-bootstrap .PHONY: stage2-start stage2-end stage2-start:: - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage2 > stage_current ; \ - echo stage2 > stage_last ; \ - [ -d stage2-gcc ] || mkdir stage2-gcc; \ - set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ - set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + echo stage2 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stage2-bfd ] || \ + mkdir stage2-bfd; \ + set stage2-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stage2-opcodes ] || \ + mkdir stage2-opcodes; \ + set stage2-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stage2-binutils ] || \ + mkdir stage2-binutils; \ + set stage2-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stage2-gas ] || \ + mkdir stage2-gas; \ + set stage2-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stage2-gcc ] || \ + mkdir stage2-gcc; \ + set stage2-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); [ -d stage2-intl ] || \ + mkdir stage2-intl; \ + set stage2-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stage2-ld ] || \ + mkdir stage2-ld; \ + set stage2-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stage2-libcpp ] || \ + mkdir stage2-libcpp; \ + set stage2-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); [ -d stage2-libiberty ] || \ + mkdir stage2-libiberty; \ + set stage2-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stage2-zlib ] || \ + mkdir stage2-zlib; \ + set stage2-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ +@endif zlib stage2-end:: - rm -f stage_current ; \ - set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ ; \ - set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ + @rm -f stage_current +@if bfd + @cd $(HOST_SUBDIR); set bfd stage2-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; \ + @UNDO_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); set opcodes stage2-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; \ + @UNDO_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); set binutils stage2-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; \ + @UNDO_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); set gas stage2-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; \ + @UNDO_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); set gcc stage2-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; \ + @UNDO_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); set intl stage2-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; \ + @UNDO_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); set ld stage2-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; \ + @UNDO_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); set libcpp stage2-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; \ + @UNDO_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); set libiberty stage2-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; \ + @UNDO_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); set zlib stage2-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; \ + @UNDO_LINK_TO_DIR@ +@endif zlib # Bubble a bugfix through all the stages up to stage 2. They # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage2-bubble stage2-bubble:: stage1-bubble - @if [ -f all-stage2-gcc ] ; then \ - echo Remaking stage 2 ; \ - rm -f all-stage2-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2-gcc - - -stage1-bubble:: - @if [ -f configure-stage2-gcc ] ; then \ - $(STAMP) configure-stage2-gcc ; \ - fi - - -configure-stage2-gcc: all-stage1-gcc - $(MAKE) stage2-start - @if [ -f stage2-gcc/Makefile ] ; then \ - $(STAMP) configure-stage2-gcc ; \ - exit 0; \ + @if test -f stage2-lean || test -f stage1-lean ; then \ + echo Skipping rebuild of stage2 ; \ else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage 2 in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ && \ - $(STAMP) ../configure-stage2-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage2; \ + fi -all-stage2-gcc: configure-stage2-gcc - $(MAKE) stage2-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - && $(STAMP) ../all-stage2-gcc +.PHONY: all-stage2 clean-stage2 +do-clean: clean-stage2 +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap .PHONY: bootstrap2 -bootstrap2: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage2-bubble all - +bootstrap2: stage2-bubble all -.PHONY: restage2 touch-stage2 distclean-stage2 -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage1:: distclean-stage2 +.PHONY: distclean-stage2 distclean-stage2:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : - rm -rf configure-stage2-gcc all-stage2-gcc stage2-gcc - -# Rules to renew the timestamp on a stage and all the following ones -touch-stage1:: touch-stage2 -touch-stage2:: - @[ -f configure-stage2-gcc ] && \ - echo '$(STAMP) configure-stage2-gcc' && \ - $(STAMP) configure-stage2-gcc; \ - [ -f all-stage2-gcc ] && \ - echo '$(STAMP) all-stage2-gcc' && \ - $(STAMP) all-stage2-gcc; \ - : - -# After building a stage, touch the following ones -restage1:: touch-stage2 -restage2:: - rm -rf all-stage2-gcc - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2-gcc + rm -rf stage2-* +@endif gcc-bootstrap .PHONY: stage3-start stage3-end stage3-start:: - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage3 > stage_current ; \ - echo stage3 > stage_last ; \ - [ -d stage3-gcc ] || mkdir stage3-gcc; \ - set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ - set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + echo stage3 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stage3-bfd ] || \ + mkdir stage3-bfd; \ + set stage3-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stage3-opcodes ] || \ + mkdir stage3-opcodes; \ + set stage3-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stage3-binutils ] || \ + mkdir stage3-binutils; \ + set stage3-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stage3-gas ] || \ + mkdir stage3-gas; \ + set stage3-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stage3-gcc ] || \ + mkdir stage3-gcc; \ + set stage3-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); [ -d stage3-intl ] || \ + mkdir stage3-intl; \ + set stage3-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stage3-ld ] || \ + mkdir stage3-ld; \ + set stage3-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stage3-libcpp ] || \ + mkdir stage3-libcpp; \ + set stage3-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); [ -d stage3-libiberty ] || \ + mkdir stage3-libiberty; \ + set stage3-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stage3-zlib ] || \ + mkdir stage3-zlib; \ + set stage3-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage2-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ +@endif zlib stage3-end:: - rm -f stage_current ; \ - set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ ; \ - set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ + @rm -f stage_current +@if bfd + @cd $(HOST_SUBDIR); set bfd stage3-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage2-bfd ; \ + @UNDO_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); set opcodes stage3-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage2-opcodes ; \ + @UNDO_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); set binutils stage3-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage2-binutils ; \ + @UNDO_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); set gas stage3-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage2-gas ; \ + @UNDO_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); set gcc stage3-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage2-gcc ; \ + @UNDO_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); set intl stage3-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage2-intl ; \ + @UNDO_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); set ld stage3-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage2-ld ; \ + @UNDO_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); set libcpp stage3-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage2-libcpp ; \ + @UNDO_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); set libiberty stage3-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage2-libiberty ; \ + @UNDO_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); set zlib stage3-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage2-zlib ; \ + @UNDO_LINK_TO_DIR@ +@endif zlib # Bubble a bugfix through all the stages up to stage 3. They # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage3-bubble stage3-bubble:: stage2-bubble - @if [ -f all-stage3-gcc ] ; then \ - echo Remaking stage 3 ; \ - rm -f all-stage3-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3-gcc - - -stage2-bubble:: - @if [ -f configure-stage3-gcc ] ; then \ - $(STAMP) configure-stage3-gcc ; \ - fi - - -configure-stage3-gcc: all-stage2-gcc - $(MAKE) stage3-start - @if [ -f stage3-gcc/Makefile ] ; then \ - $(STAMP) configure-stage3-gcc ; \ - exit 0; \ + @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean + @if test -f stage3-lean || test -f stage2-lean ; then \ + echo Skipping rebuild of stage3 ; \ else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage 3 in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ && \ - $(STAMP) ../configure-stage3-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage3; \ + fi -all-stage3-gcc: configure-stage3-gcc - $(MAKE) stage3-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - && $(STAMP) ../all-stage3-gcc +.PHONY: all-stage3 clean-stage3 +do-clean: clean-stage3 +# 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 -compare: all-stage3-gcc - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : +compare: + @if test -f stage2-lean; then \ + echo Cannot compare object files as stage 2 was deleted. ; \ + exit 0 ; \ + fi; \ + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ rm -f .bad_compare ; \ @@ -28790,120 +34341,204 @@ compare: all-stage3-gcc true; \ fi ; \ $(STAMP) compare + @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean .PHONY: bootstrap -bootstrap: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage3-bubble compare all - +bootstrap: stage3-bubble compare all -.PHONY: restage3 touch-stage3 distclean-stage3 -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage2:: distclean-stage3 +.PHONY: distclean-stage3 distclean-stage3:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : - rm -rf configure-stage3-gcc all-stage3-gcc stage3-gcc compare - -# Rules to renew the timestamp on a stage and all the following ones -touch-stage2:: touch-stage3 -touch-stage3:: - @[ -f configure-stage3-gcc ] && \ - echo '$(STAMP) configure-stage3-gcc' && \ - $(STAMP) configure-stage3-gcc; \ - [ -f all-stage3-gcc ] && \ - echo '$(STAMP) all-stage3-gcc' && \ - $(STAMP) all-stage3-gcc; \ - : - -# After building a stage, touch the following ones -restage2:: touch-stage3 -restage3:: - rm -rf all-stage3-gcc compare - $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare + rm -rf stage3-* compare .PHONY: cleanstrap -cleanstrap: distclean-stage1 bootstrap +cleanstrap: distclean bootstrap +@endif gcc-bootstrap .PHONY: stage4-start stage4-end stage4-start:: - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stage4 > stage_current ; \ - echo stage4 > stage_last ; \ - [ -d stage4-gcc ] || mkdir stage4-gcc; \ - set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ - set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + echo stage4 > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stage4-bfd ] || \ + mkdir stage4-bfd; \ + set stage4-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stage4-opcodes ] || \ + mkdir stage4-opcodes; \ + set stage4-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stage4-binutils ] || \ + mkdir stage4-binutils; \ + set stage4-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stage4-gas ] || \ + mkdir stage4-gas; \ + set stage4-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stage4-gcc ] || \ + mkdir stage4-gcc; \ + set stage4-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); [ -d stage4-intl ] || \ + mkdir stage4-intl; \ + set stage4-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stage4-ld ] || \ + mkdir stage4-ld; \ + set stage4-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stage4-libcpp ] || \ + mkdir stage4-libcpp; \ + set stage4-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); [ -d stage4-libiberty ] || \ + mkdir stage4-libiberty; \ + set stage4-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stage4-zlib ] || \ + mkdir stage4-zlib; \ + set stage4-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage3-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ +@endif zlib stage4-end:: - rm -f stage_current ; \ - set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@ ; \ - set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ + @rm -f stage_current +@if bfd + @cd $(HOST_SUBDIR); set bfd stage4-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage3-bfd ; \ + @UNDO_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); set opcodes stage4-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage3-opcodes ; \ + @UNDO_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); set binutils stage4-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage3-binutils ; \ + @UNDO_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); set gas stage4-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage3-gas ; \ + @UNDO_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); set gcc stage4-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage3-gcc ; \ + @UNDO_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); set intl stage4-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage3-intl ; \ + @UNDO_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); set ld stage4-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage3-ld ; \ + @UNDO_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); set libcpp stage4-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage3-libcpp ; \ + @UNDO_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); set libiberty stage4-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage3-libiberty ; \ + @UNDO_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); set zlib stage4-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage3-zlib ; \ + @UNDO_LINK_TO_DIR@ +@endif zlib # Bubble a bugfix through all the stages up to stage 4. They # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stage4-bubble stage4-bubble:: stage3-bubble - @if [ -f all-stage4-gcc ] ; then \ - echo Remaking stage 4 ; \ - rm -f all-stage4-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4-gcc - - -stage3-bubble:: - @if [ -f configure-stage4-gcc ] ; then \ - $(STAMP) configure-stage4-gcc ; \ - fi - - -configure-stage4-gcc: all-stage3-gcc - $(MAKE) stage4-start - @if [ -f stage4-gcc/Makefile ] ; then \ - $(STAMP) configure-stage4-gcc ; \ - exit 0; \ + @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean + @if test -f stage4-lean || test -f stage3-lean ; then \ + echo Skipping rebuild of stage4 ; \ else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage 4 in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ && \ - $(STAMP) ../configure-stage4-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stage4; \ + fi -all-stage4-gcc: configure-stage4-gcc - $(MAKE) stage4-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - && $(STAMP) ../all-stage4-gcc +.PHONY: all-stage4 clean-stage4 +do-clean: clean-stage4 +# 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 -compare3: all-stage4-gcc - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : +compare3: + @if test -f stage3-lean; then \ + echo Cannot compare object files as stage 3 was deleted. ; \ + exit 0 ; \ + fi; \ + [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ rm -f .bad_compare ; \ @@ -28923,277 +34558,412 @@ compare3: all-stage4-gcc true; \ fi ; \ $(STAMP) compare3 + @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean .PHONY: bootstrap4 -bootstrap4: - $(MAKE) $(RECURSE_FLAGS_TO_PASS) stage4-bubble compare3 all - +bootstrap4: stage4-bubble compare3 all -.PHONY: restage4 touch-stage4 distclean-stage4 -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage3:: distclean-stage4 +.PHONY: distclean-stage4 distclean-stage4:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : - rm -rf configure-stage4-gcc all-stage4-gcc stage4-gcc compare3 - -# Rules to renew the timestamp on a stage and all the following ones -touch-stage3:: touch-stage4 -touch-stage4:: - @[ -f configure-stage4-gcc ] && \ - echo '$(STAMP) configure-stage4-gcc' && \ - $(STAMP) configure-stage4-gcc; \ - [ -f all-stage4-gcc ] && \ - echo '$(STAMP) all-stage4-gcc' && \ - $(STAMP) all-stage4-gcc; \ - : - -# After building a stage, touch the following ones -restage3:: touch-stage4 -restage4:: - rm -rf all-stage4-gcc compare3 - $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3 + rm -rf stage4-* compare3 +@endif gcc-bootstrap .PHONY: stageprofile-start stageprofile-end stageprofile-start:: - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stageprofile > stage_current ; \ - echo stageprofile > stage_last ; \ - [ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \ - set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ - set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + echo stageprofile > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stageprofile-bfd ] || \ + mkdir stageprofile-bfd; \ + set stageprofile-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stageprofile-opcodes ] || \ + mkdir stageprofile-opcodes; \ + set stageprofile-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stageprofile-binutils ] || \ + mkdir stageprofile-binutils; \ + set stageprofile-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stageprofile-gas ] || \ + mkdir stageprofile-gas; \ + set stageprofile-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stageprofile-gcc ] || \ + mkdir stageprofile-gcc; \ + set stageprofile-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); [ -d stageprofile-intl ] || \ + mkdir stageprofile-intl; \ + set stageprofile-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stageprofile-ld ] || \ + mkdir stageprofile-ld; \ + set stageprofile-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stageprofile-libcpp ] || \ + mkdir stageprofile-libcpp; \ + set stageprofile-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); [ -d stageprofile-libiberty ] || \ + mkdir stageprofile-libiberty; \ + set stageprofile-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stageprofile-zlib ] || \ + mkdir stageprofile-zlib; \ + set stageprofile-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stage1-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ +@endif zlib stageprofile-end:: - rm -f stage_current ; \ - set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@ ; \ - set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ + @rm -f stage_current +@if bfd + @cd $(HOST_SUBDIR); set bfd stageprofile-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stage1-bfd ; \ + @UNDO_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); set opcodes stageprofile-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stage1-opcodes ; \ + @UNDO_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); set binutils stageprofile-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stage1-binutils ; \ + @UNDO_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); set gas stageprofile-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stage1-gas ; \ + @UNDO_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); set gcc stageprofile-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stage1-gcc ; \ + @UNDO_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); set intl stageprofile-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stage1-intl ; \ + @UNDO_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); set ld stageprofile-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stage1-ld ; \ + @UNDO_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); set libcpp stageprofile-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stage1-libcpp ; \ + @UNDO_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); set libiberty stageprofile-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stage1-libiberty ; \ + @UNDO_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); set zlib stageprofile-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stage1-zlib ; \ + @UNDO_LINK_TO_DIR@ +@endif zlib # Bubble a bugfix through all the stages up to stage profile. They # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stageprofile-bubble stageprofile-bubble:: stage1-bubble - @if [ -f all-stageprofile-gcc ] ; then \ - echo Remaking stage profile ; \ - rm -f all-stageprofile-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile-gcc - - -stage1-bubble:: - @if [ -f configure-stageprofile-gcc ] ; then \ - $(STAMP) configure-stageprofile-gcc ; \ - fi - - -configure-stageprofile-gcc: all-stage1-gcc - $(MAKE) stageprofile-start - @if [ -f stageprofile-gcc/Makefile ] ; then \ - $(STAMP) configure-stageprofile-gcc ; \ - exit 0; \ + @if test -f stageprofile-lean || test -f stage1-lean ; then \ + echo Skipping rebuild of stageprofile ; \ else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage profile in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ && \ - $(STAMP) ../configure-stageprofile-gcc - -all-stageprofile-gcc: configure-stageprofile-gcc - $(MAKE) stageprofile-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && $(STAMP) ../all-stageprofile-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stageprofile; \ + fi +.PHONY: all-stageprofile clean-stageprofile +do-clean: clean-stageprofile +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap -.PHONY: restageprofile touch-stageprofile distclean-stageprofile -# Rules to wipe a stage and all the following ones, used for cleanstrap +# Rules to wipe a stage and all the following ones, also used for cleanstrap distclean-stage1:: distclean-stageprofile +.PHONY: distclean-stageprofile distclean-stageprofile:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : - rm -rf configure-stageprofile-gcc all-stageprofile-gcc stageprofile-gcc - -# Rules to renew the timestamp on a stage and all the following ones -touch-stage1:: touch-stageprofile -touch-stageprofile:: - @[ -f configure-stageprofile-gcc ] && \ - echo '$(STAMP) configure-stageprofile-gcc' && \ - $(STAMP) configure-stageprofile-gcc; \ - [ -f all-stageprofile-gcc ] && \ - echo '$(STAMP) all-stageprofile-gcc' && \ - $(STAMP) all-stageprofile-gcc; \ - : - -# After building a stage, touch the following ones -restage1:: touch-stageprofile -restageprofile:: - rm -rf all-stageprofile-gcc - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile-gcc + rm -rf stageprofile-* +@endif gcc-bootstrap .PHONY: stagefeedback-start stagefeedback-end stagefeedback-start:: - [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : + @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \ echo stagefeedback > stage_current ; \ - echo stagefeedback > stage_last ; \ - [ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \ - set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \ - set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ + echo stagefeedback > stage_last; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR) $(TARGET_SUBDIR) +@if bfd + @cd $(HOST_SUBDIR); [ -d stagefeedback-bfd ] || \ + mkdir stagefeedback-bfd; \ + set stagefeedback-bfd bfd ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-bfd prev-bfd ; \ + @CREATE_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); [ -d stagefeedback-opcodes ] || \ + mkdir stagefeedback-opcodes; \ + set stagefeedback-opcodes opcodes ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-opcodes prev-opcodes ; \ + @CREATE_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); [ -d stagefeedback-binutils ] || \ + mkdir stagefeedback-binutils; \ + set stagefeedback-binutils binutils ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-binutils prev-binutils ; \ + @CREATE_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); [ -d stagefeedback-gas ] || \ + mkdir stagefeedback-gas; \ + set stagefeedback-gas gas ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-gas prev-gas ; \ + @CREATE_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); [ -d stagefeedback-gcc ] || \ + mkdir stagefeedback-gcc; \ + set stagefeedback-gcc gcc ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-gcc prev-gcc ; \ + @CREATE_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); [ -d stagefeedback-intl ] || \ + mkdir stagefeedback-intl; \ + set stagefeedback-intl intl ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-intl prev-intl ; \ + @CREATE_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); [ -d stagefeedback-ld ] || \ + mkdir stagefeedback-ld; \ + set stagefeedback-ld ld ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-ld prev-ld ; \ + @CREATE_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); [ -d stagefeedback-libcpp ] || \ + mkdir stagefeedback-libcpp; \ + set stagefeedback-libcpp libcpp ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-libcpp prev-libcpp ; \ + @CREATE_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); [ -d stagefeedback-libiberty ] || \ + mkdir stagefeedback-libiberty; \ + set stagefeedback-libiberty libiberty ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-libiberty prev-libiberty ; \ + @CREATE_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); [ -d stagefeedback-zlib ] || \ + mkdir stagefeedback-zlib; \ + set stagefeedback-zlib zlib ; \ + @CREATE_LINK_TO_DIR@ ; \ + set stageprofile-zlib prev-zlib ; \ + @CREATE_LINK_TO_DIR@ +@endif zlib stagefeedback-end:: - rm -f stage_current ; \ - set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@ ; \ - set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@ + @rm -f stage_current +@if bfd + @cd $(HOST_SUBDIR); set bfd stagefeedback-bfd ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-bfd stageprofile-bfd ; \ + @UNDO_LINK_TO_DIR@ +@endif bfd +@if opcodes + @cd $(HOST_SUBDIR); set opcodes stagefeedback-opcodes ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-opcodes stageprofile-opcodes ; \ + @UNDO_LINK_TO_DIR@ +@endif opcodes +@if binutils + @cd $(HOST_SUBDIR); set binutils stagefeedback-binutils ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-binutils stageprofile-binutils ; \ + @UNDO_LINK_TO_DIR@ +@endif binutils +@if gas + @cd $(HOST_SUBDIR); set gas stagefeedback-gas ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gas stageprofile-gas ; \ + @UNDO_LINK_TO_DIR@ +@endif gas +@if gcc + @cd $(HOST_SUBDIR); set gcc stagefeedback-gcc ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-gcc stageprofile-gcc ; \ + @UNDO_LINK_TO_DIR@ +@endif gcc +@if intl + @cd $(HOST_SUBDIR); set intl stagefeedback-intl ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-intl stageprofile-intl ; \ + @UNDO_LINK_TO_DIR@ +@endif intl +@if ld + @cd $(HOST_SUBDIR); set ld stagefeedback-ld ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-ld stageprofile-ld ; \ + @UNDO_LINK_TO_DIR@ +@endif ld +@if libcpp + @cd $(HOST_SUBDIR); set libcpp stagefeedback-libcpp ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libcpp stageprofile-libcpp ; \ + @UNDO_LINK_TO_DIR@ +@endif libcpp +@if libiberty + @cd $(HOST_SUBDIR); set libiberty stagefeedback-libiberty ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-libiberty stageprofile-libiberty ; \ + @UNDO_LINK_TO_DIR@ +@endif libiberty +@if zlib + @cd $(HOST_SUBDIR); set zlib stagefeedback-zlib ; \ + @UNDO_LINK_TO_DIR@ ; \ + set prev-zlib stageprofile-zlib ; \ + @UNDO_LINK_TO_DIR@ +@endif zlib # Bubble a bugfix through all the stages up to stage feedback. They # are remade, but not reconfigured. The next stage (if any) will not # be reconfigured as well. .PHONY: stagefeedback-bubble -stagefeedback-bubble:: stage1-bubble - @if [ -f all-stagefeedback-gcc ] ; then \ - echo Remaking stage feedback ; \ - rm -f all-stagefeedback-gcc ; \ - fi ; \ - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback-gcc - - -stage1-bubble:: - @if [ -f configure-stagefeedback-gcc ] ; then \ - $(STAMP) configure-stagefeedback-gcc ; \ - fi - - -configure-stagefeedback-gcc: all-stage1-gcc - $(MAKE) stagefeedback-start - @if [ -f stagefeedback-gcc/Makefile ] ; then \ - $(STAMP) configure-stagefeedback-gcc ; \ - exit 0; \ +stagefeedback-bubble:: stageprofile-bubble + @if test -f stagefeedback-lean || test -f stageprofile-lean ; then \ + echo Skipping rebuild of stagefeedback ; \ else \ - true ; \ - fi ; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - echo Configuring stage feedback in gcc ; \ - cd gcc || exit 1; \ - case $(srcdir) in \ - \.) \ - srcdiroption="--srcdir=."; \ - libsrcdir=".";; \ - /* | [A-Za-z]:[\\/]*) \ - srcdiroption="--srcdir=$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - *) \ - srcdiroption="--srcdir=../$(srcdir)/gcc"; \ - libsrcdir="$$s/gcc";; \ - esac; \ - $(SHELL) $${libsrcdir}/configure \ - $(HOST_CONFIGARGS) $${srcdiroption} \ - @stage2_werror_flag@ && \ - $(STAMP) ../configure-stagefeedback-gcc + $(MAKE) $(RECURSE_FLAGS_TO_PASS) NOTPARALLEL= all-stagefeedback; \ + fi -all-stagefeedback-gcc: configure-stagefeedback-gcc - $(MAKE) stagefeedback-start - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(STAGE_HOST_EXPORTS) \ - cd gcc && \ - $(MAKE) $(GCC_FLAGS_TO_PASS) \ - $(POSTSTAGE1_FLAGS_TO_PASS) \ - CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && $(STAMP) ../all-stagefeedback-gcc +.PHONY: all-stagefeedback clean-stagefeedback +do-clean: clean-stagefeedback +# FIXME: Will not need to be conditional when toplevel bootstrap is the +# only possibility, but now it conflicts with no-bootstrap rules +@if gcc-bootstrap +.PHONY: profiledbootstrap +profiledbootstrap: stagefeedback-bubble all -.PHONY: restagefeedback touch-stagefeedback distclean-stagefeedback -# Rules to wipe a stage and all the following ones, used for cleanstrap -distclean-stage1:: distclean-stagefeedback +# Rules to wipe a stage and all the following ones, also used for cleanstrap +distclean-stageprofile:: distclean-stagefeedback +.PHONY: distclean-stagefeedback distclean-stagefeedback:: [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : - rm -rf configure-stagefeedback-gcc all-stagefeedback-gcc stagefeedback-gcc - -# Rules to renew the timestamp on a stage and all the following ones -touch-stage1:: touch-stagefeedback -touch-stagefeedback:: - @[ -f configure-stagefeedback-gcc ] && \ - echo '$(STAMP) configure-stagefeedback-gcc' && \ - $(STAMP) configure-stagefeedback-gcc; \ - [ -f all-stagefeedback-gcc ] && \ - echo '$(STAMP) all-stagefeedback-gcc' && \ - $(STAMP) all-stagefeedback-gcc; \ - : + rm -rf stagefeedback-* -# After building a stage, touch the following ones -restage1:: touch-stagefeedback -restagefeedback:: - rm -rf all-stagefeedback-gcc - $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback-gcc +@endif gcc-bootstrap +stageprofile-end:: + $(MAKE) distclean-stagefeedback stagefeedback-start:: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - cd stageprofile-gcc && \ - { find . -type d | sort | sed 's,.*,$(SHELL) '"$$s"'/mkinstalldirs "../gcc/&",' | $(SHELL); } && \ - { find . -name '*.*da' | sed 's,.*,$(LN) -f "&" "../gcc/&",' | $(SHELL); } - -profiledbootstrap: all-prebootstrap configure-gcc - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - echo "Bootstrapping the compiler"; \ - $(MAKE) stageprofile-bubble distclean-stagefeedback - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \ - $(SET_LIB_PATH) \ - echo "Building runtime libraries and training compiler"; \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) all - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(SET_LIB_PATH) \ - $(HOST_EXPORTS) \ - echo "Building feedback based compiler"; \ - $(MAKE) stagefeedback-bubble stagefeedback-end + for i in prev-*; do \ + 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) ; } ; \ + done +@if gcc-bootstrap +NOTPARALLEL = .NOTPARALLEL +$(NOTPARALLEL): +do-distclean: distclean-stage1 @endif gcc-bootstrap # -------------------------------------- @@ -29206,6 +34976,8 @@ configure-target-libstdc++-v3: maybe-all-gcc configure-target-libmudflap: maybe-all-gcc +configure-target-libssp: maybe-all-gcc + configure-target-newlib: maybe-all-gcc configure-target-libgfortran: maybe-all-gcc @@ -29282,6 +35054,7 @@ configure-target-qthreads: maybe-all-target-newlib maybe-all-target-libgloss + # With all the machinery above in place, it is pretty easy to generate # dependencies. Host dependencies are a bit more complex because we have # to check for bootstrap/prebootstrap dependencies. To resolve @@ -29295,6 +35068,7 @@ all-build-flex: maybe-all-build-byacc 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 configure-gcc: maybe-configure-intl configure-stage1-gcc: maybe-configure-stage1-intl @@ -29303,32 +35077,30 @@ configure-stage3-gcc: maybe-configure-stage3-intl configure-stage4-gcc: maybe-configure-stage4-intl configure-stageprofile-gcc: maybe-configure-stageprofile-intl configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl -configure-gcc: maybe-configure-binutils - -configure-stage1-gcc: maybe-configure-stage1-binutils -configure-stage2-gcc: maybe-configure-stage2-binutils -configure-stage3-gcc: maybe-configure-stage3-binutils -configure-stage4-gcc: maybe-configure-stage4-binutils -configure-stageprofile-gcc: maybe-configure-stageprofile-binutils -configure-stagefeedback-gcc: maybe-configure-stagefeedback-binutils -configure-gcc: maybe-configure-gas - -configure-stage1-gcc: maybe-configure-stage1-gas -configure-stage2-gcc: maybe-configure-stage2-gas -configure-stage3-gcc: maybe-configure-stage3-gas -configure-stage4-gcc: maybe-configure-stage4-gas -configure-stageprofile-gcc: maybe-configure-stageprofile-gas -configure-stagefeedback-gcc: maybe-configure-stagefeedback-gas -configure-gcc: maybe-configure-ld - -configure-stage1-gcc: maybe-configure-stage1-ld -configure-stage2-gcc: maybe-configure-stage2-ld -configure-stage3-gcc: maybe-configure-stage3-ld -configure-stage4-gcc: maybe-configure-stage4-ld -configure-stageprofile-gcc: maybe-configure-stageprofile-ld -configure-stagefeedback-gcc: maybe-configure-stagefeedback-ld -configure-gcc: maybe-configure-bison -configure-gcc: maybe-configure-flex +configure-gcc: maybe-all-binutils + +configure-stage1-gcc: maybe-all-stage1-binutils +configure-stage2-gcc: maybe-all-stage2-binutils +configure-stage3-gcc: maybe-all-stage3-binutils +configure-stage4-gcc: maybe-all-stage4-binutils +configure-stageprofile-gcc: maybe-all-stageprofile-binutils +configure-stagefeedback-gcc: maybe-all-stagefeedback-binutils +configure-gcc: maybe-all-gas + +configure-stage1-gcc: maybe-all-stage1-gas +configure-stage2-gcc: maybe-all-stage2-gas +configure-stage3-gcc: maybe-all-stage3-gas +configure-stage4-gcc: maybe-all-stage4-gas +configure-stageprofile-gcc: maybe-all-stageprofile-gas +configure-stagefeedback-gcc: maybe-all-stagefeedback-gas +configure-gcc: maybe-all-ld + +configure-stage1-gcc: maybe-all-stage1-ld +configure-stage2-gcc: maybe-all-stage2-ld +configure-stage3-gcc: maybe-all-stage3-ld +configure-stage4-gcc: maybe-all-stage4-ld +configure-stageprofile-gcc: maybe-all-stageprofile-ld +configure-stagefeedback-gcc: maybe-all-stagefeedback-ld all-gcc: all-libiberty all-stage1-gcc: all-stage1-libiberty @@ -29345,34 +35117,60 @@ all-stage3-gcc: maybe-all-stage3-intl all-stage4-gcc: maybe-all-stage4-intl all-stageprofile-gcc: maybe-all-stageprofile-intl all-stagefeedback-gcc: maybe-all-stagefeedback-intl -all-gcc: maybe-all-texinfo -all-gcc: maybe-all-bison -all-gcc: maybe-all-byacc -all-gcc: maybe-all-flex -all-gcc: maybe-all-binutils - -all-stage1-gcc: maybe-all-stage1-binutils -all-stage2-gcc: maybe-all-stage2-binutils -all-stage3-gcc: maybe-all-stage3-binutils -all-stage4-gcc: maybe-all-stage4-binutils -all-stageprofile-gcc: maybe-all-stageprofile-binutils -all-stagefeedback-gcc: maybe-all-stagefeedback-binutils -all-gcc: maybe-all-gas - -all-stage1-gcc: maybe-all-stage1-gas -all-stage2-gcc: maybe-all-stage2-gas -all-stage3-gcc: maybe-all-stage3-gas -all-stage4-gcc: maybe-all-stage4-gas -all-stageprofile-gcc: maybe-all-stageprofile-gas -all-stagefeedback-gcc: maybe-all-stagefeedback-gas -all-gcc: maybe-all-ld - -all-stage1-gcc: maybe-all-stage1-ld -all-stage2-gcc: maybe-all-stage2-ld -all-stage3-gcc: maybe-all-stage3-ld -all-stage4-gcc: maybe-all-stage4-ld -all-stageprofile-gcc: maybe-all-stageprofile-ld -all-stagefeedback-gcc: maybe-all-stagefeedback-ld +all-gcc: maybe-all-build-texinfo + +all-stage1-gcc: maybe-all-build-texinfo +all-stage2-gcc: maybe-all-build-texinfo +all-stage3-gcc: maybe-all-build-texinfo +all-stage4-gcc: maybe-all-build-texinfo +all-stageprofile-gcc: maybe-all-build-texinfo +all-stagefeedback-gcc: maybe-all-build-texinfo +all-prebootstrap: maybe-all-build-texinfo +all-gcc: maybe-all-build-bison + +all-stage1-gcc: maybe-all-build-bison +all-stage2-gcc: maybe-all-build-bison +all-stage3-gcc: maybe-all-build-bison +all-stage4-gcc: maybe-all-build-bison +all-stageprofile-gcc: maybe-all-build-bison +all-stagefeedback-gcc: maybe-all-build-bison +all-prebootstrap: maybe-all-build-bison +all-gcc: maybe-all-build-byacc + +all-stage1-gcc: maybe-all-build-byacc +all-stage2-gcc: maybe-all-build-byacc +all-stage3-gcc: maybe-all-build-byacc +all-stage4-gcc: maybe-all-build-byacc +all-stageprofile-gcc: maybe-all-build-byacc +all-stagefeedback-gcc: maybe-all-build-byacc +all-prebootstrap: maybe-all-build-byacc +all-gcc: maybe-all-build-flex + +all-stage1-gcc: maybe-all-build-flex +all-stage2-gcc: maybe-all-build-flex +all-stage3-gcc: maybe-all-build-flex +all-stage4-gcc: maybe-all-build-flex +all-stageprofile-gcc: maybe-all-build-flex +all-stagefeedback-gcc: maybe-all-build-flex +all-prebootstrap: maybe-all-build-flex +all-gcc: maybe-all-build-libiberty + +all-stage1-gcc: maybe-all-build-libiberty +all-stage2-gcc: maybe-all-build-libiberty +all-stage3-gcc: maybe-all-build-libiberty +all-stage4-gcc: maybe-all-build-libiberty +all-stageprofile-gcc: maybe-all-build-libiberty +all-stagefeedback-gcc: maybe-all-build-libiberty +all-prebootstrap: maybe-all-build-libiberty +all-gcc: maybe-all-build-fixincludes + +all-stage1-gcc: maybe-all-build-fixincludes +all-stage2-gcc: maybe-all-build-fixincludes +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-prebootstrap: maybe-all-build-fixincludes all-gcc: maybe-all-zlib all-stage1-gcc: maybe-all-stage1-zlib @@ -29381,14 +35179,6 @@ all-stage3-gcc: maybe-all-stage3-zlib all-stage4-gcc: maybe-all-stage4-zlib all-stageprofile-gcc: maybe-all-stageprofile-zlib all-stagefeedback-gcc: maybe-all-stagefeedback-zlib -all-gcc: maybe-all-libbanshee - -all-stage1-gcc: maybe-all-stage1-libbanshee -all-stage2-gcc: maybe-all-stage2-libbanshee -all-stage3-gcc: maybe-all-stage3-libbanshee -all-stage4-gcc: maybe-all-stage4-libbanshee -all-stageprofile-gcc: maybe-all-stageprofile-libbanshee -all-stagefeedback-gcc: maybe-all-stagefeedback-libbanshee all-gcc: all-libcpp all-stage1-gcc: all-stage1-libcpp @@ -29397,7 +35187,16 @@ all-stage3-gcc: all-stage3-libcpp all-stage4-gcc: all-stage4-libcpp all-stageprofile-gcc: all-stageprofile-libcpp all-stagefeedback-gcc: all-stagefeedback-libcpp -all-gcc: maybe-all-build-libiberty +all-gcc: maybe-all-libiberty + +all-stage1-gcc: maybe-all-stage1-libiberty +all-stage2-gcc: maybe-all-stage2-libiberty +all-stage3-gcc: maybe-all-stage3-libiberty +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 +install-gcc: maybe-install-fixincludes configure-libcpp: configure-libiberty configure-stage1-libcpp: configure-stage1-libiberty @@ -29430,6 +35229,8 @@ 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-fixincludes: maybe-all-libiberty +all-gnattools: maybe-all-target-libada configure-gdb: maybe-configure-itcl configure-gdb: maybe-configure-tcl configure-gdb: maybe-configure-tk @@ -29438,13 +35239,12 @@ all-gdb: maybe-all-libiberty all-gdb: maybe-all-opcodes all-gdb: maybe-all-bfd all-gdb: maybe-all-readline -all-gdb: maybe-all-bison -all-gdb: maybe-all-byacc +all-gdb: maybe-all-build-bison +all-gdb: maybe-all-build-byacc all-gdb: maybe-all-sim install-gdb: maybe-install-tcl install-gdb: maybe-install-tk install-gdb: maybe-install-itcl -install-gdb: maybe-install-tix install-gdb: maybe-install-libgui configure-libgui: maybe-configure-tcl configure-libgui: maybe-configure-tk @@ -29499,9 +35299,33 @@ all-stage3-binutils: maybe-all-stage3-bfd all-stage4-binutils: maybe-all-stage4-bfd all-stageprofile-binutils: maybe-all-stageprofile-bfd all-stagefeedback-binutils: maybe-all-stagefeedback-bfd -all-binutils: maybe-all-flex -all-binutils: maybe-all-bison -all-binutils: maybe-all-byacc +all-binutils: maybe-all-build-flex + +all-stage1-binutils: maybe-all-build-flex +all-stage2-binutils: maybe-all-build-flex +all-stage3-binutils: maybe-all-build-flex +all-stage4-binutils: maybe-all-build-flex +all-stageprofile-binutils: maybe-all-build-flex +all-stagefeedback-binutils: maybe-all-build-flex +all-prebootstrap: maybe-all-build-flex +all-binutils: maybe-all-build-bison + +all-stage1-binutils: maybe-all-build-bison +all-stage2-binutils: maybe-all-build-bison +all-stage3-binutils: maybe-all-build-bison +all-stage4-binutils: maybe-all-build-bison +all-stageprofile-binutils: maybe-all-build-bison +all-stagefeedback-binutils: maybe-all-build-bison +all-prebootstrap: maybe-all-build-bison +all-binutils: maybe-all-build-byacc + +all-stage1-binutils: maybe-all-build-byacc +all-stage2-binutils: maybe-all-build-byacc +all-stage3-binutils: maybe-all-build-byacc +all-stage4-binutils: maybe-all-build-byacc +all-stageprofile-binutils: maybe-all-build-byacc +all-stagefeedback-binutils: maybe-all-build-byacc +all-prebootstrap: maybe-all-build-byacc all-binutils: maybe-all-intl all-stage1-binutils: maybe-all-stage1-intl @@ -29572,9 +35396,33 @@ all-stage3-ld: maybe-all-stage3-opcodes all-stage4-ld: maybe-all-stage4-opcodes all-stageprofile-ld: maybe-all-stageprofile-opcodes all-stagefeedback-ld: maybe-all-stagefeedback-opcodes -all-ld: maybe-all-bison -all-ld: maybe-all-byacc -all-ld: maybe-all-flex +all-ld: maybe-all-build-bison + +all-stage1-ld: maybe-all-build-bison +all-stage2-ld: maybe-all-build-bison +all-stage3-ld: maybe-all-build-bison +all-stage4-ld: maybe-all-build-bison +all-stageprofile-ld: maybe-all-build-bison +all-stagefeedback-ld: maybe-all-build-bison +all-prebootstrap: maybe-all-build-bison +all-ld: maybe-all-build-byacc + +all-stage1-ld: maybe-all-build-byacc +all-stage2-ld: maybe-all-build-byacc +all-stage3-ld: maybe-all-build-byacc +all-stage4-ld: maybe-all-build-byacc +all-stageprofile-ld: maybe-all-build-byacc +all-stagefeedback-ld: maybe-all-build-byacc +all-prebootstrap: maybe-all-build-byacc +all-ld: maybe-all-build-flex + +all-stage1-ld: maybe-all-build-flex +all-stage2-ld: maybe-all-build-flex +all-stage3-ld: maybe-all-build-flex +all-stage4-ld: maybe-all-build-flex +all-stageprofile-ld: maybe-all-build-flex +all-stagefeedback-ld: maybe-all-build-flex +all-prebootstrap: maybe-all-build-flex all-ld: maybe-all-intl all-stage1-ld: maybe-all-stage1-intl @@ -29613,10 +35461,6 @@ all-itcl: maybe-all-tk install-itcl: maybe-install-tcl configure-tk: maybe-configure-tcl all-tk: maybe-all-tcl -configure-tix: maybe-configure-tcl -configure-tix: maybe-configure-tk -all-tix: maybe-all-tcl -all-tix: maybe-all-tk all-sid: maybe-all-libiberty all-sid: maybe-all-bfd all-sid: maybe-all-opcodes @@ -29630,41 +35474,41 @@ all-sim: maybe-all-opcodes all-sim: maybe-all-readline all-sim: maybe-configure-gdb all-fastjar: maybe-all-zlib -all-fastjar: maybe-all-texinfo +all-fastjar: maybe-all-build-texinfo all-fastjar: maybe-all-libiberty all-autoconf: maybe-all-m4 -all-autoconf: maybe-all-texinfo +all-autoconf: maybe-all-build-texinfo all-automake: maybe-all-m4 -all-automake: maybe-all-texinfo +all-automake: maybe-all-build-texinfo all-automake: maybe-all-autoconf all-bison: maybe-all-intl -all-bison: maybe-all-texinfo +all-bison: maybe-all-build-texinfo all-diff: maybe-all-intl -all-diff: maybe-all-texinfo +all-diff: maybe-all-build-texinfo all-fileutils: maybe-all-intl -all-fileutils: maybe-all-texinfo -all-flex: maybe-all-bison -all-flex: maybe-all-byacc +all-fileutils: maybe-all-build-texinfo +all-flex: maybe-all-build-bison +all-flex: maybe-all-build-byacc all-flex: maybe-all-intl all-flex: maybe-all-m4 -all-flex: maybe-all-texinfo +all-flex: maybe-all-build-texinfo all-gzip: maybe-all-intl all-gzip: maybe-all-zlib -all-gzip: maybe-all-texinfo +all-gzip: maybe-all-build-texinfo all-hello: maybe-all-intl -all-hello: maybe-all-texinfo +all-hello: maybe-all-build-texinfo all-m4: maybe-all-intl -all-m4: maybe-all-texinfo +all-m4: maybe-all-build-texinfo all-make: maybe-all-intl -all-make: maybe-all-texinfo -all-patch: maybe-all-texinfo -all-make: maybe-all-texinfo +all-make: maybe-all-build-texinfo +all-patch: maybe-all-build-texinfo +all-make: maybe-all-build-texinfo all-prms: maybe-all-libiberty -all-recode: maybe-all-texinfo -all-sed: maybe-all-texinfo +all-recode: maybe-all-build-texinfo +all-sed: maybe-all-build-texinfo all-send-pr: maybe-all-prms -all-tar: maybe-all-texinfo -all-uudecode: maybe-all-texinfo +all-tar: maybe-all-build-texinfo +all-uudecode: maybe-all-build-texinfo configure-target-boehm-gc: maybe-configure-target-qthreads configure-target-fastjar: maybe-configure-target-zlib all-target-fastjar: maybe-all-target-zlib @@ -29685,16 +35529,8 @@ all-target-winsup: maybe-all-target-libiberty all-target-winsup: maybe-all-target-libtermcap -# Now build the prebootstrap dependencies. - -all-prebootstrap: maybe-all-bison -all-prebootstrap: maybe-all-byacc -all-prebootstrap: maybe-all-flex -all-prebootstrap: maybe-all-texinfo - -# Unless toplevel bootstrap is going, bootstrapped packages are actually -# prebootstrapped, with the exception of gcc. Another wart that will go -# away with toplevel bootstrap. +# Non-toplevel bootstrap rules must depend on several packages, to be built +# before gcc. Another wart that will go away, hopefully soon. @if gcc-no-bootstrap all-prebootstrap: maybe-all-bfd @@ -29704,7 +35540,6 @@ all-prebootstrap: maybe-all-gas all-prebootstrap: maybe-all-intl all-prebootstrap: maybe-all-ld all-prebootstrap: maybe-all-libcpp -all-prebootstrap: maybe-all-libbanshee all-prebootstrap: maybe-all-libiberty all-prebootstrap: maybe-all-zlib @endif gcc-no-bootstrap @@ -29741,7 +35576,7 @@ $(srcdir)/Makefile.in: @MAINT@ $(srcdir)/Makefile.tpl $(srcdir)/Makefile.def Makefile: $(srcdir)/Makefile.in config.status CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status -config.status: configure $(gcc_version_trigger) +config.status: configure CONFIG_SHELL="$(SHELL)" $(SHELL) ./config.status --recheck # Rebuilding configure.