X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2FMakefile.am;h=758ba6aa3555f3f8796c668ae333622364ccd4b7;hb=bddb56ff8c731c9c6f35bfb520d16680945b8747;hp=d89eaf25af03bba1665ce4ae4c2ddd24604ccecf;hpb=779519342120092188e1dc860d6a4253e6ec0e1d;p=vlc

diff --git a/activex/Makefile.am b/activex/Makefile.am
index d89eaf25af..758ba6aa35 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -32,29 +32,38 @@ SOURCES_activex = \
     connectioncontainer.h \
     objectsafety.cpp \
     objectsafety.h \
+    dataobject.cpp \
+    dataobject.h \
+    viewobject.cpp \
+    viewobject.h \
     vlccontrol.cpp \
     vlccontrol.h \
     plugin.cpp \
     plugin.h \
     axvlc_idl.c \
     axvlc_idl.h \
-	$(NULL)
+    $(NULL)
 
 DIST_rsrc = \
-	axvlc_rc.rc \
-	$(NULL)
+    axvlc_rc.rc \
+    $(NULL)
 
 DIST_misc = \
-	README.TXT \
-	axvlc.def \
-	axvlc.idl \
-	axvlc.reg \
-	axvlc.tlb \
-	inplace.bmp \
-	test.html \
-	$(NULL)
-
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
+    README.TXT \
+    axvlc.inf.in \
+    axvlc.def \
+    axvlc.idl \
+    axvlc.tlb \
+    inplace.bmp \
+    vlc16x16.bmp \
+    test.html \
+    $(NULL)
+
+if BUILD_SHARED
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
+else
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+endif
 
 if BUILD_ACTIVEX
 
@@ -62,7 +71,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`
@@ -71,8 +80,10 @@ libaxvlc_a_DEPENDENCIES = axvlc.def $(DATA_axvlc_rc)
 
 axvlc$(LIBEXT): $(libaxvlc_a_OBJECTS) \
 	              $(libaxvlc_a_DEPENDENCIES) stamp-pic
-	$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) -Wl,--enable-stdcall-fixup axvlc.def \
-	  $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
+	$(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
+	-Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
+	  $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
+	  $(INCLUDED_LIBINTL)
 
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)
@@ -85,7 +96,7 @@ axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
 	$(MIDL) -Oicf -error all -env win32 -tlb axvlc.tlb -iid axvlc_idl.c -h axvlc_idl.h axvlc.idl
 
 clean-tlb:
-	-rm axvlc.tlb axvlc_idl.c axvlc_idl.h
+	rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
 
 else
 
@@ -96,8 +107,8 @@ 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_DATA)
-	$(WINDRES) -DVERSION=$(VERSION) -DVERSION_NUMBER=`echo $(VERSION).0.0.0 | sed 's/\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\)[^.]*\.*\([0-9]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
+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
 
@@ -126,7 +137,7 @@ stamp-pic: FORCE
 ###############################################################################
 
 clean-local: clean-stamp clean-tlb
-	-rm axvlc$(LIBEXT)
+	rm -f axvlc$(LIBEXT)
 
 ###############################################################################
 # Force rule