Makefile.in (tradcpp0): Depend on mkdeps.h.

        * Makefile.in (tradcpp0): Depend on mkdeps.h.  Link mkdeps.o
        * cppinit.c (cpp_start_read): Update comment, remove unneeded
        if statement.
        * tradcpp.c: Include mkdeps.h.
        (deps, print_deps_phony_targets, deps_append, output_deps,
        init_dependency_output, output_deps): New.
        (deps_buffer, deps_allocated_size, deps_size, deps_column,
        deps_output): Delete.
        (print_deps_missing_files): Rename deps_missing_files.
        (inhibit_output): Make global.
        (main): Delete inhibit_output, deps_stream, deps_target.
        Use mkdeps functionality in the same way as cpplib.  Remove
        -g3 handling.  Handle -MF, -MP, -MQ, -MT.  Update handling of
        -M and -MM.  Remove old handling of deps via deps_out, and
        old reading of environment variables.
        (get_filename): Update to use deps_add_dep.

From-SVN: r38885

1 files changed, 4 insertions, 3 deletions

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index fd6a408..0a7fe48 100644
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -903,11 +903,11 @@ cpp_start_read (pfile, fname)
 
   if (CPP_OPTION (pfile, print_deps))
     {
-      /* Set the default target (if there is none already).  */
+      /* Set the default target (if there is none already), and
+	 the dependency on the main file.  */
       deps_add_default_target (pfile->deps, CPP_OPTION (pfile, in_fname));
 
-      if (CPP_OPTION (pfile, in_fname))
-	deps_add_dep (pfile->deps, CPP_OPTION (pfile, in_fname));
+      deps_add_dep (pfile->deps, CPP_OPTION (pfile, in_fname));
     }
 
   /* Open the main input file.  This must be done early, so we have a
@@ -943,6 +943,7 @@ cpp_start_read (pfile, fname)
   return 1;
 }
 
+/* Use mkdeps.c to output dependency information.  */
 static void
 output_deps (pfile)
      cpp_reader *pfile;