From: Tom Tromey Date: Sun, 5 Apr 1998 21:35:58 +0000 (+0000) Subject: library dependency bug reported by proven X-Git-Tag: Release-1-3~3 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=30fb11d046142ad92760e325860aee4dd4e7a373;p=automake.git library dependency bug reported by proven --- diff --git a/ChangeLog b/ChangeLog index 2eb634f9..cddebcae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ Sun Apr 5 13:58:24 1998 Tom Tromey + * automake.in (handle_ltlibraries): Examine _DEPENDENCIES + variable. Report from Chris Provenzano. Test library.test. + (handle_libraries): Likewise. + * m4/lex.m4: Allow AM_PROG_LEX to be called with no arguments. Sun Apr 5 13:54:25 1998 Alexandre Oliva diff --git a/THANKS b/THANKS index 2d5b4b03..b2494940 100644 --- a/THANKS +++ b/THANKS @@ -10,6 +10,7 @@ Anthony Green green@cygnus.com Assar Westerlund assar@sics.se Bernard Urban Bernard.Urban@meteo.fr Bill Fenner fenner@parc.xerox.com +Chris Provenzano proven@io.proven.org David A. Swierczek swiercze@mr.med.ge.com David Zaroski cz253@cleveland.Freenet.Edu Dieter Baron dillo@stieltjes.smc.univie.ac.at diff --git a/automake.in b/automake.in index 7a7e87aa..b4fa5246 100755 --- a/automake.in +++ b/automake.in @@ -1735,6 +1735,9 @@ sub handle_libraries . $xlib . "_LDADD'"); } + # Make sure we at look at this. + &examine_variable ($xlib . '_DEPENDENCIES'); + &handle_source_transform ($xlib, $onelib, $obj); $output_rules .= @@ -1849,6 +1852,9 @@ sub handle_ltlibraries . $xlib . "_LDADD'"); } + # Make sure we at look at this. + &examine_variable ($xlib . '_DEPENDENCIES'); + local ($linker) = &handle_source_transform ($xlib, $onelib, $obj); # Determine program to use for link. diff --git a/tests/ChangeLog b/tests/ChangeLog index 08106076..f49d630f 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ Sun Apr 5 15:26:42 1998 Tom Tromey + * library.test: New file. + * lex2.test: Updated since lex error changed to warning. Fri Apr 3 13:04:50 1998 Tom Tromey diff --git a/tests/Makefile.am b/tests/Makefile.am index 45f26b43..eadfd751 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -31,7 +31,7 @@ aclocal.test alpha.test whoami.test unused.test condman.test \ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \ lex2.test libobj8.test version3.test instdata.test exdir2.test \ -colon5.test +colon5.test library.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 63477ba1..e3c733ae 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -94,7 +94,7 @@ aclocal.test alpha.test whoami.test unused.test condman.test \ texinfo5.test aclocali.test texinfo6.test condman2.test colon4.test \ java.test sinclude.test javaprim.test javasubst.test aclocalii.test \ lex2.test libobj8.test version3.test instdata.test exdir2.test \ -colon5.test +colon5.test library.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff --git a/tests/library.test b/tests/library.test new file mode 100755 index 00000000..0dcbcea5 --- /dev/null +++ b/tests/library.test @@ -0,0 +1,20 @@ +#! /bin/sh + +# Test for _DEPENDENCIES with libraries. + +. $srcdir/defs || exit 1 + +cat >> configure.in << 'END' +AC_PROG_RANLIB +AM_MAINTAINER_MODE +AM_EXEEXT +AC_PROG_CC +END + +cat > Makefile.am << 'END' +AUTOMAKE_OPTIONS = dejagnu cygnus +lib_LIBRARIES = libfoo.a +libfoo_a_DEPENDENCIES = libzot.a +END + +$AUTOMAKE