X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2FMakefile.am;h=a0ef44bef992ee271bc6c2b3828e7b1663d21479;hb=afc6e765c5bb4db233d63ebaf679cc6863fd3451;hp=f5df58e5cf5afcc6674cb6d6b99162520cbc46c4;hpb=94a01b369b1e70d554d87d29a09939aca1082a38;p=vlc

diff --git a/activex/Makefile.am b/activex/Makefile.am
index f5df58e5cf..a0ef44bef9 100644
--- 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,28 @@ 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)
-
-LDFLAGS_activex = `$(VLC_CONFIG) --libs activex libvlc`
+lib_LTLIBRARIES = axvlc.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)
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \
+				   $(top_builddir)/src/libvlc.la
 
-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
+axvlc_la_SOURCES = $(SOURCES_activex)
+axvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags activex`
+axvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags activex`
+axvlc_la_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
+axvlc_la_LDFLAGS = -Wl,$(srcdir)/axvlc.def -Wl,$(DATA_axvlc_rc) \
+    -no-undefined -avoid-version -module \
+    `$(VLC_CONFIG) --ldflags activex libvlc`
+axvlc_la_LIBADD = $(LIBRARIES_libvlc) \
+	`$(VLC_CONFIG) -libs activex`
 
+DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
+noinst_axvlc_rc_DATA = axvlc_rc.$(OBJEXT)
+noinst_axvlc_rcdir = 
+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 +113,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:
@@ -134,7 +124,6 @@ endif
 ###############################################################################
 
 clean-local: clean-tlb
-	rm -f axvlc$(LIBEXT)
 
 ###############################################################################
 # Force rules