From 55fd7a94941411ea9fa53b65186389eed0762be3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 19 Oct 2006 12:23:41 +0000 Subject: [PATCH] Remove duplicates from the gl_LIBOBJS list. --- ChangeLog | 5 +++++ gnulib-tool | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a9b20cb592..a819648cda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 --git a/gnulib-tool b/gnulib-tool index b46fbe616f..713e6004a2 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -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 @@ func_emit_initmacro_end () 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" -- 2.30.2