diff options
| author | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-06 10:09:29 +0000 |
|---|---|---|
| committer | bonzini <bonzini@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-10-06 10:09:29 +0000 |
| commit | 68b4a982025df49713ae88c08c9a430c3c8866c7 (patch) | |
| tree | 87d8b5f23f248329f7107b9b4f0ef2d7d3e4d025 | |
| parent | 8a86cf44d44dcdab6ddf46e3e447f58bb79637e9 (diff) | |
| download | gcc-68b4a982025df49713ae88c08c9a430c3c8866c7.tar.gz | |
2004-10-06 Paolo Bonzini <bonzini@gnu.org>
Fix wrong conflict resolution in:
2004-08-16 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
* Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*)
in the recursive `make', instead of hardwiring `all'.
(Autogenerated TARGET-* variables): New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@88594 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | Makefile.in | 261 | ||||
| -rw-r--r-- | Makefile.tpl | 10 |
3 files changed, 209 insertions, 73 deletions
diff --git a/ChangeLog b/ChangeLog index 587f7cd086b..4aa63ba1159 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2004-10-06 Paolo Bonzini <bonzini@gnu.org> + + Fix wrong conflict resolution in: + + 2004-08-16 Paolo Bonzini <bonzini@gnu.org> + + * Makefile.in: Regenerate. + * Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*) + in the recursive `make', instead of hardwiring `all'. + (Autogenerated TARGET-* variables): New. + 2004-10-05 Tomer Levi <Tomer.Levi@nsc.com> * configure.in: Enable target-libgloss for crx-*-*. diff --git a/Makefile.in b/Makefile.in index 26df74199aa..0867ec9f535 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2543,13 +2543,15 @@ configure-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 ash && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-ash)) @endif ash .PHONY: check-ash maybe-check-ash @@ -2845,13 +2847,15 @@ configure-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 autoconf && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-autoconf)) @endif autoconf .PHONY: check-autoconf maybe-check-autoconf @@ -3147,13 +3151,15 @@ configure-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 automake && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-automake)) @endif automake .PHONY: check-automake maybe-check-automake @@ -3449,13 +3455,15 @@ configure-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 bash && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-bash)) @endif bash .PHONY: check-bash maybe-check-bash @@ -3752,6 +3760,7 @@ configure-bfd: .PHONY: all-bfd maybe-all-bfd maybe-all-bfd: @if bfd +TARGET-bfd=all maybe-all-bfd: all-bfd all-bfd: configure-bfd @test -f stage_last && exit 0; \ @@ -3759,7 +3768,8 @@ all-bfd: configure-bfd s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd bfd && $(MAKE) $(FLAGS_TO_PASS) all) + (cd bfd && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-bfd)) @endif bfd .PHONY: check-bfd maybe-check-bfd @@ -4056,6 +4066,7 @@ configure-opcodes: .PHONY: all-opcodes maybe-all-opcodes maybe-all-opcodes: @if opcodes +TARGET-opcodes=all maybe-all-opcodes: all-opcodes all-opcodes: configure-opcodes @test -f stage_last && exit 0; \ @@ -4063,7 +4074,8 @@ all-opcodes: configure-opcodes s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) all) + (cd opcodes && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-opcodes)) @endif opcodes .PHONY: check-opcodes maybe-check-opcodes @@ -4360,6 +4372,7 @@ configure-binutils: .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; \ @@ -4367,7 +4380,8 @@ all-binutils: configure-binutils s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd binutils && $(MAKE) $(FLAGS_TO_PASS) all) + (cd binutils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-binutils)) @endif binutils .PHONY: check-binutils maybe-check-binutils @@ -4663,13 +4677,15 @@ configure-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 bison && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-bison)) @endif bison .PHONY: check-bison maybe-check-bison @@ -4968,13 +4984,15 @@ configure-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 byacc && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-byacc)) @endif byacc .PHONY: check-byacc maybe-check-byacc @@ -5273,13 +5291,15 @@ configure-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 bzip2 && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-bzip2)) @endif bzip2 .PHONY: check-bzip2 maybe-check-bzip2 @@ -5575,13 +5595,15 @@ configure-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 dejagnu && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-dejagnu)) @endif dejagnu .PHONY: check-dejagnu maybe-check-dejagnu @@ -5877,13 +5899,15 @@ configure-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 diff && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-diff)) @endif diff .PHONY: check-diff maybe-check-diff @@ -6179,13 +6203,15 @@ configure-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 dosutils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-dosutils)) @endif dosutils .PHONY: check-dosutils maybe-check-dosutils @@ -6476,13 +6502,15 @@ configure-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 etc && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-etc)) @endif etc .PHONY: check-etc maybe-check-etc @@ -6778,13 +6806,15 @@ configure-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 fastjar && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-fastjar)) @endif fastjar .PHONY: check-fastjar maybe-check-fastjar @@ -7083,13 +7113,15 @@ configure-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 fileutils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-fileutils)) @endif fileutils .PHONY: check-fileutils maybe-check-fileutils @@ -7385,13 +7417,15 @@ configure-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 findutils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-findutils)) @endif findutils .PHONY: check-findutils maybe-check-findutils @@ -7687,13 +7721,15 @@ configure-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 find && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-find)) @endif find .PHONY: check-find maybe-check-find @@ -7989,13 +8025,15 @@ configure-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; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd flex && $(MAKE) $(FLAGS_TO_PASS) all) + (cd flex && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-flex)) @endif flex .PHONY: check-flex maybe-check-flex @@ -8295,6 +8333,7 @@ configure-gas: .PHONY: all-gas maybe-all-gas maybe-all-gas: @if gas +TARGET-gas=all maybe-all-gas: all-gas all-gas: configure-gas @test -f stage_last && exit 0; \ @@ -8302,7 +8341,8 @@ all-gas: configure-gas s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd gas && $(MAKE) $(FLAGS_TO_PASS) all) + (cd gas && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-gas)) @endif gas .PHONY: check-gas maybe-check-gas @@ -8599,6 +8639,7 @@ configure-gcc: .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 @test -f stage_last && exit 0; \ @@ -8606,8 +8647,8 @@ all-gcc: configure-gcc 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 gcc && $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \ + $(TARGET-gcc)) @endif gcc .PHONY: check-gcc maybe-check-gcc @@ -8903,13 +8944,15 @@ configure-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 gawk && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-gawk)) @endif gawk .PHONY: check-gawk maybe-check-gawk @@ -9205,13 +9248,15 @@ configure-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 gettext && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-gettext)) @endif gettext .PHONY: check-gettext maybe-check-gettext @@ -9507,13 +9552,15 @@ configure-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 gnuserv && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-gnuserv)) @endif gnuserv .PHONY: check-gnuserv maybe-check-gnuserv @@ -9809,13 +9856,15 @@ configure-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 gprof && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-gprof)) @endif gprof .PHONY: check-gprof maybe-check-gprof @@ -10111,13 +10160,15 @@ configure-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 gzip && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-gzip)) @endif gzip .PHONY: check-gzip maybe-check-gzip @@ -10413,13 +10464,15 @@ configure-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 hello && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-hello)) @endif hello .PHONY: check-hello maybe-check-hello @@ -10715,13 +10768,15 @@ configure-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 indent && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-indent)) @endif indent .PHONY: check-indent maybe-check-indent @@ -11018,6 +11073,7 @@ configure-intl: .PHONY: all-intl maybe-all-intl maybe-all-intl: @if intl +TARGET-intl=all maybe-all-intl: all-intl all-intl: configure-intl @test -f stage_last && exit 0; \ @@ -11025,7 +11081,8 @@ all-intl: configure-intl s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd intl && $(MAKE) $(FLAGS_TO_PASS) all) + (cd intl && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-intl)) @endif intl .PHONY: check-intl maybe-check-intl @@ -11321,13 +11378,15 @@ configure-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 tcl && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-tcl)) @endif tcl .PHONY: check-tcl maybe-check-tcl @@ -11608,13 +11667,15 @@ configure-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 itcl && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-itcl)) @endif itcl .PHONY: check-itcl maybe-check-itcl @@ -11911,6 +11972,7 @@ configure-ld: .PHONY: all-ld maybe-all-ld maybe-all-ld: @if ld +TARGET-ld=all maybe-all-ld: all-ld all-ld: configure-ld @test -f stage_last && exit 0; \ @@ -11918,7 +11980,8 @@ all-ld: configure-ld s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd ld && $(MAKE) $(FLAGS_TO_PASS) all) + (cd ld && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-ld)) @endif ld .PHONY: check-ld maybe-check-ld @@ -12215,6 +12278,7 @@ configure-libcpp: .PHONY: all-libcpp maybe-all-libcpp maybe-all-libcpp: @if libcpp +TARGET-libcpp=all maybe-all-libcpp: all-libcpp all-libcpp: configure-libcpp @test -f stage_last && exit 0; \ @@ -12222,7 +12286,8 @@ all-libcpp: configure-libcpp s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) all) + (cd libcpp && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-libcpp)) @endif libcpp .PHONY: check-libcpp maybe-check-libcpp @@ -12518,13 +12583,15 @@ configure-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 libgui && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-libgui)) @endif libgui .PHONY: check-libgui maybe-check-libgui @@ -12821,6 +12888,7 @@ configure-libiberty: .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; \ @@ -12828,7 +12896,8 @@ all-libiberty: configure-libiberty s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) all) + (cd libiberty && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-libiberty)) @endif libiberty .PHONY: check-libiberty maybe-check-libiberty @@ -13124,13 +13193,15 @@ configure-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 libtool && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-libtool)) @endif libtool .PHONY: check-libtool maybe-check-libtool @@ -13426,13 +13497,15 @@ configure-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 m4 && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-m4)) @endif m4 .PHONY: check-m4 maybe-check-m4 @@ -13728,13 +13801,15 @@ configure-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 make && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-make)) @endif make .PHONY: check-make maybe-check-make @@ -14030,13 +14105,15 @@ configure-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 mmalloc && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-mmalloc)) @endif mmalloc .PHONY: check-mmalloc maybe-check-mmalloc @@ -14327,13 +14404,15 @@ configure-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 patch && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-patch)) @endif patch .PHONY: check-patch maybe-check-patch @@ -14629,13 +14708,15 @@ configure-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 perl && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-perl)) @endif perl .PHONY: check-perl maybe-check-perl @@ -14931,13 +15012,15 @@ configure-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 prms && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-prms)) @endif prms .PHONY: check-prms maybe-check-prms @@ -15233,13 +15316,15 @@ configure-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 rcs && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-rcs)) @endif rcs .PHONY: check-rcs maybe-check-rcs @@ -15535,13 +15620,15 @@ configure-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 readline && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-readline)) @endif readline .PHONY: check-readline maybe-check-readline @@ -15837,13 +15924,15 @@ configure-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 release && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-release)) @endif release .PHONY: check-release maybe-check-release @@ -16129,13 +16218,15 @@ configure-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 recode && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-recode)) @endif recode .PHONY: check-recode maybe-check-recode @@ -16431,13 +16522,15 @@ configure-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 sed && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-sed)) @endif sed .PHONY: check-sed maybe-check-sed @@ -16733,13 +16826,15 @@ configure-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 send-pr && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-send-pr)) @endif send-pr .PHONY: check-send-pr maybe-check-send-pr @@ -17035,13 +17130,15 @@ configure-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 shellutils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-shellutils)) @endif shellutils .PHONY: check-shellutils maybe-check-shellutils @@ -17337,13 +17434,15 @@ configure-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 sid && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-sid)) @endif sid .PHONY: check-sid maybe-check-sid @@ -17639,13 +17738,15 @@ configure-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 sim && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-sim)) @endif sim .PHONY: check-sim maybe-check-sim @@ -17941,13 +18042,15 @@ configure-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 tar && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-tar)) @endif tar .PHONY: check-tar maybe-check-tar @@ -18243,13 +18346,15 @@ configure-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 texinfo && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-texinfo)) @endif texinfo .PHONY: check-texinfo maybe-check-texinfo @@ -18540,13 +18645,15 @@ configure-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 textutils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-textutils)) @endif textutils .PHONY: check-textutils maybe-check-textutils @@ -18842,13 +18949,15 @@ configure-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 time && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-time)) @endif time .PHONY: check-time maybe-check-time @@ -19144,13 +19253,15 @@ configure-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 uudecode && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-uudecode)) @endif uudecode .PHONY: check-uudecode maybe-check-uudecode @@ -19446,13 +19557,15 @@ configure-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 wdiff && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-wdiff)) @endif wdiff .PHONY: check-wdiff maybe-check-wdiff @@ -19748,13 +19861,15 @@ configure-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 zip && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-zip)) @endif zip .PHONY: check-zip maybe-check-zip @@ -20054,6 +20169,7 @@ configure-zlib: .PHONY: all-zlib maybe-all-zlib maybe-all-zlib: @if zlib +TARGET-zlib=all maybe-all-zlib: all-zlib all-zlib: configure-zlib @test -f stage_last && exit 0; \ @@ -20061,7 +20177,8 @@ all-zlib: configure-zlib s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd zlib && $(MAKE) $(FLAGS_TO_PASS) all) + (cd zlib && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-zlib)) @endif zlib .PHONY: check-zlib maybe-check-zlib @@ -20347,13 +20464,15 @@ configure-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 gdb && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-gdb)) @endif gdb .PHONY: check-gdb maybe-check-gdb @@ -20649,13 +20768,15 @@ configure-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 expect && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-expect)) @endif expect .PHONY: check-expect maybe-check-expect @@ -20951,13 +21072,15 @@ configure-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 guile && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-guile)) @endif guile .PHONY: check-guile maybe-check-guile @@ -21253,13 +21376,15 @@ configure-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 tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) \ + $(TARGET-tk)) @endif tk .PHONY: check-tk maybe-check-tk @@ -21555,13 +21680,15 @@ configure-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 libtermcap && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-libtermcap)) @endif libtermcap .PHONY: check-libtermcap maybe-check-libtermcap @@ -21792,13 +21919,15 @@ configure-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 utils && $(MAKE) $(FLAGS_TO_PASS) \ + $(TARGET-utils)) @endif utils .PHONY: check-utils maybe-check-utils diff --git a/Makefile.tpl b/Makefile.tpl index 06ea94a9639..3fb09f7d8bb 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -909,6 +909,7 @@ configure-[+module+]: .PHONY: all-[+module+] maybe-all-[+module+] maybe-all-[+module+]: @if [+module+] +TARGET-[+module+]=[+ IF target +][+target+][+ ELSE +]all[+ ENDIF target +] maybe-all-[+module+]: all-[+module+] all-[+module+]: configure-[+module+] @[+ IF bootstrap +]test -f stage_last && exit 0; \ @@ -916,13 +917,8 @@ all-[+module+]: configure-[+module+] s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(SET_LIB_PATH) \ $(HOST_EXPORTS) \ - (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS)[+ - IF with_x - +] $(X11_FLAGS_TO_PASS)[+ - ENDIF with_x +] [+extra_make_flags+] [+ - IF (== (get "module") "gcc") +] \ - `if [ -f gcc/stage_last ]; then echo quickstrap ; else echo all; fi` [+ - ELSE +]all[+ ENDIF +]) + (cd [+module+] && $(MAKE) $(FLAGS_TO_PASS) [+extra_make_flags+] \ + $(TARGET-[+module+])) @endif [+module+] .PHONY: check-[+module+] maybe-check-[+module+] |