From eb7c20a1039d237759b5972a1d2f4dcb98e8722c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 1 Oct 1998 01:36:35 +0000 Subject: [PATCH] * depend2.am: Don't bother trying to delete source file from list. --- ChangeLog | 3 +++ depend2.am | 9 +++------ lib/am/depend2.am | 9 +++------ 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5dfbc93..7ee86ab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ Thu Oct 1 00:51:51 1998 Tom Tromey + * depend2.am: Don't bother trying to delete source file from + list. + * depend2.am (%.o): Handle deleted header file problem. (%.lo): Likewise. diff --git a/depend2.am b/depend2.am index 7e4c6a3..0d9f75f 100644 --- a/depend2.am +++ b/depend2.am @@ -34,9 +34,8 @@ ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. @-tr '\\ ' '\n\n' < .deps/$(*F).p \ -## The very first nondeleted line is always the primary source file. -## No need for that, so we remove it too via `1d'. - | sed -e '/^$$/ d' -e '/:$$/ d' -e 1d -e 's/$$/:/' > .deps/$(*F).P; \ + | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/:/' \ + > .deps/$(*F).P; \ rm .deps/$(*F).p %.lo: %@EXT@ @@ -47,9 +46,7 @@ < .deps/$(*F).p > .deps/$(*F).P; \ ## See above to understand deleted header file trick. tr '\\ ' '\n\n' < .deps/$(*F).p \ -## The very first nondeleted line is always the primary source file. -## No need for that, so we remove it too via `1d'. - | sed -e '/^$$/ d' -e '/:$$/ d' -e 1d -e 's/$$/:/' \ + | 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 7e4c6a3..0d9f75f 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -34,9 +34,8 @@ ## dummy dependencies for each header file. Too bad gcc doesn't do ## this for us directly. @-tr '\\ ' '\n\n' < .deps/$(*F).p \ -## The very first nondeleted line is always the primary source file. -## No need for that, so we remove it too via `1d'. - | sed -e '/^$$/ d' -e '/:$$/ d' -e 1d -e 's/$$/:/' > .deps/$(*F).P; \ + | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/:/' \ + > .deps/$(*F).P; \ rm .deps/$(*F).p %.lo: %@EXT@ @@ -47,9 +46,7 @@ < .deps/$(*F).p > .deps/$(*F).P; \ ## See above to understand deleted header file trick. tr '\\ ' '\n\n' < .deps/$(*F).p \ -## The very first nondeleted line is always the primary source file. -## No need for that, so we remove it too via `1d'. - | sed -e '/^$$/ d' -e '/:$$/ d' -e 1d -e 's/$$/:/' \ + | 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