[CRIU] [PATCH] make: cleanup "clean" goal output

[Kinsbursky Stanislav]

From: Stanislav Kinsbursky <skinsbursky at openvz.org>

Signed-off-by: Stanislav Kinsbursky <skinsbursky at openvz.org>
---
 Documentation/Makefile             |    2 +-
 Makefile                           |    6 ++----
 test/zdtm/Makefile                 |   10 +++++++++-
 test/zdtm/lib/Makefile             |   12 ++++++++++--
 test/zdtm/live/Makefile            |   10 +++++++++-
 test/zdtm/live/static/Makefile     |   15 ++++++++++++---
 test/zdtm/live/streaming/Makefile  |   14 +++++++++++---
 test/zdtm/live/transition/Makefile |   14 +++++++++++---
 8 files changed, 65 insertions(+), 18 deletions(-)
-------------- next part --------------
diff --git a/Documentation/Makefile b/Documentation/Makefile
index d5f0aa0..5011503 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -15,6 +15,6 @@ all: $(MANS)
 	$(Q) $(XMLTO) man --skip-validation $(patsubst %.1,%.xml,$@) 2>/dev/null
 
 clean:
-	$(E) "  CLEAN   "
+	$(E) "  CLEAN DOCUMENTATION"
 	$(Q) rm -f ./*.xml
 	$(Q) rm -f ./*.1
diff --git a/Makefile b/Makefile
index 89e3efa..59f3dfb 100644
--- a/Makefile
+++ b/Makefile
@@ -107,7 +107,7 @@ rebuild:
 	$(Q) $(MAKE)
 
 clean: cleanpie cleansyscall
-	$(E) "  CLEAN"
+	$(E) "  CLEAN CRTOOLS"
 	$(Q) $(RM) -f ./*.o
 	$(Q) $(RM) -f ./*.d
 	$(Q) $(RM) -f ./*.i
@@ -117,9 +117,7 @@ clean: cleanpie cleansyscall
 	$(Q) $(RM) -f ./$(PROGRAM)
 	$(Q) $(RM) -rf ./test/dump/
 	$(Q) $(MAKE) -C test/legacy clean
-	$(Q) $(MAKE) -C test/zdtm cleandep
-	$(Q) $(MAKE) -C test/zdtm clean
-	$(Q) $(MAKE) -C test/zdtm cleanout
+	$(Q) $(MAKE) -C test/zdtm realclean
 	$(Q) $(MAKE) -C Documentation clean
 
 distclean: clean
diff --git a/test/zdtm/Makefile b/test/zdtm/Makefile
index 7b72e2f..47ef056 100644
--- a/test/zdtm/Makefile
+++ b/test/zdtm/Makefile
@@ -1,3 +1,11 @@
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
 SUBDIRS	=	lib live
 
 default:	all
@@ -5,4 +13,4 @@ default:	all
 .PHONY:	default
 
 %:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+	$(Q) set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
index a4ab681..7447520 100644
--- a/test/zdtm/lib/Makefile
+++ b/test/zdtm/lib/Makefile
@@ -1,3 +1,11 @@
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
 CFLAGS	= -g -O2 -Wall -Werror -Wno-unused-result
 
 LIB	= libzdtmtst.a
@@ -16,10 +24,10 @@ install: all
 $(LIB):	$(LIB)(${LIBOBJ})
 
 clean:
-	$(RM) $(LIBOBJ) $(LIB) *~
+	$(Q) $(RM) $(LIBOBJ) $(LIB) *~
 
 cleandep:
-	$(RM) $(LIBDEP)
+	$(Q) $(RM) $(LIBDEP)
 
 realclean:	clean cleandep
 
diff --git a/test/zdtm/live/Makefile b/test/zdtm/live/Makefile
index d50f0e7..5226f9c 100644
--- a/test/zdtm/live/Makefile
+++ b/test/zdtm/live/Makefile
@@ -1,3 +1,11 @@
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
 SUBDIRS	=	streaming transition static
 
 default:	all
@@ -5,4 +13,4 @@ default:	all
 .PHONY:	default
 
 %:
-	set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
+	$(Q) set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done
diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile
index 17a6e79..f2ab881 100644
--- a/test/zdtm/live/static/Makefile
+++ b/test/zdtm/live/static/Makefile
@@ -1,3 +1,12 @@
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
+
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
@@ -166,13 +175,13 @@ $(LIB):	force
 	$(MAKE) -C $(LIBDIR)
 
 clean:
-	$(RM) $(OBJ) $(TST) *~
+	$(Q) $(RM) $(OBJ) $(TST) *~
 
 cleandep:	clean
-	$(RM) $(DEP)
+	$(Q) $(RM) $(DEP)
 
 cleanout:
-	$(RM) -r *.pid *.out* *.test* *.state
+	$(Q) $(RM) -r *.pid *.out* *.test* *.state
 
 realclean:	cleandep cleanout
 
diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile
index 7aeced5..d76fae0 100644
--- a/test/zdtm/live/streaming/Makefile
+++ b/test/zdtm/live/streaming/Makefile
@@ -1,3 +1,11 @@
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
@@ -63,13 +71,13 @@ $(LIB):	force
 	$(MAKE) -C $(LIBDIR)
 
 clean:
-	$(RM) $(OBJ) $(TST) *~
+	$(Q) $(RM) $(OBJ) $(TST) *~
 
 cleandep:	clean
-	$(RM) $(DEP)
+	$(Q) $(RM) $(DEP)
 
 cleanout:
-	$(RM) *.pid *.out* *.test*
+	$(Q) $(RM) *.pid *.out* *.test*
 
 realclean:	cleandep cleanout
 
diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile
index 64e004b..c537559 100644
--- a/test/zdtm/live/transition/Makefile
+++ b/test/zdtm/live/transition/Makefile
@@ -1,3 +1,11 @@
+ifeq ($(strip $(V)),)
+	E = @echo
+	Q = @
+else
+	E = @\#
+	Q =
+endif
+
 LIBDIR	= ../../lib
 LIB	= $(LIBDIR)/libzdtmtst.a
 override CPPFLAGS += -I$(LIBDIR)
@@ -66,13 +74,13 @@ $(LIB):	force
 	$(MAKE) -C $(LIBDIR)
 
 clean:
-	$(RM) $(OBJ) $(TST) *~
+	$(Q) $(RM) $(OBJ) $(TST) *~
 
 cleandep:	clean
-	$(RM) $(DEP)
+	$(Q) $(RM) $(DEP)
 
 cleanout:
-	$(RM) *.pid *.out* *.test chew*
+	$(Q) $(RM) *.pid *.out* *.test chew*
 
 realclean:	cleandep cleanout