mkdeps.c (deps_add_default_target): Robustify.

	* mkdeps.c (deps_add_default_target): Robustify. Add
	basename component only.
	* cpp.texi (-M): Describe how default target is generated.
	* invoke.texi (-M): Likewise.

From-SVN: r39602

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c63b61016de7018f6d15624c9979c056bf3324eb..5838071d35d923c8ab073846b9028b9b4c7846ab 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-02-12  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * mkdeps.c (deps_add_default_target): Robustify. Add
+       basename component only.
+       * cpp.texi (-M): Describe how default target is generated.
+       * invoke.texi (-M): Likewise.
+
 2001-02-12  Kazu Hirata  <kazu@hxi.com>
 
        * toplev.c (push_float_handler): Remove.

diff --git a/gcc/cpp.texi b/gcc/cpp.texi
index 363b84c60791b6568c23d03a5a479eb4ddbd06ea..756f50ac0a1a088ce156073a4f034d8da47546cc 100644 (file)
--- a/gcc/cpp.texi
+++ b/gcc/cpp.texi
@@ -3495,7 +3495,10 @@ suitable for @code{make} describing the dependencies of the main source
 file.  The preprocessor outputs one @code{make} rule containing the
 object file name for that source file, a colon, and the names of all the
 included files, including those coming from @samp{-include} or
-@samp{-imacros} command line options.  If there are many included files
+@samp{-imacros} command line options.  Unless specified explicitly (with
+@samp{-MT} or @samp{-MQ}), the object file name consists of the basename
+of the source file with any suffix replaced with object file suffix.
+If there are many included files
 then the rule is split into several lines using @samp{\}-newline.
 
 @item -MM

diff --git a/gcc/invoke.texi b/gcc/invoke.texi
index 8052be177ec393f92769e66d282cd2c075fedbc5..e77d4c700718a833986b4dd1a3c2d6fd4586be00 100644 (file)
--- a/gcc/invoke.texi
+++ b/gcc/invoke.texi
@@ -3364,8 +3364,10 @@ Instead of outputting the result of preprocessing, output a rule
 suitable for @code{make} describing the dependencies of the main source
 file.  The preprocessor outputs one @code{make} rule containing the
 object file name for that source file, a colon, and the names of all the
-included files.  If there are many included files then the rule is split
-into several lines using @samp{\}-newline.
+included files.  Unless overridden explicitly, the object file name
+consists of the basename of the source file with any suffix replaced with
+object file suffix. If there are many included files then the
+rule is split into several lines using @samp{\}-newline.
 
 @samp{-M} implies @samp{-E}.
 

diff --git a/gcc/mkdeps.c b/gcc/mkdeps.c
index b0c62c5627ce7c36d182edb2b32f74955382aeb5..14935b328a6e1ff77289ebd8c328861edd00c78e 100644 (file)
--- a/gcc/mkdeps.c
+++ b/gcc/mkdeps.c
@@ -180,8 +180,6 @@ deps_add_default_target (d, tgt)
      struct deps *d;
      const char *tgt;
 {
-  char *o, *suffix;
-
   /* Only if we have no targets.  */
   if (d->ntargets)
     return;
@@ -190,19 +188,20 @@ deps_add_default_target (d, tgt)
     deps_add_target (d, "-", 1);
   else
     {
-      o = (char *) alloca (strlen (tgt) + 8);
-
-      strcpy (o, tgt);
-      suffix = strrchr (o, '.');
-
 #ifndef OBJECT_SUFFIX
 # define OBJECT_SUFFIX ".o"
 #endif
+      char *start = basename (tgt);
+      char *o = (char *) alloca (strlen (start) + strlen (OBJECT_SUFFIX) + 1);
+      char *suffix;
 
-      if (suffix)
-       strcpy (suffix, OBJECT_SUFFIX);
-      else
-       strcat (o, OBJECT_SUFFIX);
+      strcpy (o, start);
+      
+      suffix = strrchr (o, '.');
+      if (!suffix)
+        suffix = o + strlen (o);
+      strcpy (suffix, OBJECT_SUFFIX);
+      
       deps_add_target (d, o, 1);
     }
 }