* backport of [11511] [11512] and [11513]

[vlc] / activex / Makefile.am

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 7f63ee59ef4356bd1c9a4f2677c6684b1913ac9d..80ac888bb54ff8b2b9faa830a6c7e21ee2be1248 100644 (file)
--- 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 \
@@ -86,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
 
@@ -127,7 +128,7 @@ stamp-pic: FORCE
 ###############################################################################
 
 clean-local: clean-stamp clean-tlb
-       -rm axvlc$(LIBEXT)
+       rm -f axvlc$(LIBEXT)
 
 ###############################################################################
 # Force rule