1998-12-21 Alexandre Oliva <oliva@dcc.unicamp.br>

	* depend2.am: don't use .p and .P for dependencies; it loses on
	case-insensitive filesystems.
	Reported by Henrik Frystyk Nielsen <frystyk@w3.org>

diff --git a/ChangeLog b/ChangeLog
index 84352c5..bf3f508 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-21  Alexandre Oliva  <oliva@dcc.unicamp.br>
+
+       * depend2.am: don't use .p and .P for dependencies; it loses on
+       case-insensitive filesystems.
+       Reported by Henrik Frystyk Nielsen <frystyk@w3.org>
+
 1998-12-20  Thomas Tanner  <tanner@gmx.de>
 
        * automake.in (handle_libraries, handle_ltlibraries): relax the

diff --git a/TODO b/TODO
index 481659d..97d9409 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,5 @@
+* all-local ends up as dependency of all-am twice
+
 * `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 03edf67..d68e406 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -26,34 +26,34 @@
 ##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
-       $(@PFX@COMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+       $(@PFX@COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 ## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## 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.
-       @-cp .deps/$(*F).p .deps/$(*F).P; \
-       tr '\\ ' '\n\n' < .deps/$(*F).p \
+       @-cp .deps/$(*F).pp .deps/$(*F).P; \
+       tr '\\ ' '\n\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/$$/ :/' \
            >> .deps/$(*F).P; \
-       rm .deps/$(*F).p
+       rm .deps/$(*F).pp
 
 %.lo: %@EXT@
        @echo '$(LT@PFX@COMPILE) -c $<'; \
 ## See above to understand implementation weirdness.
-       $(LT@PFX@COMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+       $(LT@PFX@COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 ## Account for versions of gcc that put a space before the `:'.
        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
-         < .deps/$(*F).p > .deps/$(*F).P; \
+         < .deps/$(*F).pp > .deps/$(*F).P; \
 ## See above to understand deleted header file trick.
-       tr '\\ ' '\n\n' < .deps/$(*F).p \
+       tr '\\ ' '\n\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/$$/ :/' \
            >> .deps/$(*F).P; \
-       rm -f .deps/$(*F).p
+       rm -f .deps/$(*F).pp

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 03edf67..d68e406 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -26,34 +26,34 @@
 ##   -MM, not -M (despite what the docs say).
 ## - Using -M directly means running the compiler twice (even worse
 ##   than renaming).
-       $(@PFX@COMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+       $(@PFX@COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 ## This next piece of magic avoids the `deleted header file' problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## 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.
-       @-cp .deps/$(*F).p .deps/$(*F).P; \
-       tr '\\ ' '\n\n' < .deps/$(*F).p \
+       @-cp .deps/$(*F).pp .deps/$(*F).P; \
+       tr '\\ ' '\n\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/$$/ :/' \
            >> .deps/$(*F).P; \
-       rm .deps/$(*F).p
+       rm .deps/$(*F).pp
 
 %.lo: %@EXT@
        @echo '$(LT@PFX@COMPILE) -c $<'; \
 ## See above to understand implementation weirdness.
-       $(LT@PFX@COMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+       $(LT@PFX@COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
 ## Account for versions of gcc that put a space before the `:'.
        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
-         < .deps/$(*F).p > .deps/$(*F).P; \
+         < .deps/$(*F).pp > .deps/$(*F).P; \
 ## See above to understand deleted header file trick.
-       tr '\\ ' '\n\n' < .deps/$(*F).p \
+       tr '\\ ' '\n\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/$$/ :/' \
            >> .deps/$(*F).P; \
-       rm -f .deps/$(*F).p
+       rm -f .deps/$(*F).pp