activex: updated build for libtool link compatibility

diff --git a/activex/Makefile.am b/activex/Makefile.am
index f5df58e5cf5afcc6674cb6d6b99162520cbc46c4..dd21f08ece21f190a25e4b4070179ba97e467fb5 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -2,9 +2,7 @@
 # Building the Activex plugin
 ###############################################################################
 
-noinst_LIBRARIES = $(noinst_LIBRARIES_activex)
-
-MOSTLYCLEANFILES = $(LIBRARIES_activex)
+MOSTLYCLEANFILES = 
 EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) $(DIST_misc)
 BUILT_SOURCES = $(BUILT_SOURCES_activex)
 
@@ -64,30 +62,27 @@ DIST_misc = \
     test.html \
     $(NULL)
 
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
-
 if BUILD_ACTIVEX
 
-noinst_LIBRARIES_activex = libaxvlc.a
-axvlc_DATA = axvlc$(LIBEXT)
-axvlcdir = $(libdir)
+lib_LTLIBRARIES = libaxvlc.la
 
-LDFLAGS_activex = `$(VLC_CONFIG) --libs activex libvlc`
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
+                                  $(top_builddir)/src/libvlc.la
 
-libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
-libaxvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags activex`
-libaxvlc_a_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
-libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
-
-axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
-                     $(libaxvlc_a_DEPENDENCIES)
-       $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
-       $(srcdir)/axvlc.def \
-         $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
-         $(INCLUDED_LIBINTL)
-# Cygwin work-around
-       @if test -f "$@.exe"; then mv -f "$@.exe" "$@"; fi
+libaxvlc_la_SOURCES = $(SOURCES_activex)
+libaxvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags activex`
+libaxvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
+libaxvlc_la_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
+libaxvlc_la_LDFLAGS = $(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
+    -no-undefined -avoid-version $(LIBRARIES_libvlc) \
+    `$(VLC_CONFIG) --libs activex libvlc` \
+       -Wl,--output,axvlc$(LIBEXT)
 
+DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
+noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
+noinst_axvlc_rcdir = $(libdir)
+axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb
+       $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/[^0-9]*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)
 noinst_axvlc_tlb_DATA = axvlc.tlb
@@ -117,12 +112,6 @@ clean-tlb:
 endif
 endif
 
-DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
-noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
-noinst_axvlc_rcdir = $(libdir)
-axvlc_rc.$(OBJEXT): axvlc_rc.rc inplace.bmp axvlc.tlb
-       $(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/[^0-9]*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
-
 else
 
 clean-tlb:

diff --git a/configure.ac b/configure.ac
index fbf1b279a39ea58740c8ff9363f18d28e2395d29..8567124321715cf78f2e3e1e2d343334a821fd00 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5463,7 +5463,7 @@ AS_IF([test "${enable_gnutls}" != "no"], [
     VLC_ADD_PLUGINS([gnutls])
     VLC_ADD_CFLAGS([gnutls], [$GNUTLS_CFLAGS])
     AS_IF([test "${SYS}" = "mingw32"], [
-      dnl pkg-config --libs gnutls ignores these
+      dnl pkg-config --libs gnutls omits these
       VLC_ADD_LDFLAGS([gnutls], [-lz])
       AS_IF([test "${enable_libtool}" != "no"], [
         VLC_ADD_LDFLAGS([gnutls], [${LTLIBINTL}])
@@ -5602,7 +5602,7 @@ then
       [AC_CHECK_HEADERS(olectl.h,
         [ VLC_ADD_CPPFLAGS([activex],[-DUNICODE -D_UNICODE -D_MIDL_USE_GUIDDEF_])
           VLC_ADD_CXXFLAGS([activex],[-fno-exceptions])
-          VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi]) 
+          VLC_ADD_LDFLAGS([activex],[-lole32 -loleaut32 -luuid -lshlwapi -lgdi32]) 
           AC_CHECK_HEADERS(objsafe.h,
             VLC_ADD_CXXFLAGS([activex],[-DHAVE_OBJSAFE_HEADER]),,
             [