aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/Makefile.perf4
-rw-r--r--tools/perf/config/Makefile1
-rw-r--r--tools/perf/util/Build1
3 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 7daccaccd02f..713f4d17c553 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -349,10 +349,6 @@ install-gtk: $(OUTPUT)libperf-gtk.so
349 $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' 349 $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)'
350endif 350endif
351 351
352ifndef NO_ZLIB
353 LIB_OBJS += $(OUTPUT)util/zlib.o
354endif
355
356ifdef ASCIIDOC8 352ifdef ASCIIDOC8
357 export ASCIIDOC8 353 export ASCIIDOC8
358endif 354endif
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 2fc4d5682c3b..b97a7b903a23 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -640,6 +640,7 @@ ifndef NO_ZLIB
640 ifeq ($(feature-zlib), 1) 640 ifeq ($(feature-zlib), 1)
641 CFLAGS += -DHAVE_ZLIB_SUPPORT 641 CFLAGS += -DHAVE_ZLIB_SUPPORT
642 EXTLIBS += -lz 642 EXTLIBS += -lz
643 $(call detected,CONFIG_ZLIB)
643 else 644 else
644 NO_ZLIB := 1 645 NO_ZLIB := 1
645 endif 646 endif
diff --git a/tools/perf/util/Build b/tools/perf/util/Build
index f69843218228..459918872f07 100644
--- a/tools/perf/util/Build
+++ b/tools/perf/util/Build
@@ -91,6 +91,7 @@ libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o
91libperf-y += scripting-engines/ 91libperf-y += scripting-engines/
92 92
93libperf-$(CONFIG_PERF_REGS) += perf_regs.o 93libperf-$(CONFIG_PERF_REGS) += perf_regs.o
94libperf-$(CONFIG_ZLIB) += zlib.o
94 95
95CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" 96CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
96CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))" 97CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"