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

gcc/ChangeLog

+2001-01-10  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+        * 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.
+
 2001-01-10  Mark Mitchell  <mark@codesourcery.com>
 
 	* output.h (make_function_rtl): Remove prototype.

gcc/Makefile.in

@@ -1926,9 +1926,10 @@ mkdeps.o: mkdeps.c $(CONFIG_H) system.h mkdeps.h
 
 # The traditional mode preprocessor, a separate program for ease of
 # maintenance.  Some code is shared with the ISO-C cpp.
-tradcpp0$(exeext): tradcpp.o tradcif.o cppdefault.o version.o intl.o $(LIBDEPS)
+tradcpp0$(exeext): tradcpp.o tradcif.o cppdefault.o version.o intl.o \
+        mkdeps.h $(LIBDEPS)
 	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o tradcpp0$(exeext) \
-	tradcpp.o tradcif.o cppdefault.o version.o intl.o $(LIBS)
+	tradcpp.o tradcif.o mkdeps.o cppdefault.o version.o intl.o $(LIBS)
 
 tradcpp.o: tradcpp.c $(CONFIG_H) system.h version.h cppdefault.h tradcpp.h
 tradcif.o: $(srcdir)/tradcif.c $(CONFIG_H) system.h defaults.h tradcpp.h

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;