*** empty log message ***

From-SVN: r1108

1 files changed, 16 insertions, 6 deletions

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index aee83ea..225ea95 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -416,9 +416,9 @@ Makefile: $(srcdir)/Makefile.in $(srcdir)/configure $(srcdir)/version.c \
 
 all.internal: start.encap rest.encap
 # This is what to compile if making a cross-compiler.
-all.cross: native gcc-cross cross-test
+all.cross: native gcc-cross cross-test $(EXTRA_PARTS)
 # This is what must be made before installing GCC and converting libraries.
-start.encap: native gcc $(LIBGCC1_TARGET)
+start.encap: native gcc specs $(LIBGCC1_TARGET)
 # Use this to make a GCC that will be used only to recompile GCC.
 for-bootstrap: start.encap libgcc.a
 # These can't be made, with COFF encapsulation, until after GCC can run.
@@ -445,6 +445,10 @@ config.status:
 	  true; \
 	fi
 
+# On the target machine, finish building a cross compiler.
+# This does the things that can't be done on the host machine.
+rest.cross: libgcc.a float.h specs
+
 # Verify that it works to compile and link cross-test.
 # If it does, then there are sufficient replacements for libgcc1.a.
 cross-test: cross-test.o native gcc-cross
@@ -452,13 +456,17 @@ cross-test: cross-test.o native gcc-cross
 cross-test.o: cross-test.c native gcc-cross
 	$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) -c $(srcdir)/cross-test.c
 
+# Recompile all the language-independent object files.
+# This is used only if the user explicitly asks for it.
 compilations: ${OBJS}
 
 gcc: gcc.o version.o $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o gccnew gcc.o version.o $(LIBS)
 # Go via `gccnew' to avoid `file busy' if $(CC) is `gcc'.
 	mv -f gccnew gcc
-# Dump a specs file to make -B./ read these specs over installed ones
+
+# Dump a specs file to make -B./ read these specs over installed ones.
+specs: gcc
 	./gcc -dumpspecs > specs
 
 # We do want to create an executable named `gcc', so we can use it to
@@ -1135,12 +1143,14 @@ protoize.1:	$(srcdir)/proto-man ./cpp
 	./cpp -traditional $(srcdir)/proto-man \
 		| grep -v '^#' \
 			| awk 'NF > 0 {print}' > tmp-proto.1
+	-rm -f protoize.1
 	mv tmp-proto.1 protoize.1
 
 unprotoize.1:	$(srcdir)/proto-man ./cpp
 	./cpp -traditional -DUNPRO $(srcdir)/proto-man \
 		| grep -v '^#' \
 			| awk 'NF > 0 {print}' > tmp-unproto.1
+	-rm -f unprotoize.1
 	mv tmp-unproto.1 unprotoize.1
 
 # This info describes the target machine, so compile with GCC just built.
@@ -1213,7 +1223,7 @@ mostlyclean:
 	for name in $(LIB1FUNCS); do rm -f $${name}.c; done
 # Delete other temporary files.
 	-rm -f tmp-float.h tmp-gcc.xtar.Z tmp-limits.h gccnew
-	-rm -f tmp-foo1 tmp-foo2 tmp-proto.*
+	-rm -f tmp-foo1 tmp-foo2 tmp-proto.* tmp-unproto.1
 # Delete the stamp files.
 	-rm -f stamp-* tmp-*
 # Delete debugging dump files.
@@ -1236,8 +1246,8 @@ clean: mostlyclean
 # but the spec for `make clean' requires it.
 # Using unprotoize.c is not quite right in the first place, 
 # but what better way is there?
-	-rm -f libgcc.a libgcc1.a libgcc2.a libgcc2.ready unprotoize.c
-	-rm -f *.dvi
+	-rm -f libgcc.a libgcc1.a libgcc2.a libgcc2.ready libgcc1.null
+	-rm -f *.dvi unprotoize.c
 
 # Delete all files that users would normally create
 # while building and installing GCC.