* doc/libtool.texi (Compile mode): Be more specific about the

effect of `-static'.
* ltmain.in: Do not create `.lo' objects when `-static' is
specified.
* NEWS: Updated.

diff --git a/ChangeLog b/ChangeLog
index 894ceb6ef926300a5fcc8e56a75a1c07106d0704..67c50e150653148e2cb27659eb5834c31d17802d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-07  Ralph Schleicher  <rs@nunatak.allgaeu.org>
+
+       * doc/libtool.texi (Compile mode): Be more specific about the
+       effect of `-static'.
+       * ltmain.in: Do not create `.lo' objects when `-static' is
+       specified.
+       * NEWS: Updated.
+
 2003-10-07  Gary V. Vaughan  <gary@gnu.org>
 
        * doc/libtool.texi (Invoking libtool): Updated.

diff --git a/NEWS b/NEWS
index f6e6be4e9d482b058bf1b6872415f1a2fe02f22f..9a60ef329b40fd5133fffeab96c7ca0fd4d4651c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 NEWS - list of user-visible changes between releases of GNU Libtool
 
 New in 1.5b: 2003-??-??; CVS version 1.5a, Libtool team:
+* Shared objects (.lo) are no longer created when `-static' is passed in
+  compile mode.
 * libtoolize installs libtool.m4 (and ltdl.m4 if used) to AC_CONFIG_M4_DIR.
 * Mode inferrence removed, shorthand for choosing modes added.
 * Specifying -allow-undefined is now an error.

diff --git a/doc/libtool.texi b/doc/libtool.texi
index f0aa0d32855f4cc1980e3e31233558ed0c00b94a..46db6360d0200873c1d0bf18d99d69373b9bc432 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1152,8 +1152,8 @@ linker flags with @samp{-Wl,@var{flag}} and @samp{-Xlinker @var{flag}}.
 You can also pass compile specific flags using @samp{-Wc,@var{flag}}
 and @samp{-Xcompiler @var{flag}}.
 
-If the @samp{-static} option is given, then a @samp{.o} file is built,
-even if libtool was configured with @samp{--disable-static}.
+If the @samp{-static} option is given, then only a @samp{.o} file is
+built, even if libtool was configured with @samp{--disable-static}.
 
 Note that the @samp{-o} option is now fully supported.  It is emulated
 on the platforms that don't support it (by locking and moving the

diff --git a/ltmain.in b/ltmain.in
index c2d1a2191725c65ca3ef4e0ff012b2cdde91c4d4..6ba620e70be0e80f68f2965dfeafe241e8be5352 100644 (file)
--- a/ltmain.in
+++ b/ltmain.in
@@ -389,6 +389,7 @@ exec_cmd=
          ;;
 
        -static)
+         build_libtool_libs=no
          build_old_libs=yes
          continue
          ;;
@@ -879,6 +880,9 @@ EOF
          fi
          if test -n "$link_static_flag"; then
            dlopen_self=$dlopen_self_static
+           # See comment for -static flag below, for more details.
+           compile_command="$compile_command $link_static_flag"
+           finalize_command="$finalize_command $link_static_flag"
          fi
        else
          if test -z "$pic_flag" && test -n "$link_static_flag"; then
@@ -1161,10 +1165,7 @@ EOF
 
       case $arg in
       -all-static)
-       if test -n "$link_static_flag"; then
-         compile_command="$compile_command $link_static_flag"
-         finalize_command="$finalize_command $link_static_flag"
-       fi
+       # The effects of -all-static are defined in a previous loop.
        continue
        ;;