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/cxgbe | |
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/cxgbe')
-rw-r--r-- | sys/modules/cxgbe/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/cxgbei/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/if_cc/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/if_ccv/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/if_cxgbe/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/if_cxgbev/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/if_cxl/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/if_cxlv/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/iw_cxgbe/Makefile | 6 | ||||
-rw-r--r-- | sys/modules/cxgbe/t4_firmware/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/t5_firmware/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/t6_firmware/Makefile | 2 | ||||
-rw-r--r-- | sys/modules/cxgbe/tom/Makefile | 2 |
13 files changed, 15 insertions, 15 deletions
diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile index c36ef2a6..434be3b 100644 --- a/sys/modules/cxgbe/Makefile +++ b/sys/modules/cxgbe/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR= if_cxgbe diff --git a/sys/modules/cxgbe/cxgbei/Makefile b/sys/modules/cxgbe/cxgbei/Makefile index 898cc3f..af0db75 100644 --- a/sys/modules/cxgbe/cxgbei/Makefile +++ b/sys/modules/cxgbe/cxgbei/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CXGBE = ${.CURDIR}/../../../dev/cxgbe +CXGBE = ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/cxgbei KMOD= cxgbei diff --git a/sys/modules/cxgbe/if_cc/Makefile b/sys/modules/cxgbe/if_cc/Makefile index f81d174..f7cc10d 100644 --- a/sys/modules/cxgbe/if_cc/Makefile +++ b/sys/modules/cxgbe/if_cc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE} KMOD= if_cc diff --git a/sys/modules/cxgbe/if_ccv/Makefile b/sys/modules/cxgbe/if_ccv/Makefile index 0fcc03c4b..70700fc 100644 --- a/sys/modules/cxgbe/if_ccv/Makefile +++ b/sys/modules/cxgbe/if_ccv/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE} KMOD= if_ccv diff --git a/sys/modules/cxgbe/if_cxgbe/Makefile b/sys/modules/cxgbe/if_cxgbe/Makefile index 342e839..61f9e00 100644 --- a/sys/modules/cxgbe/if_cxgbe/Makefile +++ b/sys/modules/cxgbe/if_cxgbe/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE} ${CXGBE}/common KMOD= if_cxgbe diff --git a/sys/modules/cxgbe/if_cxgbev/Makefile b/sys/modules/cxgbe/if_cxgbev/Makefile index 9c72a7a..4a66572 100644 --- a/sys/modules/cxgbe/if_cxgbev/Makefile +++ b/sys/modules/cxgbe/if_cxgbev/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE} ${CXGBE}/common KMOD= if_cxgbev diff --git a/sys/modules/cxgbe/if_cxl/Makefile b/sys/modules/cxgbe/if_cxl/Makefile index ec4ff1e..f18cec1 100644 --- a/sys/modules/cxgbe/if_cxl/Makefile +++ b/sys/modules/cxgbe/if_cxl/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE} KMOD= if_cxl diff --git a/sys/modules/cxgbe/if_cxlv/Makefile b/sys/modules/cxgbe/if_cxlv/Makefile index 943ea58..ab69c0b 100644 --- a/sys/modules/cxgbe/if_cxlv/Makefile +++ b/sys/modules/cxgbe/if_cxlv/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE} KMOD= if_cxlv diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile index d4c041f..b07fe1b 100644 --- a/sys/modules/cxgbe/iw_cxgbe/Makefile +++ b/sys/modules/cxgbe/iw_cxgbe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe KMOD= iw_cxgbe @@ -23,7 +23,7 @@ SRCS+= qp.c SRCS+= resource.c SRCS+= vnode_if.h -CFLAGS+= -I${CXGBE} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED -CFLAGS+= -I${.CURDIR}/../../../compat/linuxkpi/common/include +CFLAGS+= -I${CXGBE} -I${SRCTOP}/sys/ofed/include -DLINUX_TYPES_DEFINED +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile index 3fecead..7f1ed93 100644 --- a/sys/modules/cxgbe/t4_firmware/Makefile +++ b/sys/modules/cxgbe/t4_firmware/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -T4FW= ${.CURDIR}/../../../dev/cxgbe/firmware +T4FW= ${SRCTOP}/sys/dev/cxgbe/firmware .PATH: ${T4FW} KMOD= t4fw_cfg diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile index 2419a19..ab952ae 100644 --- a/sys/modules/cxgbe/t5_firmware/Makefile +++ b/sys/modules/cxgbe/t5_firmware/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -T5FW= ${.CURDIR}/../../../dev/cxgbe/firmware +T5FW= ${SRCTOP}/sys/dev/cxgbe/firmware .PATH: ${T5FW} KMOD= t5fw_cfg diff --git a/sys/modules/cxgbe/t6_firmware/Makefile b/sys/modules/cxgbe/t6_firmware/Makefile index 9bdde07..75d7772 100644 --- a/sys/modules/cxgbe/t6_firmware/Makefile +++ b/sys/modules/cxgbe/t6_firmware/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -T6FW= ${.CURDIR}/../../../dev/cxgbe/firmware +T6FW= ${SRCTOP}/sys/dev/cxgbe/firmware .PATH: ${T6FW} KMOD= t6fw_cfg diff --git a/sys/modules/cxgbe/tom/Makefile b/sys/modules/cxgbe/tom/Makefile index 5f460e0..96daf2c 100644 --- a/sys/modules/cxgbe/tom/Makefile +++ b/sys/modules/cxgbe/tom/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -CXGBE= ${.CURDIR}/../../../dev/cxgbe +CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/tom KMOD= t4_tom |