Skip to contentSkip to conversation

tools lib api: Use tools build framework

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Feb 18, 2015 perf events

lore
Share & tools
lore

tip-bot for Jiri Olsa

author merge bot
#0 lore raw
Commit-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.

---
 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
new file mode 100644
index 0000000..64dd8d4
@@ -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
new file mode 100644
index 0000000..4ddcb0f
@@ -0,0 +1 @@
+libapikfs-y += array.o
tools/lib/api/fs/Build new file +4 -0
new file mode 100644
index 0000000..5f0fe4d
@@ -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
index 710731b..cc733ac 100644
@@ -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:'