# HG changeset patch # User Bruno Haible # Date 1161260621 0 # Node ID 47a9e8e8d86399678c47d4d16b1fc288bb7f2b06 # Parent 6e14b197079032eb6d88cebe79f5622e5b509ba0 Remove duplicates from the gl_LIBOBJS list. diff -r 6e14b1970790 -r 47a9e8e8d863 ChangeLog --- a/ChangeLog Thu Oct 19 12:22:46 2006 +0000 +++ b/ChangeLog Thu Oct 19 12:23:41 2006 +0000 @@ -1,3 +1,8 @@ +2006-10-18 Bruno Haible + + * gnulib-tool (func_emit_initmacro_end): Remove duplicates from the + gl_LIBOBJS list. + 2006-10-18 Bruno Haible * lib/findprog.c (find_in_path): Avoid "gcc -Wwrite-strings" warning. diff -r 6e14b1970790 -r 47a9e8e8d863 gnulib-tool --- a/gnulib-tool Thu Oct 19 12:22:46 2006 +0000 +++ b/gnulib-tool Thu Oct 19 12:23:41 2006 +0000 @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2006-10-13 12:40:22 $' +cvsdatestamp='$Date: 2006-10-19 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=' @@ -1346,10 +1346,9 @@ 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"