From 521faf6fc953ab14a18ac3c23c2bfc650038ffa0 Mon Sep 17 00:00:00 2001 From: Sedat Dilek Date: Sat, 31 Aug 2013 01:24:16 +0200 Subject: [PATCH 3/8] tools: vm: Consider liblk as a prerequisite Signed-off-by: Sedat Dilek --- tools/Makefile | 8 ++++---- tools/vm/Makefile | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index ae986c1..ecf17c0 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -36,13 +36,13 @@ help: cpupower: FORCE $(call descend,power/$@) -cgroup firewire lguest usb virtio vm net: FORCE +cgroup firewire lguest usb virtio net: FORCE $(call descend,$@) liblk: FORCE $(call descend,lib/lk) -perf: liblk FORCE +perf vm: liblk FORCE $(call descend,$@) selftests: FORCE @@ -70,13 +70,13 @@ install: cgroup_install cpupower_install firewire_install lguest_install \ cpupower_clean: $(call descend,power/cpupower,clean) -cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean: +cgroup_clean firewire_clean lguest_clean usb_clean virtio_clean net_clean: $(call descend,$(@:_clean=),clean) liblk_clean: $(call descend,lib/lk,clean) -perf_clean: liblk_clean +perf_clean vm_clean: liblk_clean $(call descend,$(@:_clean=),clean) selftests_clean: diff --git a/tools/vm/Makefile b/tools/vm/Makefile index 24e9ddd..63e7848 100644 --- a/tools/vm/Makefile +++ b/tools/vm/Makefile @@ -19,4 +19,4 @@ liblk: clean: $(RM) page-types slabinfo - make -C ../lib/lk clean + make -C $(LK_DIR) clean -- 1.8.4