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/cxgb | |
| 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/cxgb')
| -rw-r--r-- | sys/modules/cxgb/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/cxgb/cxgb/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/cxgb/cxgb_t3fw/Makefile | 2 | ||||
| -rw-r--r-- | sys/modules/cxgb/iw_cxgb/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/cxgb/tom/Makefile | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile index 8a6bb33..f286b79 100644 --- a/sys/modules/cxgb/Makefile +++ b/sys/modules/cxgb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR= cxgb diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile index 911f2bb..a67cfda 100644 --- a/sys/modules/cxgb/cxgb/Makefile +++ b/sys/modules/cxgb/cxgb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CXGB = ${.CURDIR}/../../../dev/cxgb +CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys KMOD= if_cxgb diff --git a/sys/modules/cxgb/cxgb_t3fw/Makefile b/sys/modules/cxgb/cxgb_t3fw/Makefile index 0d2f363..46fd3fe 100644 --- a/sys/modules/cxgb/cxgb_t3fw/Makefile +++ b/sys/modules/cxgb/cxgb_t3fw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CXGB = ${.CURDIR}/../../../dev/cxgb +CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB} KMOD= cxgb_t3fw diff --git a/sys/modules/cxgb/iw_cxgb/Makefile b/sys/modules/cxgb/iw_cxgb/Makefile index 57a7c60..fc95ec4 100644 --- a/sys/modules/cxgb/iw_cxgb/Makefile +++ b/sys/modules/cxgb/iw_cxgb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CXGB = ${.CURDIR}/../../../dev/cxgb +CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB}/ulp/iw_cxgb KMOD= iw_cxgb @@ -9,7 +9,7 @@ SRCS+= iw_cxgb_provider.c iw_cxgb_qp.c iw_cxgb_resource.c SRCS+= iw_cxgb_ev.c iw_cxgb_mem.c iw_cxgb_dbg.c iw_cxgb_cq.c SRCS+= bus_if.h device_if.h opt_sched.h pci_if.h pcib_if.h opt_ktr.h SRCS+= opt_inet.h opt_ofed.h vnode_if.h -CFLAGS+= -I${CXGB} -I${.CURDIR}/../../../ofed/include -DLINUX_TYPES_DEFINED -CFLAGS+= -I${.CURDIR}/../../../compat/linuxkpi/common/include +CFLAGS+= -I${CXGB} -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/cxgb/tom/Makefile b/sys/modules/cxgb/tom/Makefile index 0316cce..fdf12e7 100644 --- a/sys/modules/cxgb/tom/Makefile +++ b/sys/modules/cxgb/tom/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -CXGB = ${.CURDIR}/../../../dev/cxgb +CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB}/ulp/tom KMOD= t3_tom |
