diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-07 15:27:08 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-10-07 15:30:30 +0200 |
| commit | 15083f5e837b6ee0b67b6370ca37a6dceda0a810 (patch) | |
| tree | e8be659cfd1f3eb5103113c4734702df9f7c5ebc /src | |
| parent | 214cc189aad68868c0ac390dc12981747bbbb858 (diff) | |
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>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 2 | ||||
| -rw-r--r-- | src/tests/qemu/Makefile | 2 |
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 |