[toplevel PATCH] Shorten names for new-bootstrap targets

[Paolo Bonzini <bonzini at gnu dot org>]

This patch, now that toplevel bootstrap is picked with a configure 
option, omits the `new-' prefix on the toplevel bootstrap targets.

I'm currently away from CVS, so I cannot commit the patches that 
Alexandre approved.  I will do so on Monday, presumably.

Bootstrapped i686-pc-linux-gnu, both new-style and old-style, ok for 
mainline and src?

Paolo
2004-05-24  Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.def: Remove new- prefix from toplevel
	bootstrap targets.
	* Makefile.tpl: Likewise.
	* configure.in: Likewise.
	* Makefile.in: Regenerate.
	* configure: Regenerate.

diff -u after-patch-1/Makefile.def ./Makefile.def
--- after-patch-1/Makefile.def	2004-05-24 15:13:10.000000000 +0200
+++ ./Makefile.def	2004-05-24 15:13:28.000000000 +0200
@@ -227,7 +227,7 @@
 bootstrap_stage = {
 	id=3 ; prev=2 ;
 	compare_target=compare ;
-	bootstrap_target=new-bootstrap ;
-	cleanstrap_target=new-cleanstrap ;
+	bootstrap_target=bootstrap ;
+	cleanstrap_target=cleanstrap ;
 	extra_configure_flags="@stage2_werror_flag@" ;
 	extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; };
diff -u after-patch-1/Makefile.tpl ./Makefile.tpl
--- after-patch-1/Makefile.tpl	2004-05-24 15:13:10.000000000 +0200
+++ ./Makefile.tpl	2004-05-24 15:13:42.000000000 +0200
@@ -1402,16 +1402,16 @@
 # * We build only C (and possibly Ada).
 
 [+ FOR bootstrap-stage +]
-.PHONY: new-stage[+id+]-start new-stage[+id+]-end
+.PHONY: stage[+id+]-start stage[+id+]-end
 
-new-stage[+id+]-start:
-	[ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
+stage[+id+]-start:
+	[ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
 	echo stage[+id+] > stage_last ; \
 	[ -d stage[+id+]-gcc ] || mkdir stage[+id+]-gcc; \
 	set stage[+id+]-gcc gcc ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
 	set stage[+prev+]-gcc prev-gcc ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
 
-new-stage[+id+]-end:
+stage[+id+]-end:
 	rm -f stage_last ; \
 	set gcc stage[+id+]-gcc ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
 	set prev-gcc stage[+prev+]-gcc ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
@@ -1419,8 +1419,8 @@
 # Bubble a bugfix through all the stages up to stage [+id+].  They
 # are remade, but not reconfigured.  The next stage (if any) will not
 # be reconfigured as well.
-.PHONY: new-stage[+id+]-bubble
-new-stage[+id+]-bubble: [+ IF prev +]new-stage[+prev+]-bubble[+ ENDIF +]
+.PHONY: stage[+id+]-bubble
+stage[+id+]-bubble: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
 	@if [ -f all-stage[+id+]-gcc ] ; then \
 	  echo Remaking stage [+id+] ; \
 	  rm -f all-stage[+id+]-gcc ; \
@@ -1434,7 +1434,7 @@
 
 configure-stage[+id+]-gcc: [+ IF prev +] all-stage[+prev+]-gcc [+
 	  ELSE +] prebootstrap [+ ENDIF prev +]
-	$(MAKE) new-stage[+id+]-start
+	$(MAKE) stage[+id+]-start
 	@if [ -f stage[+id+]-gcc/Makefile ] ; then \
 	  $(STAMP) configure-stage[+id+]-gcc ; \
 	  exit 0; \
@@ -1483,7 +1483,7 @@
 	  $(STAMP) ../configure-stage[+id+]-gcc
 
 all-stage[+id+]-gcc: configure-stage[+id+]-gcc
-	$(MAKE) new-stage[+id+]-start
+	$(MAKE) stage[+id+]-start
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	cd gcc && \
@@ -1495,7 +1495,7 @@
 
 [+ IF compare-target +]
 [+compare-target+]: all-stage[+id+]-gcc
-	[ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
+	[ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
 	@r=`${PWD_COMMAND}`; export r; \
 	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
 	rm -f .bad_compare ; \
@@ -1520,20 +1520,20 @@
 [+ IF bootstrap-target +]
 .PHONY: [+bootstrap-target+]
 [+bootstrap-target+]:
-	$(MAKE) new-stage[+id+]-bubble [+
+	$(MAKE) stage[+id+]-bubble [+
 	  IF compare-target +] [+compare-target+] [+
 	  ENDIF compare-target +] \
-	  new-stage[+id+]-start all new-stage[+id+]-end 
+	  stage[+id+]-start all stage[+id+]-end 
 [+ ENDIF bootstrap-target +]
 
-.PHONY: new-restage[+id+] distclean-stage[+id+]
+.PHONY: restage[+id+] distclean-stage[+id+]
 
 distclean-stage[+id+]: [+ IF next +] distclean-stage[+next+] [+ ENDIF next +]
-	[ -f stage_last ] && $(MAKE) new-`cat stage_last`-end || :
+	[ -f stage_last ] && $(MAKE) `cat stage_last`-end || :
 	rm -rf configure-stage[+id+]-gcc all-stage[+id+]-gcc stage[+id+]-gcc [+
 	  IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
 
-new-restage[+id+]: [+ IF next +] distclean-stage[+next+] [+ ENDIF next +]
+restage[+id+]: [+ IF next +] distclean-stage[+next+] [+ ENDIF next +]
 	rm -rf all-stage[+id+]-gcc [+
 	  IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
 	$(MAKE) [+
diff -u after-patch-1/configure.in ./configure.in
--- after-patch-1/configure.in	2004-05-24 15:23:37.000000000 +0200
+++ configure.in	2004-05-24 15:23:45.000000000 +0200
@@ -1778,7 +1778,7 @@
 
 case "$enable_bootstrap" in
   yes)
-    default_target=new-bootstrap
+    default_target=bootstrap
     extrasub="$extrasub
 ^@if gcc-bootstrap\$/d
 ^@endif gcc-bootstrap\$/d" ;;