Get rid of --enable-shared-libvlc on non-Microsoft platforms

as it did never worked properly, if at all with these
(you should use libtool to build a shared libvlc instead)

diff --git a/bootstrap b/bootstrap
index 01702d826122d9209ba0155dc8aa3da7c7765e9e..d6672f1ec013b63b9502510470e4b2bb9b75e9d1 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -226,16 +226,8 @@ LTLIBVLC = \$(top_builddir)/src/libvlc.la
 
 if BUILD_SHARED
 LIBVLC = \$(top_builddir)/src/libvlc\$(LIBEXT)
-if HAVE_WIN32
 LIBADD = \$(LIBVLC)
 endif
-if HAVE_WINCE
-LIBADD = \$(LIBVLC)
-endif
-if HAVE_DARWIN
-LIBADD = \$(LIBVLC)
-endif
-endif
 
 all: all-modules
 

diff --git a/configure.ac b/configure.ac
index 05bff92582466e653342c7a870e6313d120305ad..3d7c08a1c32c898745006f0a58a4a721201b5957 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1388,7 +1388,7 @@ dnl  Is the shared libvlc forced ?
 dnl
 build_pic=no
 AC_ARG_ENABLE(shared-libvlc,
-  [  --enable-shared-libvlc  shared libvlc (default disabled EXPERIMENTAL)])
+  [  --enable-shared-libvlc  Win32 libvlc.dll build (default disabled)])
 AS_IF([test "${enable_libtool}" != "no" && test "${enable_shared_libvlc}"], [
   AC_MSG_ERROR([--enable-shared-libvlc and --enable-libtool are mutually exclusive])
 ])

diff --git a/src/Makefile.am b/src/Makefile.am
index 726f014ff1572701707b4e9a6e293a1b0804a214..c632b36f6990c1ea80894a07b40f3b652b9a2232 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -187,30 +187,15 @@ endif
 if USE_LIBTOOL
 lib_LTLIBRARIES = libvlc.la
 else
-LIBRARIES_nopic = libvlc.a
-LIBRARIES_pic = libvlc_pic.a
-if HAVE_WIN32
-lib_LIBRARIES = $(LIBRARIES_nopic)
-else
-if BUILD_SHARED
-lib_LIBRARIES = $(LIBRARIES_pic)
-else
-lib_LIBRARIES = $(LIBRARIES_nopic)
+lib_LIBRARIES = libvlc.a
 if BUILD_PIC
-lib_LIBRARIES += $(LIBRARIES_pic)
-endif
-endif
+lib_LIBRARIES += libvlc_pic.a
 endif
 endif
 
+if HAVE_WIN32
 if BUILD_SHARED
 DATA_noinst_libvlc = libvlc$(LIBEXT)
-if HAVE_WIN32
-OBJECTS_libvlc_so = $(libvlc_a_OBJECTS)
-LDFLAGS_libvlc_so = -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a
-else
-OBJECTS_libvlc_so = $(libvlc_pic_a_OBJECTS)
-endif
 endif
 
 libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
@@ -221,11 +206,13 @@ libvlc$(LIBEXT): $(OBJECTS_libvlc_so) stamp-builtins
          c|*)  ld="$(LINK)" ;; \
        esac ; \
        echo $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl; \
-       $$ld $(OBJECTS_libvlc_so) $(LDFLAGS_libvlc_so) $$ldfl
+       $$ld $(libvlc_a_OBJECTS) \
+               -Wl,--out-implib,$(top_builddir)/src/libvlc.dll.a $$ldfl
 # It sucks big time, but we have to do that to link vlc properly
 # on non-PIC OSes, otherwise ld will favor builtins-less libvlc.a over
 # libvlc$(LIBEXT)
        rm -f libvlc.a
+endif
 
 EXTRA_DIST += \
        $(SOURCES_libvlc_beos) \