vlc | branch: master | Alexandre Janniaux <[email protected]> | Thu Oct 10 00:27:57 2019 +0200| [2147e12a39879f51221916f416da5c5e130bd58a] | committer: Marvin Scholz
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) > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2147e12a39879f51221916f416da5c5e130bd58a --- 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 4c4c318f0f..993c490690 100644 --- a/contrib/src/mysofa/rules.mak +++ b/contrib/src/mysofa/rules.mak @@ -24,7 +24,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) $(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 29c92fd9f5..ee2652b6d2 100644 --- a/contrib/src/projectM/rules.mak +++ b/contrib/src/projectM/rules.mak @@ -35,7 +35,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 $@ _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
