* depend2.am (%.o): Append sed results to .P file in this case

        too.  From Raja R Harinath.

diff --git a/ChangeLog b/ChangeLog
index 3a2879b..51c994e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Thu Oct  1 00:51:51 1998  Tom Tromey  <tromey@cygnus.com>
 
+       * depend2.am (%.o): Append sed results to .P file in this case
+       too.  From Raja R Harinath.
+
        * m4/lispdir.m4 (AM_PATH_LISPDIR): Correctly find xemacs and
        xemacs install directories.  From Robert Bihlmeyer.
 

diff --git a/depend2.am b/depend2.am
index 0d9f75f..5e26662 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -33,9 +33,10 @@
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-       @-tr '\\ ' '\n\n' < .deps/$(*F).p \
+       @-cp .deps/$(*F).p .deps/$(*F).P; \
+       tr '\\ ' '\n\n' < .deps/$(*F).p \
          | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/:/' \
-           > .deps/$(*F).P; \
+           >> .deps/$(*F).P; \
        rm .deps/$(*F).p
 
 %.lo: %@EXT@
@@ -47,6 +48,5 @@
 ## See above to understand deleted header file trick.
        tr '\\ ' '\n\n' < .deps/$(*F).p \
          | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/:/' \
-## Note subtle difference: here we append to the .P file.
            >> .deps/$(*F).P; \
        rm -f .deps/$(*F).p

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 0d9f75f..5e26662 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -33,9 +33,10 @@
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-       @-tr '\\ ' '\n\n' < .deps/$(*F).p \
+       @-cp .deps/$(*F).p .deps/$(*F).P; \
+       tr '\\ ' '\n\n' < .deps/$(*F).p \
          | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/:/' \
-           > .deps/$(*F).P; \
+           >> .deps/$(*F).P; \
        rm .deps/$(*F).p
 
 %.lo: %@EXT@
@@ -47,6 +48,5 @@
 ## See above to understand deleted header file trick.
        tr '\\ ' '\n\n' < .deps/$(*F).p \
          | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/:/' \
-## Note subtle difference: here we append to the .P file.
            >> .deps/$(*F).P; \
        rm -f .deps/$(*F).p