libbpf: Refactor header installation portions of Makefile

As we gradually get more headers that have to be installed, it's quite
annoying to copy/paste long $(call) commands. So extract that logic and do
a simple $(foreach) over the list of headers.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20210603004026.2698513-3-andrii@kernel.org

diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile
index 15420303cf06e89e6b34f75bebe2a2642417eaeb..d1b909e005dc6caeeed222a8bc61fa699443152f 100644 (file)
--- a/tools/lib/bpf/Makefile
+++ b/tools/lib/bpf/Makefile
@@ -223,19 +223,14 @@ install_lib: all_cmd
                $(call do_install_mkdir,$(libdir_SQ)); \
                cp -fpR $(LIB_FILE) $(DESTDIR)$(libdir_SQ)
 
+INSTALL_HEADERS = bpf.h libbpf.h btf.h libbpf_common.h libbpf_legacy.h xsk.h \
+                 bpf_helpers.h $(BPF_HELPER_DEFS) bpf_tracing.h             \
+                 bpf_endian.h bpf_core_read.h
+
 install_headers: $(BPF_HELPER_DEFS)
-       $(call QUIET_INSTALL, headers) \
-               $(call do_install,bpf.h,$(prefix)/include/bpf,644); \
-               $(call do_install,libbpf.h,$(prefix)/include/bpf,644); \
-               $(call do_install,btf.h,$(prefix)/include/bpf,644); \
-               $(call do_install,libbpf_common.h,$(prefix)/include/bpf,644); \
-               $(call do_install,libbpf_legacy.h,$(prefix)/include/bpf,644); \
-               $(call do_install,xsk.h,$(prefix)/include/bpf,644); \
-               $(call do_install,bpf_helpers.h,$(prefix)/include/bpf,644); \
-               $(call do_install,$(BPF_HELPER_DEFS),$(prefix)/include/bpf,644); \
-               $(call do_install,bpf_tracing.h,$(prefix)/include/bpf,644); \
-               $(call do_install,bpf_endian.h,$(prefix)/include/bpf,644); \
-               $(call do_install,bpf_core_read.h,$(prefix)/include/bpf,644);
+       $(call QUIET_INSTALL, headers)                                       \
+               $(foreach hdr,$(INSTALL_HEADERS),                            \
+                       $(call do_install,$(hdr),$(prefix)/include/bpf,644);)
 
 install_pkgconfig: $(PC_FILE)
        $(call QUIET_INSTALL, $(PC_FILE)) \