X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=activex%2FMakefile.am;h=80ac888bb54ff8b2b9faa830a6c7e21ee2be1248;hb=1d8fa38783a9e68ed9dfcc380eb63ac142d85907;hp=f77e21d1feca0c04b4bdf27a1d2ee89db061d0b3;hpb=6d094bafb374b9b5fefdbaeddbfd5053fcd368be;p=vlc

diff --git a/activex/Makefile.am b/activex/Makefile.am
index f77e21d1fe..80ac888bb5 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -32,6 +32,8 @@ SOURCES_activex = \
     connectioncontainer.h \
     objectsafety.cpp \
     objectsafety.h \
+    viewobject.cpp \
+    viewobject.h \
     vlccontrol.cpp \
     vlccontrol.h \
     plugin.cpp \
@@ -48,7 +50,6 @@ DIST_misc = \
     README.TXT \
     axvlc.def \
     axvlc.idl \
-    axvlc.reg \
     axvlc.tlb \
     inplace.bmp \
     test.html \
@@ -71,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)
 
 
@@ -85,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
 
@@ -126,7 +128,7 @@ stamp-pic: FORCE
 ###############################################################################
 
 clean-local: clean-stamp clean-tlb
-	-rm axvlc$(LIBEXT)
+	rm -f axvlc$(LIBEXT)
 
 ###############################################################################
 # Force rule