I'm installing this on HEAD and branch-1-9.
2005-07-09 Zack Weinberg <[EMAIL PROTECTED]> (tiny change)
* lib/depcomp: Handle "#line" markers as well as "# " markers in
"cpp" style, so it can work with newer HP compilers (for their
ia64 systems).
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.273
diff -u -r1.273 THANKS
--- THANKS 30 Jun 2005 21:19:46 -0000 1.273
+++ THANKS 9 Jul 2005 09:22:59 -0000
@@ -276,6 +276,7 @@
Werner Koch [EMAIL PROTECTED]
William S Fulton [EMAIL PROTECTED]
Yann Droneaud [EMAIL PROTECTED]
+Zack Weinberg [EMAIL PROTECTED]
;; Local Variables:
;; mode: text
Index: lib/depcomp
===================================================================
RCS file: /cvs/automake/automake/lib/depcomp,v
retrieving revision 1.54
diff -u -r1.54 depcomp
--- lib/depcomp 14 May 2005 20:28:50 -0000 1.54
+++ lib/depcomp 9 Jul 2005 09:23:00 -0000
@@ -1,7 +1,7 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2005-05-14.22
+scriptversion=2005-07-09.11
# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
@@ -467,7 +467,8 @@
done
"$@" -E |
- sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
+ sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+ -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
sed '$ s: \\$::' > "$tmpdepfile"
rm -f "$depfile"
echo "$object : \\" > "$depfile"
--
Alexandre Duret-Lutz
