summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2016-08-03 01:09:50 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2016-08-03 13:46:36 +0200
commitfdd99220e92e7ca59a38ee6ff6a87ba157000556 (patch)
treecfbfb79926093bf5df432a78f357893a19343d25
parenta77d553a3a0f7d726a9134497b3a3263adf82536 (diff)
Kbuild: move module deps out of tests/
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
-rw-r--r--src/Kbuild17
-rw-r--r--src/tests/moduledeps.mk17
2 files changed, 16 insertions, 18 deletions
diff --git a/src/Kbuild b/src/Kbuild
index bde4036..4c125fa 100644
--- a/src/Kbuild
+++ b/src/Kbuild
@@ -12,7 +12,22 @@ endif
endif
ifneq ($(KBUILD_EXTMOD),)
-include $(M)/tests/moduledeps.mk
+CONFIG_WIREGUARD := m
+ifeq ($(CONFIG_WIREGUARD_PARALLEL),)
+ifneq (,$(filter $(CONFIG_PADATA),y m))
+ccflags-y += -DCONFIG_WIREGUARD_PARALLEL=y
+endif
+endif
+ifneq ($(CONFIG_MODULES),)
+ifeq ($(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT),)
+$(error "WireGuard requires CONFIG_NETFILTER_XT_MATCH_HASHLIMIT to be configured in your kernel. See https://www.wireguard.io/install/#kernel-requirements for more info")
+endif
+ifeq ($(CONFIG_PADATA),)
+ifneq ($(CONFIG_SMP),)
+$(warning "PEFORMANCE WARNING: WireGuard has enormous speed benefits when using CONFIG_PADATA on SMP systems. Please enable CONFIG_PADATA in your kernel configuration. See https://www.wireguard.io/install/#kernel-requirements for more info.")
+endif
+endif
+endif
endif
obj-$(CONFIG_WIREGUARD) := wireguard.o
diff --git a/src/tests/moduledeps.mk b/src/tests/moduledeps.mk
deleted file mode 100644
index 4344d30..0000000
--- a/src/tests/moduledeps.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-CONFIG_WIREGUARD := m
-ifeq ($(CONFIG_WIREGUARD_PARALLEL),)
-ifneq (,$(filter $(CONFIG_PADATA),y m))
-ccflags-y += -DCONFIG_WIREGUARD_PARALLEL=y
-endif
-endif
-
-ifneq ($(CONFIG_MODULES),)
-ifeq ($(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT),)
-$(error "WireGuard requires CONFIG_NETFILTER_XT_MATCH_HASHLIMIT to be configured in your kernel. See https://www.wireguard.io/install/#kernel-requirements for more info")
-endif
-ifeq ($(CONFIG_PADATA),)
-ifneq ($(CONFIG_SMP),)
-$(warning "PEFORMANCE WARNING: WireGuard has enormous speed benefits when using CONFIG_PADATA on SMP systems. Please enable CONFIG_PADATA in your kernel configuration. See https://www.wireguard.io/install/#kernel-requirements for more info.")
-endif
-endif
-endif