* Makefile.in: Move many of the *_H definitions eariler in the

file, so that rules in t-* files that use them for
dependencies will work in a parallel build.
* config/i386/t-cygwin (winnt.o): Depend on $(CONFIG_H).

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42516 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a62306d..7ae1e66 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-05-23  Kelley Cook  <kelley.cook@home.com>
+
+       * Makefile.in: Move many of the *_H definitions eariler in the
+       file, so that rules in t-* files that use them for
+       dependencies will work in a parallel build.
+       * config/i386/t-cygwin (winnt.o): Depend on $(CONFIG_H).
+
 2001-05-23  Richard Henderson <rth@redhat.com>
 
        * integrate.c (expand_inline_function): Handle CONCAT DECL_RESULT.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 83c52f4..5365bec 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -545,6 +545,34 @@ all: all.indirect
 # This tells GNU Make version 3 not to put all variables in the environment.
 .NOEXPORT:
 
+# GCONFIG_H lists the config files that the generator files depend on, while
+# CONFIG_H lists the the ones ordinary gcc files depend on, which includes
+# a file generated by gencodes.
+GCONFIG_H = config.h $(host_xm_file_list)
+HCONFIG_H = hconfig.h $(build_xm_file_list)
+CONFIG_H = $(GCONFIG_H) insn-codes.h insn-flags.h
+TCONFIG_H = tconfig.h $(xm_file_list) insn-codes.h
+TM_P_H = tm_p.h $(tm_p_file_list) insn-codes.h
+
+MACHMODE_H = machmode.h machmode.def
+RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H)
+RTL_H = $(RTL_BASE_H) genrtl.h
+TREE_H = tree.h real.h tree.def $(MACHMODE_H) tree-check.h version.h builtins.def
+BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h
+DEMANGLE_H = $(srcdir)/../include/demangle.h
+RECOG_H = recog.h
+EXPR_H = expr.h insn-codes.h
+REGS_H = regs.h varray.h $(MACHMODE_H)
+INTEGRATE_H = integrate.h varray.h
+LOOP_H = loop.h varray.h bitmap.h
+GCC_H = gcc.h version.h
+GGC_H = ggc.h varray.h
+TIMEVAR_H = timevar.h timevar.def
+INSN_ATTR_H = insn-attr.h $(srcdir)/insn-addr.h $(srcdir)/varray.h
+C_COMMON_H = c-common.h $(SPLAY_TREE_H)
+C_TREE_H = c-tree.h $(C_COMMON_H)
+SYSTEM_H = system.h hwint.h $(srcdir)/../include/libiberty.h
+
 # sed inserts variable overrides after the following line.
 ####target overrides
 @target_overrides@
@@ -771,34 +799,6 @@ DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \
     _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \
     _df_to_sf _thenan_df _df_to_usi _usi_to_df
 
-# GCONFIG_H lists the config files that the generator files depend on, while
-# CONFIG_H lists the the ones ordinary gcc files depend on, which includes
-# a file generated by gencodes.
-GCONFIG_H = config.h $(host_xm_file_list)
-HCONFIG_H = hconfig.h $(build_xm_file_list)
-CONFIG_H = $(GCONFIG_H) insn-codes.h insn-flags.h
-TCONFIG_H = tconfig.h $(xm_file_list) insn-codes.h
-TM_P_H = tm_p.h $(tm_p_file_list) insn-codes.h
-
-MACHMODE_H = machmode.h machmode.def
-RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H)
-RTL_H = $(RTL_BASE_H) genrtl.h
-TREE_H = tree.h real.h tree.def $(MACHMODE_H) tree-check.h version.h builtins.def
-BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h
-DEMANGLE_H = $(srcdir)/../include/demangle.h
-RECOG_H = recog.h
-EXPR_H = expr.h insn-codes.h
-REGS_H = regs.h varray.h $(MACHMODE_H)
-INTEGRATE_H = integrate.h varray.h
-LOOP_H = loop.h varray.h bitmap.h
-GCC_H = gcc.h version.h
-GGC_H = ggc.h varray.h
-TIMEVAR_H = timevar.h timevar.def
-INSN_ATTR_H = insn-attr.h $(srcdir)/insn-addr.h $(srcdir)/varray.h
-C_COMMON_H = c-common.h $(SPLAY_TREE_H)
-C_TREE_H = c-tree.h $(C_COMMON_H)
-SYSTEM_H = system.h hwint.h $(srcdir)/../include/libiberty.h
-
 #\f
 # Language makefile fragments.
 

diff --git a/gcc/config/i386/t-cygwin b/gcc/config/i386/t-cygwin
index 360faca..b9595c6 100644 (file)
--- a/gcc/config/i386/t-cygwin
+++ b/gcc/config/i386/t-cygwin
@@ -14,5 +14,5 @@ LIBGCC2_INCLUDES = -I$(srcdir)/../winsup/include \
        -I$(srcdir)/../winsup/cygwin/include \
        -I$(srcdir)/../winsup/w32api/include
 
-winnt.o: $(srcdir)/config/i386/winnt.c $(RTL_H) $(TREE_H)
+winnt.o: $(srcdir)/config/i386/winnt.c $(RTL_H) $(TREE_H) $(CONFIG_H)
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(srcdir)/config/i386/winnt.c