perf build: Add zlib objects building
tip-bot for Jiri Olsa
merge botCommit-ID: 1571b695053c4ccad66c5151d78247a6590338d6 Gitweb: http://git.kernel.org/tip/1571b695053c4ccad66c5151d78247a6590338d6 Author: Jiri Olsa <[email protected]> AuthorDate: Tue, 30 Dec 2014 13:31:12 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Thu, 12 Feb 2015 13:11:18 -0300
perf build: Add zlib objects building
Move the zlib objects building under build framework to be included in the libperf build object.
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/perf/Makefile.perf | 4 ---- tools/perf/config/Makefile | 1 + tools/perf/util/Build | 1 + 3 files changed, 2 insertions(+), 4 deletions(-)
tools/perf/Makefile.perf +0 -4
@@ -349,10 +349,6 @@ install-gtk: $(OUTPUT)libperf-gtk.so $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' endif -ifndef NO_ZLIB - LIB_OBJS += $(OUTPUT)util/zlib.o -endif - ifdef ASCIIDOC8 export ASCIIDOC8 endif
tools/perf/config/Makefile +1 -0
@@ -640,6 +640,7 @@ ifndef NO_ZLIB ifeq ($(feature-zlib), 1) CFLAGS += -DHAVE_ZLIB_SUPPORT EXTLIBS += -lz + $(call detected,CONFIG_ZLIB) else NO_ZLIB := 1 endif
tools/perf/util/Build +1 -0
@@ -91,6 +91,7 @@ libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o libperf-y += scripting-engines/ libperf-$(CONFIG_PERF_REGS) += perf_regs.o +libperf-$(CONFIG_ZLIB) += zlib.o CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"