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/netgraph | |
| 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/netgraph')
20 files changed, 40 insertions, 40 deletions
diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index c9b5748a..ac674d1 100644 --- a/sys/modules/netgraph/Makefile +++ b/sys/modules/netgraph/Makefile @@ -1,7 +1,7 @@ # $Whistle: Makefile,v 1.5 1999/01/24 06:48:37 archie Exp $ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR= async \ diff --git a/sys/modules/netgraph/Makefile.inc b/sys/modules/netgraph/Makefile.inc index 3d2fd19..0a25d0f 100644 --- a/sys/modules/netgraph/Makefile.inc +++ b/sys/modules/netgraph/Makefile.inc @@ -1,7 +1,7 @@ # $FreeBSD$ # $Whistle: Makefile.inc,v 1.4 1999/01/19 23:46:16 archie Exp $ -.PATH: ${.CURDIR}/../../../netgraph +.PATH: ${SRCTOP}/sys/netgraph SRCS+= opt_netgraph.h diff --git a/sys/modules/netgraph/atm/atm/Makefile b/sys/modules/netgraph/atm/atm/Makefile index ebd94e1..2cd6d9d 100644 --- a/sys/modules/netgraph/atm/atm/Makefile +++ b/sys/modules/netgraph/atm/atm/Makefile @@ -2,7 +2,7 @@ # # Author: Harti Brandt <harti@freebsd.org> # -.PATH: ${.CURDIR}/../../../../netgraph/atm +.PATH: ${SRCTOP}/sys/netgraph/atm KMOD= ng_atm SRCS= ng_atm.c diff --git a/sys/modules/netgraph/atm/atmbase/Makefile b/sys/modules/netgraph/atm/atmbase/Makefile index 1ad4bb6..f495cdb 100644 --- a/sys/modules/netgraph/atm/atmbase/Makefile +++ b/sys/modules/netgraph/atm/atmbase/Makefile @@ -3,9 +3,9 @@ # Author: Harti Brandt <harti@freebsd.org> # -LIBBASE= ${.CURDIR}/../../../../contrib/ngatm +LIBBASE= ${SRCTOP}/sys/contrib/ngatm -.PATH: ${.CURDIR}/../../../../netgraph/atm +.PATH: ${SRCTOP}/sys/netgraph/atm .PATH: ${LIBBASE}/netnatm/misc .PATH: ${LIBBASE}/netnatm/msg diff --git a/sys/modules/netgraph/atm/ccatm/Makefile b/sys/modules/netgraph/atm/ccatm/Makefile index 8bf741d..3cf9070 100644 --- a/sys/modules/netgraph/atm/ccatm/Makefile +++ b/sys/modules/netgraph/atm/ccatm/Makefile @@ -3,9 +3,9 @@ # Author: Harti Brandt <harti@freebsd.org> # -LIBBASE= ${.CURDIR}/../../../../contrib/ngatm +LIBBASE= ${SRCTOP}/sys/contrib/ngatm -.PATH: ${.CURDIR}/../../../../netgraph/atm/ccatm +.PATH: ${SRCTOP}/sys/netgraph/atm/ccatm .PATH: ${LIBBASE}/netnatm/api KMOD= ng_ccatm diff --git a/sys/modules/netgraph/atm/sscfu/Makefile b/sys/modules/netgraph/atm/sscfu/Makefile index 278159f..3d747c7 100644 --- a/sys/modules/netgraph/atm/sscfu/Makefile +++ b/sys/modules/netgraph/atm/sscfu/Makefile @@ -3,9 +3,9 @@ # Author: Harti Brandt <harti@freebsd.org> # -LIBBASE= ${.CURDIR}/../../../../contrib/ngatm +LIBBASE= ${SRCTOP}/sys/contrib/ngatm -.PATH: ${.CURDIR}/../../../../netgraph/atm/sscfu ${LIBBASE}/netnatm/saal +.PATH: ${SRCTOP}/sys/netgraph/atm/sscfu ${LIBBASE}/netnatm/saal KMOD= ng_sscfu SRCS= ng_sscfu.c saal_sscfu.c diff --git a/sys/modules/netgraph/atm/sscop/Makefile b/sys/modules/netgraph/atm/sscop/Makefile index b9334dd..3270f13 100644 --- a/sys/modules/netgraph/atm/sscop/Makefile +++ b/sys/modules/netgraph/atm/sscop/Makefile @@ -2,9 +2,9 @@ # # Author: Harti Brandt <harti@freebsd.org> -LIBBASE= ${.CURDIR}/../../../../contrib/ngatm +LIBBASE= ${SRCTOP}/sys/contrib/ngatm -.PATH: ${.CURDIR}/../../../../netgraph/atm/sscop ${LIBBASE}/netnatm/saal +.PATH: ${SRCTOP}/sys/netgraph/atm/sscop ${LIBBASE}/netnatm/saal KMOD= ng_sscop SRCS= ng_sscop.c saal_sscop.c diff --git a/sys/modules/netgraph/atm/uni/Makefile b/sys/modules/netgraph/atm/uni/Makefile index 57c20b0..a260fca 100644 --- a/sys/modules/netgraph/atm/uni/Makefile +++ b/sys/modules/netgraph/atm/uni/Makefile @@ -3,9 +3,9 @@ # Author: Harti Brandt <harti@freebsd.org> # -LIBBASE= ${.CURDIR}/../../../../contrib/ngatm +LIBBASE= ${SRCTOP}/sys/contrib/ngatm -.PATH: ${.CURDIR}/../../../../netgraph/atm/uni +.PATH: ${SRCTOP}/sys/netgraph/atm/uni .PATH: ${LIBBASE}/netnatm/sig KMOD= ng_uni diff --git a/sys/modules/netgraph/bluetooth/bluetooth/Makefile b/sys/modules/netgraph/bluetooth/bluetooth/Makefile index 35c3ead..2e25d8e 100644 --- a/sys/modules/netgraph/bluetooth/bluetooth/Makefile +++ b/sys/modules/netgraph/bluetooth/bluetooth/Makefile @@ -1,9 +1,9 @@ # $Id: Makefile,v 1.1 2002/11/24 20:39:57 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/common +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/common -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include KMOD= ng_bluetooth SRCS= ng_bluetooth.c diff --git a/sys/modules/netgraph/bluetooth/bt3c/Makefile b/sys/modules/netgraph/bluetooth/bt3c/Makefile index 36514b1..47c4f7a 100644 --- a/sys/modules/netgraph/bluetooth/bt3c/Makefile +++ b/sys/modules/netgraph/bluetooth/bt3c/Makefile @@ -1,10 +1,10 @@ # $Id: Makefile,v 1.2 2002/11/24 20:50:56 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/drivers/bt3c -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ - -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/bt3c +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include \ + -I${SRCTOP}/sys/netgraph/bluetooth/drivers/bt3c KMOD= ng_bt3c SRCS= ng_bt3c_pccard.c bus_if.h card_if.h device_if.h pccarddevs.h diff --git a/sys/modules/netgraph/bluetooth/h4/Makefile b/sys/modules/netgraph/bluetooth/h4/Makefile index f8dfc96..808f44c 100644 --- a/sys/modules/netgraph/bluetooth/h4/Makefile +++ b/sys/modules/netgraph/bluetooth/h4/Makefile @@ -1,10 +1,10 @@ # $Id: Makefile,v 1.1 2002/11/24 20:40:04 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4 +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/drivers/h4 -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ - -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/h4 +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include \ + -I${SRCTOP}/sys/netgraph/bluetooth/drivers/h4 KMOD= ng_h4 SRCS= ng_h4.c diff --git a/sys/modules/netgraph/bluetooth/hci/Makefile b/sys/modules/netgraph/bluetooth/hci/Makefile index 729ea7b..1e970c9 100644 --- a/sys/modules/netgraph/bluetooth/hci/Makefile +++ b/sys/modules/netgraph/bluetooth/hci/Makefile @@ -1,10 +1,10 @@ # $Id: Makefile,v 1.1 2002/11/24 20:40:05 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/hci +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/hci -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ - -I${.CURDIR}/../../../../netgraph/bluetooth/hci +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include \ + -I${SRCTOP}/sys/netgraph/bluetooth/hci KMOD= ng_hci SRCS= ng_hci_main.c ng_hci_cmds.c ng_hci_evnt.c \ diff --git a/sys/modules/netgraph/bluetooth/l2cap/Makefile b/sys/modules/netgraph/bluetooth/l2cap/Makefile index 5b66e09..03ee080 100644 --- a/sys/modules/netgraph/bluetooth/l2cap/Makefile +++ b/sys/modules/netgraph/bluetooth/l2cap/Makefile @@ -1,10 +1,10 @@ # $Id: Makefile,v 1.1 2002/11/24 20:40:11 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/l2cap +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/l2cap -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ - -I${.CURDIR}/../../../../netgraph/bluetooth/l2cap +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include \ + -I${SRCTOP}/sys/netgraph/bluetooth/l2cap KMOD= ng_l2cap SRCS= ng_l2cap_main.c ng_l2cap_cmds.c ng_l2cap_evnt.c \ diff --git a/sys/modules/netgraph/bluetooth/socket/Makefile b/sys/modules/netgraph/bluetooth/socket/Makefile index 38e90f5..36bc4e9 100644 --- a/sys/modules/netgraph/bluetooth/socket/Makefile +++ b/sys/modules/netgraph/bluetooth/socket/Makefile @@ -1,9 +1,9 @@ # $Id: Makefile,v 1.2 2003/01/12 23:37:31 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/socket +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/socket -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include KMOD= ng_btsocket SRCS= ng_btsocket.c \ diff --git a/sys/modules/netgraph/bluetooth/ubt/Makefile b/sys/modules/netgraph/bluetooth/ubt/Makefile index b9ff0c1..b41fc36 100644 --- a/sys/modules/netgraph/bluetooth/ubt/Makefile +++ b/sys/modules/netgraph/bluetooth/ubt/Makefile @@ -1,10 +1,10 @@ # $Id: Makefile,v 1.2 2003/03/22 23:44:34 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/drivers/ubt -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ - -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubt +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include \ + -I${SRCTOP}/sys/netgraph/bluetooth/drivers/ubt KMOD= ng_ubt SRCS= ng_ubt.c opt_bus.h opt_usb.h device_if.h bus_if.h \ diff --git a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile index 4c5c813..19a00ba 100644 --- a/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile +++ b/sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile @@ -1,10 +1,10 @@ # $Id: Makefile,v 1.1 2003/04/27 00:22:12 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw +.PATH: ${SRCTOP}/sys/netgraph/bluetooth/drivers/ubtbcmfw -CFLAGS+= -I${.CURDIR}/../../../../netgraph/bluetooth/include \ - -I${.CURDIR}/../../../../netgraph/bluetooth/drivers/ubtbcmfw +CFLAGS+= -I${SRCTOP}/sys/netgraph/bluetooth/include \ + -I${SRCTOP}/sys/netgraph/bluetooth/drivers/ubtbcmfw KMOD= ubtbcmfw SRCS= ubtbcmfw.c opt_bus.h opt_usb.h device_if.h bus_if.h \ diff --git a/sys/modules/netgraph/bpf/Makefile b/sys/modules/netgraph/bpf/Makefile index adef38f..3fcc4ac 100644 --- a/sys/modules/netgraph/bpf/Makefile +++ b/sys/modules/netgraph/bpf/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.1 1999/12/03 01:44:28 archie Exp $ -.PATH: ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/net KMOD= ng_bpf SRCS= opt_bpf.h ng_bpf.c bpf_filter.c diff --git a/sys/modules/netgraph/mppc/Makefile b/sys/modules/netgraph/mppc/Makefile index 1ab69e6..0cd02f7 100644 --- a/sys/modules/netgraph/mppc/Makefile +++ b/sys/modules/netgraph/mppc/Makefile @@ -8,12 +8,12 @@ NETGRAPH_MPPC_COMPRESSION?= 1 NETGRAPH_MPPC_ENCRYPTION?= 1 .if ${NETGRAPH_MPPC_COMPRESSION} > 0 -.PATH: ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/net SRCS+= mppcc.c mppcd.c .endif .if ${NETGRAPH_MPPC_ENCRYPTION} > 0 -.PATH: ${.CURDIR}/../../../crypto +.PATH: ${SRCTOP}/sys/crypto SRCS+= sha1.c .endif diff --git a/sys/modules/netgraph/netflow/Makefile b/sys/modules/netgraph/netflow/Makefile index 10345c1..365c99b 100644 --- a/sys/modules/netgraph/netflow/Makefile +++ b/sys/modules/netgraph/netflow/Makefile @@ -3,7 +3,7 @@ # Author: Gleb Smirnoff <glebius@freebsd.org> # -.PATH: ${.CURDIR}/../../../netgraph/netflow +.PATH: ${SRCTOP}/sys/netgraph/netflow KMOD= ng_netflow SRCS= ng_netflow.c netflow.c netflow_v9.c opt_inet6.h opt_route.h diff --git a/sys/modules/netgraph/vjc/Makefile b/sys/modules/netgraph/vjc/Makefile index 4921ac9..4e4d361 100644 --- a/sys/modules/netgraph/vjc/Makefile +++ b/sys/modules/netgraph/vjc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # $Whistle: Makefile,v 1.1 1999/01/24 06:48:07 archie Exp $ -.PATH: ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/net KMOD= ng_vjc SRCS= ng_vjc.c slcompress.c |
