svn commit: r301934 - head/gnu/usr.bin/cc/cc_tools

[Bryan Drewery]

Author: bdrewery
Date: Wed Jun 15 23:57:46 2016
New Revision: 301934
URL: https://svnweb.freebsd.org/changeset/base/301934

Log:
  Convert to new FAST_DEPEND syntax for guessed dependencies.
  
  This OBJS_DEPEND_GUESS is needed since each target gets its
  own .depend.target.o file but also because it is spelled
  .meta.target.o with WITH_META_MODE.  The OBJS_DEPEND_GUESS
  will apply the dependency if the required file is missing.
  
  Also remove redundant .c files while here to avoid prolems with
  targets using .ALLSRC and getting multiple source files.
  
  Approved by:	re (implicit)
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/gnu/usr.bin/cc/cc_tools/Makefile
  head/gnu/usr.bin/cc/cc_tools/Makefile.dep

Modified: head/gnu/usr.bin/cc/cc_tools/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile	Wed Jun 15 23:57:32 2016	(r301933)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile	Wed Jun 15 23:57:46 2016	(r301934)
@@ -438,9 +438,7 @@ CLEANFILES+=	${GENSRCS} ${GENONLY} ${GEN
 
 #-----------------------------------------------------------------------
 # Manual dependencies.
-.if !exists(${DEPENDFILE})
 .include  "Makefile.dep"
-.endif
 
 .include <bsd.prog.mk>
 # DO NOT DELETE

Modified: head/gnu/usr.bin/cc/cc_tools/Makefile.dep
==============================================================================
--- head/gnu/usr.bin/cc/cc_tools/Makefile.dep	Wed Jun 15 23:57:32 2016	(r301933)
+++ head/gnu/usr.bin/cc/cc_tools/Makefile.dep	Wed Jun 15 23:57:46 2016	(r301934)
@@ -1,131 +1,131 @@
 # $FreeBSD$
 
-errors.o: bconfig.h auto-host.h
+OBJS_DEPEND_GUESS.errors.o+= bconfig.h auto-host.h
 
-genattr.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genattr.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genattrtab.o: bconfig.h \
+OBJS_DEPEND_GUESS.genattrtab.o+= bconfig.h \
   auto-host.h \
   tm.h options.h \
   insn-modes.h \
   gtype-desc.h
 
-genautomata.o: bconfig.h \
+OBJS_DEPEND_GUESS.genautomata.o+= bconfig.h \
   auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-gencheck.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gencheck.o+= bconfig.h auto-host.h \
   tm.h options.h \
   gencheck.h
 
-genchecksum.o: bconfig.h \
+OBJS_DEPEND_GUESS.genchecksum.o+= bconfig.h \
   auto-host.h
 
-gencodes.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gencodes.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genconditions.o: bconfig.h \
+OBJS_DEPEND_GUESS.genconditions.o+= bconfig.h \
   auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genconfig.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genconfig.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genconstants.o: bconfig.h \
+OBJS_DEPEND_GUESS.genconstants.o+= bconfig.h \
   auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genemit.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genemit.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genextract.o: bconfig.h \
+OBJS_DEPEND_GUESS.genextract.o+= bconfig.h \
   auto-host.h \
   tm.h options.h \
   insn-modes.h \
   insn-config.h
 
-genflags.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genflags.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-gengenrtl.o: bconfig.h auto-host.h
+OBJS_DEPEND_GUESS.gengenrtl.o+= bconfig.h auto-host.h
 
-gengtype.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gengtype.o+= bconfig.h auto-host.h \
   tm.h options.h \
   gtyp-gen.h
 
-genmddeps.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genmddeps.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genmodes.o: bconfig.h auto-host.h
+OBJS_DEPEND_GUESS.genmodes.o+= bconfig.h auto-host.h
 
-genopinit.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genopinit.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genoutput.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genoutput.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genpeep.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genpeep.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genpreds.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genpreds.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-genrecog.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.genrecog.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-gensupport.o: bconfig.h \
+OBJS_DEPEND_GUESS.gensupport.o+= bconfig.h \
   auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-ggc-none.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.ggc-none.o+= bconfig.h auto-host.h \
   gtype-desc.h
 
-print-rtl.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.print-rtl.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-read-rtl.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.read-rtl.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-rtl.o: bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.rtl.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-modes.h \
   gtype-desc.h
 
-insn-modes.o: insn-modes.c config.h auto-host.h \
+OBJS_DEPEND_GUESS.insn-modes.o+= insn-modes.c config.h auto-host.h \
   tm.h options.h \
   insn-modes.h
 
-min-insn-modes.o: min-insn-modes.c bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.min-insn-modes.o+= bconfig.h auto-host.h \
   insn-modes.h
 
-gengtype-lex.o: gengtype-lex.c \
+OBJS_DEPEND_GUESS.gengtype-lex.o+= \
   bconfig.h auto-host.h \
   gengtype-yacc.h
 
-gengtype-yacc+%DIKED.o: gengtype-yacc+%DIKED.c \
+OBJS_DEPEND_GUESS.gengtype-yacc+%DIKED.o+= \
   bconfig.h \
   auto-host.h \
   tm.h options.h \
 
-insn-conditions.o: insn-conditions.c bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.insn-conditions.o+= insn-conditions.c bconfig.h auto-host.h \
   insn-constants.h \
   tm.h options.h \
   insn-modes.h \
@@ -133,12 +133,12 @@ insn-conditions.o: insn-conditions.c bco
   tm-preds.h \
   options.h
 
-gencondmd.o: gencondmd.c \
+OBJS_DEPEND_GUESS.gencondmd.o+= \
   tm.h options.h tm_p.h \
   tm-preds.h tm-constrs.h tree-check.h \
   insn-constants.h
 
-gencondmd.o: gencondmd.c bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.gencondmd.o+= bconfig.h auto-host.h \
   tm.h options.h \
   insn-constants.h \
   insn-modes.h \
@@ -147,7 +147,7 @@ gencondmd.o: gencondmd.c bconfig.h auto-
   tree-check.h \
   tm-constrs.h
 
-vec.o: vec.c bconfig.h auto-host.h \
+OBJS_DEPEND_GUESS.vec.o+= bconfig.h auto-host.h \
   insn-modes.h \
   tree-check.h \
   gtype-desc.h