diff options
| author | ngie <ngie@FreeBSD.org> | 2017-05-30 04:11:12 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-05-30 04:11:12 +0000 |
| commit | 96dc1cf1ed7b32083e3c2518b615049a51e28805 (patch) | |
| tree | cc073c28e12eab20ba91fc4b06400c1131b8d67d /sys/modules/crypto/Makefile | |
| parent | 61642a6713ab173381f65410feaddc6c99f97b54 (diff) | |
| download | FreeBSD-src-96dc1cf1ed7b32083e3c2518b615049a51e28805.zip FreeBSD-src-96dc1cf1ed7b32083e3c2518b615049a51e28805.tar.gz | |
MFC r314651,r318439,r318440:
r314651:
sys/modules: normalize .CURDIR-relative paths to SRCTOP
This simplifies make output/logic
Tested with: `cd sys/modules; make ALL_MODULES=` on amd64
r318439:
Normalize .PATH on SRCTOP
This will help Jenkins dedupe 9 warnings between the static build and
the module build of ipsec(4).
Missed in SRCTOP conversion in r314651.
MFC with: r314651
r318440:
Normalize SYSDIR on SRCTOP instead of .CURDIR
This is being done to simplify pathing for CFLAGS and source files.
Diffstat (limited to 'sys/modules/crypto/Makefile')
| -rw-r--r-- | sys/modules/crypto/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 35e533b..a06d7da 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../opencrypto -.PATH: ${.CURDIR}/../../crypto -.PATH: ${.CURDIR}/../../crypto/blowfish -.PATH: ${.CURDIR}/../../crypto/camellia -.PATH: ${.CURDIR}/../../crypto/des -.PATH: ${.CURDIR}/../../crypto/rijndael -.PATH: ${.CURDIR}/../../crypto/sha2 -.PATH: ${.CURDIR}/../../crypto/siphash -.PATH: ${.CURDIR}/../../crypto/skein +.PATH: ${SRCTOP}/sys/opencrypto +.PATH: ${SRCTOP}/sys/crypto +.PATH: ${SRCTOP}/sys/crypto/blowfish +.PATH: ${SRCTOP}/sys/crypto/camellia +.PATH: ${SRCTOP}/sys/crypto/des +.PATH: ${SRCTOP}/sys/crypto/rijndael +.PATH: ${SRCTOP}/sys/crypto/sha2 +.PATH: ${SRCTOP}/sys/crypto/siphash +.PATH: ${SRCTOP}/sys/crypto/skein KMOD = crypto SRCS = crypto.c cryptodev_if.c @@ -20,7 +20,7 @@ SRCS += des_ecb.c des_enc.c des_setkey.c SRCS += sha1.c sha256c.c sha512c.c SRCS += skein.c skein_block.c .if exists(${MACHINE_ARCH}/skein_block_asm.s) -.PATH: ${.CURDIR}/../../crypto/skein/${MACHINE_ARCH} +.PATH: ${SRCTOP}/sys/crypto/skein/${MACHINE_ARCH} SRCS += skein_block_asm.s CFLAGS += -DSKEIN_ASM -DSKEIN_USE_ASM=1792 # list of block functions to replace with assembly: 256+512+1024 = 1792 ACFLAGS += -DELF -Wa,--noexecstack |
