projects
/
pspp
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1b576b2
)
Remove duplicates from the gl_LIBOBJS list.
author
Bruno Haible
<bruno@clisp.org>
Thu, 19 Oct 2006 12:23:41 +0000
(12:23 +0000)
committer
Bruno Haible
<bruno@clisp.org>
Thu, 19 Oct 2006 12:23:41 +0000
(12:23 +0000)
ChangeLog
patch
|
blob
|
history
gnulib-tool
patch
|
blob
|
history
diff --git
a/ChangeLog
b/ChangeLog
index a9b20cb592afde834355540638ed3e205856b32a..a819648cda06b1801df641d1e7ab9d772ece16d9 100644
(file)
--- a/
ChangeLog
+++ b/
ChangeLog
@@
-1,3
+1,8
@@
+2006-10-18 Bruno Haible <bruno@clisp.org>
+
+ * gnulib-tool (func_emit_initmacro_end): Remove duplicates from the
+ gl_LIBOBJS list.
+
2006-10-18 Bruno Haible <bruno@clisp.org>
* lib/findprog.c (find_in_path): Avoid "gcc -Wwrite-strings" warning.
2006-10-18 Bruno Haible <bruno@clisp.org>
* lib/findprog.c (find_in_path): Avoid "gcc -Wwrite-strings" warning.
diff --git
a/gnulib-tool
b/gnulib-tool
index b46fbe616f9f2fc11d0785ed3f7b10d7f82dabb8..713e6004a22c4cfdcc5c085013fed4a36824a81e 100755
(executable)
--- a/
gnulib-tool
+++ b/
gnulib-tool
@@
-22,7
+22,7
@@
progname=$0
package=gnulib
progname=$0
package=gnulib
-cvsdatestamp='$Date: 2006-10-1
3 12:40:22
$'
+cvsdatestamp='$Date: 2006-10-1
9 12:23:41
$'
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
nl='
@@
-1346,10
+1346,9
@@
func_emit_initmacro_end ()
echo " ${macro_prefix}_libobjs="
echo " ${macro_prefix}_ltlibobjs="
echo " if test -n \"\$${macro_prefix}_LIBOBJS\"; then"
echo " ${macro_prefix}_libobjs="
echo " ${macro_prefix}_ltlibobjs="
echo " if test -n \"\$${macro_prefix}_LIBOBJS\"; then"
- echo " for i in \$${macro_prefix}_LIBOBJS; do"
- echo " # Remove the extension."
- echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'"
- echo " i=\`echo \"\$i\" | sed \"\$sed_drop_objext\"\`"
+ echo " # Remove the extension."
+ echo " sed_drop_objext='s/\\.o\$//;s/\\.obj\$//'"
+ echo " for i in \`for i in \$${macro_prefix}_LIBOBJS; do echo \"\$i\"; done | sed \"\$sed_drop_objext\" | sort | uniq\`; do"
echo " ${macro_prefix}_libobjs=\"\$${macro_prefix}_libobjs \$i.\$ac_objext\""
echo " ${macro_prefix}_ltlibobjs=\"\$${macro_prefix}_ltlibobjs \$i.lo\""
echo " done"
echo " ${macro_prefix}_libobjs=\"\$${macro_prefix}_libobjs \$i.\$ac_objext\""
echo " ${macro_prefix}_ltlibobjs=\"\$${macro_prefix}_ltlibobjs \$i.lo\""
echo " done"