From: Akim Demaille <akim@epita.fr>
Date: Tue, 17 Oct 2000 08:29:44 +0000 (+0000)
Subject: * depcomp: Altered sed clause to strip of inclusion depth
X-Git-Tag: Release-1-4b~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9fe970b81806d03a4af33b82f5a04bca750d4f2;p=thirdparty%2Fautomake.git

* depcomp: Altered sed clause to strip of inclusion depth
---

diff --git a/ChangeLog b/ChangeLog
index 1f69a9166..c923879ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-17  Alex Hornby <alex@anvil.com>
+
+	* depcomp: Altered sed clause to strip of inclusion depth
+ 	numbers generated by cpp. Also output in gcc style.
+
 2000-10-16  Morten Eriksen  <mortene@sim.no>
 
 	* depcomp (msvisualcpp): New dependency tracking mode, for
diff --git a/THANKS b/THANKS
index 8101930cd..79a7db7ff 100644
--- a/THANKS
+++ b/THANKS
@@ -85,6 +85,7 @@ Michael Brantley	Michael-Brantley@deshaw.com
 Michel de Ruiter	mdruiter@cs.vu.nl
 Miles Bader		miles@ccs.mt.nec.co.jp
 Miodrag Vallat		miodrag@ifrance.com
+Morten Eriksen		mortene@sim.no
 Motoyuki Kasahara	m-kasahr@sra.co.jp
 Motoyuki Kasahara	m-kasahr@sra.co.jp
 Nicolas Thiery		nthiery@Icare.mines.edu
diff --git a/depcomp b/depcomp
index 4779ed079..0a92302ec 100755
--- a/depcomp
+++ b/depcomp
@@ -248,7 +248,7 @@ cpp)
     *" --mode=compile "*)
       for arg
       do # cycle over the arguments
-        case "$arg" in
+        case $arg in
 	"--mode=compile")
 	  # insert --quiet before "--mode=compile"
 	  set fnord "$@" --quiet
@@ -262,7 +262,8 @@ cpp)
       ;;
     esac
     "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)"/ s::'"$object"'\: \1:p' > "$tmpdepfile"
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
   ) &
   proc=$!
   "$@"
@@ -270,8 +271,9 @@ cpp)
   wait "$proc"
   if test "$stat" != 0; then exit $stat; fi
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed < "$tmpdepfile" -e 's/^[^:]*: //' -e 's/$/ :/' >> "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
diff --git a/lib/depcomp b/lib/depcomp
index 4779ed079..0a92302ec 100755
--- a/lib/depcomp
+++ b/lib/depcomp
@@ -248,7 +248,7 @@ cpp)
     *" --mode=compile "*)
       for arg
       do # cycle over the arguments
-        case "$arg" in
+        case $arg in
 	"--mode=compile")
 	  # insert --quiet before "--mode=compile"
 	  set fnord "$@" --quiet
@@ -262,7 +262,8 @@ cpp)
       ;;
     esac
     "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)"/ s::'"$object"'\: \1:p' > "$tmpdepfile"
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+    sed '$ s: \\$::' > "$tmpdepfile"
   ) &
   proc=$!
   "$@"
@@ -270,8 +271,9 @@ cpp)
   wait "$proc"
   if test "$stat" != 0; then exit $stat; fi
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed < "$tmpdepfile" -e 's/^[^:]*: //' -e 's/$/ :/' >> "$depfile"
+  echo "$object : \\" > "$depfile"
+  cat < "$tmpdepfile" >> "$depfile"
+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;