X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2FMakefile.am;h=f5df58e5cf5afcc6674cb6d6b99162520cbc46c4;hb=59bc3cca8f7f3c0e2f031e6322a1b41af05d788c;hp=e833132262fccf98823aeb32659e2f4612a6a78b;hpb=2f53a04a1204337abacebcf83b5f6bcdd17336e0;p=vlc

diff --git a/activex/Makefile.am b/activex/Makefile.am
index e833132262..f5df58e5cf 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -36,16 +36,17 @@ SOURCES_activex = \
     dataobject.h \
     viewobject.cpp \
     viewobject.h \
+    supporterrorinfo.cpp \
+    supporterrorinfo.h \
     vlccontrol.cpp \
     vlccontrol.h \
-    vlcconfiguration.cpp \
-    vlcconfiguration.h \
     vlccontrol2.cpp \
     vlccontrol2.h \
     plugin.cpp \
     plugin.h \
     axvlc_idl.c \
     axvlc_idl.h \
+    guiddef.h \
     $(NULL)
 
 DIST_rsrc = \
@@ -63,11 +64,7 @@ DIST_misc = \
     test.html \
     $(NULL)
 
-if BUILD_SHARED
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll
-else
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
-endif
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
 
 if BUILD_ACTIVEX
 
@@ -75,15 +72,15 @@ noinst_LIBRARIES_activex = libaxvlc.a
 axvlc_DATA = axvlc$(LIBEXT)
 axvlcdir = $(libdir)
 
-LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
+LDFLAGS_activex = `$(VLC_CONFIG) --libs activex libvlc`
 
 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)
+libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc) $(LIBRARIES_libvlc)
 
 axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
-	              $(libaxvlc_a_DEPENDENCIES) stamp-pic
+	              $(libaxvlc_a_DEPENDENCIES)
 	$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
 	$(srcdir)/axvlc.def \
 	  $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
@@ -132,26 +129,11 @@ clean-tlb:
 
 endif
 
-###############################################################################
-# Stamp rules
-###############################################################################
-
-clean-stamp:
-	rm -f stamp-pic
-
-if BUILD_SHARED
-stamp-pic:
-else
-stamp-pic: $(shell $(VLC_CONFIG) --target builtin)
-endif
-	@touch $@
-
-
 ###############################################################################
 # Clean rules
 ###############################################################################
 
-clean-local: clean-stamp clean-tlb
+clean-local: clean-tlb
 	rm -f axvlc$(LIBEXT)
 
 ###############################################################################