[PATCH 06/32] perf kbuild: store in config-detected missing variables (libdir, ...)
From: Alexis Berlemont
Date: Tue Jun 03 2014 - 18:17:57 EST
---
tools/perf/Makefile.kbuild | 5 ++++-
tools/perf/config/Makefile | 3 +++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/perf/Makefile.kbuild b/tools/perf/Makefile.kbuild
index b2d0d08..e82615f 100644
--- a/tools/perf/Makefile.kbuild
+++ b/tools/perf/Makefile.kbuild
@@ -212,8 +212,11 @@ export prefix_SQ
export PARSER_DEBUG_BISON
export PARSER_DEBUG_FLEX
export ETC_PERFCONFIG_SQ
+export libdir_SQ
export PYTHON_EMBED_CCOPTS
export PERL_EMBED_CCOPTS
+export GTK_CFLAGS
+
endif
# let sources know it's kbuild
@@ -262,7 +265,7 @@ $(obj-perf)/built-in.o: $(obj-perf)/common-cmds.h FORCE
LIBS = -Wl,--whole-archive $^ -Wl,--no-whole-archive -Wl,--start-group $(EXTLIBS) -Wl,--end-group
tools/perf/perf: $(obj-perf)/built-in.o $(LIBS_A)
- $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(LIBS)
+ $(QUIET_LINK)$(CC) $(LDFLAGS) -o $@ $(LIBS) $(GTK_LIBS)
$(LIBTRACEEVENT): FORCE
@mkdir -p $(obj-kernel)/tools/lib/traceevent
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 1760f57..e10e8bf 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -774,7 +774,10 @@ all:
$(call store,ETC_PERFCONFIG_SQ)
$(call store,DESTDIR_SQ)
$(call store,bindir_SQ)
+ $(call store,libdir_SQ)
$(call store,perfexec_instdir_SQ)
$(call store,sysconfdir_SQ)
+ $(call store,GTK_CFLAGS)
+ $(call store,GTK_LIBS)
endif # CONFIG_DETECTED
--
1.9.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/