* ltmain.in: Only create directory into which to extract

convenience libraries when $convenience is not empty.  It would
always be created on systems that did not support
whole_archive_flag_spec.

diff --git a/ChangeLog b/ChangeLog
index f3468a929087360fa87ebc19ba0b5743b4fd80f5..0f32067b25b7cb7b1953f61f9b0d85309c683434 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 1999-05-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
+       * ltmain.in: Only create directory into which to extract
+       convenience libraries when $convenience is not empty.  It would
+       always be created on systems that did not support
+       whole_archive_flag_spec.
+
        * ltconfig.in (export_symbols_cmds): Add $convenience.
        (cygwin, export_symbols_cmds): Ditto.
        * ltmain.in: Generate export symbol list before expanding

diff --git a/ltmain.in b/ltmain.in
index 72ffe690e777cf998cebd56777e967ca6e172441..bd572352d4799e7f35a126a69f4f2c779e6ca531 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -2064,44 +2064,44 @@ EOF
          $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
        fi
 
-       if test -n "$whole_archive_flag_spec"; then
-         if test -n "$convenience"; then
+       if test -n "$convenience"; then
+         if test -n "$whole_archive_flag_spec"; then
            eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-         fi
-       else
-         gentop="$output_objdir/${outputname}x"
-         $show "${rm}r $gentop"
-         $run ${rm}r "$gentop"
-         $show "mkdir $gentop"
-         $run mkdir "$gentop"
-         status=$?
-         if test $status -ne 0 && test ! -d "$gentop"; then
-           exit $status
-         fi
-         generated="$generated $gentop"
-         
-         for xlib in $convenience; do
-           # Extract the objects.
-           case "$xlib" in
-           [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-           *) xabs=`pwd`"/$xlib" ;;
-           esac
-           xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-           xdir="$gentop/$xlib"
-
-           $show "${rm}r $xdir"
-           $run ${rm}r "$xdir"
-           $show "mkdir $xdir"
-           $run mkdir "$xdir"
+         else
+           gentop="$output_objdir/${outputname}x"
+           $show "${rm}r $gentop"
+           $run ${rm}r "$gentop"
+           $show "mkdir $gentop"
+           $run mkdir "$gentop"
            status=$?
-           if test $status -ne 0 && test ! -d "$xdir"; then
+           if test $status -ne 0 && test ! -d "$gentop"; then
              exit $status
            fi
-           $show "(cd $xdir && $AR x $xabs)"
-           $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+           generated="$generated $gentop"
 
-           libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
-         done
+           for xlib in $convenience; do
+             # Extract the objects.
+             case "$xlib" in
+             [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+             *) xabs=`pwd`"/$xlib" ;;
+             esac
+             xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+             xdir="$gentop/$xlib"
+
+             $show "${rm}r $xdir"
+             $run ${rm}r "$xdir"
+             $show "mkdir $xdir"
+             $run mkdir "$xdir"
+             status=$?
+             if test $status -ne 0 && test ! -d "$xdir"; then
+               exit $status
+             fi
+             $show "(cd $xdir && $AR x $xabs)"
+             $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+
+             libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
+           done
+         fi
        fi
 
        if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then