From 93643ee974780766bd302eaa51599228bb068b24 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 2 Mar 2001 19:44:19 +0000 Subject: [PATCH] =?utf8?q?2001-03-02=20=20Jens=20Kr=FCger=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * depend2.am (?!GENERIC??LIBTOOL?%LTOBJ%): Add `%' to fix typo. --- ChangeLog | 4 ++++ THANKS | 1 + TODO | 3 +++ depend2.am | 2 +- lib/am/depend2.am | 2 +- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67f1e157..c53a4bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-03-02 Jens Krüger + + * depend2.am (?!GENERIC??LIBTOOL?%LTOBJ%): Add `%' to fix typo. + 2001-02-28 Akim Demaille * automake.in (&add_depend2): Transform `GENERIC'. diff --git a/THANKS b/THANKS index eaf5e871..4ac4188d 100644 --- 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 1fc173ed..576693aa 100644 --- 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 77241576..b7158ba4 100644 --- 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 77241576..b7158ba4 100644 --- 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@ -- 2.43.5