projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57b2981
)
Make it possible to use lib_LTLIBRARIES in a snippet.
author
Bruno Haible
<bruno@clisp.org>
Tue, 22 Aug 2006 18:57:52 +0000
(18:57 +0000)
committer
Bruno Haible
<bruno@clisp.org>
Tue, 22 Aug 2006 18:57:52 +0000
(18:57 +0000)
ChangeLog
patch
|
blob
|
history
gnulib-tool
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index 8ed60d716a01e9671249f6bf4dcb4dc64691fc26..31f61daffb46f4e65fd2ffac5c3c178f906ab8f2 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,8
@@
+2006-08-22 Bruno Haible <bruno@clisp.org>
+
+ * gnulib-tool (func_emit_lib_Makefile_am): Don't treat lib_LIBRARIES
+ and lib_LTLIBRARIES like the other lib_* variables.
+
2006-08-22 Paul Eggert <eggert@cs.ucla.edu>
Avoid the need for AC_LIBSOURCES in m4 macros.
2006-08-22 Paul Eggert <eggert@cs.ucla.edu>
Avoid the need for AC_LIBSOURCES in m4 macros.
@@
-146,8
+151,8
@@
2006-08-21 Bruno Haible <bruno@clisp.org>
* gnulib-tool (func_emit_lib_Makefile_am): If the snippets already
2006-08-21 Bruno Haible <bruno@clisp.org>
* gnulib-tool (func_emit_lib_Makefile_am): If the snippets already
- specify an installation location, don't emit a noinst_
[LT]LIBRARIES
- assignment.
+ specify an installation location, don't emit a noinst_
LIBRARIES or
+
noinst_LTLIBRARIES
assignment.
2006-08-19 Bruno Haible <bruno@clisp.org>
2006-08-19 Bruno Haible <bruno@clisp.org>
diff --git
a/gnulib-tool
b/gnulib-tool
index 36899447d5915d10b58be140c50eb15ef3d012de..998860cf568fcd411d0e5e8bcc24e731300e4897 100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-22,7
+22,7
@@
progname=$0
package=gnulib
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2006-08-2
1 18:49:51
$'
+cvsdatestamp='$Date: 2006-08-2
2 18:57:52
$'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
@@
-904,7
+904,11
@@
func_emit_lib_Makefile_am ()
if test -n "$module"; then
{
func_get_automake_snippet "$module" |
if test -n "$module"; then
{
func_get_automake_snippet "$module" |
- sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g'
+ sed -e 's,lib_LIBRARIES,lib%_LIBRARIES,g' \
+ -e 's,lib_LTLIBRARIES,lib%_LTLIBRARIES,g' |
+ sed -e 's,lib_\([A-Z][A-Z]*\),'"${libname}_${libext}"'_\1,g' |
+ sed -e 's,lib%_LIBRARIES,lib_LIBRARIES,g' \
+ -e 's,lib%_LTLIBRARIES,lib_LTLIBRARIES,g'
if test "$module" = 'alloca'; then
echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
fi
if test "$module" = 'alloca'; then
echo "${libname}_${libext}_LIBADD += @${perhapsLT}ALLOCA@"
fi