From d01025edd9d06beae93dc421e0acf702958a34bc Mon Sep 17 00:00:00 2001 From: Cyrill Gorcunov Date: Mon, 20 Jan 2014 14:14:27 +0400 Subject: [PATCH] zdtm: Force lib to be built before live targets It's ugly but should work for now. Strictly speaking I need to rework the complete make engine used in zdtm. Signed-off-by: Cyrill Gorcunov Tested-by: Andrew Vagin Signed-off-by: Pavel Emelyanov --- test/zdtm/Makefile | 10 +++++++++- test/zdtm/lib/Makefile | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/zdtm/Makefile b/test/zdtm/Makefile index 5e0ba42b8..4d6639557 100644 --- a/test/zdtm/Makefile +++ b/test/zdtm/Makefile @@ -1,7 +1,15 @@ SUBDIRS = lib live default: all -.PHONY: default +.PHONY: default lib live +lib: + $(MAKE) -C lib all + +live: lib + $(MAKE) -C live all + +all: lib live + @true %: set -e; for d in $(SUBDIRS); do $(MAKE) -C $$d $@; done diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile index 37d99bafb..d5b5e26e3 100644 --- a/test/zdtm/lib/Makefile +++ b/test/zdtm/lib/Makefile @@ -18,7 +18,8 @@ all: $(LIB) install: all .PHONY: all install -$(LIB): $(LIB)(${LIBOBJ}) +$(LIB): $(LIBOBJ) + $(Q) ar rv $@ $^ clean: $(RM) -f $(LIBOBJ) $(LIB) *~