[CRIU] [PATCH] zdtm: Force lib to be built before live targets
Cyrill Gorcunov
gorcunov at openvz.org
Sat Jan 18 08:18:09 PST 2014
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 <gorcunov at openvz.org>
---
Andrey, could you please confirm if it fixes the problem?
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 5e0ba42b8579..4d66395574a1 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 37d99bafbb9d..d5b5e26e366f 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) *~
--
1.8.3.1
More information about the CRIU
mailing list