2001-03-02 Jens Krüger <jens_krueger@physik.tu-muenchen.de>

	* depend2.am (?!GENERIC??LIBTOOL?%LTOBJ%): Add `%' to fix typo.

diff --git a/ChangeLog b/ChangeLog
index 67f1e15..c53a4bb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-02  Jens Krüger <jens_krueger@physik.tu-muenchen.de>
+
+       * depend2.am (?!GENERIC??LIBTOOL?%LTOBJ%): Add `%' to fix typo.
+
 2001-02-28  Akim Demaille  <akim@epita.fr>
 
        * automake.in (&add_depend2): Transform `GENERIC'.

diff --git a/THANKS b/THANKS
index eaf5e87..4ac4188 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -53,6 +53,7 @@ Janos Farkas          chexum@shadow.banki.hu
 Jason Molenda          crash@cygnus.co.jp
 Jeff Bailey            Jbailey@phn.ca
 Jeff Garzik            jgarzik@pobox.com
+Jens Krüger            jens_krueger@physik.tu-muenchen.de
 Jerome Lovy            jlovy@multimania.com
 Jerome Santini         santini@chambord.univ-orleans.fr
 Jim Meyering           meyering@na-net.ornl.gov

diff --git a/TODO b/TODO
index 1fc173e..576693a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,6 @@
+for 1.5
+investigate problems with conditionally defined libraries
+
 add an error if the user makefile.am violates our
    namespace rules
 

diff --git a/depend2.am b/depend2.am
index 7724157..b7158ba 100644 (file)
--- a/depend2.am
+++ b/depend2.am
@@ -31,7 +31,7 @@
        %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 
 ?GENERIC??LIBTOOL?%EXT%.lo:
-?!GENERIC??LIBTOOL?LTOBJ%: %SOURCE%
+?!GENERIC??LIBTOOL?%LTOBJ%: %SOURCE%
 ?LIBTOOL??AMDEP?@AMDEP@        source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
 ?LIBTOOL??AMDEP?@AMDEP@        depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
 ?LIBTOOL??AMDEP?@AMDEP@        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@

diff --git a/lib/am/depend2.am b/lib/am/depend2.am
index 7724157..b7158ba 100644 (file)
--- a/lib/am/depend2.am
+++ b/lib/am/depend2.am
@@ -31,7 +31,7 @@
        %COMPILE% -c -o %OBJ% `test -f %SOURCE% || echo '$(srcdir)/'`%SOURCE%
 
 ?GENERIC??LIBTOOL?%EXT%.lo:
-?!GENERIC??LIBTOOL?LTOBJ%: %SOURCE%
+?!GENERIC??LIBTOOL?%LTOBJ%: %SOURCE%
 ?LIBTOOL??AMDEP?@AMDEP@        source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@
 ?LIBTOOL??AMDEP?@AMDEP@        depfile='$(DEPDIR)/%BASE%.Plo' tmpdepfile='$(DEPDIR)/%BASE%.TPlo' @AMDEPBACKSLASH@
 ?LIBTOOL??AMDEP?@AMDEP@        $(%FPFX%DEPMODE) $(depcomp) @AMDEPBACKSLASH@