Makefile.in (bootstrap-lean): Combined with `normal' bootstrap targets using "$@...

        * Makefile.in (bootstrap-lean): Combined with `normal' bootstrap
        targets using "$@" to provide support for similar but not identical
        targets without having to duplicate code.

From-SVN: r16186

diff --git a/ChangeLog b/ChangeLog
index 147325d75733c2e6d9cd8a29f95f789ff910d744..9e4494526d779ba5aee2bfe56558c53ea55c4d2e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct 26 11:48:27 1997  Manfred Hollstein  (manfred@s-direktnet.de)
+
+       * Makefile.in (bootstrap-lean): Combined with `normal' bootstrap
+       targets using "$@" to provide support for similar but not identical
+       targets without having to duplicate code.
+
 Mon Sep 29 00:38:08 1997 Aaron Jackson <jackson@negril.msrce.howard.edu>
 
        * Makefile.in (bootstrap-lean): New target.

diff --git a/Makefile.in b/Makefile.in
index b7f9c27be7954c78d47bcebdaae400f63d2d1888..d4d99477dc668038d06f699800a5d5e9805435a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1283,8 +1283,8 @@ all-gcc:
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #
-.PHONY: bootstrap bootstrap2 bootstrap3
-bootstrap bootstrap2 bootstrap3: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
+.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap3 bootstrap4
+bootstrap bootstrap-lean bootstrap2 bootstrap3 bootstrap4: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
        @r=`pwd`; export r; \
        s=`cd $(srcdir); pwd`; export s; \
        $(SET_LIB_PATH) \
@@ -1292,24 +1292,17 @@ bootstrap bootstrap2 bootstrap3: all-texinfo all-bison all-byacc all-binutils al
        cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $@
        @r=`pwd`; export r; \
        s=`cd $(srcdir); pwd`; export s; \
+       case "$@" in \
+         *bootstrap4 ) msg="Comparing stage3 and stage4 of the compiler"; \
+                       compare=compare3 ;; \
+         *-lean )      msg="Comparing stage2 and stage3 of the compiler"; \
+                       compare=compare-lean ;; \
+         * )           msg="Comparing stage2 and stage3 of the compiler"; \
+                       compare=compare ;; \
+       esac; \
        $(SET_LIB_PATH) \
-       echo "Comparing stage2 and stage3 of the compiler"; \
-       cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) compare
-       @echo "Building runtime libraries"; \
-       $(MAKE) all
-
-.PHONY: bootstrap-lean
-bootstrap-lean: all-texinfo all-bison all-byacc all-binutils all-gas all-ld
-       @r=`pwd`; export r; \
-       s=`cd $(srcdir); pwd`; export s; \
-       $(SET_LIB_PATH) \
-       echo "Bootstrapping the compiler"; \
-       cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $@
-       @r=`pwd`; export r; \
-       s=`cd $(srcdir); pwd`; export s; \
-       $(SET_LIB_PATH) \
-       echo "Comparing stage2 and stage3 of the compiler"; \
-       cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) compare-lean
+       echo "$$msg"; \
+       cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) $$compare
        @echo "Building runtime libraries"; \
        $(MAKE) all