[vlc-commits] contrib: use rm -f instead of dash prefix

[Alexandre Janniaux]

vlc/vlc-3.0 | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Thu Oct 10 00:27:57 2019 +0200| [e68a11dd140d764e1ea8c4c3bf927b4a0d87e076] | committer: Steve Lhomme

contrib: use rm -f instead of dash prefix

This is more silent and avoid messages like:
rm: cannot remove 'CMakeCache.txt': No such file or directory
make: [.mysofa] Error 1 (ignored)

(cherry picked from commit 2147e12a39879f51221916f416da5c5e130bd58a) (rebased)

rebased:
- the master branch removed pthreadGC2 and related patches before this patch

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e68a11dd140d764e1ea8c4c3bf927b4a0d87e076
---

 contrib/src/fluidlite/rules.mak    | 2 +-
 contrib/src/mysofa/rules.mak       | 2 +-
 contrib/src/projectM/rules.mak     | 2 +-
 contrib/src/spatialaudio/rules.mak | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/contrib/src/fluidlite/rules.mak b/contrib/src/fluidlite/rules.mak
index f98aa34ac3..4ab3cc6029 100644
--- a/contrib/src/fluidlite/rules.mak
+++ b/contrib/src/fluidlite/rules.mak
@@ -25,7 +25,7 @@ fluidlite: fluidlite-$(FLUID_HASH).tar.xz .sum-fluidlite
 	$(MOVE)
 
 .fluidlite: fluidlite toolchain.cmake
-	-cd $< && rm CMakeCache.txt
+	cd $< && rm -f CMakeCache.txt
 	cd $< && $(HOSTVARS) $(CMAKE)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/mysofa/rules.mak b/contrib/src/mysofa/rules.mak
index 0a0377ecc1..432aef502d 100644
--- a/contrib/src/mysofa/rules.mak
+++ b/contrib/src/mysofa/rules.mak
@@ -28,7 +28,7 @@ mysofa: libmysofa-$(MYSOFA_VERSION).tar.gz .sum-mysofa
 	$(MOVE)
 
 .mysofa: mysofa toolchain.cmake
-	-cd $< && rm CMakeCache.txt
+	cd $< && rm -f CMakeCache.txt
 	cd $< && $(HOSTVARS) CFLAGS="$(MYSOFA_CFLAGS)" CXXFLAGS="$(MYSOFA_CXXFLAGS)" $(CMAKE) -DBUILD_TESTS=OFF -DBUILD_SHARED_LIBS=OFF
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/projectM/rules.mak b/contrib/src/projectM/rules.mak
index a9e7b29911..58b021ae78 100644
--- a/contrib/src/projectM/rules.mak
+++ b/contrib/src/projectM/rules.mak
@@ -28,7 +28,7 @@ endif
 DEPS_projectM = glew $(DEPS_glew)
 
 .projectM: projectM toolchain.cmake
-	-cd $< && rm CMakeCache.txt
+	cd $< && rm -f CMakeCache.txt
 	cd $< && $(HOSTVARS) $(CMAKE) \
 		-DINCLUDE-PROJECTM-LIBVISUAL:BOOL=OFF \
 		-DDISABLE_NATIVE_PRESETS:BOOL=ON \
diff --git a/contrib/src/spatialaudio/rules.mak b/contrib/src/spatialaudio/rules.mak
index 76a5c03be9..60a6596fc2 100644
--- a/contrib/src/spatialaudio/rules.mak
+++ b/contrib/src/spatialaudio/rules.mak
@@ -21,7 +21,7 @@ spatialaudio: spatialaudio-$(SPATIALAUDIO_VERSION).tar.bz2 .sum-spatialaudio
 	$(MOVE)
 
 .spatialaudio: spatialaudio toolchain.cmake
-	-cd $< && rm CMakeCache.txt
+	cd $< && rm -f CMakeCache.txt
 	cd $< && $(HOSTVARS) $(CMAKE) -DMYSOFA_ROOT_DIR=$(PREFIX) -DHAVE_MIT_HRTF=OFF
 	cd $< && $(MAKE) install
 	touch $@