From 7c8f43ebffe4977b57550fa55a64280826b39066 Mon Sep 17 00:00:00 2001 From: Donald Hunter Date: Thu, 22 Dec 2022 15:49:31 +0000 Subject: [PATCH] Clean up COMMON_DIR paths to remove trailing / Signed-off-by: Donald Hunter --- advanced03-AF_XDP/Makefile | 2 +- basic-solutions/Makefile | 2 +- basic01-xdp-pass/Makefile | 2 +- basic02-prog-by-name/Makefile | 2 +- common/common.mk | 2 +- tracing01-xdp-simple/Makefile | 2 +- tracing02-xdp-monitor/Makefile | 2 +- tracing03-xdp-debug-print/Makefile | 2 +- tracing04-xdp-tcpdump/Makefile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/advanced03-AF_XDP/Makefile b/advanced03-AF_XDP/Makefile index 19ae8e42..38a5dec7 100644 --- a/advanced03-AF_XDP/Makefile +++ b/advanced03-AF_XDP/Makefile @@ -4,7 +4,7 @@ XDP_TARGETS := af_xdp_kern USER_TARGETS := af_xdp_user LDLIBS+= -lpthread -COMMON_DIR = ../common/ +COMMON_DIR = ../common include $(COMMON_DIR)/common.mk COMMON_OBJS := $(COMMON_DIR)/common_params.o diff --git a/basic-solutions/Makefile b/basic-solutions/Makefile index 461ead1e..baa52029 100644 --- a/basic-solutions/Makefile +++ b/basic-solutions/Makefile @@ -2,7 +2,7 @@ USER_TARGETS := xdp_stats xdp_loader -COMMON_DIR = ../common/ +COMMON_DIR = ../common # Extend with another COMMON_OBJS COMMON_OBJS += $(COMMON_DIR)/common_user_bpf_xdp.o diff --git a/basic01-xdp-pass/Makefile b/basic01-xdp-pass/Makefile index 82e543f7..53860705 100644 --- a/basic01-xdp-pass/Makefile +++ b/basic01-xdp-pass/Makefile @@ -7,6 +7,6 @@ LLC ?= llc CLANG ?= clang CC := gcc -COMMON_DIR = ../common/ +COMMON_DIR = ../common include $(COMMON_DIR)/common.mk diff --git a/basic02-prog-by-name/Makefile b/basic02-prog-by-name/Makefile index da5b2cba..ac56eadf 100644 --- a/basic02-prog-by-name/Makefile +++ b/basic02-prog-by-name/Makefile @@ -3,7 +3,7 @@ XDP_TARGETS := xdp_prog_kern USER_TARGETS := xdp_loader -COMMON_DIR = ../common/ +COMMON_DIR = ../common include $(COMMON_DIR)/common.mk diff --git a/common/common.mk b/common/common.mk index d53126e8..caedfe6e 100644 --- a/common/common.mk +++ b/common/common.mk @@ -3,7 +3,7 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) # # This file should be included from your Makefile like: -# COMMON_DIR = ../common/ +# COMMON_DIR = ../common # include $(COMMON_DIR)/common.mk # # It is expected that you define the variables: diff --git a/tracing01-xdp-simple/Makefile b/tracing01-xdp-simple/Makefile index cea04496..28595047 100644 --- a/tracing01-xdp-simple/Makefile +++ b/tracing01-xdp-simple/Makefile @@ -4,7 +4,7 @@ XDP_TARGETS := trace_prog_kern xdp_prog_kern USER_TARGETS := trace_load_and_stats -COMMON_DIR = ../common/ +COMMON_DIR = ../common include $(COMMON_DIR)/common.mk diff --git a/tracing02-xdp-monitor/Makefile b/tracing02-xdp-monitor/Makefile index 5707f46a..6d446fbe 100644 --- a/tracing02-xdp-monitor/Makefile +++ b/tracing02-xdp-monitor/Makefile @@ -4,7 +4,7 @@ XDP_TARGETS := trace_prog_kern USER_TARGETS := trace_load_and_stats -COMMON_DIR = ../common/ +COMMON_DIR = ../common # Extend with another COMMON_OBJS COMMON_OBJS += $(COMMON_DIR)/common_user_bpf_xdp.o diff --git a/tracing03-xdp-debug-print/Makefile b/tracing03-xdp-debug-print/Makefile index 33d73702..902f21f2 100644 --- a/tracing03-xdp-debug-print/Makefile +++ b/tracing03-xdp-debug-print/Makefile @@ -9,7 +9,7 @@ LLC ?= llc CLANG ?= clang CC := gcc -COMMON_DIR = ../common/ +COMMON_DIR = ../common include $(COMMON_DIR)/common.mk COMMON_OBJS := $(COMMON_DIR)/common_params.o diff --git a/tracing04-xdp-tcpdump/Makefile b/tracing04-xdp-tcpdump/Makefile index 77495d7f..f4d4a55a 100644 --- a/tracing04-xdp-tcpdump/Makefile +++ b/tracing04-xdp-tcpdump/Makefile @@ -4,7 +4,7 @@ XDP_TARGETS := xdp_sample_pkts_kern USER_TARGETS := xdp_sample_pkts_user LDLIBS+=-lpcap -COMMON_DIR = ../common/ +COMMON_DIR = ../common include $(COMMON_DIR)/common.mk COMMON_OBJS := $(COMMON_DIR)/common_params.o