Mercurial > gnulib
changeset 31154:2d0270c3c30b
Make it easier to distribute gnulib-built libraries.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sun, 05 Apr 2009 22:42:13 +0200 |
| parents | 470349055dcd |
| children | a495f8f9d6ac |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Apr 05 21:48:52 2009 +0200 +++ b/ChangeLog Sun Apr 05 22:42:13 2009 +0200 @@ -1,3 +1,9 @@ +2009-04-05 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_emit_lib_Makefile_am): Don't add the library to + noinst_LTLIBRARIES if the Makefile.am in the same directory specifies + that it should be installed. + 2009-04-05 Bruno Haible <bruno@clisp.org> * gnulib-tool: New option --copy-file.
--- a/gnulib-tool Sun Apr 05 21:48:52 2009 +0200 +++ b/gnulib-tool Sun Apr 05 22:42:13 2009 +0200 @@ -2047,9 +2047,14 @@ echo "AM_CFLAGS =" fi echo - if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null; then - # One of the snippets already specifies an installation location for the - # library. Don't confuse automake by saying it should not be installed. + if LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" allsnippets.tmp > /dev/null \ + || { test -n "$makefile_name" \ + && test -f "$sourcebase/Makefile.am" \ + && LC_ALL=C grep "^[a-zA-Z0-9_]*_${perhapsLT}LIBRARIES *+\{0,1\}= *$libname\\.$libext\$" "$sourcebase/Makefile.am" > /dev/null; \ + }; then + # One of the snippets or the user's Makefile.am already specifies an + # installation location for the library. Don't confuse automake by saying + # it should not be installed. : else # By default, the generated library should not be installed.