* depend2.am: Don't assume backslash can't occur in the middle of

	filename; it loses on M$W

diff --git a/ChangeLog b/ChangeLog
index 31a1ca02d31401632911b1bb9a51eaeb2983be39..c49d7a218b14679a77ac4dff47b05cab0782587d 100644 (file)
--- 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 97d9409a0e3b48e5de8930564434f3e3a77143be..493b2eb78041d3ff6b107d07b4359b1ae68f031d 100644 (file)
--- 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 d68e406ba05a16ce9d9c540a60da056dce85f042..a9e2d4a754e8cebdd48fa1aad106d894aa759750 100644 (file)
--- 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 d68e406ba05a16ce9d9c540a60da056dce85f042..a9e2d4a754e8cebdd48fa1aad106d894aa759750 100644 (file)
--- 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