From 50793ea328ff2b3253c2da16e0c5a99bae487c25 Mon Sep 17 00:00:00 2001 From: "Kaveh R. Ghazi" Date: Sat, 27 Jun 1998 04:42:25 +0000 Subject: [PATCH] Replace Makefile.in dependencies on expr.h with variable $(EXPR_H), which contains headers also pulled in via expr.h. * Makefile.in (EXPR_H): New dependency variable. (c-typeck.o): Depend on $(EXPR_H) instead of expr.h. (c-iterate.o): Likewise. (gencheck): Depend on $(TREE_H) instead of tree.h, etc. (stor-layout.o): Depend on $(EXPR_H) instead of expr.h. (toplev.o): Likewise. Also depend on $(RECOG_H) instead of recog.h. (varasm.o): Depend on $(EXPR_H) instead of expr.h. (function.o): Likewise. (stmt.o): Likewise. (except.o): Likewise. (expr.o): Likewise. (calls.o): Likewise. (expmed.o): Likewise. (explow.o): Likewise. (optabs.o): Likewise. (sdbout.o): Likewise. (dwarf2out.o): Likewise. (emit-rtl.o): Likewise. (integrate.o): Likewise. (jump.o): Likewise. (cse.o): Likewise. (gcse.o): Likewise. Also depend on $(BASIC_BLOCK_H) instead of basic-block.h. (loop.o): Depend on $(EXPR_H) instead of expr.h. (unroll.o): Likewise. (combine.o): Likewise. (reload.o): Likewise. (reload1.o): Likewise. (caller-save.o): Likewise. (reorg.o): Likewise. (alias.o): Don't depend on insn-codes.h. (regmove.o): Depend on $(RECOG_H)/$(EXPR_H) instead of recog.h/expr.h. (insn-emit.o): Depend on $(EXPR_H) instead of expr.h. (insn-opinit.o): Likewise. From-SVN: r20748 --- gcc/ChangeLog | 37 ++++++++++++++++++++++ gcc/Makefile.in | 81 +++++++++++++++++++++++++------------------------ 2 files changed, 78 insertions(+), 40 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc0dcb542e6..57e5b3b89cc 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,40 @@ +Sat Jun 27 07:35:21 1998 Kaveh R. Ghazi + + * Makefile.in (EXPR_H): New dependency variable. + (c-typeck.o): Depend on $(EXPR_H) instead of expr.h. + (c-iterate.o): Likewise. + (gencheck): Depend on $(TREE_H) instead of tree.h, etc. + (stor-layout.o): Depend on $(EXPR_H) instead of expr.h. + (toplev.o): Likewise. Also depend on $(RECOG_H) instead of recog.h. + (varasm.o): Depend on $(EXPR_H) instead of expr.h. + (function.o): Likewise. + (stmt.o): Likewise. + (except.o): Likewise. + (expr.o): Likewise. + (calls.o): Likewise. + (expmed.o): Likewise. + (explow.o): Likewise. + (optabs.o): Likewise. + (sdbout.o): Likewise. + (dwarf2out.o): Likewise. + (emit-rtl.o): Likewise. + (integrate.o): Likewise. + (jump.o): Likewise. + (cse.o): Likewise. + (gcse.o): Likewise. Also depend on $(BASIC_BLOCK_H) instead of + basic-block.h. + (loop.o): Depend on $(EXPR_H) instead of expr.h. + (unroll.o): Likewise. + (combine.o): Likewise. + (reload.o): Likewise. + (reload1.o): Likewise. + (caller-save.o): Likewise. + (reorg.o): Likewise. + (alias.o): Don't depend on insn-codes.h. + (regmove.o): Depend on $(RECOG_H)/$(EXPR_H) instead of recog.h/expr.h. + (insn-emit.o): Depend on $(EXPR_H) instead of expr.h. + (insn-opinit.o): Likewise. + Sat Jun 27 01:35:14 1998 Jeffrey A Law (law@cygnus.com) * choose-temp.c (choose_temp_base): Remove MPW bits. Use mkstemp diff --git a/gcc/Makefile.in b/gcc/Makefile.in index c18ff8932ef..f2e090cc865 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -720,6 +720,7 @@ TREE_H = tree.h real.h tree.def gansidecl.h machmode.h machmode.def tree-check.h BASIC_BLOCK_H = basic-block.h bitmap.h DEMANGLE_H = demangle.h gansidecl.h RECOG_H = recog.h gansidecl.h +EXPR_H = expr.h insn-codes.h # # Language makefile fragments. @@ -1268,7 +1269,7 @@ $(srcdir)/c-gperf.h: c-parse.gperf c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-lex.h flags.h \ output.h toplev.h c-typeck.o : c-typeck.c $(CONFIG_H) system.h $(TREE_H) c-tree.h flags.h \ - output.h expr.h insn-codes.h $(RTL_H) toplev.h + output.h $(EXPR_H) $(RTL_H) toplev.h c-lang.o : c-lang.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-lex.h toplev.h \ output.h c-lex.o : c-lex.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-lex.h c-tree.h \ @@ -1279,7 +1280,7 @@ c-convert.o : c-convert.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h c-pragma.o: c-pragma.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) except.h \ function.h defaults.h c-pragma.h toplev.h c-iterate.o: c-iterate.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-tree.h \ - flags.h toplev.h expr.h insn-codes.h + flags.h toplev.h $(EXPR_H) collect2$(exeext): collect2.o tlink.o hash.o cplus-dem.o underscore.o \ version.o choose-temp.o mkstemp.o $(LIBDEPS) @@ -1338,7 +1339,7 @@ s-check : tree.def gencheck $(srcdir)/move-if-change $(srcdir)/move-if-change tmp-check.h tree-check.h touch s-check -gencheck : gencheck.o tree.h tree.def $(HOST_LIBDEPS) +gencheck : gencheck.o $(TREE_H) $(HOST_LIBDEPS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ gencheck.o $(HOST_LIBS) @@ -1362,11 +1363,11 @@ convert.o: convert.c $(CONFIG_H) $(TREE_H) flags.h convert.h toplev.h tree.o : tree.c $(CONFIG_H) system.h $(TREE_H) flags.h function.h toplev.h except.h print-tree.o : print-tree.c $(CONFIG_H) system.h $(TREE_H) stor-layout.o : stor-layout.c $(CONFIG_H) system.h $(TREE_H) flags.h \ - function.h expr.h insn-codes.h $(RTL_H) toplev.h except.h + function.h $(EXPR_H) $(RTL_H) toplev.h except.h fold-const.o : fold-const.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h toplev.o : toplev.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) \ flags.h input.h insn-attr.h xcoffout.h defaults.h output.h \ - insn-codes.h insn-config.h recog.h Makefile toplev.h dwarfout.h \ + insn-codes.h insn-config.h $(RECOG_H) Makefile toplev.h dwarfout.h \ dwarf2out.h sdbout.h dbxout.h \ $(lang_options_files) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(MAYBE_USE_COLLECT2) \ @@ -1379,72 +1380,72 @@ print-rtl.o : print-rtl.c $(CONFIG_H) system.h $(RTL_H) bitmap.h rtlanal.o : rtlanal.c $(CONFIG_H) system.h $(RTL_H) varasm.o : varasm.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h \ - function.h defaults.h insn-codes.h expr.h hard-reg-set.h regs.h \ + function.h defaults.h $(EXPR_H) hard-reg-set.h regs.h \ xcoffout.h output.h c-pragma.h toplev.h except.h dbxout.h sdbout.h function.o : function.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - function.h insn-flags.h insn-codes.h expr.h regs.h hard-reg-set.h \ + function.h insn-flags.h insn-codes.h $(EXPR_H) regs.h hard-reg-set.h \ insn-config.h $(RECOG_H) output.h toplev.h except.h stmt.o : stmt.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h \ - insn-flags.h insn-config.h insn-codes.h hard-reg-set.h expr.h except.h \ + insn-flags.h insn-config.h insn-codes.h hard-reg-set.h $(EXPR_H) except.h \ loop.h $(RECOG_H) toplev.h output.h except.o : except.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - function.h insn-flags.h insn-codes.h expr.h regs.h hard-reg-set.h \ + function.h insn-flags.h $(EXPR_H) regs.h hard-reg-set.h \ insn-config.h $(RECOG_H) output.h except.h toplev.h expr.o : expr.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h \ - regs.h insn-flags.h insn-codes.h expr.h insn-config.h $(RECOG_H) output.h \ + regs.h insn-flags.h insn-codes.h $(EXPR_H) insn-config.h $(RECOG_H) output.h \ typeclass.h hard-reg-set.h toplev.h hard-reg-set.h except.h -calls.o : calls.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h expr.h \ - insn-codes.h insn-flags.h regs.h toplev.h output.h +calls.o : calls.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h $(EXPR_H) \ + insn-flags.h regs.h toplev.h output.h expmed.o : expmed.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - insn-flags.h insn-config.h insn-codes.h expr.h $(RECOG_H) real.h + insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) real.h explow.o : explow.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - hard-reg-set.h insn-config.h expr.h $(RECOG_H) insn-flags.h insn-codes.h + hard-reg-set.h insn-config.h $(EXPR_H) $(RECOG_H) insn-flags.h insn-codes.h optabs.o : optabs.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - insn-flags.h insn-config.h insn-codes.h expr.h $(RECOG_H) reload.h + insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) reload.h dbxout.o : dbxout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h regs.h \ insn-config.h reload.h gstab.h xcoffout.h defaults.h output.h dbxout.h \ toplev.h sdbout.o : sdbout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h except.h \ - function.h expr.h output.h hard-reg-set.h regs.h defaults.h real.h \ - insn-config.h obstack.h xcoffout.h c-pragma.h sdbout.h insn-codes.h toplev.h + function.h $(EXPR_H) output.h hard-reg-set.h regs.h defaults.h real.h \ + insn-config.h obstack.h xcoffout.h c-pragma.h sdbout.h toplev.h dwarfout.o : dwarfout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) dwarf.h \ flags.h insn-config.h reload.h output.h defaults.h toplev.h dwarfout.h dwarf2out.o : dwarf2out.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) dwarf2.h \ - flags.h insn-config.h insn-codes.h reload.h output.h defaults.h \ - hard-reg-set.h regs.h expr.h toplev.h dwarf2out.h + flags.h insn-config.h reload.h output.h defaults.h \ + hard-reg-set.h regs.h $(EXPR_H) toplev.h dwarf2out.h xcoffout.o : xcoffout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) xcoffout.h \ flags.h toplev.h output.h dbxout.h emit-rtl.o : emit-rtl.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - except.h function.h regs.h insn-config.h insn-codes.h $(RECOG_H) real.h \ - expr.h obstack.h hard-reg-set.h bitmap.h + except.h function.h regs.h insn-config.h $(RECOG_H) real.h \ + $(EXPR_H) obstack.h hard-reg-set.h bitmap.h real.o : real.c $(CONFIG_H) system.h $(TREE_H) toplev.h getpwd.o : getpwd.c $(CONFIG_H) system.h integrate.o : integrate.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - integrate.h insn-flags.h insn-config.h insn-codes.h expr.h real.h regs.h \ + integrate.h insn-flags.h insn-config.h $(EXPR_H) real.h regs.h \ function.h output.h $(RECOG_H) except.h toplev.h jump.o : jump.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h regs.h \ - insn-config.h insn-codes.h insn-flags.h $(RECOG_H) expr.h real.h except.h \ + insn-config.h insn-flags.h $(RECOG_H) $(EXPR_H) real.h except.h \ toplev.h stupid.o : stupid.c $(CONFIG_H) system.h $(RTL_H) regs.h hard-reg-set.h \ flags.h toplev.h cse.o : cse.c $(CONFIG_H) system.h $(RTL_H) regs.h hard-reg-set.h flags.h \ - real.h insn-config.h insn-codes.h $(RECOG_H) expr.h toplev.h output.h + real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h output.h gcse.o : gcse.c $(CONFIG_H) system.h $(RTL_H) regs.h hard-reg-set.h flags.h \ - real.h insn-config.h insn-codes.h $(RECOG_H) expr.h basic-block.h output.h + real.h insn-config.h $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) output.h profile.o : profile.c $(CONFIG_H) system.h $(RTL_H) flags.h insn-flags.h \ gcov-io.h $(TREE_H) output.h regs.h toplev.h loop.o : loop.c $(CONFIG_H) system.h $(RTL_H) flags.h loop.h insn-config.h \ - insn-flags.h insn-codes.h regs.h hard-reg-set.h $(RECOG_H) expr.h real.h \ + insn-flags.h regs.h hard-reg-set.h $(RECOG_H) $(EXPR_H) real.h \ toplev.h -unroll.o : unroll.c $(CONFIG_H) system.h $(RTL_H) insn-config.h insn-codes.h \ - integrate.h regs.h $(RECOG_H) flags.h expr.h loop.h toplev.h +unroll.o : unroll.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \ + integrate.h regs.h $(RECOG_H) flags.h $(EXPR_H) loop.h toplev.h flow.o : flow.c $(CONFIG_H) system.h $(RTL_H) flags.h insn-config.h \ $(BASIC_BLOCK_H) regs.h hard-reg-set.h output.h toplev.h combine.o : combine.c $(CONFIG_H) system.h $(RTL_H) flags.h \ - insn-config.h insn-flags.h insn-codes.h insn-attr.h regs.h expr.h \ + insn-config.h insn-flags.h insn-codes.h insn-attr.h regs.h $(EXPR_H) \ $(BASIC_BLOCK_H) $(RECOG_H) real.h hard-reg-set.h toplev.h regclass.o : regclass.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h flags.h \ $(BASIC_BLOCK_H) regs.h insn-config.h $(RECOG_H) reload.h real.h toplev.h \ @@ -1457,23 +1458,23 @@ bitmap.o : bitmap.c $(CONFIG_H) system.h $(RTL_H) flags.h $(BASIC_BLOCK_H) \ global.o : global.c $(CONFIG_H) system.h $(RTL_H) flags.h \ $(BASIC_BLOCK_H) regs.h hard-reg-set.h insn-config.h output.h toplev.h -reload.o : reload.c $(CONFIG_H) system.h $(RTL_H) flags.h output.h expr.h \ +reload.o : reload.c $(CONFIG_H) system.h $(RTL_H) flags.h output.h $(EXPR_H) \ reload.h $(RECOG_H) hard-reg-set.h insn-config.h insn-codes.h regs.h \ real.h toplev.h -reload1.o : reload1.c $(CONFIG_H) system.h $(RTL_H) real.h flags.h expr.h \ +reload1.o : reload1.c $(CONFIG_H) system.h $(RTL_H) real.h flags.h $(EXPR_H) \ reload.h regs.h hard-reg-set.h insn-config.h insn-flags.h insn-codes.h \ $(BASIC_BLOCK_H) $(RECOG_H) output.h toplev.h caller-save.o : caller-save.c $(CONFIG_H) system.h $(RTL_H) flags.h \ - regs.h hard-reg-set.h insn-codes.h insn-config.h $(BASIC_BLOCK_H) \ - $(RECOG_H) reload.h expr.h toplev.h + regs.h hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) \ + $(RECOG_H) reload.h $(EXPR_H) toplev.h reorg.o : reorg.c $(CONFIG_H) system.h $(RTL_H) conditions.h hard-reg-set.h \ - $(BASIC_BLOCK_H) regs.h insn-config.h insn-codes.h insn-attr.h \ - insn-flags.h $(RECOG_H) flags.h output.h expr.h + $(BASIC_BLOCK_H) regs.h insn-config.h insn-attr.h \ + insn-flags.h $(RECOG_H) flags.h output.h $(EXPR_H) alias.o : alias.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h regs.h \ - insn-codes.h toplev.h + toplev.h regmove.o : regmove.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \ - insn-codes.h recog.h output.h reload.h regs.h hard-reg-set.h flags.h \ - expr.h insn-flags.h $(BASIC_BLOCK_H) toplev.h + $(RECOG_H) output.h reload.h regs.h hard-reg-set.h flags.h \ + $(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h $(SCHED_PREFIX)sched.o : $(SCHED_PREFIX)sched.c $(CONFIG_H) system.h $(RTL_H) \ $(BASIC_BLOCK_H) regs.h hard-reg-set.h flags.h insn-config.h insn-attr.h \ toplev.h @@ -1558,7 +1559,7 @@ s-codes : $(md_file) gencodes $(srcdir)/move-if-change $(srcdir)/move-if-change tmp-codes.h insn-codes.h touch s-codes -insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) expr.h real.h output.h \ +insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \ insn-config.h insn-flags.h insn-codes.h system.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-emit.c @@ -1579,7 +1580,7 @@ s-recog : $(md_file) genrecog $(srcdir)/move-if-change touch s-recog insn-opinit.o : insn-opinit.c $(CONFIG_H) $(RTL_H) insn-codes.h insn-flags.h \ - insn-config.h flags.h $(RECOG_H) expr.h reload.h system.h + insn-config.h flags.h $(RECOG_H) $(EXPR_H) reload.h system.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-opinit.c insn-opinit.c: s-opinit ; @true