Commit 7bf731dc authored by Quentin Monnet's avatar Quentin Monnet Committed by Andrii Nakryiko
Browse files

bpf: iterators: Install libbpf headers when building 



API headers from libbpf should not be accessed directly from the
library's source directory. Instead, they should be exported with "make
install_headers". Let's make sure that bpf/preload/iterators/Makefile
installs the headers properly when building.

Signed-off-by: default avatarQuentin Monnet <quentin@isovalent.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Link: https://lore.kernel.org/bpf/20211007194438.34443-8-quentin@isovalent.com
parent bf607917

kernel/bpf/preload/iterators/Makefile

+25 −13
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

OUTPUT := .output

abs_out := $(abspath $(OUTPUT))



CLANG ?= clang

LLC ?= llc

LLVM_STRIP ?= llvm-strip



TOOLS_PATH := $(abspath ../../../../tools)

BPFTOOL_SRC := $(TOOLS_PATH)/bpf/bpftool

BPFTOOL_OUTPUT := $(abs_out)/bpftool

DEFAULT_BPFTOOL := $(OUTPUT)/sbin/bpftool

BPFTOOL ?= $(DEFAULT_BPFTOOL)

LIBBPF_SRC := $(abspath ../../../../tools/lib/bpf)

BPFOBJ := $(OUTPUT)/libbpf.a

BPF_INCLUDE := $(OUTPUT)

INCLUDES := -I$(OUTPUT) -I$(BPF_INCLUDE) -I$(abspath ../../../../tools/lib)        \

       -I$(abspath ../../../../tools/include/uapi)



LIBBPF_SRC := $(TOOLS_PATH)/lib/bpf

LIBBPF_OUTPUT := $(abs_out)/libbpf

LIBBPF_DESTDIR := $(LIBBPF_OUTPUT)

LIBBPF_INCLUDE := $(LIBBPF_DESTDIR)/include

BPFOBJ := $(LIBBPF_OUTPUT)/libbpf.a



INCLUDES := -I$(OUTPUT) -I$(LIBBPF_INCLUDE) -I$(TOOLS_PATH)/include/uapi

CFLAGS := -g -Wall



abs_out := $(abspath $(OUTPUT))

ifeq ($(V),1)

Q =

msg =
@@ -44,14 +52,18 @@ $(OUTPUT)/iterators.bpf.o: iterators.bpf.c $(BPFOBJ) | $(OUTPUT) 
		 -c $(filter %.c,$^) -o $@ &&				      \

	$(LLVM_STRIP) -g $@



$(OUTPUT):

$(OUTPUT) $(LIBBPF_OUTPUT) $(BPFTOOL_OUTPUT):

	$(call msg,MKDIR,$@)

	$(Q)mkdir -p $(OUTPUT)

	$(Q)mkdir -p $@



$(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(OUTPUT)

$(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUTPUT)

	$(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC)			       \

		    OUTPUT=$(abspath $(dir $@))/ $(abspath $@)

		    OUTPUT=$(abspath $(dir $@))/ prefix=		       \

		    DESTDIR=$(LIBBPF_DESTDIR) $(abspath $@) install_headers



$(DEFAULT_BPFTOOL):

	$(Q)$(MAKE) $(submake_extras) -C ../../../../tools/bpf/bpftool			      \

		    prefix= OUTPUT=$(abs_out)/ DESTDIR=$(abs_out) install
 
$(DEFAULT_BPFTOOL): $(BPFOBJ) | $(BPFTOOL_OUTPUT)

	$(Q)$(MAKE) $(submake_extras) -C $(BPFTOOL_SRC)			       \

		    OUTPUT=$(BPFTOOL_OUTPUT)/				       \

		    LIBBPF_OUTPUT=$(LIBBPF_OUTPUT)/			       \

		    LIBBPF_DESTDIR=$(LIBBPF_DESTDIR)/			       \

		    prefix= DESTDIR=$(abs_out)/ install