Backport 13132

[vlc] / activex / Makefile.am

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 696234d9ba052d20bd6548a1478f495fc7bbe6c0..9489ba42fd4e9d1572ca735510eed460b2cd7599 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -32,35 +32,42 @@ 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)
+    README.TXT \
+    axvlc.inf.in \
+    axvlc.def \
+    axvlc.idl \
+    axvlc.tlb \
+    inplace.bmp \
+    vlc16x16.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)
 
-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`
@@ -69,8 +76,9 @@ 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 $(LDFLAGS_activex) $(LIBRARIES_libvlc) 
 
 
 DATA_axvlc_tlb = $(axvlc_tlb_DATA)
@@ -83,7 +91,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
 
@@ -94,9 +102,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
 ###############################################################################
@@ -118,7 +132,7 @@ stamp-pic: FORCE
 ###############################################################################
 
 clean-local: clean-stamp clean-tlb
-       -rm axvlc$(LIBEXT)
+       rm -f axvlc$(LIBEXT)
 
 ###############################################################################
 # Force rule