diff options
author | S. Lockwood-Childs <sjl@vctlabs.com> | 2014-05-08 13:34:01 -0400 |
---|---|---|
committer | Sasha Levin <sasha.levin@oracle.com> | 2014-05-08 13:34:45 -0400 |
commit | 0041898ec19f10e2adf5f1245f32df88d627ae8a (patch) | |
tree | a8ca7eb74903458bc30957edfb480cb757f1cff2 /tools | |
parent | d1db0eea852497762cab43b905b879dfcd3b8987 (diff) |
tools/liblockdep: Build liblockdep from tools/Makefile
add targets to build liblockdep with
make -C tools liblockdep
like the way other stuff under tools/ can be built
Signed-off-by: S. Lockwood-Childs <sjl@vctlabs.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 6 | ||||
-rw-r--r-- | tools/lib/lockdep/Makefile | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/tools/Makefile b/tools/Makefile index bcae806b0c39..9a617adc6675 100644 --- a/tools/Makefile +++ b/tools/Makefile | |||
@@ -44,6 +44,9 @@ cpupower: FORCE | |||
44 | cgroup firewire hv guest usb virtio vm net: FORCE | 44 | cgroup firewire hv guest usb virtio vm net: FORCE |
45 | $(call descend,$@) | 45 | $(call descend,$@) |
46 | 46 | ||
47 | liblockdep: FORCE | ||
48 | $(call descend,lib/lockdep) | ||
49 | |||
47 | libapikfs: FORCE | 50 | libapikfs: FORCE |
48 | $(call descend,lib/api) | 51 | $(call descend,lib/api) |
49 | 52 | ||
@@ -91,6 +94,9 @@ cpupower_clean: | |||
91 | cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean: | 94 | cgroup_clean hv_clean firewire_clean lguest_clean usb_clean virtio_clean vm_clean net_clean: |
92 | $(call descend,$(@:_clean=),clean) | 95 | $(call descend,$(@:_clean=),clean) |
93 | 96 | ||
97 | liblockdep_clean: | ||
98 | $(call descend,lib/lockdep,clean) | ||
99 | |||
94 | libapikfs_clean: | 100 | libapikfs_clean: |
95 | $(call descend,lib/api,clean) | 101 | $(call descend,lib/api,clean) |
96 | 102 | ||
diff --git a/tools/lib/lockdep/Makefile b/tools/lib/lockdep/Makefile index cb09d3ff8f58..c70919b5ebe7 100644 --- a/tools/lib/lockdep/Makefile +++ b/tools/lib/lockdep/Makefile | |||
@@ -1,8 +1,7 @@ | |||
1 | # file format version | 1 | # file format version |
2 | FILE_VERSION = 1 | 2 | FILE_VERSION = 1 |
3 | 3 | ||
4 | MAKEFLAGS += --no-print-directory | 4 | LIBLOCKDEP_VERSION=$(shell make --no-print-directory -sC ../../.. kernelversion) |
5 | LIBLOCKDEP_VERSION=$(shell make -sC ../../.. kernelversion) | ||
6 | 5 | ||
7 | # Makefiles suck: This macro sets a default value of $(2) for the | 6 | # Makefiles suck: This macro sets a default value of $(2) for the |
8 | # variable named by $(1), unless the variable has been set by | 7 | # variable named by $(1), unless the variable has been set by |