From 89d002987f222e53ad9a60f8d19a39e922c670d1 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 27 Aug 1996 05:53:57 +0000 Subject: [PATCH] More fixes --- ChangeLog | 5 +++++ THANKS | 1 + TODO | 7 ++++++- automake.in | 8 ++++++-- tests/ChangeLog | 2 ++ tests/Makefile.am | 2 +- tests/Makefile.in | 2 +- tests/alllib.test | 20 ++++++++++++++++++++ 8 files changed, 42 insertions(+), 5 deletions(-) create mode 100755 tests/alllib.test diff --git a/ChangeLog b/ChangeLog index 272cfa2..641f224 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ Mon Aug 26 21:37:32 1996 Tom Tromey + * automake.in (handle_lib_objects): Bug fix from Steve M Robbins. + (handle_libraries): Don't include libraries from EXTRA_LIBRARIES + in LIBFILES definition. Reported by Steve M Robbins. Test + alllib.test. + * automake.in (variable_value_as_list): New sub. (handle_source_transform): Use it. (handle_lib_objects): Ditto. diff --git a/THANKS b/THANKS index 44b5829..d41d300 100644 --- a/THANKS +++ b/THANKS @@ -23,6 +23,7 @@ Mark Galassi Markku Rossi Noah Friedman Nyul Laszlo +Steve M. Robbins Thomas Morgan Tom Tromey Ulrich Drepper diff --git a/TODO b/TODO index 195987d..35238c0 100644 --- a/TODO +++ b/TODO @@ -7,7 +7,8 @@ Priorities for release: !! remove autosystem-specific macros !! should write autoconf-style doc entries for each m4 macro -should put inverse of @MAINT@ before `.PHONY: configure' +should put inverse of @MAINT@ before `.PHONY: configure'. This means +fixing configure target name (no $srcdir) * must update GNU Hello @@ -330,6 +331,10 @@ djm says: David> A list of autoconf macros that can be required for use with David> automake, all in one place, would be helpful. +document *not* putting config.h into _SOURCES + +document variable scanning: $() and ${} interpolation + ================================================================ diff --git a/automake.in b/automake.in index 406df90..67b0d86 100755 --- a/automake.in +++ b/automake.in @@ -849,7 +849,7 @@ sub handle_lib_objects foreach $lsearch (&variable_value_as_list ($var)) { # Skip -lfoo and -Ldir. - next if /^-[lL]/; + next if $lsearch =~ /^-[lL]/; # Assume we have a file of some sort, and push it onto the # dependency list. This isn't perfect, but hopefully people @@ -991,6 +991,7 @@ sub handle_libraries # am_install_var. local ($onedir, $onelib); local (@outlist); + local (@libfiles_list); foreach $onedir (keys %valid) { if (&variable_defined ($onedir . '_LIBRARIES')) @@ -1002,6 +1003,9 @@ sub handle_libraries } &pretty_print ($onedir . '_LIBFILES =', "", @outlist); } + + push (@libfiles_list, '$(' . $onedir . '_LIBFILES)') + unless $onedir eq 'EXTRA'; } push (@all, '$(LIBFILES)'); @@ -1049,7 +1053,7 @@ sub handle_libraries if (! &variable_defined ('LIBFILES')) { - &pretty_print ('LIBFILES = ', "", @liblist); + &pretty_print ('LIBFILES = ', "", @libfiles_list); } if ($seen_libtool) diff --git a/tests/ChangeLog b/tests/ChangeLog index 35d8eb6..bdaf166 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,5 +1,7 @@ Mon Aug 26 23:04:01 1996 Tom Tromey + * alllib.test: New file. + * interp.test: New file. Mon Aug 12 13:58:55 1996 Tom Tromey diff --git a/tests/Makefile.am b/tests/Makefile.am index 08f197a..5530c28 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -13,6 +13,6 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \ error.test colon.test vtexi2.test tags.test comment.test libfiles.test \ man.test info.test obsolete.test lex.test scripts.test subdir2.test \ exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \ -order.test libobj2.test interp.test +order.test libobj2.test interp.test alllib.test EXTRA_DIST = defs $(TESTS) diff --git a/tests/Makefile.in b/tests/Makefile.in index 2f5698a..5d83490 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -51,7 +51,7 @@ yacc.test mkinstall2.test texinfo2.test ansi.test depacl.test depacl2.test \ error.test colon.test vtexi2.test tags.test comment.test libfiles.test \ man.test info.test obsolete.test lex.test scripts.test subdir2.test \ exsource.test canon4.test dup.test defun.test cxxlink.test cxxnoc.test \ -order.test libobj2.test interp.test +order.test libobj2.test interp.test alllib.test EXTRA_DIST = defs $(TESTS) mkinstalldirs = $(top_srcdir)/mkinstalldirs diff --git a/tests/alllib.test b/tests/alllib.test new file mode 100755 index 0000000..be35156 --- /dev/null +++ b/tests/alllib.test @@ -0,0 +1,20 @@ +#! /bin/sh + +# Make sure EXTRA_LIBRARIES aren't built by "all". +# Bug from Steve M Robbins. + +. $srcdir/defs || exit 1 + +cat >> configure.in << 'END' +AC_PROG_RANLIB +END + +cat > Makefile.am << 'END' +lib_LIBRARIES = V +EXTRA_LIBRARIES = Vm +END + +$AUTOMAKE || exit 1 + +(grep '^LIBFILES =' Makefile.in | grep libVm) && exit 1 +exit 0 -- 2.7.4