summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-10-07 15:27:08 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-10-07 15:30:30 +0200
commitc32b5f951bd79d18cfd084568fba8f077e9a67f7 (patch)
tree26b4dc564f687774c64397c124c02bb616993f85
parentcrypto: use BIT(i) & bitmap instead of (bitmap >> i) & 1 (diff)
downloadwireguard-monolithic-historical-c32b5f951bd79d18cfd084568fba8f077e9a67f7.tar.xz
wireguard-monolithic-historical-c32b5f951bd79d18cfd084568fba8f077e9a67f7.zip
makefile: do more generic wildcard so as to avoid rename issues
Commit ad5e4210 (global: rename include'd C files to be .c) breaks install target for dkms sources. Fix installing selftest/*.c. Suggested-by: Christian Hesse <mail@eworm.de>
-rw-r--r--src/Makefile2
-rw-r--r--src/tests/qemu/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile
index 8543b99..e1d271e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -52,7 +52,7 @@ install:
@$(MAKE) -C tools install
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
-DKMS_SOURCES := version.h Makefile Kbuild Kconfig dkms.conf $(filter-out version.h wireguard.mod.c,$(wildcard *.c *.h selftest/*.h uapi/*.h)) $(call rwildcard,crypto/,*.c *.h *.S *.include) $(call rwildcard,compat/,*.c *.h *.include)
+DKMS_SOURCES := version.h Makefile Kbuild Kconfig dkms.conf $(filter-out version.h wireguard.mod.c tools/% tests/%,$(call rwildcard,,*.c *.h *.S *.include))
dkms-install: $(DKMS_SOURCES)
@$(foreach f,$(DKMS_SOURCES),install -v -m0644 -D $(f) $(DESTDIR)$(DKMSDIR)/$(f);)
diff --git a/src/tests/qemu/Makefile b/src/tests/qemu/Makefile
index 0c4bca3..e590eed 100644
--- a/src/tests/qemu/Makefile
+++ b/src/tests/qemu/Makefile
@@ -23,7 +23,7 @@ NR_CPUS ?= 4
MIRROR := https://download.wireguard.com/qemu-test/distfiles/
rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
-WIREGUARD_SOURCES := $(wildcard ../../Kbuild ../../Kconfig ../../*.c ../../*.h ../../selftest/*.h ../../uapi/*.h) $(call rwildcard,../../crypto/,*.c *.h *.S *.include) $(call rwildcard,../../compat/,*.c *.h *.include)
+WIREGUARD_SOURCES := ../../Kbuild ../../Kconfig $(filter-out ../../tools/% ../../tests/%,$(call rwildcard,../../,*.c *.h *.S *.include))
TOOLS_SOURCES := $(wildcard ../../tools/*.c ../../tools/*.h ../../uapi/*.h ../../crypto/zinc/curve25519/curve25519-hacl64.h ../../crypto/zinc/curve25519/curve25519-fiat32.h)
default: qemu