Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf build: Add scripts objects building

Move the scripts objects building under build framework to be included
in the libperf build object.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: Will Deacon <will.deacon@arm.com>
Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-ry8pd41ahwpq9h46i8te33c7@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
c7355f84 88aeea06

+21 -22
+1
tools/perf/Build
··· 35 35 libperf-y += util/ 36 36 libperf-y += arch/ 37 37 libperf-y += ui/ 38 + libperf-y += scripts/ 38 39 39 40 gtk-y += ui/gtk/
-22
tools/perf/Makefile.perf
··· 349 349 $(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)' 350 350 endif 351 351 352 - ifndef NO_LIBPERL 353 - LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o 354 - LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o 355 - endif 356 - 357 - ifndef NO_LIBPYTHON 358 - LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o 359 - LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o 360 - endif 361 - 362 352 ifeq ($(NO_PERF_REGS),0) 363 353 ifeq ($(ARCH),x86) 364 354 LIB_H += arch/x86/include/perf_regs.h ··· 448 458 $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $< 449 459 $(OUTPUT)%.s: %.S 450 460 $(QUIET_CC)$(CC) -o $@ -E $(CFLAGS) $< 451 - 452 - $(OUTPUT)util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c $(OUTPUT)PERF-CFLAGS 453 - $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow -Wno-undef -Wno-switch-default $< 454 - 455 - $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o: scripts/perl/Perf-Trace-Util/Context.c $(OUTPUT)PERF-CFLAGS 456 - $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-undef -Wno-switch-default $< 457 - 458 - $(OUTPUT)util/scripting-engines/trace-event-python.o: util/scripting-engines/trace-event-python.c $(OUTPUT)PERF-CFLAGS 459 - $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $< 460 - 461 - $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o: scripts/python/Perf-Trace-Util/Context.c $(OUTPUT)PERF-CFLAGS 462 - $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs $< 463 461 464 462 $(OUTPUT)perf-%: %.o $(PERFLIBS) 465 463 $(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(filter %.o,$^) $(LIBS)
+4
tools/perf/config/Makefile
··· 518 518 else 519 519 LDFLAGS += $(PERL_EMBED_LDFLAGS) 520 520 EXTLIBS += $(PERL_EMBED_LIBADD) 521 + $(call detected,CONFIG_LIBPERL) 521 522 endif 522 523 endif 523 524 ··· 578 577 LDFLAGS += $(PYTHON_EMBED_LDFLAGS) 579 578 EXTLIBS += $(PYTHON_EMBED_LIBADD) 580 579 LANG_BINDINGS += $(obj-perf)python/perf.so 580 + $(call detected,CONFIG_LIBPYTHON) 581 581 endif 582 582 endif 583 583 endif ··· 849 847 $(call detected_var,perfexecdir_SQ) 850 848 $(call detected_var,LIBDIR) 851 849 $(call detected_var,GTK_CFLAGS) 850 + $(call detected_var,PERL_EMBED_CCOPTS) 851 + $(call detected_var,PYTHON_EMBED_CCOPTS)
+2
tools/perf/scripts/Build
··· 1 + libperf-$(CONFIG_LIBPERL) += perl/Perf-Trace-Util/ 2 + libperf-$(CONFIG_LIBPYTHON) += python/Perf-Trace-Util/
+3
tools/perf/scripts/perl/Perf-Trace-Util/Build
··· 1 + libperf-y += Context.o 2 + 3 + CFLAGS_Context.o += $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-undef -Wno-switch-default
+3
tools/perf/scripts/python/Perf-Trace-Util/Build
··· 1 + libperf-y += Context.o 2 + 3 + CFLAGS_Context.o += $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs
+2
tools/perf/util/Build
··· 88 88 libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o 89 89 libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o 90 90 91 + libperf-y += scripting-engines/ 92 + 91 93 CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" 92 94 CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))" 93 95
+6
tools/perf/util/scripting-engines/Build
··· 1 + libperf-$(CONFIG_LIBPERL) += trace-event-perl.o 2 + libperf-$(CONFIG_LIBPYTHON) += trace-event-python.o 3 + 4 + CFLAGS_trace-event-perl.o += $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow -Wno-undef -Wno-switch-default 5 + 6 + CFLAGS_trace-event-python.o += $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow