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

tools lib perf: Add dependency test to install_headers

Compute the headers to be installed from their source headers and make
each have its own build target to install it. Using dependencies
avoids headers being reinstalled and getting a new timestamp which
then causes files that depend on the header to be rebuilt.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Josh Poimboeuf <jpoimboe@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Masahiro Yamada <masahiroy@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Nicolas Schier <nicolas@fjasle.eu>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Rix <trix@redhat.com>
Cc: bpf@vger.kernel.org
Cc: llvm@lists.linux.dev
Link: https://lore.kernel.org/r/20221202045743.2639466-3-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Ian Rogers and committed by
Arnaldo Carvalho de Melo
47e02b94 1849f9f0

+22 -21
+22 -21
tools/lib/perf/Makefile
··· 176 176 endef 177 177 178 178 define do_install 179 - if [ ! -d '$(DESTDIR_SQ)$2' ]; then \ 180 - $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$2'; \ 181 - fi; \ 182 - $(INSTALL) $1 $(if $3,-m $3,) '$(DESTDIR_SQ)$2' 179 + if [ ! -d '$2' ]; then \ 180 + $(INSTALL) -d -m 755 '$2'; \ 181 + fi; \ 182 + $(INSTALL) $1 $(if $3,-m $3,) '$2' 183 183 endef 184 184 185 185 install_lib: libs ··· 187 187 $(call do_install_mkdir,$(libdir_SQ)); \ 188 188 cp -fpR $(LIBPERF_ALL) $(DESTDIR)$(libdir_SQ) 189 189 190 - install_headers: 191 - $(call QUIET_INSTALL, libperf_headers) \ 192 - $(call do_install,include/perf/bpf_perf.h,$(prefix)/include/perf,644); \ 193 - $(call do_install,include/perf/core.h,$(prefix)/include/perf,644); \ 194 - $(call do_install,include/perf/cpumap.h,$(prefix)/include/perf,644); \ 195 - $(call do_install,include/perf/threadmap.h,$(prefix)/include/perf,644); \ 196 - $(call do_install,include/perf/evlist.h,$(prefix)/include/perf,644); \ 197 - $(call do_install,include/perf/evsel.h,$(prefix)/include/perf,644); \ 198 - $(call do_install,include/perf/event.h,$(prefix)/include/perf,644); \ 199 - $(call do_install,include/perf/mmap.h,$(prefix)/include/perf,644); \ 200 - $(call do_install,include/internal/cpumap.h,$(prefix)/include/internal,644); \ 201 - $(call do_install,include/internal/evlist.h,$(prefix)/include/internal,644); \ 202 - $(call do_install,include/internal/evsel.h,$(prefix)/include/internal,644); \ 203 - $(call do_install,include/internal/lib.h,$(prefix)/include/internal,644); \ 204 - $(call do_install,include/internal/mmap.h,$(prefix)/include/internal,644); \ 205 - $(call do_install,include/internal/threadmap.h,$(prefix)/include/internal,644); \ 206 - $(call do_install,include/internal/xyarray.h,$(prefix)/include/internal,644); 190 + HDRS := bpf_perf.h core.h cpumap.h threadmap.h evlist.h evsel.h event.h mmap.h 191 + INTERNAL_HDRS := cpumap.h evlist.h evsel.h lib.h mmap.h threadmap.h xyarray.h 192 + 193 + INSTALL_HDRS_PFX := $(DESTDIR)$(prefix)/include/perf 194 + INSTALL_HDRS := $(addprefix $(INSTALL_HDRS_PFX)/, $(HDRS)) 195 + INSTALL_INTERNAL_HDRS_PFX := $(DESTDIR)$(prefix)/include/internal 196 + INSTALL_INTERNAL_HDRS := $(addprefix $(INSTALL_INTERNAL_HDRS_PFX)/, $(INTERNAL_HDRS)) 197 + 198 + $(INSTALL_HDRS): $(INSTALL_HDRS_PFX)/%.h: include/perf/%.h 199 + $(call QUIET_INSTALL, $@) \ 200 + $(call do_install,$<,$(INSTALL_HDRS_PFX)/,644) 201 + 202 + $(INSTALL_INTERNAL_HDRS): $(INSTALL_INTERNAL_HDRS_PFX)/%.h: include/internal/%.h 203 + $(call QUIET_INSTALL, $@) \ 204 + $(call do_install,$<,$(INSTALL_INTERNAL_HDRS_PFX)/,644) 205 + 206 + install_headers: $(INSTALL_HDRS) $(INSTALL_INTERNAL_HDRS) 207 + $(call QUIET_INSTALL, libperf_headers) 207 208 208 209 install_pkgconfig: $(LIBPERF_PC) 209 210 $(call QUIET_INSTALL, $(LIBPERF_PC)) \