(fix-header.o): Depend on fix-header.c.

(scan-decls.o): New target.
(gen-protos.o, scan.o): New targets.

(deduced.h): Pass GCC source dir to scan-types.sh.

From-SVN: r5900

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index ed562732d72ca28e0b3d391f53cb499af7e4bb2d..06eab5b00d4cf1216b42ce836b0a1ed85034c6f4 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1571,12 +1571,15 @@ objc-headers: stmp-fixinc
 deduced.h: $(GCC_PASSES) $(srcdir)/scan-types.sh stmp-int-hdrs
        CC="$(GCC_FOR_TARGET) $(GCC_CFLAGS) $(ALL_CPPFLAGS) -Iinclude -I${SYSTEM_HEADER_DIR}"; \
          export CC; \
-         $(srcdir)/scan-types.sh >tmp-deduced.h
+         $(srcdir)/scan-types.sh "$(srcdir)" >tmp-deduced.h
        mv tmp-deduced.h deduced.h
 
 gen-protos: gen-protos.o scan.o
        ${HOST_CC} -o gen-protos gen-protos.o scan.o
 
+gen-protos.o: gen-protos.c scan.h
+scan.o: scan.c scan.h
+
 xsys-protos.h: $(GCC_PASSES) $(srcdir)/sys-protos.h deduced.h gen-protos Makefile
        cat deduced.h $(srcdir)/sys-protos.h > fixtmp.c
        $(GCC_FOR_TARGET) fixtmp.c -E \
@@ -1587,7 +1590,8 @@ xsys-protos.h: $(GCC_PASSES) $(srcdir)/sys-protos.h deduced.h gen-protos Makefil
 fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(HOST_OBSTACK)
        $(HOST_CC) -o fix-header fix-header.o scan-decls.o scan.o $(HOST_OBSTACK)
 
-fix-header.o: xsys-protos.h
+fix-header.o: fix-header.c obstack.h scan.h xsys-protos.h
+scan-decls.o: scan-decls.c scan.h
 
 # stmp-fixproto depends on this, not on fix-header directly.
 # The idea is to make sure fix-header gets built,