PlaneteCasio
/
libc
1
0
Fork 0
Code Issues 6 Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Paolo Bonzini 2004-10-06 10:15:24 +00:00
parent 4f8dc86255
commit 5e6b1f07c9
3 changed files with 209 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -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 Ulrich Weigand <uweigand@de.ibm.com>
Merged from GCC / libtool upstream:

261
Makefile.in
View File

File diff suppressed because it is too large Load Diff

10
Makefile.tpl
View File

@ -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+]