From 5949ff934bf09806b2aa6708bf3ad9b2a05a9a71 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 1 Oct 1998 21:53:55 +0000 Subject: [PATCH] * depend2.am (%.o): Append sed results to .P file in this case too. From Raja R Harinath. --- ChangeLog | 3 +++ depend2.am | 6 +++--- lib/am/depend2.am | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3a2879b..51c994e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Thu Oct 1 00:51:51 1998 Tom Tromey + * 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 --- 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 --- 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 -- 2.7.4