diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2004-10-06 10:15:24 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2004-10-06 10:15:24 +0000 |
| commit | d27cc32edd9a133cc634be2cca62c5094d5b782b (patch) | |
| tree | ff633b51e24326fb1888a4e35960dc62cf7f3400 /Makefile.tpl | |
| parent | 2348555434c49b1f1e6f006f7ad43f7a1603747c (diff) | |
| download | gdb-d27cc32edd9a133cc634be2cca62c5094d5b782b.zip gdb-d27cc32edd9a133cc634be2cca62c5094d5b782b.tar.gz gdb-d27cc32edd9a133cc634be2cca62c5094d5b782b.tar.bz2 | |
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.
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 06ea94a..3fb09f7 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+] |