From 5cf96508df42c169d2bd80d8b3d3326f2ece8527 Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Tue, 9 Feb 2021 17:03:55 +0100 Subject: [PATCH] Move parsing_helpers.h into new include directory Adjust makefile construct to use the new include direcory. Signed-off-by: Jesper Dangaard Brouer --- {headers => include}/xdp/parsing_helpers.h | 0 lib/common.mk | 6 +++--- lib/defines.mk | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) rename {headers => include}/xdp/parsing_helpers.h (100%) diff --git a/headers/xdp/parsing_helpers.h b/include/xdp/parsing_helpers.h similarity index 100% rename from headers/xdp/parsing_helpers.h rename to include/xdp/parsing_helpers.h diff --git a/lib/common.mk b/lib/common.mk index b0fa130..2719d98 100644 --- a/lib/common.mk +++ b/lib/common.mk @@ -36,10 +36,10 @@ endif # BPF-prog kern and userspace shares struct via header file: KERN_USER_H ?= $(wildcard common_kern_user.h) -CFLAGS += -I$(HEADER_DIR) -I$(LIB_DIR)/util $(EXTRA_CFLAGS) -BPF_CFLAGS += -I$(HEADER_DIR) $(EXTRA_CFLAGS) +CFLAGS += -I$(INCLUDE_DIR) -I$(HEADER_DIR) -I$(LIB_DIR)/util $(EXTRA_CFLAGS) +BPF_CFLAGS += -I$(INCLUDE_DIR) -I$(HEADER_DIR) $(EXTRA_CFLAGS) -BPF_HEADERS := $(wildcard $(HEADER_DIR)/bpf/*.h) $(wildcard $(HEADER_DIR)/xdp/*.h) +BPF_HEADERS := $(wildcard $(HEADER_DIR)/bpf/*.h) $(wildcard $(INCLUDE_DIR)/xdp/*.h) all: $(USER_TARGETS) $(BPF_OBJ) $(EXTRA_TARGETS) diff --git a/lib/defines.mk b/lib/defines.mk index ffce423..e123a26 100644 --- a/lib/defines.mk +++ b/lib/defines.mk @@ -13,7 +13,10 @@ BPF_DIR_MNT ?=/sys/fs/bpf BPF_OBJECT_DIR ?=$(LIBDIR)/bpf MAX_DISPATCHER_ACTIONS ?=10 +# headers/ dir contains include header files needed to compile BPF programs HEADER_DIR = $(LIB_DIR)/../headers +# include/ dir contains the projects own include header files +INCLUDE_DIR = $(LIB_DIR)/../include TEST_DIR = $(LIB_DIR)/testing LIBBPF_DIR := $(LIB_DIR)/libbpf