Clean up COMMON_DIR paths to remove trailing /

Signed-off-by: Donald Hunter <donald.hunter@gmail.com>
xdp-project · Mar 3, 2023 · 7c8f43e · 7c8f43e
1 parent 0ded568
commit 7c8f43e
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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