* modules/stream_out/transcode.c: fixed crash with multithread encoding.

[vlc] / activex / Makefile.am

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 2798c6547f06de7a124ca6a14e640bac68f3197d..80ac888bb54ff8b2b9faa830a6c7e21ee2be1248 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -5,7 +5,7 @@
 noinst_LIBRARIES = $(noinst_LIBRARIES_activex)
 
 MOSTLYCLEANFILES = $(LIBRARIES_activex)
-EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) 
+EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) $(DIST_misc)
 BUILT_SOURCES = $(BUILT_SOURCES_activex)
 
 SOURCES_activex = \
@@ -32,20 +32,33 @@ SOURCES_activex = \
     connectioncontainer.h \
     objectsafety.cpp \
     objectsafety.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.tlb \
+    inplace.bmp \
+    test.html \
+    $(NULL)
 
 LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
 
+if BUILD_ACTIVEX
+
 noinst_LIBRARIES_activex = libaxvlc.a
 axvlc_DATA = axvlc$(LIBEXT)
 axvlcdir = $(libdir)
@@ -59,7 +72,8 @@ 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 \
+       $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
+       -Wl,--enable-stdcall-fixup $(srcdir)/axvlc.def \
          $(LIBRARIES_libvlc) -shared $(LDFLAGS_activex)
 
 
@@ -73,7 +87,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
 
@@ -84,9 +98,15 @@ 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)
+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]*\).*/\1,\2,\3,\4/'` --include-dir $(srcdir) -i $< -o $@
 
+else
+
+clean-tlb:
+
+endif
+
 ###############################################################################
 # Stamp rules
 ###############################################################################
@@ -108,7 +128,7 @@ stamp-pic: FORCE
 ###############################################################################
 
 clean-local: clean-stamp clean-tlb
-       -rm axvlc$(LIBEXT)
+       rm -f axvlc$(LIBEXT)
 
 ###############################################################################
 # Force rule