| 2000-06-21 Alex Hornby <[EMAIL PROTECTED]>
|
| * depcomp: Altered sed clause to strip of inclusion depth
| numbers generated by cpp. Also output in gcc style.
|
| Index: depcomp
| ===================================================================
| RCS file: /cvs/automake/automake/depcomp,v
| retrieving revision 1.8
| diff -u -r1.8 depcomp
| --- depcomp 2000/08/20 15:58:45 1.8
| +++ depcomp 2000/09/05 09:35:43
| @@ -253,7 +253,8 @@
| ;;
| 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=$!
| "$@"
| @@ -261,8 +262,9 @@
| 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" -e '/^$/d' -e 's/^ //' -e 's/ \\$//' -e 's/$/ :/' >>
|"$depfile"
| rm -f "$tmpdepfile"
| ;;
Fine with me. Any objection? I'll change the last sed into
sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
