mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-01-07 13:43:51 +00:00
perf ui: Make ui its own library
Make the ui code its own library. This is done to avoid compiling code twice, once for the perf tool and once for the perf python module. Signed-off-by: Ian Rogers <irogers@google.com> Reviewed-by: James Clark <james.clark@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: Kees Cook <keescook@chromium.org> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Nick Terrell <terrelln@fb.com> Cc: Gary Guo <gary@garyguo.net> Cc: Alex Gaynor <alex.gaynor@gmail.com> Cc: Boqun Feng <boqun.feng@gmail.com> Cc: Wedson Almeida Filho <wedsonaf@gmail.com> Cc: Ze Gao <zegao2021@gmail.com> Cc: Alice Ryhl <aliceryhl@google.com> Cc: Andrei Vagin <avagin@google.com> Cc: Yicong Yang <yangyicong@hisilicon.com> Cc: Jonathan Cameron <jonathan.cameron@huawei.com> Cc: Guo Ren <guoren@kernel.org> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Leo Yan <leo.yan@linux.dev> Cc: Oliver Upton <oliver.upton@linux.dev> Cc: John Garry <john.g.garry@oracle.com> Cc: Benno Lossin <benno.lossin@proton.me> Cc: Björn Roy Baron <bjorn3_gh@protonmail.com> Cc: Andreas Hindborg <a.hindborg@samsung.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20240625214117.953777-3-irogers@google.com
This commit is contained in:
parent
7f240209ba
commit
39f3ce5cab
@ -55,7 +55,7 @@ CFLAGS_builtin-report.o += -DDOCDIR="BUILD_STR($(srcdir_SQ)/Documentation)"
|
||||
|
||||
perf-y += util/
|
||||
perf-y += arch/
|
||||
perf-y += ui/
|
||||
perf-ui-y += ui/
|
||||
perf-y += scripts/
|
||||
|
||||
gtk-y += ui/gtk/
|
||||
|
@ -425,10 +425,14 @@ endif
|
||||
|
||||
export PERL_PATH
|
||||
|
||||
LIBPERF_UI_IN := $(OUTPUT)perf-ui-in.o
|
||||
LIBPERF_UI := $(OUTPUT)libperf-ui.a
|
||||
|
||||
PERFLIBS = $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL)
|
||||
ifdef LIBBPF_STATIC
|
||||
PERFLIBS += $(LIBBPF)
|
||||
endif
|
||||
PERFLIBS += $(LIBPERF_UI)
|
||||
|
||||
# We choose to avoid "if .. else if .. else .. endif endif"
|
||||
# because maintaining the nesting to match is a pain. If
|
||||
@ -729,6 +733,12 @@ $(PERF_IN): prepare FORCE
|
||||
$(PMU_EVENTS_IN): FORCE prepare
|
||||
$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events
|
||||
|
||||
$(LIBPERF_UI_IN): FORCE prepare
|
||||
$(Q)$(MAKE) $(build)=perf-ui
|
||||
|
||||
$(LIBPERF_UI): $(LIBPERF_UI_IN)
|
||||
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $<
|
||||
|
||||
$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN)
|
||||
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \
|
||||
$(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@
|
||||
|
@ -1,12 +1,12 @@
|
||||
perf-y += setup.o
|
||||
perf-y += helpline.o
|
||||
perf-y += progress.o
|
||||
perf-y += util.o
|
||||
perf-y += hist.o
|
||||
perf-y += stdio/hist.o
|
||||
perf-ui-y += setup.o
|
||||
perf-ui-y += helpline.o
|
||||
perf-ui-y += progress.o
|
||||
perf-ui-y += util.o
|
||||
perf-ui-y += hist.o
|
||||
perf-ui-y += stdio/hist.o
|
||||
|
||||
CFLAGS_setup.o += -DLIBDIR="BUILD_STR($(LIBDIR))"
|
||||
|
||||
perf-$(CONFIG_SLANG) += browser.o
|
||||
perf-$(CONFIG_SLANG) += browsers/
|
||||
perf-$(CONFIG_SLANG) += tui/
|
||||
perf-ui-$(CONFIG_SLANG) += browser.o
|
||||
perf-ui-$(CONFIG_SLANG) += browsers/
|
||||
perf-ui-$(CONFIG_SLANG) += tui/
|
||||
|
@ -1,7 +1,7 @@
|
||||
perf-y += annotate.o
|
||||
perf-y += annotate-data.o
|
||||
perf-y += hists.o
|
||||
perf-y += map.o
|
||||
perf-y += scripts.o
|
||||
perf-y += header.o
|
||||
perf-y += res_sample.o
|
||||
perf-ui-y += annotate.o
|
||||
perf-ui-y += annotate-data.o
|
||||
perf-ui-y += hists.o
|
||||
perf-ui-y += map.o
|
||||
perf-ui-y += scripts.o
|
||||
perf-ui-y += header.o
|
||||
perf-ui-y += res_sample.o
|
||||
|
@ -1,4 +1,4 @@
|
||||
perf-y += setup.o
|
||||
perf-y += util.o
|
||||
perf-y += helpline.o
|
||||
perf-y += progress.o
|
||||
perf-ui-y += setup.o
|
||||
perf-ui-y += util.o
|
||||
perf-ui-y += helpline.o
|
||||
perf-ui-y += progress.o
|
||||
|
Loading…
Reference in New Issue
Block a user