* mp4: fix memleak in mov ref. files handling

[vlc] / activex / Makefile.am

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 0342823f2d513e6167b205f3021acd3357471036..a66346e59d93b5cd7dc61a5b5216f0c1630dcc76 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -36,8 +36,12 @@ SOURCES_activex = \
     dataobject.h \
     viewobject.cpp \
     viewobject.h \
+    supporterrorinfo.cpp \
+    supporterrorinfo.h \
     vlccontrol.cpp \
     vlccontrol.h \
+    vlccontrol2.cpp \
+    vlccontrol2.h \
     plugin.cpp \
     plugin.h \
     axvlc_idl.c \
@@ -60,7 +64,7 @@ DIST_misc = \
     $(NULL)
 
 if BUILD_SHARED
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll.a
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.dll
 else
 LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
 endif
@@ -76,10 +80,10 @@ LDFLAGS_activex = `$(VLC_CONFIG) --libs activex vlc builtin`
 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) stamp-builtin
        $(CXXLINK) $(libaxvlc_a_OBJECTS) $(DATA_axvlc_rc) \
        $(srcdir)/axvlc.def \
          $(LIBRARIES_libvlc) -shared $(LIBRARIES_libvlc) $(LDFLAGS_activex) \
@@ -100,10 +104,20 @@ axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
 clean-tlb:
        rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
 
+else
+if HAS_WIDL_COMPILER
+
+axvlc.tlb axvlc_idl.c axvlc_idl.h: axvlc.idl
+       $(WIDL) -I$(WINE_SDK_PATH)/include -tuh -T axvlc.tlb -U axvlc_idl.c -H axvlc_idl.h axvlc.idl
+
+clean-tlb:
+       rm -f axvlc.tlb axvlc_idl.c axvlc_idl.h
+
 else
 
 clean-tlb:
 
+endif
 endif
 
 DATA_axvlc_rc = $(noinst_axvlc_rc_DATA)
@@ -125,14 +139,13 @@ endif
 clean-stamp:
        rm -f stamp-pic
 
-stamp-pic: FORCE
-       @for dep in "" `$(VLC_CONFIG) --target builtin`; do \
-         if test "$${dep}" -nt "$(LIBRARIES_activex)"; then \
-           rm -f $@; \
-           break; \
-         fi; \
-       done
-       @if test ! -f $@; then printf "" > $@; fi
+if BUILD_SHARED
+stamp-builtin:
+else
+stamp-builtin: $(shell ${VLC_CONFIG} --target builtin)
+endif
+       @touch $@
+
 
 ###############################################################################
 # Clean rules
@@ -142,7 +155,6 @@ clean-local: clean-stamp clean-tlb
        rm -f axvlc$(LIBEXT)
 
 ###############################################################################
-# Force rule
+# Force rules
 ###############################################################################
-FORCE: