In the targets such as $(HOST_PREFIX_1)rtl.o,

use sed to make them include hconfig.h instead of config.h.
(distclean): Add command to delete hconfig.h.

From-SVN: r2250

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index afab6451405932ca52a48f6f7b1c82c224b95eec..aa07ba2b2f7af4a2e8256e720b8f28ea1e2b79dd 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1075,17 +1075,17 @@ genoutput.o : genoutput.c $(RTL_H) config.h
 # with the rules for rtl.o, alloca.o, etc.
 $(HOST_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(CONFIG_H) $(RTL_H)
        rm -f $(HOST_PREFIX)rtl.c
-       cp $(srcdir)/rtl.c $(HOST_PREFIX)rtl.c
+       sed -e 's/config[.]/hconfig[.]h/' $(srcdir)/rtlanal.c > $(HOST_PREFIX)rtlanal.c
        $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)rtl.c
 
 $(HOST_PREFIX_1)print-rtl.o: $(srcdir)/print-rtl.c $(CONFIG_H) $(RTL_H)
        rm -f $(HOST_PREFIX)print-rtl.c
-       cp $(srcdir)/print-rtl.c $(HOST_PREFIX)print-rtl.c
+       sed -e 's/config[.]/hconfig[.]h/' $(srcdir)/rtlanal.c > $(HOST_PREFIX)rtlanal.c
        $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)print-rtl.c
 
 $(HOST_PREFIX_1)rtlanal.o: $(srcdir)/rtlanal.c $(CONFIG_H) $(RTL_H)
        rm -f $(HOST_PREFIX)rtlanal.c
-       cp $(srcdir)/rtlanal.c $(HOST_PREFIX)rtlanal.c
+       sed -e 's/config[.]/hconfig[.]h/' $(srcdir)/rtlanal.c > $(HOST_PREFIX)rtlanal.c
        $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)rtlanal.c
 
 $(HOST_PREFIX_1)alloca.o: alloca.c
@@ -1095,12 +1095,12 @@ $(HOST_PREFIX_1)alloca.o: alloca.c
 
 $(HOST_PREFIX_1)obstack.o: obstack.c
        rm -f $(HOST_PREFIX)obstack.c
-       cp $(srcdir)/obstack.c $(HOST_PREFIX)obstack.c
+       sed -e 's/config[.]/hconfig[.]h/' $(srcdir)/obstack.c > $(HOST_PREFIX)obstack.c
        $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)obstack.c
 
 $(HOST_PREFIX_1)malloc.o: malloc.c
        rm -f $(HOST_PREFIX)malloc.c
-       cp $(srcdir)/malloc.c $(HOST_PREFIX)malloc.c
+       sed -e 's/config[.]/hconfig[.]h/' $(srcdir)/malloc.c > $(HOST_PREFIX)malloc.c
        $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)malloc.c
 
 # This satisfies the dependency that we get if you cross-compile a compiler
@@ -1264,7 +1264,7 @@ clean: mostlyclean
 # Delete all files that users would normally create
 # while building and installing GCC.
 distclean: clean
-       -rm -f tm.h aux-output.c config.h md config.status tconfig.h
+       -rm -f tm.h aux-output.c config.h md config.status tconfig.h hconfig.h
        -rm -f Makefile *.oaux
        -rm -fr stage1 stage2 stage3 stage4