Commit c7355f84 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: default avatarWill 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 88aeea06

tools/perf/Build

+1 −0
Original line number Diff line number Diff line
@@ -35,5 +35,6 @@ CFLAGS_builtin-timechart.o += $(paths) 
libperf-y += util/

libperf-y += arch/

libperf-y += ui/

libperf-y += scripts/



gtk-y += ui/gtk/

tools/perf/Makefile.perf

+0 −22
Original line number Diff line number Diff line
@@ -349,16 +349,6 @@ install-gtk: $(OUTPUT)libperf-gtk.so 
		$(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)'

endif



ifndef NO_LIBPERL

  LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-perl.o

  LIB_OBJS += $(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o

endif



ifndef NO_LIBPYTHON

  LIB_OBJS += $(OUTPUT)util/scripting-engines/trace-event-python.o

  LIB_OBJS += $(OUTPUT)scripts/python/Perf-Trace-Util/Context.o

endif



ifeq ($(NO_PERF_REGS),0)

  ifeq ($(ARCH),x86)

    LIB_H += arch/x86/include/perf_regs.h
@@ -459,18 +449,6 @@ $(OUTPUT)%.o: %.S 
$(OUTPUT)%.s: %.S

	$(QUIET_CC)$(CC) -o $@ -E $(CFLAGS) $<



$(OUTPUT)util/scripting-engines/trace-event-perl.o: util/scripting-engines/trace-event-perl.c $(OUTPUT)PERF-CFLAGS

	$(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 $<



$(OUTPUT)scripts/perl/Perf-Trace-Util/Context.o: scripts/perl/Perf-Trace-Util/Context.c $(OUTPUT)PERF-CFLAGS

	$(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 $<



$(OUTPUT)util/scripting-engines/trace-event-python.o: util/scripting-engines/trace-event-python.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-shadow $<



$(OUTPUT)scripts/python/Perf-Trace-Util/Context.o: scripts/python/Perf-Trace-Util/Context.c $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $(PYTHON_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs $<



$(OUTPUT)perf-%: %.o $(PERFLIBS)

	$(QUIET_LINK)$(CC) $(CFLAGS) -o $@ $(LDFLAGS) $(filter %.o,$^) $(LIBS)

tools/perf/config/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ else 
  else

    LDFLAGS += $(PERL_EMBED_LDFLAGS)

    EXTLIBS += $(PERL_EMBED_LIBADD)

    $(call detected,CONFIG_LIBPERL)

  endif

endif
@@ -577,6 +578,7 @@ else 
          LDFLAGS += $(PYTHON_EMBED_LDFLAGS)

          EXTLIBS += $(PYTHON_EMBED_LIBADD)

          LANG_BINDINGS += $(obj-perf)python/perf.so

          $(call detected,CONFIG_LIBPYTHON)

        endif

      endif

    endif
@@ -847,3 +849,5 @@ $(call detected_var,prefix_SQ) 
$(call detected_var,perfexecdir_SQ)

$(call detected_var,LIBDIR)

$(call detected_var,GTK_CFLAGS)

$(call detected_var,PERL_EMBED_CCOPTS)

$(call detected_var,PYTHON_EMBED_CCOPTS)

tools/perf/scripts/Build

0 → 100644
+2 −0
Original line number Diff line number Diff line 
libperf-$(CONFIG_LIBPERL)   += perl/Perf-Trace-Util/

libperf-$(CONFIG_LIBPYTHON) += python/Perf-Trace-Util/

tools/perf/scripts/perl/Perf-Trace-Util/Build

0 → 100644
+3 −0
Original line number Diff line number Diff line 
libperf-y += Context.o



CFLAGS_Context.o += $(PERL_EMBED_CCOPTS) -Wno-redundant-decls -Wno-strict-prototypes -Wno-unused-parameter -Wno-nested-externs -Wno-undef -Wno-switch-default

CRA Git | Maintained and supported by SUSTech CRA and CCSE