From d2f664b8770641dec598dac5aff7ada734e90f0e Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Wed, 25 Jan 2012 17:45:49 +0400 Subject: [PATCH] make: Eliminate deps build on no-deps targets in zdtm Signed-off-by: Cyrill Gorcunov Reviewed-by: Pavel Emelyanov --- Makefile | 6 ++---- Makefile.inc | 2 ++ test/zdtm/lib/Makefile | 2 ++ test/zdtm/live/static/Makefile | 2 ++ test/zdtm/live/streaming/Makefile | 2 ++ test/zdtm/live/transition/Makefile | 2 ++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9bde1bfb1..f7452ac47 100644 --- a/Makefile +++ b/Makefile @@ -150,6 +150,7 @@ clean: $(Q) $(MAKE) -C test/legacy clean $(Q) $(MAKE) -C test/zdtm cleandep $(Q) $(MAKE) -C test/zdtm clean + $(Q) $(MAKE) -C test/zdtm cleanout .PHONY: clean tags: @@ -164,9 +165,6 @@ cscope: $(Q) $(CSCOPE) -bkqu .PHONY: cscope -no-blob-targets := tags clean cscope - -ifeq ($(filter-out no-blob-targets, $(MAKECMDGOALS)),) +ifeq ($(filter-out no-deps-targets, $(MAKECMDGOALS)),) -include $(DEPS) endif - diff --git a/Makefile.inc b/Makefile.inc index ee3d9c4c6..ffa02d9b3 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -36,3 +36,5 @@ ifeq ($(uname_M),x86_64) ARCH := x86 DEFINES += -DCONFIG_X86_64 endif + +no-deps-targets := tags cscope clean cleanout cleandep realclean diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile index f0bb19ded..8e8f20ef2 100644 --- a/test/zdtm/lib/Makefile +++ b/test/zdtm/lib/Makefile @@ -25,4 +25,6 @@ realclean: clean cleandep .PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop +ifeq ($(filter-out no-deps-targets, $(MAKECMDGOALS)),) -include $(LIBDEP) +endif diff --git a/test/zdtm/live/static/Makefile b/test/zdtm/live/static/Makefile index 1727ce2b1..433c968e9 100644 --- a/test/zdtm/live/static/Makefile +++ b/test/zdtm/live/static/Makefile @@ -157,4 +157,6 @@ realclean: cleandep cleanout .PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop +ifeq ($(filter-out no-deps-targets, $(MAKECMDGOALS)),) -include $(DEP) +endif diff --git a/test/zdtm/live/streaming/Makefile b/test/zdtm/live/streaming/Makefile index 5b8bbcda8..67d2ce1cf 100644 --- a/test/zdtm/live/streaming/Makefile +++ b/test/zdtm/live/streaming/Makefile @@ -75,4 +75,6 @@ realclean: cleandep cleanout .PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop +ifeq ($(filter-out no-deps-targets, $(MAKECMDGOALS)),) -include $(DEP) +endif diff --git a/test/zdtm/live/transition/Makefile b/test/zdtm/live/transition/Makefile index eb265a201..85217eed6 100644 --- a/test/zdtm/live/transition/Makefile +++ b/test/zdtm/live/transition/Makefile @@ -77,4 +77,6 @@ realclean: cleandep cleanout .PHONY: force clean cleandep cleanout realclean start check_start stop wait_stop +ifeq ($(filter-out no-deps-targets, $(MAKECMDGOALS)),) -include $(DEP) +endif