From 9484c52412c30d85a864d0122b3aca018fe3ecee Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 22 Dec 1998 12:14:03 +0000
Subject: [PATCH] 	* depend2.am: Don't assume backslash can't occur in
 the middle of 	filename; it loses on M$W

---
 ChangeLog         | 5 +++++
 TODO              | 6 ++++++
 depend2.am        | 8 ++++----
 lib/am/depend2.am | 8 ++++----
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 31a1ca02..c49d7a21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1998-12-22  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+	* depend2.am: Don't assume backslash can't occur in the middle of
+	filename; it loses on M$W
+
 1998-12-21  Tom Tromey  <tromey@cygnus.com>
 
 	* automake.in (handle_libraries): Reverted Thomas Tanner's
diff --git a/TODO b/TODO
index 97d9409a..493b2eb7 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,11 @@
 * all-local ends up as dependency of all-am twice
 
+* foo=bar
+  if cond
+  foo += joe
+  endif
+  ... this ought to work.  The fix is probably complicated
+
 * `distcheck' and `dist' should depend on `all'
 
 * Document why putting @FOO@ in _SOURCES doesn't work.
diff --git a/depend2.am b/depend2.am
index d68e406b..a9e2d4a7 100644
--- a/depend2.am
+++ b/depend2.am
@@ -34,11 +34,11 @@
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr '\\ ' '\n\n' < .deps/$(*F).pp \
+	tr ' ' '\n' < .deps/$(*F).pp \
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.
-	  | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 	    >> .deps/$(*F).P; \
 	rm .deps/$(*F).pp
 
@@ -50,10 +50,10 @@
 	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
 	  < .deps/$(*F).pp > .deps/$(*F).P; \
 ## See above to understand deleted header file trick.
-	tr '\\ ' '\n\n' < .deps/$(*F).pp \
+	tr ' ' '\n' < .deps/$(*F).pp \
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.
-	  | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 	    >> .deps/$(*F).P; \
 	rm -f .deps/$(*F).pp
diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index d68e406b..a9e2d4a7 100644
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -34,11 +34,11 @@
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr '\\ ' '\n\n' < .deps/$(*F).pp \
+	tr ' ' '\n' < .deps/$(*F).pp \
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.
-	  | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 	    >> .deps/$(*F).P; \
 	rm .deps/$(*F).pp
 
@@ -50,10 +50,10 @@
 	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
 	  < .deps/$(*F).pp > .deps/$(*F).P; \
 ## See above to understand deleted header file trick.
-	tr '\\ ' '\n\n' < .deps/$(*F).pp \
+	tr ' ' '\n' < .deps/$(*F).pp \
 ## Some versions of gcc put a space before the `:'.  On the theory
 ## that the space means something, we add a space to the output as
 ## well.
-	  | sed -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
 	    >> .deps/$(*F).P; \
 	rm -f .deps/$(*F).pp
-- 
2.43.5