|
@@ -313,6 +313,9 @@ TEST_PROGRAMS =
|
|
|
|
|
|
SCRIPT_SH += perf-archive.sh
|
|
|
|
|
|
+grep-libs = $(filter -l%,$(1))
|
|
|
+strip-libs = $(filter-out -l%,$(1))
|
|
|
+
|
|
|
#
|
|
|
# No Perl scripts right now:
|
|
|
#
|
|
@@ -588,14 +591,17 @@ endif
|
|
|
ifdef NO_LIBPERL
|
|
|
BASIC_CFLAGS += -DNO_LIBPERL
|
|
|
else
|
|
|
- PERL_EMBED_LDOPTS = `perl -MExtUtils::Embed -e ldopts 2>/dev/null`
|
|
|
+ PERL_EMBED_LDOPTS = $(shell perl -MExtUtils::Embed -e ldopts 2>/dev/null)
|
|
|
+ PERL_EMBED_LDFLAGS = $(call strip-libs,$(PERL_EMBED_LDOPTS))
|
|
|
+ PERL_EMBED_LIBADD = $(call grep-libs,$(PERL_EMBED_LDOPTS))
|
|
|
PERL_EMBED_CCOPTS = `perl -MExtUtils::Embed -e ccopts 2>/dev/null`
|
|
|
FLAGS_PERL_EMBED=$(PERL_EMBED_CCOPTS) $(PERL_EMBED_LDOPTS)
|
|
|
|
|
|
ifneq ($(call try-cc,$(SOURCE_PERL_EMBED),$(FLAGS_PERL_EMBED)),y)
|
|
|
BASIC_CFLAGS += -DNO_LIBPERL
|
|
|
else
|
|
|
- ALL_LDFLAGS += $(PERL_EMBED_LDOPTS)
|
|
|
+ ALL_LDFLAGS += $(PERL_EMBED_LDFLAGS)
|
|
|
+ EXTLIBS += $(PERL_EMBED_LIBADD)
|
|
|
LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o
|
|
|
LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o
|
|
|
endif
|
|
@@ -604,13 +610,16 @@ endif
|
|
|
ifdef NO_LIBPYTHON
|
|
|
BASIC_CFLAGS += -DNO_LIBPYTHON
|
|
|
else
|
|
|
- PYTHON_EMBED_LDOPTS = `python-config --ldflags 2>/dev/null`
|
|
|
+ PYTHON_EMBED_LDOPTS = $(shell python-config --ldflags 2>/dev/null)
|
|
|
+ PYTHON_EMBED_LDFLAGS = $(call strip-libs,$(PYTHON_EMBED_LDOPTS))
|
|
|
+ PYTHON_EMBED_LIBADD = $(call grep-libs,$(PYTHON_EMBED_LDOPTS))
|
|
|
PYTHON_EMBED_CCOPTS = `python-config --cflags 2>/dev/null`
|
|
|
FLAGS_PYTHON_EMBED=$(PYTHON_EMBED_CCOPTS) $(PYTHON_EMBED_LDOPTS)
|
|
|
ifneq ($(call try-cc,$(SOURCE_PYTHON_EMBED),$(FLAGS_PYTHON_EMBED)),y)
|
|
|
BASIC_CFLAGS += -DNO_LIBPYTHON
|
|
|
else
|
|
|
- ALL_LDFLAGS += $(PYTHON_EMBED_LDOPTS)
|
|
|
+ ALL_LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
|
|
|
+ EXTLIBS += $(PYTHON_EMBED_LIBADD)
|
|
|
LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o
|
|
|
LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o
|
|
|
endif
|
|
@@ -919,8 +928,8 @@ $(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
|
|
|
$(ALL_CFLAGS) -c $(filter %.c,$^) -o $@
|
|
|
|
|
|
$(OUTPUT)perf$X: $(OUTPUT)perf.o $(BUILTIN_OBJS) $(PERFLIBS)
|
|
|
- $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(OUTPUT)perf.o \
|
|
|
- $(BUILTIN_OBJS) $(ALL_LDFLAGS) $(LIBS)
|
|
|
+ $(QUIET_LINK)$(CC) $(ALL_CFLAGS) $(ALL_LDFLAGS) $(OUTPUT)perf.o \
|
|
|
+ $(BUILTIN_OBJS) $(LIBS) -o $@
|
|
|
|
|
|
$(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
|
|
|
$(QUIET_CC)$(CC) -o $@ -c $(ALL_CFLAGS) \
|