(stmp-int-hdrs): No longer depends on gsyslimits.h.

Don't make include/syslimits.h here since we want to test the limits.h
made by fixincludes, not by the later part of this rule.
(stmp-fixinc): Depends on gsyslimits.h.
Make include/syslimits.h here.

From-SVN: r4254

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index e516fc53367b54aec53718a44c9898f6625218d9..aa34037e81625a2341a41d5460646d6ae41d1d0b 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1304,7 +1304,8 @@ test-protoize-simple: ./protoize ./unprotoize $(GCC_PASSES)
 
 # Build the include directory except for float.h (which depends upon
 # enquire).
-stmp-int-hdrs: stmp-fixinc $(USER_H) gvarargs.h gstdarg.h gstddef.h gsyslimits.h xlimits.h objc-headers
+stmp-int-hdrs: stmp-fixinc $(USER_H) gvarargs.h gstdarg.h gstddef.h \
+  xlimits.h objc-headers
 # Copy in the headers provided with gcc.
 # The sed command gets just the last file name component;
 # this is necessary because VPATH could add a dirname.
@@ -1317,13 +1318,6 @@ stmp-int-hdrs: stmp-fixinc $(USER_H) gvarargs.h gstdarg.h gstddef.h gsyslimits.h
          cp $$realfile $$objdir/include; \
          chmod a+r $$objdir/include/$$realfile; \
        done
-       rm -f include/syslimits.h
-       if [ -f include/limits.h ]; then \
-         mv include/limits.h include/syslimits.h; \
-       else \
-         cp $(srcdir)/gsyslimits.h include/syslimits.h; \
-       fi
-       chmod a+r include/syslimits.h
        rm -f include/varargs.h
        cp $(srcdir)/gvarargs.h include/varargs.h
        chmod a+r include/varargs.h
@@ -1350,7 +1344,7 @@ stmp-headers: stmp-int-hdrs gfloat.h
        touch stmp-headers
 
 # Build fixed copies of system files.
-stmp-fixinc: $(srcdir)/$(FIXINCLUDES)
+stmp-fixinc: $(srcdir)/$(FIXINCLUDES) gsyslimits.h
        rm -rf include
        mkdir include
        if [ x$(FIXINCLUDES) != xMakefile.in ]; \
@@ -1363,6 +1357,13 @@ stmp-fixinc: $(srcdir)/$(FIXINCLUDES)
          done; \
        else true; \
        fi
+       rm -f include/syslimits.h
+       if [ -f include/limits.h ]; then \
+         mv include/limits.h include/syslimits.h; \
+       else \
+         cp $(srcdir)/gsyslimits.h include/syslimits.h; \
+       fi
+       chmod a+r include/syslimits.h
        touch stmp-fixinc
 
 # copy objc header files