From f27f36ff157eff2c0ad50bd778a2542df3af185e Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 16 Jan 2014 11:25:42 -0500
Subject: [PATCH] Make the QUIET build option apply to clean and bare targets.

---
 Makefile         | 28 ++++++++++++++--------------
 Rules.modular    | 10 +++++-----
 Rules.monolithic | 14 +++++++-------
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index ec7b5cba8..45bd45d31 100644
--- a/Makefile
+++ b/Makefile
@@ -609,27 +609,27 @@ resetlabels:
 # Clean everything
 #
 bare: clean
-	rm -f $(polxml)
-	rm -f $(layerxml)
-	rm -f $(modxml)
-	rm -f $(tunxml)
-	rm -f $(boolxml)
-	rm -f $(mod_conf)
-	rm -f $(booleans)
-	rm -fR $(htmldir)
-	rm -f $(tags)
+	$(verbose) rm -f $(polxml)
+	$(verbose) rm -f $(layerxml)
+	$(verbose) rm -f $(modxml)
+	$(verbose) rm -f $(tunxml)
+	$(verbose) rm -f $(boolxml)
+	$(verbose) rm -f $(mod_conf)
+	$(verbose) rm -f $(booleans)
+	$(verbose) rm -fR $(htmldir)
+	$(verbose) rm -f $(tags)
 # don't remove these files if we're given a local root
 ifndef LOCAL_ROOT
-	rm -f $(fcsort)
-	rm -f $(support)/*.pyc
+	$(verbose) rm -f $(fcsort)
+	$(verbose) rm -f $(support)/*.pyc
 ifneq ($(generated_te),)
-	rm -f $(generated_te)
+	$(verbose) rm -f $(generated_te)
 endif
 ifneq ($(generated_if),)
-	rm -f $(generated_if)
+	$(verbose) rm -f $(generated_if)
 endif
 ifneq ($(generated_fc),)
-	rm -f $(generated_fc)
+	$(verbose) rm -f $(generated_fc)
 endif
 endif
 
diff --git a/Rules.modular b/Rules.modular
index 313d8375b..58e94dabb 100644
--- a/Rules.modular
+++ b/Rules.modular
@@ -208,10 +208,10 @@ validate: $(base_pkg) $(mod_pkgs)
 # Clean the sources
 #
 clean:
-	rm -f $(base_conf)
-	rm -f $(base_fc)
-	rm -f $(builddir)*.pp
-	rm -f $(net_contexts)
-	rm -fR $(tmpdir)
+	$(verbose) rm -f $(base_conf)
+	$(verbose) rm -f $(base_fc)
+	$(verbose) rm -f $(builddir)*.pp
+	$(verbose) rm -f $(net_contexts)
+	$(verbose) rm -fR $(tmpdir)
 
 .PHONY: default all policy base modules install load clean validate
diff --git a/Rules.monolithic b/Rules.monolithic
index 808a5398a..7e77c032c 100644
--- a/Rules.monolithic
+++ b/Rules.monolithic
@@ -245,12 +245,12 @@ $(installdir)/seusers: $(seusers)
 # Clean the sources
 #
 clean:
-	rm -f $(policy_conf)
-	rm -f $(polver)
-	rm -f $(fc)
-	rm -f $(homedir_template)
-	rm -f $(net_contexts)
-	rm -f *.res
-	rm -fR $(tmpdir)
+	$(verbose) rm -f $(policy_conf)
+	$(verbose) rm -f $(polver)
+	$(verbose) rm -f $(fc)
+	$(verbose) rm -f $(homedir_template)
+	$(verbose) rm -f $(net_contexts)
+	$(verbose) rm -f *.res
+	$(verbose) rm -fR $(tmpdir)
 
 .PHONY: default policy install load reload enableaudit checklabels restorelabels relabel check longcheck clean