tools lib api: Use tools build framework
tip-bot for Jiri Olsa
merge botCommit-ID: b4f9166847354cb839c275c062c6b17afba49211 Gitweb: http://git.kernel.org/tip/b4f9166847354cb839c275c062c6b17afba49211 Author: Jiri Olsa <[email protected]> AuthorDate: Fri, 9 Jan 2015 16:38:25 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 12 Feb 2015 17:54:39 -0300
tools lib api: Use tools build framework
Move the libapikfs library building under tools build framework.
Signed-off-by Jiri Olsa <[email protected]>
Tested-by Sukadev Bhattiprolu <[email protected]>
Tested-by Will Deacon <[email protected]>
Cc Alexis Berlemont <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Corey Ashford <[email protected]>
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/lib/api/Build | 2 ++ tools/lib/api/Makefile | 62 ++++++++++++++++++++---------------------------- tools/lib/api/fd/Build | 1 + tools/lib/api/fs/Build | 4 ++++ tools/perf/Makefile.perf | 12 ++-------- 5 files changed, 35 insertions(+), 46 deletions(-)
tools/lib/api/Build new file +2 -0
@@ -0,0 +1,2 @@ +libapikfs-y += fd/ +libapikfs-y += fs/
tools/lib/api/Makefile +26 -36
79 lines not on this page · raw message
tools/lib/api/fd/Build new file +1 -0
@@ -0,0 +1 @@ +libapikfs-y += array.o
tools/lib/api/fs/Build new file +4 -0
@@ -0,0 +1,4 @@ +libapikfs-y += fs.o +libapikfs-y += findfs.o +libapikfs-y += debugfs.o +libapikfs-y += tracefs.o
tools/perf/Makefile.perf +2 -10
@@ -375,20 +375,12 @@ $(LIBTRACEEVENT)-clean: install-traceevent-plugins: $(LIBTRACEEVENT) $(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(LIBTRACEEVENT_FLAGS) install_plugins -LIBAPIKFS_SOURCES = $(wildcard $(LIB_PATH)fs/*.[ch] $(LIB_PATH)fd/*.[ch]) - -# if subdir is set, we've been called from above so target has been built -# already -$(LIBAPIKFS): $(LIBAPIKFS_SOURCES) -ifeq ($(subdir),) - $(QUIET_SUBDIR0)$(LIB_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libapikfs.a -endif +$(LIBAPIKFS): FORCE + @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) $(OUTPUT)libapikfs.a $(LIBAPIKFS)-clean: -ifeq ($(subdir),) $(call QUIET_CLEAN, libapikfs) @$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null -endif help: @echo 'Perf make targets:'