Mesa (master): mesa: Remove unnecessary -f from $(RM).

Matt Turner mattst88 at kemper.freedesktop.org
Thu Dec 18 02:13:21 UTC 2014


Module: Mesa
Branch: master
Commit: 18ebf9e251cac6a0f898f4b7e159382f3c96b2b7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=18ebf9e251cac6a0f898f4b7e159382f3c96b2b7

Author: Matt Turner <mattst88 at gmail.com>
Date:   Wed Dec 17 13:19:37 2014 -0800

mesa: Remove unnecessary -f from $(RM).

$(RM) includes -f.

---

 src/gallium/targets/dri/Makefile.am   |    6 +++---
 src/gallium/targets/vdpau/Makefile.am |    2 +-
 src/gallium/targets/xvmc/Makefile.am  |    2 +-
 src/mesa/drivers/dri/Makefile.am      |    6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index da1d1ed..5df3a20 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -125,7 +125,7 @@ all-local: $(dri_LTLIBRARIES)
 clean-local:
 	$(AM_V_GEN)link_dir=$(top_builddir)/$(LIB_DIR)/gallium;         \
 	$(AM_V_GEN)for i in $(TARGET_DRIVERS); do                       \
-		$(RM) -f $${link_dir}/$${i}_dri.so;                     \
+		$(RM) $${link_dir}/$${i}_dri.so;                        \
 	done;
 endif
 
@@ -136,9 +136,9 @@ install-data-hook:
 		ln -f $(DESTDIR)$(dridir)/gallium_dri.so                \
 		      $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
 	done;                                                           \
-	$(RM) -f $(DESTDIR)$(dridir)/gallium_dri.*
+	$(RM) $(DESTDIR)$(dridir)/gallium_dri.*
 
 uninstall-hook:
 	for i in $(TARGET_DRIVERS); do                                  \
-		$(RM) -f $(DESTDIR)$(dridir)/$${i}_dri.so;              \
+		$(RM) $(DESTDIR)$(dridir)/$${i}_dri.so;                 \
 	done;
diff --git a/src/gallium/targets/vdpau/Makefile.am b/src/gallium/targets/vdpau/Makefile.am
index 32b3401..2980cc3 100644
--- a/src/gallium/targets/vdpau/Makefile.am
+++ b/src/gallium/targets/vdpau/Makefile.am
@@ -118,7 +118,7 @@ install-data-hook:
 		ln -sf $${l}						\
 		       $${dest_dir}/$${k};				\
 	done;								\
-	$(RM) -f $${dest_dir}/libvdpau_gallium.*
+	$(RM) $${dest_dir}/libvdpau_gallium.*
 
 uninstall-hook:
 	for i in $(TARGET_DRIVERS); do					\
diff --git a/src/gallium/targets/xvmc/Makefile.am b/src/gallium/targets/xvmc/Makefile.am
index a7b3365..8aed969 100644
--- a/src/gallium/targets/xvmc/Makefile.am
+++ b/src/gallium/targets/xvmc/Makefile.am
@@ -81,7 +81,7 @@ install-data-hook:
 		ln -sf $${l}						\
 		       $${dest_dir}/$${k};				\
 	done;								\
-	$(RM) -f $${dest_dir}/libXvMCgallium.*
+	$(RM) $${dest_dir}/libXvMCgallium.*
 
 uninstall-hook:
 	for i in $(TARGET_DRIVERS); do					\
diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index 0c677a0..fa1de10 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -81,7 +81,7 @@ all-local: mesa_dri_drivers.la
 clean-local:
 	$(AM_V_GEN)$(RM) $(top_builddir)/$(LIB_DIR)/mesa_dri_drivers.so;
 	$(AM_V_GEN)for i in $(MEGADRIVERS); do \
-		$(RM) -f $(top_builddir)/$(LIB_DIR)/$$i; \
+		$(RM) $(top_builddir)/$(LIB_DIR)/$$i; \
 	done;
 endif
 
@@ -92,11 +92,11 @@ install-data-hook:
 		ln -f $(DESTDIR)$(dridir)/mesa_dri_drivers.so \
 		      $(DESTDIR)$(dridir)/$$i; \
 	done;
-	$(RM) -f $(DESTDIR)$(dridir)/mesa_dri_drivers.*
+	$(RM) $(DESTDIR)$(dridir)/mesa_dri_drivers.*
 
 uninstall-hook:
 	for i in $(MEGADRIVERS); do \
-		$(RM) -f $(DESTDIR)$(dridir)/$$i; \
+		$(RM) $(DESTDIR)$(dridir)/$$i; \
 	done;
 
 endif




More information about the mesa-commit mailing list