- add libvlc.a at the end of the linking chain, so that --disable-plugins works for...

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 9586b6e0c29702003695ee8e0c958c0151f742b5..9489ba42fd4e9d1572ca735510eed460b2cd7599 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -67,7 +67,7 @@ noinst_LIBRARIES_activex = libaxvlc.a
 axvlc_DATA = axvlc$(LIBEXT)
 axvlcdir = $(libdir)
 
-LDFLAGS_activex = `$(VLC_CONFIG) --libs vlc activex builtin`
+LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
 
 libaxvlc_a_SOURCES = $(SOURCES_activex) $(SOURCE_dll)
 libaxvlc_a_CFLAGS = `$(VLC_CONFIG) --cflags activex`
@@ -78,7 +78,7 @@ axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
                      $(libaxvlc_a_DEPENDENCIES) stamp-pic
        $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
        -Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
-         $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
+         $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex) $(LIBRARIES_libvlc) 
 
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)