From d27cc32edd9a133cc634be2cca62c5094d5b782b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 6 Oct 2004 10:15:24 +0000 Subject: 2004-10-06 Paolo Bonzini Fix wrong conflict resolution in: 2004-08-16 Paolo Bonzini * Makefile.in: Regenerate. * Makefile.tpl (Autogenerated `all-*' targets): Invoke $(TARGET-*) in the recursive `make', instead of hardwiring `all'. (Autogenerated TARGET-* variables): New. --- Makefile.tpl | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'Makefile.tpl') diff --git a/Makefile.tpl b/Makefile.tpl index 06ea94a963..3fb09f7d8b 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+] -- cgit v1.2.1