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

perf build: Add ui objects building

Move the ui 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-re5vuat8uu396n7hyor9b5ve@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
3b939a63 b2e45c32

+10 -10
+1
tools/perf/Build
··· 34 34 35 35 libperf-y += util/ 36 36 libperf-y += arch/ 37 + libperf-y += ui/
-10
tools/perf/Makefile.perf
··· 327 327 LIB_H += util/kvm-stat.h 328 328 LIB_H += util/thread-stack.h 329 329 330 - LIB_OBJS += $(OUTPUT)ui/setup.o 331 - LIB_OBJS += $(OUTPUT)ui/helpline.o 332 - LIB_OBJS += $(OUTPUT)ui/progress.o 333 - LIB_OBJS += $(OUTPUT)ui/util.o 334 - LIB_OBJS += $(OUTPUT)ui/hist.o 335 - LIB_OBJS += $(OUTPUT)ui/stdio/hist.o 336 - 337 330 PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT) 338 331 339 332 # We choose to avoid "if .. else if .. else .. endif endif" ··· 483 490 $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) $< 484 491 $(OUTPUT)%.s: %.S 485 492 $(QUIET_CC)$(CC) -o $@ -E $(CFLAGS) $< 486 - 487 - $(OUTPUT)ui/setup.o: ui/setup.c $(OUTPUT)PERF-CFLAGS 488 - $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DLIBDIR='"$(libdir_SQ)"' $< 489 493 490 494 $(OUTPUT)ui/browser.o: ui/browser.c $(OUTPUT)PERF-CFLAGS 491 495 $(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) -DENABLE_SLFUTURE_CONST $<
+1
tools/perf/config/Makefile
··· 844 844 $(call detected_var,ETC_PERFCONFIG_SQ) 845 845 $(call detected_var,prefix_SQ) 846 846 $(call detected_var,perfexecdir_SQ) 847 + $(call detected_var,LIBDIR)
+8
tools/perf/ui/Build
··· 1 + libperf-y += setup.o 2 + libperf-y += helpline.o 3 + libperf-y += progress.o 4 + libperf-y += util.o 5 + libperf-y += hist.o 6 + libperf-y += stdio/hist.o 7 + 8 + CFLAGS_setup.o += -DLIBDIR="BUILD_STR($(LIBDIR))"