diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2017-03-04 10:10:17 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2017-03-04 10:10:17 +0000 |
| commit | 193d9e768ba63fcfb187cfd17f461f7d41345048 (patch) | |
| tree | 0bd611a14f41427d2dd6120d82a36544617899be /sys | |
| parent | abe427af75e9478f8ab875b40333d594d1fb46ac (diff) | |
| download | src-193d9e768ba63fcfb187cfd17f461f7d41345048.tar.gz src-193d9e768ba63fcfb187cfd17f461f7d41345048.zip | |
Notes
Diffstat (limited to 'sys')
791 files changed, 1010 insertions, 1017 deletions
diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile index 67f183150641..05f57cb2a6b9 100644 --- a/sys/modules/3dfx/Makefile +++ b/sys/modules/3dfx/Makefile @@ -1,11 +1,10 @@ # $FreeBSD$ -.PATH: $(.CURDIR)/../../dev/tdfx +.PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx SRCS= bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\ tdfx_vars.h tdfx_pci.c -INCSRC= ../../sys # Uncomment this for debugging messages #CFLAGS+= -DDEBUG diff --git a/sys/modules/3dfx_linux/Makefile b/sys/modules/3dfx_linux/Makefile index 8376037c954b..609f5b3cf3ca 100644 --- a/sys/modules/3dfx_linux/Makefile +++ b/sys/modules/3dfx_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/tdfx +.PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx_linux SRCS= tdfx_linux.c diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 46c244a02b42..085e7f35f81f 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR_PARALLEL= @@ -423,7 +423,7 @@ SUBDIR+= opensolaris .endif .if ${MK_CRYPT} != "no" || defined(ALL_MODULES) -.if exists(${.CURDIR}/../opencrypto) +.if exists(${SRCTOP}/sys/opencrypto) _crypto= crypto _cryptodev= cryptodev _random_fortuna=random_fortuna diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile index 5b6525f7deac..1a5b433688ee 100644 --- a/sys/modules/aac/Makefile +++ b/sys/modules/aac/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aac +.PATH: ${SRCTOP}/sys/dev/aac .if ${MACHINE_CPUARCH} == "i386" SUBDIR= aac_linux diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile index 4247a2280878..88861bf85b32 100644 --- a/sys/modules/aac/aac_linux/Makefile +++ b/sys/modules/aac/aac_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/aac +.PATH: ${SRCTOP}/sys/dev/aac KMOD= aac_linux SRCS= aac_linux.c diff --git a/sys/modules/aacraid/Makefile b/sys/modules/aacraid/Makefile index d0da1c2a77d1..8852d477b739 100644 --- a/sys/modules/aacraid/Makefile +++ b/sys/modules/aacraid/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aacraid +.PATH: ${SRCTOP}/sys/dev/aacraid .if ${MACHINE_CPUARCH} == "i386" SUBDIR= aacraid_linux diff --git a/sys/modules/aacraid/aacraid_linux/Makefile b/sys/modules/aacraid/aacraid_linux/Makefile index 7a8b416f47d3..426f9d8a4f77 100644 --- a/sys/modules/aacraid/aacraid_linux/Makefile +++ b/sys/modules/aacraid/aacraid_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/aacraid +.PATH: ${SRCTOP}/sys/dev/aacraid KMOD= aacraid_linux SRCS= aacraid_linux.c diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_data/Makefile index 6c5216c07a65..3cd8139fc79f 100644 --- a/sys/modules/accf_data/Makefile +++ b/sys/modules/accf_data/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= accf_data SRCS= accf_data.c diff --git a/sys/modules/accf_dns/Makefile b/sys/modules/accf_dns/Makefile index 49012e20f7bb..ba655024951a 100644 --- a/sys/modules/accf_dns/Makefile +++ b/sys/modules/accf_dns/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= accf_dns SRCS= accf_dns.c diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_http/Makefile index b942d3e7639e..6444703ce90f 100644 --- a/sys/modules/accf_http/Makefile +++ b/sys/modules/accf_http/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= accf_http SRCS= accf_http.c diff --git a/sys/modules/acl_nfs4/Makefile b/sys/modules/acl_nfs4/Makefile index baff941eb589..2a6dee6312b6 100644 --- a/sys/modules/acl_nfs4/Makefile +++ b/sys/modules/acl_nfs4/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= acl_nfs4 SRCS= vnode_if.h subr_acl_nfs4.c diff --git a/sys/modules/acl_posix1e/Makefile b/sys/modules/acl_posix1e/Makefile index cb0c6e9eb8d4..70d1b9d870b1 100644 --- a/sys/modules/acl_posix1e/Makefile +++ b/sys/modules/acl_posix1e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= acl_posix1e SRCS= vnode_if.h subr_acl_posix1e.c diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile index 83672d730780..3d5ec770799d 100644 --- a/sys/modules/acpi/acpi_asus/Makefile +++ b/sys/modules/acpi/acpi_asus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus SRCS= acpi_asus.c opt_acpi.h acpi_if.h bus_if.h device_if.h diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile index a5ff32a22efb..d9fa647633bd 100644 --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus_wmi -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_asus_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_dock/Makefile b/sys/modules/acpi/acpi_dock/Makefile index efbb9730a764..7bda6b98c376 100644 --- a/sys/modules/acpi/acpi_dock/Makefile +++ b/sys/modules/acpi/acpi_dock/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpica +.PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_dock SRCS= acpi_dock.c opt_acpi.h device_if.h bus_if.h acpi_if.h SRCS+= opt_ddb.h diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile index b77a2255423e..9c21c4b6118c 100644 --- a/sys/modules/acpi/acpi_fujitsu/Makefile +++ b/sys/modules/acpi/acpi_fujitsu/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_fujitsu -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_fujitsu.c opt_acpi.h acpi_if.h device_if.h bus_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_hp/Makefile b/sys/modules/acpi/acpi_hp/Makefile index 306bebeaad37..e927b9278fe8 100644 --- a/sys/modules/acpi/acpi_hp/Makefile +++ b/sys/modules/acpi/acpi_hp/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_hp -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_hp.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile index caf0c2b06c5e..d6530241adbe 100644 --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_ibm SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h SRCS+= opt_ddb.h diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile index 36f8d77d7511..e13a43cf7eaa 100644 --- a/sys/modules/acpi/acpi_panasonic/Makefile +++ b/sys/modules/acpi/acpi_panasonic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_panasonic SRCS= acpi_panasonic.c opt_acpi.h acpi_if.h bus_if.h device_if.h diff --git a/sys/modules/acpi/acpi_rapidstart/Makefile b/sys/modules/acpi/acpi_rapidstart/Makefile index 161962573bfe..30e373b9b533 100644 --- a/sys/modules/acpi/acpi_rapidstart/Makefile +++ b/sys/modules/acpi/acpi_rapidstart/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_rapidstart SRCS= acpi_rapidstart.c opt_acpi.h device_if.h bus_if.h acpi_if.h diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile index 027afefb19c2..94bd85d05978 100644 --- a/sys/modules/acpi/acpi_sony/Makefile +++ b/sys/modules/acpi/acpi_sony/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_sony SRCS= acpi_sony.c opt_acpi.h device_if.h bus_if.h acpi_if.h diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile index 12070152e319..7d6576753b37 100644 --- a/sys/modules/acpi/acpi_toshiba/Makefile +++ b/sys/modules/acpi/acpi_toshiba/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_toshiba SRCS= acpi_toshiba.c opt_acpi.h acpi_if.h bus_if.h device_if.h diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile index 67d3f0860832..803598144a9a 100644 --- a/sys/modules/acpi/acpi_video/Makefile +++ b/sys/modules/acpi/acpi_video/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpica +.PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_video SRCS= acpi_video.c diff --git a/sys/modules/acpi/acpi_wmi/Makefile b/sys/modules/acpi/acpi_wmi/Makefile index bdeefe31676a..0c03ffb789b9 100644 --- a/sys/modules/acpi/acpi_wmi/Makefile +++ b/sys/modules/acpi/acpi_wmi/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_wmi -CFLAGS+=-I${.CURDIR}/../../../dev/acpi_support +CFLAGS+=-I${SRCTOP}/sys/dev/acpi_support SRCS= acpi_wmi.c opt_acpi.h acpi_if.h acpi_wmi_if.h device_if.h bus_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/acpi/aibs/Makefile b/sys/modules/acpi/aibs/Makefile index 5894fa8078fd..dec7f39f4358 100644 --- a/sys/modules/acpi/aibs/Makefile +++ b/sys/modules/acpi/aibs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/acpi_support +.PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= aibs SRCS= atk0110.c diff --git a/sys/modules/ae/Makefile b/sys/modules/ae/Makefile index 4cd97a118837..38ee90e2858f 100644 --- a/sys/modules/ae/Makefile +++ b/sys/modules/ae/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ae +.PATH: ${SRCTOP}/sys/dev/ae KMOD= if_ae SRCS= if_ae.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile index 97cbc5dcffa9..82f6d1178ff8 100644 --- a/sys/modules/aesni/Makefile +++ b/sys/modules/aesni/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/aesni +.PATH: ${SRCTOP}/sys/crypto/aesni KMOD= aesni SRCS= aesni.c diff --git a/sys/modules/age/Makefile b/sys/modules/age/Makefile index cfbf9cdc1a1d..477b5b7af32e 100644 --- a/sys/modules/age/Makefile +++ b/sys/modules/age/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/age +.PATH: ${SRCTOP}/sys/dev/age KMOD= if_age SRCS= if_age.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile index bed6c2900912..383788f9d6b4 100644 --- a/sys/modules/agp/Makefile +++ b/sys/modules/agp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/agp +.PATH: ${SRCTOP}/sys/dev/agp KMOD= agp SRCS= agp.c agp_if.c diff --git a/sys/modules/aha/Makefile b/sys/modules/aha/Makefile index 28bef14218d5..2f1e1759475a 100644 --- a/sys/modules/aha/Makefile +++ b/sys/modules/aha/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aha +.PATH: ${SRCTOP}/sys/dev/aha KMOD= aha SRCS= aha.c aha_isa.c ahareg.h opt_cam.h device_if.h bus_if.h \ diff --git a/sys/modules/ahci/Makefile b/sys/modules/ahci/Makefile index cc947d3b910a..7085927715db 100644 --- a/sys/modules/ahci/Makefile +++ b/sys/modules/ahci/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ahci +.PATH: ${SRCTOP}/sys/dev/ahci KMOD= ahci SRCS= ahci.c ahci_pci.c ahciem.c ahci.h device_if.h bus_if.h pci_if.h opt_cam.h diff --git a/sys/modules/aic/Makefile b/sys/modules/aic/Makefile index 4c0277f86eb0..297f0729cf67 100644 --- a/sys/modules/aic/Makefile +++ b/sys/modules/aic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/aic +.PATH: ${SRCTOP}/sys/dev/aic KMOD= aic SRCS= aic.c aic_isa.c aic_pccard.c diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 7b47625baf86..8347d002f35d 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/dev/aic7xxx diff --git a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile index f479a15af54c..301e095e5c2a 100644 --- a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/aic7xxx +.PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_isa SRCS= ahc_isa.c SRCS+= device_if.h bus_if.h pci_if.h isa_if.h SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h -CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. +CFLAGS+= -I${SRCTOP}/sys/dev/aic7xxx -I.. .include <bsd.kmod.mk> diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile index 729b566d399a..7d59c868c853 100644 --- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/aic7xxx +.PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_pci SRCS= ahc_pci.c aic7xxx_pci.c SRCS+= device_if.h bus_if.h pci_if.h SRCS+= opt_scsi.h opt_cam.h opt_aic7xxx.h -CFLAGS+= -I${.CURDIR}/../../../../dev/aic7xxx -I.. +CFLAGS+= -I${SRCTOP}/sys/dev/aic7xxx -I.. .include <bsd.kmod.mk> diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile index 44392a9704ad..20da514a26b6 100644 --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/aic7xxx +.PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahd GENSRCS= aic79xx_seq.h aic79xx_reg.h @@ -17,14 +17,14 @@ BEFORE_DEPEND= ${GENSRCS} .if make(ahdfirmware) ahdfirmware: ${GENSRCS} ${GENSRCS}: \ - ${.CURDIR}/../../../dev/aic7xxx/aic79xx.{reg,seq} \ - ${.CURDIR}/../../../cam/scsi/scsi_message.h - aicasm ${INCLUDES} -I${.CURDIR}/../../../cam/scsi \ - -I${.CURDIR}/../../../dev/aic7xxx \ + ${SRCTOP}/sys/dev/aic7xxx/aic79xx.{reg,seq} \ + ${SRCTOP}/sys/cam/scsi/scsi_message.h + aicasm ${INCLUDES} -I${SRCTOP}/sys/cam/scsi \ + -I${SRCTOP}/sys/dev/aic7xxx \ -o aic79xx_seq.h -r aic79xx_reg.h \ ${REG_PRINT_OPT} \ - -i ${.CURDIR}/../../../dev/aic7xxx/aic79xx_osm.h \ - ${.CURDIR}/../../../dev/aic7xxx/aic79xx.seq + -i ${SRCTOP}/sys/dev/aic7xxx/aic79xx_osm.h \ + ${SRCTOP}/sys/dev/aic7xxx/aic79xx.seq .else ${GENSRCS}: .NOMETA @echo "Error: ${.TARGET} is missing. Run 'make ahdfirmware'." diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile index b1b2cf7a293f..c5a7fc19cbd5 100644 --- a/sys/modules/aic7xxx/aicasm/Makefile +++ b/sys/modules/aic7xxx/aicasm/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -MAKESRCPATH= ${.CURDIR}/../../../dev/aic7xxx/aicasm +MAKESRCPATH= ${SRCTOP}/sys/dev/aic7xxx/aicasm install: -.include "${.CURDIR}/../../../dev/aic7xxx/aicasm/Makefile" +.include "${SRCTOP}/sys/dev/aic7xxx/aicasm/Makefile" build-tools: ${PROG} diff --git a/sys/modules/alc/Makefile b/sys/modules/alc/Makefile index 9f6d6fc99437..439788f6601f 100644 --- a/sys/modules/alc/Makefile +++ b/sys/modules/alc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/alc +.PATH: ${SRCTOP}/sys/dev/alc KMOD= if_alc SRCS= if_alc.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/ale/Makefile b/sys/modules/ale/Makefile index a6479725c136..a7bacf4271d1 100644 --- a/sys/modules/ale/Makefile +++ b/sys/modules/ale/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ale +.PATH: ${SRCTOP}/sys/dev/ale KMOD= if_ale SRCS= if_ale.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/alq/Makefile b/sys/modules/alq/Makefile index 782c3706d3cb..911eeca73880 100644 --- a/sys/modules/alq/Makefile +++ b/sys/modules/alq/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= alq SRCS= opt_mac.h vnode_if.h kern_alq.c diff --git a/sys/modules/am335x_dmtpps/Makefile b/sys/modules/am335x_dmtpps/Makefile index 3ca49452c693..607f88d52d65 100644 --- a/sys/modules/am335x_dmtpps/Makefile +++ b/sys/modules/am335x_dmtpps/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../arm/ti/am335x +.PATH: ${SRCTOP}/sys/arm/ti/am335x KMOD= am335x_dmtpps SRCS= am335x_dmtpps.c diff --git a/sys/modules/amd_ecc_inject/Makefile b/sys/modules/amd_ecc_inject/Makefile index 56000ca9e0f5..1e17eb31d0a2 100644 --- a/sys/modules/amd_ecc_inject/Makefile +++ b/sys/modules/amd_ecc_inject/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amd_ecc_inject +.PATH: ${SRCTOP}/sys/dev/amd_ecc_inject KMOD= amd_ecc_inject SRCS= ecc_inject.c bus_if.h device_if.h pci_if.h diff --git a/sys/modules/amdsbwd/Makefile b/sys/modules/amdsbwd/Makefile index 56f9ab79b873..cf69fd0ffbff 100644 --- a/sys/modules/amdsbwd/Makefile +++ b/sys/modules/amdsbwd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amdsbwd +.PATH: ${SRCTOP}/sys/dev/amdsbwd KMOD = amdsbwd SRCS = amdsbwd.c SRCS += device_if.h bus_if.h pci_if.h isa_if.h diff --git a/sys/modules/amdtemp/Makefile b/sys/modules/amdtemp/Makefile index 1f7cff502ec4..f7e5ac64494b 100644 --- a/sys/modules/amdtemp/Makefile +++ b/sys/modules/amdtemp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amdtemp +.PATH: ${SRCTOP}/sys/dev/amdtemp KMOD= amdtemp SRCS= amdtemp.c bus_if.h device_if.h pci_if.h diff --git a/sys/modules/amr/Makefile b/sys/modules/amr/Makefile index 02de047d2aa3..1ee2ece51a16 100644 --- a/sys/modules/amr/Makefile +++ b/sys/modules/amr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/amr +.PATH: ${SRCTOP}/sys/dev/amr SUBDIR= amr_cam .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/modules/amr/amr_cam/Makefile b/sys/modules/amr/amr_cam/Makefile index b7aaee88f7b2..ab7da0a331ec 100644 --- a/sys/modules/amr/amr_cam/Makefile +++ b/sys/modules/amr/amr_cam/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/amr +.PATH: ${SRCTOP}/sys/dev/amr KMOD= amr_cam SRCS= amr_cam.c device_if.h bus_if.h diff --git a/sys/modules/amr/amr_linux/Makefile b/sys/modules/amr/amr_linux/Makefile index 3df7eed5e446..b5cf493098d9 100644 --- a/sys/modules/amr/amr_linux/Makefile +++ b/sys/modules/amr/amr_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/amr +.PATH: ${SRCTOP}/sys/dev/amr KMOD= amr_linux SRCS= amr_linux.c device_if.h bus_if.h diff --git a/sys/modules/an/Makefile b/sys/modules/an/Makefile index 82c4421fffb7..41c7b2fb871f 100644 --- a/sys/modules/an/Makefile +++ b/sys/modules/an/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/an +.PATH: ${SRCTOP}/sys/dev/an KMOD= if_an SRCS= if_an.c if_an_pccard.c if_an_pci.c if_an_isa.c diff --git a/sys/modules/aout/Makefile b/sys/modules/aout/Makefile index 203d9cfca3dd..3eb57c1be688 100644 --- a/sys/modules/aout/Makefile +++ b/sys/modules/aout/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= aout SRCS= imgact_aout.c \ diff --git a/sys/modules/apm/Makefile b/sys/modules/apm/Makefile index d7be22d65982..d5168bd991fa 100644 --- a/sys/modules/apm/Makefile +++ b/sys/modules/apm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../i386/bios +.PATH: ${SRCTOP}/sys/i386/bios KMOD= apm SRCS= apm.c apm.h diff --git a/sys/modules/ar71xx/ar71xx_ehci/Makefile b/sys/modules/ar71xx/ar71xx_ehci/Makefile index 96f3261e169c..b99e24e39869 100644 --- a/sys/modules/ar71xx/ar71xx_ehci/Makefile +++ b/sys/modules/ar71xx/ar71xx_ehci/Makefile @@ -29,15 +29,15 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../mips/atheros/ +.PATH: ${SRCTOP}/sys/mips/atheros/ KMOD= ar71xx_ehci SRCS= ar71xx_ehci.c SRCS+= device_if.h bus_if.h usb_if.h opt_usb.h opt_bus.h -.PATH: ${.CURDIR}/../../../dev/usb/controller/ +.PATH: ${SRCTOP}/sys/dev/usb/controller/ SRCS+= ehci.c -CFLAGS+= -I. -I${.CURDIR}/../../../mips/atheros +CFLAGS+= -I. -I${SRCTOP}/sys/mips/atheros .include <bsd.kmod.mk> diff --git a/sys/modules/ar71xx/ar71xx_ohci/Makefile b/sys/modules/ar71xx/ar71xx_ohci/Makefile index 6fcee34a40a6..df3077120b77 100644 --- a/sys/modules/ar71xx/ar71xx_ohci/Makefile +++ b/sys/modules/ar71xx/ar71xx_ohci/Makefile @@ -29,15 +29,15 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../mips/atheros/ +.PATH: ${SRCTOP}/sys/mips/atheros/ KMOD= ar71xx_ohci SRCS= ar71xx_ohci.c SRCS+= device_if.h bus_if.h usb_if.h opt_usb.h opt_bus.h -CFLAGS+= -I. -I${.CURDIR}/../../../mips/atheros +CFLAGS+= -I. -I${SRCTOP}/sys/mips/atheros -.PATH: ${.CURDIR}/../../../dev/usb/controller/ +.PATH: ${SRCTOP}/sys/dev/usb/controller/ SRCS+= ohci.c .include <bsd.kmod.mk> diff --git a/sys/modules/arcmsr/Makefile b/sys/modules/arcmsr/Makefile index 0a186f883b6d..015adbbba403 100644 --- a/sys/modules/arcmsr/Makefile +++ b/sys/modules/arcmsr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/arcmsr +.PATH: ${SRCTOP}/sys/dev/arcmsr KMOD= arcmsr SRCS= arcmsr.c diff --git a/sys/modules/arcnet/Makefile b/sys/modules/arcnet/Makefile index 2b2b4654f774..1f62e639d545 100644 --- a/sys/modules/arcnet/Makefile +++ b/sys/modules/arcnet/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= arcnet SRCS= if_arcsubr.c diff --git a/sys/modules/armv8crypto/Makefile b/sys/modules/armv8crypto/Makefile index 179d639d0e72..1f425b4c718e 100644 --- a/sys/modules/armv8crypto/Makefile +++ b/sys/modules/armv8crypto/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/armv8 +.PATH: ${SRCTOP}/sys/crypto/armv8 KMOD= armv8crypto SRCS= armv8_crypto.c diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile index 0561fd585c9d..36ab7c1ae300 100644 --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/asmc +.PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc SRCS= asmc.c opt_acpi.h opt_intr_filter.h acpi_if.h bus_if.h device_if.h diff --git a/sys/modules/ata/atacard/Makefile b/sys/modules/ata/atacard/Makefile index 412a16499d6e..2b58e37dad9c 100644 --- a/sys/modules/ata/atacard/Makefile +++ b/sys/modules/ata/atacard/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= atacard SRCS= ata-card.c diff --git a/sys/modules/ata/atacore/Makefile b/sys/modules/ata/atacore/Makefile index 4ee16cfb3cc6..9ecd03ed0ba5 100644 --- a/sys/modules/ata/atacore/Makefile +++ b/sys/modules/ata/atacore/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= ata SRCS= ata-all.c ata_if.c ata-lowlevel.c diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile index 5c951c0fe5c5..38b782870029 100644 --- a/sys/modules/ata/ataisa/Makefile +++ b/sys/modules/ata/ataisa/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= ataisa SRCS= ata-isa.c diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile index 0addeb3a6b01..5aaa265000cf 100644 --- a/sys/modules/ata/atapci/Makefile +++ b/sys/modules/ata/atapci/Makefile @@ -2,7 +2,7 @@ SUBDIR += chipsets -.PATH: ${.CURDIR}/../../../dev/ata +.PATH: ${SRCTOP}/sys/dev/ata KMOD= atapci SRCS= ata-pci.c ata-dma.c ata-sata.c diff --git a/sys/modules/ata/atapci/chipsets/ataacard/Makefile b/sys/modules/ata/atapci/chipsets/ataacard/Makefile index a0e0389ed960..99c4c3620286 100644 --- a/sys/modules/ata/atapci/chipsets/ataacard/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacard/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacard SRCS= ata-acard.c diff --git a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile index 6712f53cb8ae..8684293ca9e2 100644 --- a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacerlabs SRCS= ata-acerlabs.c diff --git a/sys/modules/ata/atapci/chipsets/ataamd/Makefile b/sys/modules/ata/atapci/chipsets/ataamd/Makefile index d6dedd5edfd5..96ed09d1e8f4 100644 --- a/sys/modules/ata/atapci/chipsets/ataamd/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataamd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataamd SRCS= ata-amd.c diff --git a/sys/modules/ata/atapci/chipsets/ataati/Makefile b/sys/modules/ata/atapci/chipsets/ataati/Makefile index 2f59398f1d72..f7d524b64b5d 100644 --- a/sys/modules/ata/atapci/chipsets/ataati/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataati/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataati SRCS= ata-ati.c diff --git a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile index 5986465f97fc..336052712738 100644 --- a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacenatek SRCS= ata-cenatek.c diff --git a/sys/modules/ata/atapci/chipsets/atacypress/Makefile b/sys/modules/ata/atapci/chipsets/atacypress/Makefile index c3fe346a430d..284b6fb6a47c 100644 --- a/sys/modules/ata/atapci/chipsets/atacypress/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacypress/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacypress SRCS= ata-cypress.c diff --git a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile index 92df121edff3..fe9296e8b403 100644 --- a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacyrix SRCS= ata-cyrix.c diff --git a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile index 89a7d052615b..2ef5eabbe09d 100644 --- a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile +++ b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atahighpoint SRCS= ata-highpoint.c diff --git a/sys/modules/ata/atapci/chipsets/ataintel/Makefile b/sys/modules/ata/atapci/chipsets/ataintel/Makefile index 93845d17d5d8..8ec8a91cfeaf 100644 --- a/sys/modules/ata/atapci/chipsets/ataintel/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataintel/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataintel SRCS= ata-intel.c diff --git a/sys/modules/ata/atapci/chipsets/ataite/Makefile b/sys/modules/ata/atapci/chipsets/ataite/Makefile index f8e596b7ce67..eabb064c0e36 100644 --- a/sys/modules/ata/atapci/chipsets/ataite/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataite/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataite SRCS= ata-ite.c diff --git a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile index 2f74305cdf12..ddc75296ad64 100644 --- a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atajmicron SRCS= ata-jmicron.c diff --git a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile index 6d644493886d..0d77b3f4a2cb 100644 --- a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamarvell SRCS= ata-marvell.c diff --git a/sys/modules/ata/atapci/chipsets/atamicron/Makefile b/sys/modules/ata/atapci/chipsets/atamicron/Makefile index 820cf912c63d..2952a518c387 100644 --- a/sys/modules/ata/atapci/chipsets/atamicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamicron/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamicron SRCS= ata-micron.c diff --git a/sys/modules/ata/atapci/chipsets/atanational/Makefile b/sys/modules/ata/atapci/chipsets/atanational/Makefile index 62a2dd61613b..a7a1ec8fc9ed 100644 --- a/sys/modules/ata/atapci/chipsets/atanational/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanational/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanational SRCS= ata-national.c diff --git a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile index 357e4d52671b..64bd6502f1f6 100644 --- a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanetcell SRCS= ata-netcell.c diff --git a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile index f4b7b6f6cb3b..4fd44374ce54 100644 --- a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanvidia SRCS= ata-nvidia.c diff --git a/sys/modules/ata/atapci/chipsets/atapromise/Makefile b/sys/modules/ata/atapci/chipsets/atapromise/Makefile index d232725580c3..a53ddba17b31 100644 --- a/sys/modules/ata/atapci/chipsets/atapromise/Makefile +++ b/sys/modules/ata/atapci/chipsets/atapromise/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atapromise SRCS= ata-promise.c diff --git a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile index 19d7557a865b..1f731ff27114 100644 --- a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataserverworks SRCS= ata-serverworks.c diff --git a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile index 04c44cf12fcc..7e44778bc165 100644 --- a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasiliconimage SRCS= ata-siliconimage.c diff --git a/sys/modules/ata/atapci/chipsets/atasis/Makefile b/sys/modules/ata/atapci/chipsets/atasis/Makefile index 65d7fa44ce10..8e6b1cb7e785 100644 --- a/sys/modules/ata/atapci/chipsets/atasis/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasis SRCS= ata-sis.c diff --git a/sys/modules/ata/atapci/chipsets/atavia/Makefile b/sys/modules/ata/atapci/chipsets/atavia/Makefile index 271f2fb65722..75a164099469 100644 --- a/sys/modules/ata/atapci/chipsets/atavia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atavia/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../../dev/ata/chipsets +.PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atavia SRCS= ata-via.c diff --git a/sys/modules/ath_ahb/Makefile b/sys/modules/ath_ahb/Makefile index 9d31841e4e15..ad3316d18623 100644 --- a/sys/modules/ath_ahb/Makefile +++ b/sys/modules/ath_ahb/Makefile @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/ath -.PATH: ${.CURDIR}/../../dev/ath/ath_hal +.PATH: ${SRCTOP}/sys/dev/ath +.PATH: ${SRCTOP}/sys/dev/ath/ath_hal KMOD= if_ath_ahb SRCS= if_ath_ahb.c SRCS+= device_if.h bus_if.h opt_wlan.h opt_ath.h opt_ah.h -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal +CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal .include <bsd.kmod.mk> diff --git a/sys/modules/ath_pci/Makefile b/sys/modules/ath_pci/Makefile index 5f9e0a136c4e..516d14e127eb 100644 --- a/sys/modules/ath_pci/Makefile +++ b/sys/modules/ath_pci/Makefile @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/ath -.PATH: ${.CURDIR}/../../dev/ath/ath_hal +.PATH: ${SRCTOP}/sys/dev/ath +.PATH: ${SRCTOP}/sys/dev/ath/ath_hal KMOD= if_ath_pci SRCS= if_ath_pci.c SRCS+= device_if.h bus_if.h pci_if.h opt_wlan.h opt_ath.h opt_ah.h -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal +CFLAGS+= -I. -I${SRCTOP}/sys/dev/ath -I${SRCTOP}/sys/dev/ath/ath_hal .include <bsd.kmod.mk> diff --git a/sys/modules/autofs/Makefile b/sys/modules/autofs/Makefile index 5aaa8927267b..e6e93536677c 100644 --- a/sys/modules/autofs/Makefile +++ b/sys/modules/autofs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/autofs +.PATH: ${SRCTOP}/sys/fs/autofs KMOD= autofs SRCS= vnode_if.h \ diff --git a/sys/modules/auxio/Makefile b/sys/modules/auxio/Makefile index ead878cce503..f46f438accc5 100644 --- a/sys/modules/auxio/Makefile +++ b/sys/modules/auxio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/auxio +.PATH: ${SRCTOP}/sys/dev/auxio KMOD= auxio diff --git a/sys/modules/bce/Makefile b/sys/modules/bce/Makefile index 1be2a3f98ce2..81940f23691b 100644 --- a/sys/modules/bce/Makefile +++ b/sys/modules/bce/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bce +.PATH: ${SRCTOP}/sys/dev/bce KMOD= if_bce SRCS= opt_bce.h if_bce.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/bfe/Makefile b/sys/modules/bfe/Makefile index 19413f7d994d..a5748f399c53 100644 --- a/sys/modules/bfe/Makefile +++ b/sys/modules/bfe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bfe +.PATH: ${SRCTOP}/sys/dev/bfe KMOD= if_bfe SRCS= if_bfe.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile index 9742e6b8f372..53e3364f0e3a 100644 --- a/sys/modules/bge/Makefile +++ b/sys/modules/bge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bge +.PATH: ${SRCTOP}/sys/dev/bge KMOD= if_bge SRCS= if_bge.c miibus_if.h miidevs.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/bhnd/Makefile b/sys/modules/bhnd/Makefile index d6de8281ce64..992e98011321 100644 --- a/sys/modules/bhnd/Makefile +++ b/sys/modules/bhnd/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bhnd -.PATH: ${.CURDIR}/../../dev/bhnd/cores/chipc -.PATH: ${.CURDIR}/../../dev/bhnd/cores/chipc/pwrctl -.PATH: ${.CURDIR}/../../dev/bhnd/cores/pmu -.PATH: ${.CURDIR}/../../dev/bhnd/nvram +.PATH: ${SRCTOP}/sys/dev/bhnd +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/chipc +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/chipc/pwrctl +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pmu +.PATH: ${SRCTOP}/sys/dev/bhnd/nvram KMOD= bhnd SRCS= bhnd.c bhnd_subr.c diff --git a/sys/modules/bhnd/bcma/Makefile b/sys/modules/bhnd/bcma/Makefile index 8b86c3e6500e..08a651d8477f 100644 --- a/sys/modules/bhnd/bcma/Makefile +++ b/sys/modules/bhnd/bcma/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bhnd/bcma +.PATH: ${SRCTOP}/sys/dev/bhnd/bcma KMOD= bcma SRCS= bcma.c bcma_subr.c bcma_erom.c diff --git a/sys/modules/bhnd/bcma_bhndb/Makefile b/sys/modules/bhnd/bcma_bhndb/Makefile index e069cb5bdc30..7dd2f82b4761 100644 --- a/sys/modules/bhnd/bcma_bhndb/Makefile +++ b/sys/modules/bhnd/bcma_bhndb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bhnd/bcma +.PATH: ${SRCTOP}/sys/dev/bhnd/bcma KMOD= bcma_bhndb SRCS= bcma_bhndb.c diff --git a/sys/modules/bhnd/bhndb/Makefile b/sys/modules/bhnd/bhndb/Makefile index 04297f101c5b..36f01ca3e349 100644 --- a/sys/modules/bhnd/bhndb/Makefile +++ b/sys/modules/bhnd/bhndb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bhnd/bhndb +.PATH: ${SRCTOP}/sys/dev/bhnd/bhndb KMOD= bhndb SRCS= bhndb.c bhndb_subr.c bhndb_hwdata.c \ diff --git a/sys/modules/bhnd/bhndb_pci/Makefile b/sys/modules/bhnd/bhndb_pci/Makefile index f10845a8386d..9e4f18185ac5 100644 --- a/sys/modules/bhnd/bhndb_pci/Makefile +++ b/sys/modules/bhnd/bhndb_pci/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bhnd/bhndb +.PATH: ${SRCTOP}/sys/dev/bhnd/bhndb KMOD= bhndb_pci SRCS= bhndb_pci.c bhndb_pci_hwdata.c \ diff --git a/sys/modules/bhnd/cores/bhnd_pci/Makefile b/sys/modules/bhnd/cores/bhnd_pci/Makefile index fb6ce438779b..62bf96b68e98 100644 --- a/sys/modules/bhnd/cores/bhnd_pci/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pci/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci -.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pcie2 +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 KMOD= bhnd_pci SRCS= bhnd_pci.c bhnd_pcie2.c diff --git a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile index bbfa7b272103..03f20f61ae52 100644 --- a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci -.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pcie2 +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 KMOD= bhnd_pci_hostb SRCS= bhnd_pci_hostb.c bhnd_pcie2_hostb.c diff --git a/sys/modules/bhnd/cores/bhnd_pcib/Makefile b/sys/modules/bhnd/cores/bhnd_pcib/Makefile index c9bb61d423e8..be7b21984eb5 100644 --- a/sys/modules/bhnd/cores/bhnd_pcib/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pcib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pci -.PATH: ${.CURDIR}/../../../../dev/bhnd/cores/pcie2 +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci +.PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 KMOD= bhnd_pcib SRCS= bhnd_pcib.c bhnd_pcie2b.c diff --git a/sys/modules/bhnd/siba/Makefile b/sys/modules/bhnd/siba/Makefile index 7c6a69272ae0..addb797542a3 100644 --- a/sys/modules/bhnd/siba/Makefile +++ b/sys/modules/bhnd/siba/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bhnd/siba +.PATH: ${SRCTOP}/sys/dev/bhnd/siba KMOD= siba SRCS= siba.c siba_subr.c \ diff --git a/sys/modules/bhnd/siba_bhndb/Makefile b/sys/modules/bhnd/siba_bhndb/Makefile index bd9e6c28e4ce..bba2b97954a9 100644 --- a/sys/modules/bhnd/siba_bhndb/Makefile +++ b/sys/modules/bhnd/siba_bhndb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bhnd/siba +.PATH: ${SRCTOP}/sys/dev/bhnd/siba KMOD= siba_bhndb SRCS= siba_bhndb.c diff --git a/sys/modules/bios/smapi/Makefile b/sys/modules/bios/smapi/Makefile index f55ab5af3bbf..c488491bd525 100644 --- a/sys/modules/bios/smapi/Makefile +++ b/sys/modules/bios/smapi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../i386/bios +.PATH: ${SRCTOP}/sys/i386/bios KMOD= smapi SRCS= smapi.c smapi_bios.S \ diff --git a/sys/modules/bios/smbios/Makefile b/sys/modules/bios/smbios/Makefile index b7bdf4819b72..ff8d22b764aa 100644 --- a/sys/modules/bios/smbios/Makefile +++ b/sys/modules/bios/smbios/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../x86/bios +.PATH: ${SRCTOP}/sys/x86/bios KMOD= smbios SRCS= smbios.c \ diff --git a/sys/modules/bios/vpd/Makefile b/sys/modules/bios/vpd/Makefile index 093ac81f59b8..86b9719f1b52 100644 --- a/sys/modules/bios/vpd/Makefile +++ b/sys/modules/bios/vpd/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../x86/bios +.PATH: ${SRCTOP}/sys/x86/bios KMOD= vpd SRCS= vpd.c \ diff --git a/sys/modules/bktr/bktr/Makefile b/sys/modules/bktr/bktr/Makefile index 60e4a7c12a9a..4345abeaedf6 100644 --- a/sys/modules/bktr/bktr/Makefile +++ b/sys/modules/bktr/bktr/Makefile @@ -2,7 +2,7 @@ # Makefile for the bktr Brooktree Bt848/Bt878 PCI video capture device -.PATH: ${.CURDIR}/../../../dev/bktr +.PATH: ${SRCTOP}/sys/dev/bktr KMOD= bktr SRCS= bktr_core.c bktr_os.c bktr_audio.c bktr_tuner.c bktr_card.c msp34xx.c \ diff --git a/sys/modules/bktr/bktr_mem/Makefile b/sys/modules/bktr/bktr_mem/Makefile index d5f619041b8d..12c9cbd26189 100644 --- a/sys/modules/bktr/bktr_mem/Makefile +++ b/sys/modules/bktr/bktr_mem/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/bktr +.PATH: ${SRCTOP}/sys/dev/bktr KMOD= bktr_mem SRCS= bktr_mem.c diff --git a/sys/modules/bm/Makefile b/sys/modules/bm/Makefile index 30c5e8679bbe..65ac2ed5dd45 100644 --- a/sys/modules/bm/Makefile +++ b/sys/modules/bm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bm +.PATH: ${SRCTOP}/sys/dev/bm KMOD= if_bm SRCS= if_bm.c diff --git a/sys/modules/bnxt/Makefile b/sys/modules/bnxt/Makefile index 1d478d16671d..861a0b4c4d4a 100644 --- a/sys/modules/bnxt/Makefile +++ b/sys/modules/bnxt/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bnxt +.PATH: ${SRCTOP}/sys/dev/bnxt KMOD = if_bnxt SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h ifdi_if.h diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile index 3cfc6e376df2..0bfd0caa1880 100644 --- a/sys/modules/bridgestp/Makefile +++ b/sys/modules/bridgestp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= bridgestp SRCS= bridgestp.c diff --git a/sys/modules/bwi/Makefile b/sys/modules/bwi/Makefile index 25f0022c6054..c956f64d40c2 100644 --- a/sys/modules/bwi/Makefile +++ b/sys/modules/bwi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bwi +.PATH: ${SRCTOP}/sys/dev/bwi KMOD = if_bwi diff --git a/sys/modules/bwn/Makefile b/sys/modules/bwn/Makefile index 99041da1f39d..b4f3a6645056 100644 --- a/sys/modules/bwn/Makefile +++ b/sys/modules/bwn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bwn +.PATH: ${SRCTOP}/sys/dev/bwn KMOD= if_bwn SRCS= if_bwn.c if_bwnreg.h if_bwnvar.h @@ -16,7 +16,7 @@ SRCS+= device_if.h bus_if.h pci_if.h opt_bwn.h opt_wlan.h # The following need the BWN_GPL_PHY kenrel option to opt-in # to the GPL'd 802.11n PHY support for this driver. -.PATH: ${.CURDIR}/../../gnu/dev/bwn/phy_n +.PATH: ${SRCTOP}/sys/gnu/dev/bwn/phy_n SRCS.BWN_GPL_PHY+= if_bwn_radio_2055.c SRCS.BWN_GPL_PHY+= if_bwn_radio_2056.c SRCS.BWN_GPL_PHY+= if_bwn_radio_2057.c diff --git a/sys/modules/bwn_pci/Makefile b/sys/modules/bwn_pci/Makefile index 15b9ded4a58b..cfdfda320eb4 100644 --- a/sys/modules/bwn_pci/Makefile +++ b/sys/modules/bwn_pci/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/bwn +.PATH: ${SRCTOP}/sys/dev/bwn KMOD= if_bwn_pci SRCS= if_bwn_pci.c bwn_mac.c diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile index b2e32f7db05c..3470571d94ff 100644 --- a/sys/modules/bxe/Makefile +++ b/sys/modules/bxe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR ?= ${.CURDIR}/../.. +SYSDIR ?= ${SRCTOP}/sys BXE = ${SYSDIR}/dev/bxe .PATH: ${BXE} diff --git a/sys/modules/bytgpio/Makefile b/sys/modules/bytgpio/Makefile index 069241e99f72..4a46f612a0b6 100644 --- a/sys/modules/bytgpio/Makefile +++ b/sys/modules/bytgpio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/gpio +.PATH: ${SRCTOP}/sys/dev/gpio KMOD= bytgpio SRCS= bytgpio.c SRCS+= acpi_if.h device_if.h bus_if.h gpio_if.h opt_acpi.h opt_platform.h diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile index 216276321633..cc5dcfaa3818 100644 --- a/sys/modules/cam/Makefile +++ b/sys/modules/cam/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys .PATH: $S/cam $S/cam/scsi $S/cam/ata $S/cam/nvme $S/${MACHINE}/${MACHINE} diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile index ee65d3a2da1f..16c2659c8a61 100644 --- a/sys/modules/cardbus/Makefile +++ b/sys/modules/cardbus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cardbus +.PATH: ${SRCTOP}/sys/dev/cardbus KMOD= cardbus SRCS= cardbus.c cardbus_cis.c cardbus_device.c \ diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile index e1890d4c4f92..052687381ba6 100644 --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet -.PATH: ${.CURDIR}/../../crypto +.PATH: ${SRCTOP}/sys/netinet +.PATH: ${SRCTOP}/sys/crypto KMOD= carp SRCS= ip_carp.c sha1.c diff --git a/sys/modules/cas/Makefile b/sys/modules/cas/Makefile index 0877c6c41084..2e6fcfb4cb45 100644 --- a/sys/modules/cas/Makefile +++ b/sys/modules/cas/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cas +.PATH: ${SRCTOP}/sys/dev/cas KMOD= if_cas SRCS= bus_if.h device_if.h if_cas.c miibus_if.h pci_if.h ${ofw_bus_if} diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile index 8b9e9540f2a0..aa706e87a406 100644 --- a/sys/modules/cbb/Makefile +++ b/sys/modules/cbb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/pccbb +.PATH: ${SRCTOP}/sys/dev/pccbb KMOD= cbb SRCS= pccbb.c pccbb_isa.c pccbb_pci.c \ diff --git a/sys/modules/cc/cc_cdg/Makefile b/sys/modules/cc/cc_cdg/Makefile index f61cb61ae905..83a4887af705 100644 --- a/sys/modules/cc/cc_cdg/Makefile +++ b/sys/modules/cc/cc_cdg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_cdg SRCS= cc_cdg.c diff --git a/sys/modules/cc/cc_chd/Makefile b/sys/modules/cc/cc_chd/Makefile index b3881b87a099..db7e350d49fc 100644 --- a/sys/modules/cc/cc_chd/Makefile +++ b/sys/modules/cc/cc_chd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_chd SRCS= cc_chd.c diff --git a/sys/modules/cc/cc_cubic/Makefile b/sys/modules/cc/cc_cubic/Makefile index e22d902eae35..e56848cb11a8 100644 --- a/sys/modules/cc/cc_cubic/Makefile +++ b/sys/modules/cc/cc_cubic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_cubic SRCS= cc_cubic.c diff --git a/sys/modules/cc/cc_dctcp/Makefile b/sys/modules/cc/cc_dctcp/Makefile index 7ba6cf141fb6..cb6cb06682ef 100644 --- a/sys/modules/cc/cc_dctcp/Makefile +++ b/sys/modules/cc/cc_dctcp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_dctcp SRCS= cc_dctcp.c diff --git a/sys/modules/cc/cc_hd/Makefile b/sys/modules/cc/cc_hd/Makefile index 3a2b041e99d6..49c0dfce84e0 100644 --- a/sys/modules/cc/cc_hd/Makefile +++ b/sys/modules/cc/cc_hd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_hd SRCS= cc_hd.c diff --git a/sys/modules/cc/cc_htcp/Makefile b/sys/modules/cc/cc_htcp/Makefile index 787a709753a0..99f3f8f8f99d 100644 --- a/sys/modules/cc/cc_htcp/Makefile +++ b/sys/modules/cc/cc_htcp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_htcp SRCS= cc_htcp.c diff --git a/sys/modules/cc/cc_vegas/Makefile b/sys/modules/cc/cc_vegas/Makefile index 731a80f3a473..eda8ee62d88a 100644 --- a/sys/modules/cc/cc_vegas/Makefile +++ b/sys/modules/cc/cc_vegas/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/cc +.PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_vegas SRCS= cc_vegas.c diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile index 5fbc1b7fe2f5..5036ef04c677 100644 --- a/sys/modules/cd9660/Makefile +++ b/sys/modules/cd9660/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/cd9660 +.PATH: ${SRCTOP}/sys/fs/cd9660 KMOD= cd9660 SRCS= vnode_if.h \ diff --git a/sys/modules/cd9660_iconv/Makefile b/sys/modules/cd9660_iconv/Makefile index 48ddb56427ba..54c6f912c29c 100644 --- a/sys/modules/cd9660_iconv/Makefile +++ b/sys/modules/cd9660_iconv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/cd9660 +.PATH: ${SRCTOP}/sys/fs/cd9660 KMOD= cd9660_iconv SRCS= cd9660_iconv.c diff --git a/sys/modules/ce/Makefile b/sys/modules/ce/Makefile index 87d06b048492..05dd0bcc1124 100644 --- a/sys/modules/ce/Makefile +++ b/sys/modules/ce/Makefile @@ -1,7 +1,7 @@ # $Cronyx: sys.modules.ce.Makefile,v 1.2 2005/04/23 20:10:22 rik Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ce +.PATH: ${SRCTOP}/sys/dev/ce KMOD = if_ce SRCS = if_ce.c ceddk.c tau32-ddk.c SRCS += opt_bpf.h opt_netgraph.h opt_ng_cronyx.h device_if.h bus_if.h \ diff --git a/sys/modules/cfi/Makefile b/sys/modules/cfi/Makefile index bb3fa5d887f9..59ec4d693df7 100644 --- a/sys/modules/cfi/Makefile +++ b/sys/modules/cfi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cfi +.PATH: ${SRCTOP}/sys/dev/cfi KMOD= cfi SRCS= ${_cfi_bus} cfi_core.c cfi_dev.c diff --git a/sys/modules/chromebook_platform/Makefile b/sys/modules/chromebook_platform/Makefile index 640c536abd9a..f21f202064f8 100644 --- a/sys/modules/chromebook_platform/Makefile +++ b/sys/modules/chromebook_platform/Makefile @@ -1,7 +1,7 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/chromebook_platform -KMOD = chromebook_platform -SRCS = chromebook_platform.c bus_if.h device_if.h pci_if.h +.PATH: ${SRCTOP}/sys/dev/chromebook_platform +KMOD= chromebook_platform +SRCS= chromebook_platform.c bus_if.h device_if.h pci_if.h .include <bsd.kmod.mk> diff --git a/sys/modules/ciss/Makefile b/sys/modules/ciss/Makefile index 2ea619c5786c..9ab327674d76 100644 --- a/sys/modules/ciss/Makefile +++ b/sys/modules/ciss/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ KMOD = ciss -.PATH: ${.CURDIR}/../../dev/${KMOD} +.PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS = ciss.c SRCS += opt_scsi.h opt_cam.h SRCS += device_if.h bus_if.h pci_if.h diff --git a/sys/modules/cloudabi/Makefile b/sys/modules/cloudabi/Makefile index c608580c7f30..c32b7babccdb 100644 --- a/sys/modules/cloudabi/Makefile +++ b/sys/modules/cloudabi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/cloudabi +.PATH: ${SRCTOP}/sys/compat/cloudabi KMOD= cloudabi SRCS= cloudabi_clock.c cloudabi_errno.c cloudabi_fd.c cloudabi_file.c \ diff --git a/sys/modules/cloudabi32/Makefile b/sys/modules/cloudabi32/Makefile index 61e5142824e7..42482e74d0ee 100644 --- a/sys/modules/cloudabi32/Makefile +++ b/sys/modules/cloudabi32/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/compat/cloudabi32 .PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi32 diff --git a/sys/modules/cloudabi64/Makefile b/sys/modules/cloudabi64/Makefile index 17698542ea54..4e23f0b1dbb4 100644 --- a/sys/modules/cloudabi64/Makefile +++ b/sys/modules/cloudabi64/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/compat/cloudabi64 .PATH: ${SYSDIR}/${MACHINE_CPUARCH}/cloudabi64 diff --git a/sys/modules/cm/Makefile b/sys/modules/cm/Makefile index 3f2067b46985..911e71f5ce67 100644 --- a/sys/modules/cm/Makefile +++ b/sys/modules/cm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cm +.PATH: ${SRCTOP}/sys/dev/cm KMOD= if_cm SRCS= smc90cx6.c if_cm_isa.c diff --git a/sys/modules/cmx/Makefile b/sys/modules/cmx/Makefile index 779a8301d5b2..eea6658d421b 100644 --- a/sys/modules/cmx/Makefile +++ b/sys/modules/cmx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/cmx +.PATH: ${SRCTOP}/sys/dev/cmx KMOD= cmx SRCS= cmx.c cmxvar.h cmxreg.h \ diff --git a/sys/modules/coff/Makefile b/sys/modules/coff/Makefile index 95956e5c9784..5325a962c91f 100644 --- a/sys/modules/coff/Makefile +++ b/sys/modules/coff/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../i386/ibcs2 +.PATH: ${SRCTOP}/sys/i386/ibcs2 KMOD= ibcs2_coff SRCS= imgact_coff.c vnode_if.h diff --git a/sys/modules/coretemp/Makefile b/sys/modules/coretemp/Makefile index dd540ba4a6f0..504ece3cbe6c 100644 --- a/sys/modules/coretemp/Makefile +++ b/sys/modules/coretemp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/coretemp +.PATH: ${SRCTOP}/sys/dev/coretemp KMOD= coretemp SRCS= coretemp.c bus_if.h device_if.h diff --git a/sys/modules/cp/Makefile b/sys/modules/cp/Makefile index 56be36c556ad..5a83f10955db 100644 --- a/sys/modules/cp/Makefile +++ b/sys/modules/cp/Makefile @@ -1,7 +1,7 @@ # $Cronyx: sys.modules.cp.Makefile,v 1.1.2.3 2004/04/28 16:17:57 rik Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cp +.PATH: ${SRCTOP}/sys/dev/cp KMOD = if_cp SRCS = if_cp.c cpddk.c SRCS += opt_netgraph.h opt_ng_cronyx.h device_if.h bus_if.h \ diff --git a/sys/modules/cpsw/Makefile b/sys/modules/cpsw/Makefile index 508fb0389965..130a659a11b9 100644 --- a/sys/modules/cpsw/Makefile +++ b/sys/modules/cpsw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../arm/ti/cpsw +.PATH: ${SRCTOP}/sys/arm/ti/cpsw KMOD= if_cpsw SRCS= if_cpsw.c device_if.h bus_if.h ofw_bus_if.h miibus_if.h diff --git a/sys/modules/cpuctl/Makefile b/sys/modules/cpuctl/Makefile index 74c76b91d66e..d7f7e05b9376 100644 --- a/sys/modules/cpuctl/Makefile +++ b/sys/modules/cpuctl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cpuctl +.PATH: ${SRCTOP}/sys/dev/cpuctl KMOD= cpuctl SRCS= cpuctl.c diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile index 26fea830b8cb..e9fae049ebed 100644 --- a/sys/modules/cpufreq/Makefile +++ b/sys/modules/cpufreq/Makefile @@ -1,14 +1,14 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cpufreq \ - ${.CURDIR}/../../${MACHINE_CPUARCH}/cpufreq +.PATH: ${SRCTOP}/sys/dev/cpufreq \ + ${SRCTOP}/sys/${MACHINE_CPUARCH}/cpufreq KMOD= cpufreq SRCS= ichss.c SRCS+= bus_if.h cpufreq_if.h device_if.h pci_if.h .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" -.PATH: ${.CURDIR}/../../x86/cpufreq +.PATH: ${SRCTOP}/sys/x86/cpufreq SRCS+= acpi_if.h opt_acpi.h SRCS+= est.c hwpstate.c p4tcc.c powernow.c @@ -19,7 +19,7 @@ SRCS+= smist.c .endif .if ${MACHINE} == "powerpc" -.PATH: ${.CURDIR}/../../powerpc/cpufreq +.PATH: ${SRCTOP}/sys/powerpc/cpufreq SRCS+= dfs.c .endif diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 35e533b8038e..a06d7dacfbe1 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 diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile index a82517d5897c..7497772bb0b6 100644 --- a/sys/modules/cryptodev/Makefile +++ b/sys/modules/cryptodev/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../opencrypto +.PATH: ${SRCTOP}/sys/opencrypto KMOD = cryptodev SRCS = cryptodev.c SRCS += bus_if.h device_if.h opt_compat.h diff --git a/sys/modules/cs/Makefile b/sys/modules/cs/Makefile index 39da53044b3f..d457128a57e7 100644 --- a/sys/modules/cs/Makefile +++ b/sys/modules/cs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cs +.PATH: ${SRCTOP}/sys/dev/cs KMOD= if_cs SRCS= if_cs.c if_cs_isa.c if_cs_pccard.c diff --git a/sys/modules/ctau/Makefile b/sys/modules/ctau/Makefile index 9d3d9c51f94d..065d16eef7d5 100644 --- a/sys/modules/ctau/Makefile +++ b/sys/modules/ctau/Makefile @@ -1,6 +1,6 @@ # Cronyx Id: sys.modules.ct.Makefile,v 1.1.2.2 2003/12/08 15:39:01 rik Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ctau +.PATH: ${SRCTOP}/sys/dev/ctau KMOD= if_ct SRCS= if_ct.c ctddk.c ctau.c opt_netgraph.h opt_ng_cronyx.h \ device_if.h bus_if.h isa_if.h diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile index c9be22b98a1e..947f4e104339 100644 --- a/sys/modules/ctl/Makefile +++ b/sys/modules/ctl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../cam/ctl +.PATH: ${SRCTOP}/sys/cam/ctl KMOD= ctl diff --git a/sys/modules/cuse/Makefile b/sys/modules/cuse/Makefile index 049eb7e0d858..cefd1e03f586 100644 --- a/sys/modules/cuse/Makefile +++ b/sys/modules/cuse/Makefile @@ -24,7 +24,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../fs/cuse +.PATH: ${SRCTOP}/sys/fs/cuse KMOD= cuse SRCS= cuse.c device_if.h bus_if.h vnode_if.h opt_compat.h diff --git a/sys/modules/cx/Makefile b/sys/modules/cx/Makefile index 937937075a8d..87147e330fa2 100644 --- a/sys/modules/cx/Makefile +++ b/sys/modules/cx/Makefile @@ -1,7 +1,7 @@ # Cronyx Id: sys.modules.cx.Makefile,v 1.1.2.2 2003/01/21 15:15:49 rik Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/cx +.PATH: ${SRCTOP}/sys/dev/cx KMOD= if_cx SRCS= if_cx.c cxddk.c csigma.c opt_netgraph.h opt_ng_cronyx.h \ device_if.h bus_if.h isa_if.h diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile index 8a6bb331b8c5..f286b79a8dd3 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 911f2bb2ee14..a67cfda0999c 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 0d2f36330f5c..46fd3fe3ae1c 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 57a7c6030732..fc95ec4dff03 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 0316cce28157..fdf12e70dd93 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 diff --git a/sys/modules/cxgbe/Makefile b/sys/modules/cxgbe/Makefile index c36ef2a66ac1..434be3ba6a98 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 bf577514bd7e..ecd92218c8ef 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 f81d174d3236..f7cc10d44866 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 0fcc03c4b6cd..70700fceee5f 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 a86b145651fb..5c711c4899d7 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 9c72a7aad407..4a66572080ac 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 ec4ff1ed1802..f18cec139e13 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 943ea58bc2a5..ab69c0bc77ac 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 d4c041f00910..b07fe1b7027b 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 3feceada3733..7f1ed93005fe 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 2419a191f864..ab952ae3af56 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 9bdde07b84f5..75d77720e21c 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 5f460e04d65a..96daf2c441a8 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 diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile index d0a5abb39a10..c692532a9c01 100644 --- a/sys/modules/dc/Makefile +++ b/sys/modules/dc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/dc +.PATH: ${SRCTOP}/sys/dev/dc KMOD= if_dc SRCS= if_dc.c dcphy.c pnphy.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/dcons/Makefile b/sys/modules/dcons/Makefile index 4a08b6592381..be27ee22dae0 100644 --- a/sys/modules/dcons/Makefile +++ b/sys/modules/dcons/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile,v 1.6 2003/10/24 15:41:26 simokawa Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/dcons +.PATH: ${SRCTOP}/sys/dev/dcons KMOD = dcons SRCS = dcons.c dcons.h dcons_os.c dcons_os.h \ @@ -15,6 +15,6 @@ opt_ddb.h: echo "#define DDB 1" > $@ .endif -CFLAGS+= -I${.CURDIR}/../.. +CFLAGS+= -I${SRCTOP}/sys .include <bsd.kmod.mk> diff --git a/sys/modules/dcons_crom/Makefile b/sys/modules/dcons_crom/Makefile index 258beaddf14b..b5ac6048b6c1 100644 --- a/sys/modules/dcons_crom/Makefile +++ b/sys/modules/dcons_crom/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile,v 1.6 2003/10/24 15:43:24 simokawa Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/dcons +.PATH: ${SRCTOP}/sys/dev/dcons KMOD = dcons_crom SRCS = dcons_crom.c dcons.h dcons_os.h \ @@ -9,6 +9,6 @@ SRCS = dcons_crom.c dcons.h dcons_os.h \ #KMODDEPS = firewire dcons -CFLAGS+= -I${.CURDIR}/../.. +CFLAGS+= -I${SRCTOP}/sys .include <bsd.kmod.mk> diff --git a/sys/modules/de/Makefile b/sys/modules/de/Makefile index 6af4c7ad5879..38373235c3be 100644 --- a/sys/modules/de/Makefile +++ b/sys/modules/de/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/de +.PATH: ${SRCTOP}/sys/dev/de KMOD= if_de SRCS= if_de.c opt_ddb.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/dpms/Makefile b/sys/modules/dpms/Makefile index 4eabf14fc98b..0e84f8d2e164 100644 --- a/sys/modules/dpms/Makefile +++ b/sys/modules/dpms/Makefile @@ -3,7 +3,7 @@ KMOD= dpms SRCS= bus_if.h device_if.h pci_if.h -.PATH: ${.CURDIR}/../../dev/dpms +.PATH: ${SRCTOP}/sys/dev/dpms SRCS+= dpms.c .include <bsd.kmod.mk> diff --git a/sys/modules/dpt/Makefile b/sys/modules/dpt/Makefile index 7b4f9cc5bc3a..d01f1704db34 100644 --- a/sys/modules/dpt/Makefile +++ b/sys/modules/dpt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/dev/dpt diff --git a/sys/modules/drm/Makefile b/sys/modules/drm/Makefile index 2114f545a7e6..e217decb4b5e 100644 --- a/sys/modules/drm/Makefile +++ b/sys/modules/drm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" # Modules that include binary-only blobs of microcode should be selectable by diff --git a/sys/modules/drm/drm/Makefile b/sys/modules/drm/drm/Makefile index 938186610b22..41e8a6fd8614 100644 --- a/sys/modules/drm/drm/Makefile +++ b/sys/modules/drm/drm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = drm SRCS = \ ati_pcigart.c \ diff --git a/sys/modules/drm/i915/Makefile b/sys/modules/drm/i915/Makefile index b64539e37d46..8daa669847c5 100644 --- a/sys/modules/drm/i915/Makefile +++ b/sys/modules/drm/i915/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = i915 SRCS = i915_dma.c i915_drv.c i915_irq.c i915_mem.c i915_suspend.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h diff --git a/sys/modules/drm/mach64/Makefile b/sys/modules/drm/mach64/Makefile index 4d5069c1e5eb..e2d229bbb9fe 100644 --- a/sys/modules/drm/mach64/Makefile +++ b/sys/modules/drm/mach64/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = mach64 SRCS = mach64_dma.c mach64_drv.c mach64_irq.c mach64_state.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h diff --git a/sys/modules/drm/mga/Makefile b/sys/modules/drm/mga/Makefile index d88d12c78d03..20a8499ffc09 100644 --- a/sys/modules/drm/mga/Makefile +++ b/sys/modules/drm/mga/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = mga SRCS = mga_drv.c mga_state.c mga_warp.c mga_dma.c \ mga_irq.c diff --git a/sys/modules/drm/r128/Makefile b/sys/modules/drm/r128/Makefile index 6882c3d61a82..a51ed0dafb54 100644 --- a/sys/modules/drm/r128/Makefile +++ b/sys/modules/drm/r128/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = r128 SRCS = r128_cce.c r128_drv.c r128_irq.c r128_state.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h diff --git a/sys/modules/drm/radeon/Makefile b/sys/modules/drm/radeon/Makefile index e24875ac7dfd..388718aa4703 100644 --- a/sys/modules/drm/radeon/Makefile +++ b/sys/modules/drm/radeon/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = radeon SRCS = r300_cmdbuf.c r600_blit.c r600_cp.c radeon_cp.c radeon_cs.c \ radeon_drv.c radeon_irq.c radeon_mem.c radeon_state.c diff --git a/sys/modules/drm/savage/Makefile b/sys/modules/drm/savage/Makefile index f1c9b42a5f33..f2142a8fbc64 100644 --- a/sys/modules/drm/savage/Makefile +++ b/sys/modules/drm/savage/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD= savage -CFLAGS += -I${.CURDIR}/../../../dev/drm +CFLAGS += -I${SRCTOP}/sys/dev/drm SRCS= savage_bci.c savage_drv.c savage_state.c SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h diff --git a/sys/modules/drm/sis/Makefile b/sys/modules/drm/sis/Makefile index 885ce2863bb4..98b58adb41b6 100644 --- a/sys/modules/drm/sis/Makefile +++ b/sys/modules/drm/sis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD= sis SRCS= sis_drv.c sis_ds.c sis_mm.c SRCS+= device_if.h bus_if.h pci_if.h opt_drm.h diff --git a/sys/modules/drm/tdfx/Makefile b/sys/modules/drm/tdfx/Makefile index 2e015a7cead7..3cfc8b7e426c 100644 --- a/sys/modules/drm/tdfx/Makefile +++ b/sys/modules/drm/tdfx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = tdfx SRCS = tdfx_drv.c SRCS +=device_if.h bus_if.h pci_if.h opt_drm.h diff --git a/sys/modules/drm/via/Makefile b/sys/modules/drm/via/Makefile index a419bebacc9b..b06bc6cd8406 100644 --- a/sys/modules/drm/via/Makefile +++ b/sys/modules/drm/via/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm +.PATH: ${SRCTOP}/sys/dev/drm KMOD = via SRCS = via_dma.c via_dmablit.c via_drv.c via_irq.c via_map.c via_mm.c \ via_verifier.c via_video.c diff --git a/sys/modules/drm2/Makefile b/sys/modules/drm2/Makefile index 52fc3e241ff1..689fd689c038 100644 --- a/sys/modules/drm2/Makefile +++ b/sys/modules/drm2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/drm2/drm2/Makefile b/sys/modules/drm2/drm2/Makefile index 35bee2972091..f267715af6fb 100644 --- a/sys/modules/drm2/drm2/Makefile +++ b/sys/modules/drm2/drm2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm2 ${.CURDIR}/../../../dev/drm2/ttm +.PATH: ${SRCTOP}/sys/dev/drm2 ${SRCTOP}/sys/dev/drm2/ttm KMOD = drm2 SRCS = \ drm_agpsupport.c \ diff --git a/sys/modules/drm2/i915kms/Makefile b/sys/modules/drm2/i915kms/Makefile index c42066add1c3..79cf8e08a169 100644 --- a/sys/modules/drm2/i915kms/Makefile +++ b/sys/modules/drm2/i915kms/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm2/i915 +.PATH: ${SRCTOP}/sys/dev/drm2/i915 KMOD = i915kms SRCS = \ dvo_ch7017.c \ diff --git a/sys/modules/drm2/radeonkms/Makefile b/sys/modules/drm2/radeonkms/Makefile index 0c101eadea58..68b030cbc8e3 100644 --- a/sys/modules/drm2/radeonkms/Makefile +++ b/sys/modules/drm2/radeonkms/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/drm2/radeon +.PATH: ${SRCTOP}/sys/dev/drm2/radeon KMOD = radeonkms SRCS = \ @@ -114,7 +114,7 @@ SRCS += \ .include <bsd.kmod.mk> -CFLAGS+= -I${.CURDIR}/../../../dev/drm2/radeon +CFLAGS+= -I${SRCTOP}/sys/dev/drm2/radeon CWARNFLAGS.radeon_cp.c= -Wno-unused-value CWARNFLAGS.r600_cp.c= -Wno-unused-value diff --git a/sys/modules/drm2/radeonkmsfw/Makefile.inc b/sys/modules/drm2/radeonkmsfw/Makefile.inc index f6035a19f875..c645a88b8210 100644 --- a/sys/modules/drm2/radeonkmsfw/Makefile.inc +++ b/sys/modules/drm2/radeonkmsfw/Makefile.inc @@ -14,5 +14,5 @@ FIRMWS= ${_FIRM}:${KMOD} # #FIRMWARE_LICENSE= -${_FIRM}: ${.CURDIR}/../../../../contrib/dev/drm2/radeonkmsfw/${_FIRM}.uu +${_FIRM}: ${SRCTOP}/sys/contrib/dev/drm2/radeonkmsfw/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/dtrace/dtmalloc/Makefile b/sys/modules/dtrace/dtmalloc/Makefile index e2d4968aba05..d43d302a53b8 100644 --- a/sys/modules/dtrace/dtmalloc/Makefile +++ b/sys/modules/dtrace/dtmalloc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/dtmalloc diff --git a/sys/modules/dtrace/dtnfscl/Makefile b/sys/modules/dtrace/dtnfscl/Makefile index fc0438c787b5..3b6134348019 100644 --- a/sys/modules/dtrace/dtnfscl/Makefile +++ b/sys/modules/dtrace/dtnfscl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/fs/nfsclient diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 35287d12730a..40a0e6d08b26 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys ARCHDIR= ${MACHINE_CPUARCH} diff --git a/sys/modules/dtrace/dtrace_test/Makefile b/sys/modules/dtrace/dtrace_test/Makefile index 56099b68e72c..7e883e8de799 100644 --- a/sys/modules/dtrace/dtrace_test/Makefile +++ b/sys/modules/dtrace/dtrace_test/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/dtrace diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile index b5d9494ca6d5..1750b5b8bacf 100644 --- a/sys/modules/dtrace/dtraceall/Makefile +++ b/sys/modules/dtrace/dtraceall/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys KMOD= dtraceall SRCS= dtraceall.c opt_compat.h opt_nfs.h diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile index be65a3d1d8fc..49c0de8c08d3 100644 --- a/sys/modules/dtrace/fasttrap/Makefile +++ b/sys/modules/dtrace/fasttrap/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/common/dtrace diff --git a/sys/modules/dtrace/fbt/Makefile b/sys/modules/dtrace/fbt/Makefile index 969f07605ff8..68156981d077 100644 --- a/sys/modules/dtrace/fbt/Makefile +++ b/sys/modules/dtrace/fbt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/fbt diff --git a/sys/modules/dtrace/profile/Makefile b/sys/modules/dtrace/profile/Makefile index b0f59f53e153..c33427564880 100644 --- a/sys/modules/dtrace/profile/Makefile +++ b/sys/modules/dtrace/profile/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/profile diff --git a/sys/modules/dtrace/prototype/Makefile b/sys/modules/dtrace/prototype/Makefile index 68d4c35f4406..83ec176d0306 100644 --- a/sys/modules/dtrace/prototype/Makefile +++ b/sys/modules/dtrace/prototype/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev diff --git a/sys/modules/dtrace/sdt/Makefile b/sys/modules/dtrace/sdt/Makefile index b77299dd77fd..79c0e5f0f383 100644 --- a/sys/modules/dtrace/sdt/Makefile +++ b/sys/modules/dtrace/sdt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/sdt diff --git a/sys/modules/dtrace/systrace/Makefile b/sys/modules/dtrace/systrace/Makefile index 1d6f1875b3ff..0c682f4e3d5e 100644 --- a/sys/modules/dtrace/systrace/Makefile +++ b/sys/modules/dtrace/systrace/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_freebsd32/Makefile b/sys/modules/dtrace/systrace_freebsd32/Makefile index 4c5da4478a60..e20f59f27e53 100644 --- a/sys/modules/dtrace/systrace_freebsd32/Makefile +++ b/sys/modules/dtrace/systrace_freebsd32/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_linux/Makefile b/sys/modules/dtrace/systrace_linux/Makefile index 1cf5e3170516..037dd3d03849 100644 --- a/sys/modules/dtrace/systrace_linux/Makefile +++ b/sys/modules/dtrace/systrace_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_linux32/Makefile b/sys/modules/dtrace/systrace_linux32/Makefile index db798c39b256..52a71100bc04 100644 --- a/sys/modules/dtrace/systrace_linux32/Makefile +++ b/sys/modules/dtrace/systrace_linux32/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 877e01a69db4..31ce91d085c0 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/ipfw +.PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= dummynet SRCS= ip_dummynet.c SRCS+= ip_dn_glue.c ip_dn_io.c diff --git a/sys/modules/ed/Makefile b/sys/modules/ed/Makefile index a6a74b16470c..ca753aa5fc33 100644 --- a/sys/modules/ed/Makefile +++ b/sys/modules/ed/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ed +.PATH: ${SRCTOP}/sys/dev/ed KMOD= if_ed SRCS= if_ed.c diff --git a/sys/modules/efirt/Makefile b/sys/modules/efirt/Makefile index 993ecdb9e888..f840bc1524bf 100644 --- a/sys/modules/efirt/Makefile +++ b/sys/modules/efirt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE} -.PATH: ${.CURDIR}/../../dev/efidev +.PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE} +.PATH: ${SRCTOP}/sys/dev/efidev KMOD= efirt SRCS= efirt.c efidev.c diff --git a/sys/modules/elink/Makefile b/sys/modules/elink/Makefile index a7776578931b..78ccd947940a 100644 --- a/sys/modules/elink/Makefile +++ b/sys/modules/elink/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../i386/isa +.PATH: ${SRCTOP}/sys/i386/isa KMOD= elink SRCS= elink.c diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile index 18f16756bfa5..7567990110ad 100644 --- a/sys/modules/em/Makefile +++ b/sys/modules/em/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/e1000 +.PATH: ${SRCTOP}/sys/dev/e1000 KMOD = if_em SRCS = device_if.h bus_if.h pci_if.h opt_ddb.h opt_inet.h \ opt_inet6.h ifdi_if.h @@ -17,7 +17,7 @@ PCIE_SHARED = e1000_80003es2lan.c e1000_ich8lan.c e1000_82571.c e1000_82575.c LEGACY_SHARED = e1000_82540.c e1000_82542.c e1000_82541.c e1000_82543.c -CFLAGS += -I${.CURDIR}/../../dev/e1000 +CFLAGS += -I${SRCTOP}/sys/dev/e1000 # DEVICE_POLLING for a non-interrupt-driven method #CFLAGS += -DDEVICE_POLLING diff --git a/sys/modules/en/Makefile b/sys/modules/en/Makefile index 05672f03cdb8..459bf64112fc 100644 --- a/sys/modules/en/Makefile +++ b/sys/modules/en/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/en +.PATH: ${SRCTOP}/sys/dev/en KMOD= if_en SRCS= if_en_pci.c midway.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/ep/Makefile b/sys/modules/ep/Makefile index 6759781e41c0..c91c38784f49 100644 --- a/sys/modules/ep/Makefile +++ b/sys/modules/ep/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/dev/ep diff --git a/sys/modules/epic/Makefile b/sys/modules/epic/Makefile index 8c2212b5e426..b791d340b844 100644 --- a/sys/modules/epic/Makefile +++ b/sys/modules/epic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../sparc64/ebus +.PATH: ${SRCTOP}/sys/sparc64/ebus KMOD= epic SRCS= device_if.h epic.c bus_if.h ofw_bus_if.h diff --git a/sys/modules/esp/Makefile b/sys/modules/esp/Makefile index ccefca52768e..d582a2da5dbe 100644 --- a/sys/modules/esp/Makefile +++ b/sys/modules/esp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/esp +.PATH: ${SRCTOP}/sys/dev/esp KMOD= esp SRCS= device_if.h esp_pci.c ${esp_sbus} bus_if.h ncr53c9x.c ${ofw_bus_if} diff --git a/sys/modules/et/Makefile b/sys/modules/et/Makefile index e71543157db5..bb0d3fff3420 100644 --- a/sys/modules/et/Makefile +++ b/sys/modules/et/Makefile @@ -1,7 +1,7 @@ # $DragonFly: src/sys/dev/netif/et/Makefile,v 1.1 2007/10/12 14:12:42 sephe Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/et +.PATH: ${SRCTOP}/sys/dev/et KMOD= if_et SRCS= if_et.c diff --git a/sys/modules/evdev/Makefile b/sys/modules/evdev/Makefile index 11091eababa0..7bea12e3277f 100644 --- a/sys/modules/evdev/Makefile +++ b/sys/modules/evdev/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/evdev +.PATH: ${SRCTOP}/sys/dev/evdev KMOD= evdev SRCS= cdev.c evdev.c evdev_mt.c evdev_utils.c diff --git a/sys/modules/ex/Makefile b/sys/modules/ex/Makefile index 5c394aa5e11f..b7047ac5b941 100644 --- a/sys/modules/ex/Makefile +++ b/sys/modules/ex/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/ex +.PATH: ${SRCTOP}/sys/dev/ex KMOD= if_ex SRCS= if_ex.c \ diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile index b7a8d522b283..5135ff24adb3 100644 --- a/sys/modules/exca/Makefile +++ b/sys/modules/exca/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/exca +.PATH: ${SRCTOP}/sys/dev/exca KMOD= exca SRCS= exca.c device_if.h bus_if.h power_if.h card_if.h pccarddevs.h diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile index fc10ab0928ba..70814bfb1223 100644 --- a/sys/modules/ext2fs/Makefile +++ b/sys/modules/ext2fs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/ext2fs +.PATH: ${SRCTOP}/sys/fs/ext2fs KMOD= ext2fs SRCS= opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \ ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_extents.c ext2_hash.c \ diff --git a/sys/modules/fatm/Makefile b/sys/modules/fatm/Makefile index 8e1e7bb5d7bc..c228fb8e49e8 100644 --- a/sys/modules/fatm/Makefile +++ b/sys/modules/fatm/Makefile @@ -2,7 +2,7 @@ # # Author: Harti Brandt <harti@freebsd.org> # -.PATH: ${.CURDIR}/../../dev/fatm +.PATH: ${SRCTOP}/sys/dev/fatm KMOD= if_fatm SRCS= if_fatm.c device_if.h bus_if.h pci_if.h opt_inet.h opt_natm.h diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile index b19f204aacd0..0f39acb4c596 100644 --- a/sys/modules/fdc/Makefile +++ b/sys/modules/fdc/Makefile @@ -2,7 +2,7 @@ KMOD= fdc -.PATH: ${.CURDIR}/../../dev/fdc +.PATH: ${SRCTOP}/sys/dev/fdc SRCS= fdc.c fdc_isa.c fdc_pccard.c .if ${MACHINE} == "i386" || ${MACHINE} == "amd64" SRCS+= opt_acpi.h acpi_if.h fdc_acpi.c diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile index eead3ec0862b..083ad17c6158 100644 --- a/sys/modules/fdescfs/Makefile +++ b/sys/modules/fdescfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/fdescfs +.PATH: ${SRCTOP}/sys/fs/fdescfs KMOD= fdescfs SRCS= vnode_if.h \ diff --git a/sys/modules/fe/Makefile b/sys/modules/fe/Makefile index 81a7e12905e0..3137bf2ed440 100644 --- a/sys/modules/fe/Makefile +++ b/sys/modules/fe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/fe +.PATH: ${SRCTOP}/sys/dev/fe KMOD= if_fe SRCS= if_fe.c if_fe_isa.c if_fe_pccard.c diff --git a/sys/modules/filemon/Makefile b/sys/modules/filemon/Makefile index b97b2e2fbbd3..b0c7cd324610 100644 --- a/sys/modules/filemon/Makefile +++ b/sys/modules/filemon/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/filemon +.PATH: ${SRCTOP}/sys/dev/filemon KMOD= filemon SRCS= ${KMOD}.c diff --git a/sys/modules/firewire/firewire/Makefile b/sys/modules/firewire/firewire/Makefile index de418b14432d..72fa049d4326 100644 --- a/sys/modules/firewire/firewire/Makefile +++ b/sys/modules/firewire/firewire/Makefile @@ -2,7 +2,7 @@ # Makefile for the IEEE1394 OHCI chipset -.PATH: ${.CURDIR}/../../../dev/firewire +.PATH: ${SRCTOP}/sys/dev/firewire KMOD= firewire SRCS = bus_if.h device_if.h pci_if.h \ diff --git a/sys/modules/firewire/fwe/Makefile b/sys/modules/firewire/fwe/Makefile index 746eb65b449a..8632ab2e16c5 100644 --- a/sys/modules/firewire/fwe/Makefile +++ b/sys/modules/firewire/fwe/Makefile @@ -2,7 +2,7 @@ # Makefile for the fwe(4) module (Ethernet over IEEE1394) -.PATH: ${.CURDIR}/../../../dev/firewire +.PATH: ${SRCTOP}/sys/dev/firewire KMOD = if_fwe SRCS = bus_if.h device_if.h \ diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile index 992d35601c98..e79bd1486f44 100644 --- a/sys/modules/firewire/fwip/Makefile +++ b/sys/modules/firewire/fwip/Makefile @@ -2,7 +2,7 @@ # Makefile for the fwip(4) module (IP over IEEE1394) -.PATH: ${.CURDIR}/../../../dev/firewire ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/dev/firewire ${SRCTOP}/sys/net KMOD = if_fwip SRCS = bus_if.h device_if.h \ diff --git a/sys/modules/firewire/sbp/Makefile b/sys/modules/firewire/sbp/Makefile index 94218c46763a..7023b8df99b1 100644 --- a/sys/modules/firewire/sbp/Makefile +++ b/sys/modules/firewire/sbp/Makefile @@ -2,7 +2,7 @@ # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394) -.PATH: ${.CURDIR}/../../../dev/firewire +.PATH: ${SRCTOP}/sys/dev/firewire KMOD = sbp SRCS = bus_if.h device_if.h \ diff --git a/sys/modules/firewire/sbp_targ/Makefile b/sys/modules/firewire/sbp_targ/Makefile index 98ca9571b20a..2be9c565eca7 100644 --- a/sys/modules/firewire/sbp_targ/Makefile +++ b/sys/modules/firewire/sbp_targ/Makefile @@ -2,7 +2,7 @@ # Makefile for the SBP-II Target mode -.PATH: ${.CURDIR}/../../../dev/firewire +.PATH: ${SRCTOP}/sys/dev/firewire KMOD = sbp_targ SRCS = bus_if.h device_if.h \ diff --git a/sys/modules/firmware/Makefile b/sys/modules/firmware/Makefile index 90f1cbdbca8c..7a9eb4522970 100644 --- a/sys/modules/firmware/Makefile +++ b/sys/modules/firmware/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= firmware SRCS= subr_firmware.c vnode_if.h diff --git a/sys/modules/fuse/Makefile b/sys/modules/fuse/Makefile index 4ccc1a0f46c3..c831e5dc0e60 100644 --- a/sys/modules/fuse/Makefile +++ b/sys/modules/fuse/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/fuse +.PATH: ${SRCTOP}/sys/fs/fuse KMOD= fuse SRCS= vnode_if.h \ diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile index 283b638386a8..fbe14392f69f 100644 --- a/sys/modules/fxp/Makefile +++ b/sys/modules/fxp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/fxp +.PATH: ${SRCTOP}/sys/dev/fxp KMOD= if_fxp SRCS= device_if.h bus_if.h if_fxp.c inphy.c miibus_if.h miidevs.h pci_if.h diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile index 941dc18f4a29..54083b0de6cb 100644 --- a/sys/modules/gem/Makefile +++ b/sys/modules/gem/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/gem +.PATH: ${SRCTOP}/sys/dev/gem KMOD= if_gem SRCS= bus_if.h device_if.h if_gem.c if_gem_pci.c ${if_gem_sbus} miibus_if.h diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index 7b79f53a13af..cbc7207b6f0e 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR= geom_bde \ diff --git a/sys/modules/geom/geom_bde/Makefile b/sys/modules/geom/geom_bde/Makefile index bcb4dbcfeb6b..a3961c2254b2 100644 --- a/sys/modules/geom/geom_bde/Makefile +++ b/sys/modules/geom/geom_bde/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/bde -.PATH: ${.CURDIR}/../../../crypto/rijndael -.PATH: ${.CURDIR}/../../../crypto/sha2 +.PATH: ${SRCTOP}/sys/geom/bde +.PATH: ${SRCTOP}/sys/crypto/rijndael +.PATH: ${SRCTOP}/sys/crypto/sha2 KMOD= geom_bde SRCS= g_bde.c g_bde_crypt.c g_bde_lock.c g_bde_work.c diff --git a/sys/modules/geom/geom_bsd/Makefile b/sys/modules/geom/geom_bsd/Makefile index b605df95d4f8..6f7b907f0289 100644 --- a/sys/modules/geom/geom_bsd/Makefile +++ b/sys/modules/geom/geom_bsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_bsd SRCS= geom_bsd.c geom_bsd_enc.c diff --git a/sys/modules/geom/geom_cache/Makefile b/sys/modules/geom/geom_cache/Makefile index 7ccbe98fdac9..8260f9e2b776 100644 --- a/sys/modules/geom/geom_cache/Makefile +++ b/sys/modules/geom/geom_cache/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/cache +.PATH: ${SRCTOP}/sys/geom/cache KMOD= geom_cache SRCS= g_cache.c diff --git a/sys/modules/geom/geom_ccd/Makefile b/sys/modules/geom/geom_ccd/Makefile index 18d6eeb04718..3e1c667011fa 100644 --- a/sys/modules/geom/geom_ccd/Makefile +++ b/sys/modules/geom/geom_ccd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_ccd SRCS= geom_ccd.c diff --git a/sys/modules/geom/geom_concat/Makefile b/sys/modules/geom/geom_concat/Makefile index 3de201a79b48..5caff7117f02 100644 --- a/sys/modules/geom/geom_concat/Makefile +++ b/sys/modules/geom/geom_concat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/concat +.PATH: ${SRCTOP}/sys/geom/concat KMOD= geom_concat SRCS= g_concat.c diff --git a/sys/modules/geom/geom_eli/Makefile b/sys/modules/geom/geom_eli/Makefile index c42ccf19f737..b3b2f926c595 100644 --- a/sys/modules/geom/geom_eli/Makefile +++ b/sys/modules/geom/geom_eli/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/eli +.PATH: ${SRCTOP}/sys/geom/eli KMOD= geom_eli SRCS= g_eli.c diff --git a/sys/modules/geom/geom_flashmap/Makefile b/sys/modules/geom/geom_flashmap/Makefile index d475860fefe6..8b56c145ea51 100644 --- a/sys/modules/geom/geom_flashmap/Makefile +++ b/sys/modules/geom/geom_flashmap/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_flashmap SRCS= geom_flashmap.c diff --git a/sys/modules/geom/geom_fox/Makefile b/sys/modules/geom/geom_fox/Makefile index adf8c2e8e8bf..04fc63a33d12 100644 --- a/sys/modules/geom/geom_fox/Makefile +++ b/sys/modules/geom/geom_fox/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_fox SRCS= geom_fox.c diff --git a/sys/modules/geom/geom_gate/Makefile b/sys/modules/geom/geom_gate/Makefile index 783a58ac2d82..88705a0e9511 100644 --- a/sys/modules/geom/geom_gate/Makefile +++ b/sys/modules/geom/geom_gate/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/gate +.PATH: ${SRCTOP}/sys/geom/gate KMOD= geom_gate SRCS= g_gate.c diff --git a/sys/modules/geom/geom_journal/Makefile b/sys/modules/geom/geom_journal/Makefile index 0288b4810ce9..89298a8180d7 100644 --- a/sys/modules/geom/geom_journal/Makefile +++ b/sys/modules/geom/geom_journal/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/journal +.PATH: ${SRCTOP}/sys/geom/journal KMOD= geom_journal SRCS= g_journal.c diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile index b06e1089c803..f5f4a7c90630 100644 --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/label +.PATH: ${SRCTOP}/sys/geom/label KMOD= geom_label SRCS= g_label.c diff --git a/sys/modules/geom/geom_linux_lvm/Makefile b/sys/modules/geom/geom_linux_lvm/Makefile index 1e10e13bc57c..5d2b7a3eadd1 100644 --- a/sys/modules/geom/geom_linux_lvm/Makefile +++ b/sys/modules/geom/geom_linux_lvm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/linux_lvm +.PATH: ${SRCTOP}/sys/geom/linux_lvm KMOD= geom_linux_lvm SRCS= g_linux_lvm.c diff --git a/sys/modules/geom/geom_map/Makefile b/sys/modules/geom/geom_map/Makefile index 6b26ba9470fe..4f5b773d755a 100644 --- a/sys/modules/geom/geom_map/Makefile +++ b/sys/modules/geom/geom_map/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_map SRCS= geom_map.c bus_if.h device_if.h diff --git a/sys/modules/geom/geom_mbr/Makefile b/sys/modules/geom/geom_mbr/Makefile index 1820f3bc3bdd..0759a649d972 100644 --- a/sys/modules/geom/geom_mbr/Makefile +++ b/sys/modules/geom/geom_mbr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_mbr SRCS= geom_mbr.c geom_mbr_enc.c diff --git a/sys/modules/geom/geom_mirror/Makefile b/sys/modules/geom/geom_mirror/Makefile index 3e653ce540c4..f2a11a537374 100644 --- a/sys/modules/geom/geom_mirror/Makefile +++ b/sys/modules/geom/geom_mirror/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/mirror +.PATH: ${SRCTOP}/sys/geom/mirror KMOD= geom_mirror SRCS= g_mirror.c diff --git a/sys/modules/geom/geom_mountver/Makefile b/sys/modules/geom/geom_mountver/Makefile index 8e89c9ab5dec..ff579ba3289e 100644 --- a/sys/modules/geom/geom_mountver/Makefile +++ b/sys/modules/geom/geom_mountver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/mountver +.PATH: ${SRCTOP}/sys/geom/mountver KMOD= geom_mountver SRCS= g_mountver.c diff --git a/sys/modules/geom/geom_multipath/Makefile b/sys/modules/geom/geom_multipath/Makefile index d036fe0dec7b..27b6fdbf67e4 100644 --- a/sys/modules/geom/geom_multipath/Makefile +++ b/sys/modules/geom/geom_multipath/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/multipath +.PATH: ${SRCTOP}/sys/geom/multipath KMOD= geom_multipath SRCS= g_multipath.c diff --git a/sys/modules/geom/geom_nop/Makefile b/sys/modules/geom/geom_nop/Makefile index 139e12422ea2..d2294823488b 100644 --- a/sys/modules/geom/geom_nop/Makefile +++ b/sys/modules/geom/geom_nop/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/nop +.PATH: ${SRCTOP}/sys/geom/nop KMOD= geom_nop SRCS= g_nop.c diff --git a/sys/modules/geom/geom_part/geom_part_apm/Makefile b/sys/modules/geom/geom_part/geom_part_apm/Makefile index afd9eb6bc8dc..ee7966f1f858 100644 --- a/sys/modules/geom/geom_part/geom_part_apm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_apm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_apm SRCS= g_part_apm.c diff --git a/sys/modules/geom/geom_part/geom_part_bsd/Makefile b/sys/modules/geom/geom_part/geom_part_bsd/Makefile index f6d323c766fd..8e8cc732a9fe 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part ${.CURDIR}/../../../../geom +.PATH: ${SRCTOP}/sys/geom/part ${SRCTOP}/sys/geom KMOD= geom_part_bsd SRCS= g_part_bsd.c geom_bsd_enc.c diff --git a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile index abe153fe56b2..4dabbaa6fe12 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_bsd64 SRCS= g_part_bsd64.c diff --git a/sys/modules/geom/geom_part/geom_part_ebr/Makefile b/sys/modules/geom/geom_part/geom_part_ebr/Makefile index 3b0d36bff48c..4aa8ec1c4f9f 100644 --- a/sys/modules/geom/geom_part/geom_part_ebr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ebr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ebr SRCS= g_part_ebr.c diff --git a/sys/modules/geom/geom_part/geom_part_gpt/Makefile b/sys/modules/geom/geom_part/geom_part_gpt/Makefile index 26df04a09e1b..d0f7089ab13a 100644 --- a/sys/modules/geom/geom_part/geom_part_gpt/Makefile +++ b/sys/modules/geom/geom_part/geom_part_gpt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_gpt SRCS= g_part_gpt.c diff --git a/sys/modules/geom/geom_part/geom_part_ldm/Makefile b/sys/modules/geom/geom_part/geom_part_ldm/Makefile index 71f364d76fe2..f51049bce280 100644 --- a/sys/modules/geom/geom_part/geom_part_ldm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ldm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ldm SRCS= g_part_ldm.c diff --git a/sys/modules/geom/geom_part/geom_part_mbr/Makefile b/sys/modules/geom/geom_part/geom_part_mbr/Makefile index 3dfd72ecbd06..8f4e1812aa82 100644 --- a/sys/modules/geom/geom_part/geom_part_mbr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_mbr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_mbr SRCS= g_part_mbr.c diff --git a/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile b/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile index 085648ae220d..f3aa9cb050a4 100644 --- a/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile +++ b/sys/modules/geom/geom_part/geom_part_vtoc8/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../geom/part +.PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_vtoc8 SRCS= g_part_vtoc8.c diff --git a/sys/modules/geom/geom_raid/Makefile b/sys/modules/geom/geom_raid/Makefile index d2c3e4d2c8d2..b9c8f2ce219d 100644 --- a/sys/modules/geom/geom_raid/Makefile +++ b/sys/modules/geom/geom_raid/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/raid +.PATH: ${SRCTOP}/sys/geom/raid KMOD= geom_raid SRCS= g_raid.c diff --git a/sys/modules/geom/geom_raid3/Makefile b/sys/modules/geom/geom_raid3/Makefile index b202237a611f..5baa6c2df4ce 100644 --- a/sys/modules/geom/geom_raid3/Makefile +++ b/sys/modules/geom/geom_raid3/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/raid3 +.PATH: ${SRCTOP}/sys/geom/raid3 KMOD= geom_raid3 SRCS= g_raid3.c diff --git a/sys/modules/geom/geom_sched/Makefile.inc b/sys/modules/geom/geom_sched/Makefile.inc index 808d6eba89a0..a81a965bebb9 100644 --- a/sys/modules/geom/geom_sched/Makefile.inc +++ b/sys/modules/geom/geom_sched/Makefile.inc @@ -1,9 +1,9 @@ # $FreeBSD$ # included by geom_sched children -.PATH: ${.CURDIR}/../../../../geom/sched +.PATH: ${SRCTOP}/sys/geom/sched # 6.x needs this path -#CFLAGS += -I${.CURDIR}/../../../../geom/sched +#CFLAGS += -I${SRCTOP}/sys/geom/sched # .include <bsd.kmod.mk> diff --git a/sys/modules/geom/geom_shsec/Makefile b/sys/modules/geom/geom_shsec/Makefile index f229203ad87a..79d29ea4b205 100644 --- a/sys/modules/geom/geom_shsec/Makefile +++ b/sys/modules/geom/geom_shsec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/shsec +.PATH: ${SRCTOP}/sys/geom/shsec KMOD= geom_shsec SRCS= g_shsec.c diff --git a/sys/modules/geom/geom_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile index 278d3accfdc6..947b3bb7bef5 100644 --- a/sys/modules/geom/geom_stripe/Makefile +++ b/sys/modules/geom/geom_stripe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/stripe +.PATH: ${SRCTOP}/sys/geom/stripe KMOD= geom_stripe SRCS= g_stripe.c diff --git a/sys/modules/geom/geom_sunlabel/Makefile b/sys/modules/geom/geom_sunlabel/Makefile index 840395aaf1de..cb0d13eb0f13 100644 --- a/sys/modules/geom/geom_sunlabel/Makefile +++ b/sys/modules/geom/geom_sunlabel/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_sunlabel SRCS= geom_sunlabel.c geom_sunlabel_enc.c diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile index dd2bd4619d55..2a7cba7d8a7a 100644 --- a/sys/modules/geom/geom_uzip/Makefile +++ b/sys/modules/geom/geom_uzip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/uzip ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/geom/uzip ${SRCTOP}/sys/net KMOD= geom_uzip SRCS= g_uzip.c g_uzip_zlib.c g_uzip_lzma.c g_uzip_wrkthr.c @@ -8,13 +8,13 @@ SRCS+= g_uzip.h g_uzip_dapi.h g_uzip_lzma.h g_uzip_zlib.h g_uzip_softc.h \ g_uzip_wrkthr.h #CFLAGS= -g -DINVARIANT_SUPPORT -DINVARIANTS -.PATH: ${.CURDIR}/../../../contrib/xz-embedded/freebsd/ \ - ${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ \ - ${.CURDIR}/../../../contrib/xz-embedded/linux/include/linux/ \ - ${.CURDIR}/../../../net +.PATH: ${SRCTOP}/sys/contrib/xz-embedded/freebsd/ \ + ${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz/ \ + ${SRCTOP}/sys/contrib/xz-embedded/linux/include/linux/ \ + ${SRCTOP}/sys/net -CFLAGS+= -I${.CURDIR}/../../../contrib/xz-embedded/freebsd \ - -I${.CURDIR}/../../../contrib/xz-embedded/linux/lib/xz/ +CFLAGS+= -I${SRCTOP}/sys/contrib/xz-embedded/freebsd \ + -I${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz/ SRCS+= xz_crc32.c xz_dec_bcj.c xz_dec_lzma2.c xz_dec_stream.c \ xz_malloc.c SRCS+= xz.h xz_config.h xz_lzma2.h xz_malloc.h xz_private.h xz_stream.h diff --git a/sys/modules/geom/geom_vinum/Makefile b/sys/modules/geom/geom_vinum/Makefile index 48ac962a96d4..69dd8083acce 100644 --- a/sys/modules/geom/geom_vinum/Makefile +++ b/sys/modules/geom/geom_vinum/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/vinum +.PATH: ${SRCTOP}/sys/geom/vinum KMOD= geom_vinum SRCS= geom_vinum.c geom_vinum_create.c geom_vinum_drive.c geom_vinum_plex.c \ diff --git a/sys/modules/geom/geom_virstor/Makefile b/sys/modules/geom/geom_virstor/Makefile index 3a099f2c3c17..ea2b7debe82c 100644 --- a/sys/modules/geom/geom_virstor/Makefile +++ b/sys/modules/geom/geom_virstor/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/virstor +.PATH: ${SRCTOP}/sys/geom/virstor KMOD= geom_virstor SRCS= g_virstor.c g_virstor_md.c binstream.c diff --git a/sys/modules/geom/geom_vol_ffs/Makefile b/sys/modules/geom/geom_vol_ffs/Makefile index de9b75806dfe..d7287c85752f 100644 --- a/sys/modules/geom/geom_vol_ffs/Makefile +++ b/sys/modules/geom/geom_vol_ffs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom +.PATH: ${SRCTOP}/sys/geom KMOD= geom_vol_ffs SRCS= geom_vol_ffs.c diff --git a/sys/modules/geom/geom_zero/Makefile b/sys/modules/geom/geom_zero/Makefile index 43dae09d3333..bd0a3277f267 100644 --- a/sys/modules/geom/geom_zero/Makefile +++ b/sys/modules/geom/geom_zero/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../geom/zero +.PATH: ${SRCTOP}/sys/geom/zero KMOD= geom_zero SRCS= g_zero.c diff --git a/sys/modules/glxiic/Makefile b/sys/modules/glxiic/Makefile index 46b0c071c611..beef3c429c91 100644 --- a/sys/modules/glxiic/Makefile +++ b/sys/modules/glxiic/Makefile @@ -2,7 +2,7 @@ #CFLAGS+= -DGLXIIC_DEBUG -.PATH: ${.CURDIR}/../../dev/glxiic +.PATH: ${SRCTOP}/sys/dev/glxiic KMOD= glxiic SRCS= glxiic.c SRCS+= device_if.h bus_if.h pci_if.h iicbus_if.h diff --git a/sys/modules/glxsb/Makefile b/sys/modules/glxsb/Makefile index 7167f8294c53..649901072cae 100644 --- a/sys/modules/glxsb/Makefile +++ b/sys/modules/glxsb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/glxsb +.PATH: ${SRCTOP}/sys/dev/glxsb KMOD = glxsb SRCS = glxsb.c glxsb_hash.c glxsb.h SRCS += device_if.h pci_if.h bus_if.h diff --git a/sys/modules/gpio/gpiobus/Makefile b/sys/modules/gpio/gpiobus/Makefile index cc67b9c6c301..24a0f1314a75 100644 --- a/sys/modules/gpio/gpiobus/Makefile +++ b/sys/modules/gpio/gpiobus/Makefile @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../dev/gpio/ +.PATH: ${SRCTOP}/sys/dev/gpio/ KMOD= gpiobus SRCS= gpiobus.c gpioc.c SRCS+= gpio_if.c gpio_if.h gpiobus_if.c gpiobus_if.h ofw_bus_if.h SRCS+= device_if.h bus_if.h opt_platform.h -CFLAGS+= -I. -I${.CURDIR}/../../../dev/gpio/ +CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include <bsd.kmod.mk> diff --git a/sys/modules/gpio/gpioiic/Makefile b/sys/modules/gpio/gpioiic/Makefile index 055f2ecba5c8..ff422f33ddaa 100644 --- a/sys/modules/gpio/gpioiic/Makefile +++ b/sys/modules/gpio/gpioiic/Makefile @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../dev/gpio/ +.PATH: ${SRCTOP}/sys/dev/gpio/ KMOD= gpioiic SRCS= gpioiic.c SRCS+= device_if.h bus_if.h gpio_if.h gpiobus_if.h iicbus_if.h iicbb_if.h SRCS+= ofw_bus_if.h opt_platform.h -CFLAGS+= -I. -I${.CURDIR}/../../../dev/gpio/ +CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include <bsd.kmod.mk> diff --git a/sys/modules/gpio/gpiokeys/Makefile b/sys/modules/gpio/gpiokeys/Makefile index 95ffce104e62..eafb5d29afec 100644 --- a/sys/modules/gpio/gpiokeys/Makefile +++ b/sys/modules/gpio/gpiokeys/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../dev/gpio/ +.PATH: ${SRCTOP}/sys/dev/gpio/ KMOD= gpiokeys SRCS= gpiokeys.c gpiokeys_codes.c SRCS+= bus_if.h device_if.h gpio_if.h ofw_bus_if.h SRCS+= opt_platform.h opt_kbd.h -CFLAGS+= -I. -I${.CURDIR}/../../../dev/gpio/ +CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include <bsd.kmod.mk> diff --git a/sys/modules/gpio/gpioled/Makefile b/sys/modules/gpio/gpioled/Makefile index 4c70a1fcf520..87d8ee339c98 100644 --- a/sys/modules/gpio/gpioled/Makefile +++ b/sys/modules/gpio/gpioled/Makefile @@ -29,7 +29,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../dev/gpio/ +.PATH: ${SRCTOP}/sys/dev/gpio/ KMOD= gpioled .if !empty(OPT_FDT) @@ -39,6 +39,6 @@ SRCS= gpioled.c .endif SRCS+= device_if.h bus_if.h gpio_if.h gpiobus_if.h opt_platform.h ofw_bus_if.h -CFLAGS+= -I. -I${.CURDIR}/../../../dev/gpio/ +CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include <bsd.kmod.mk> diff --git a/sys/modules/gpio/gpiopps/Makefile b/sys/modules/gpio/gpiopps/Makefile index 3adc1c6a82a3..7b3408fc40bf 100644 --- a/sys/modules/gpio/gpiopps/Makefile +++ b/sys/modules/gpio/gpiopps/Makefile @@ -29,12 +29,12 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../dev/gpio/ +.PATH: ${SRCTOP}/sys/dev/gpio/ KMOD= gpiopps SRCS= gpiopps.c SRCS+= device_if.h bus_if.h gpio_if.h gpiobus_if.h opt_platform.h ofw_bus_if.h -CFLAGS+= -I. -I${.CURDIR}/../../../dev/gpio/ +CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include <bsd.kmod.mk> diff --git a/sys/modules/gpio/gpiospi/Makefile b/sys/modules/gpio/gpiospi/Makefile index 181ec03b4d78..023714e6b2a2 100644 --- a/sys/modules/gpio/gpiospi/Makefile +++ b/sys/modules/gpio/gpiospi/Makefile @@ -29,13 +29,13 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../dev/gpio/ +.PATH: ${SRCTOP}/sys/dev/gpio/ KMOD= gpiospi SRCS= gpiospi.c SRCS+= device_if.h bus_if.h gpio_if.h gpiobus_if.h spibus_if.h SRCS+= ofw_bus_if.h opt_gpio.h opt_platform.h -CFLAGS+= -I. -I${.CURDIR}/../../../dev/gpio/ +CFLAGS+= -I. -I${SRCTOP}/sys/dev/gpio/ .include <bsd.kmod.mk> diff --git a/sys/modules/hatm/Makefile b/sys/modules/hatm/Makefile index 557819956597..5027babd1944 100644 --- a/sys/modules/hatm/Makefile +++ b/sys/modules/hatm/Makefile @@ -2,7 +2,7 @@ # # Author: Harti Brandt <harti@freebsd.org> # -.PATH: ${.CURDIR}/../../dev/hatm +.PATH: ${SRCTOP}/sys/dev/hatm KMOD= if_hatm SRCS= if_hatm.c if_hatm_intr.c if_hatm_ioctl.c if_hatm_tx.c if_hatm_rx.c \ diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile index 6897e348ec59..840f668d23e6 100644 --- a/sys/modules/hifn/Makefile +++ b/sys/modules/hifn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/hifn +.PATH: ${SRCTOP}/sys/dev/hifn KMOD = hifn SRCS = hifn7751.c opt_hifn.h SRCS += device_if.h bus_if.h pci_if.h diff --git a/sys/modules/hme/Makefile b/sys/modules/hme/Makefile index 465628195eed..74633717bbd3 100644 --- a/sys/modules/hme/Makefile +++ b/sys/modules/hme/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/hme +.PATH: ${SRCTOP}/sys/dev/hme KMOD= if_hme SRCS= bus_if.h device_if.h if_hme.c if_hme_pci.c ${if_hme_sbus} miibus_if.h diff --git a/sys/modules/hpt27xx/Makefile b/sys/modules/hpt27xx/Makefile index 3f7899d02a09..b28b5f16f3e4 100644 --- a/sys/modules/hpt27xx/Makefile +++ b/sys/modules/hpt27xx/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -HPT27XX= ${.CURDIR}/../../dev/hpt27xx +HPT27XX= ${SRCTOP}/sys/dev/hpt27xx .PATH: ${HPT27XX} KMOD= hpt27xx diff --git a/sys/modules/hptiop/Makefile b/sys/modules/hptiop/Makefile index 66f11c287ac4..d001f9b4ed2a 100644 --- a/sys/modules/hptiop/Makefile +++ b/sys/modules/hptiop/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/hptiop +.PATH: ${SRCTOP}/sys/dev/hptiop KMOD= hptiop SRCS= hptiop.c diff --git a/sys/modules/hptmv/Makefile b/sys/modules/hptmv/Makefile index 134c207020d2..9b727230d9d7 100644 --- a/sys/modules/hptmv/Makefile +++ b/sys/modules/hptmv/Makefile @@ -4,7 +4,7 @@ # # $FreeBSD$ -HPTMV= ${.CURDIR}/../../dev/hptmv +HPTMV= ${SRCTOP}/sys/dev/hptmv .PATH: ${HPTMV} KMOD= hptmv diff --git a/sys/modules/hptnr/Makefile b/sys/modules/hptnr/Makefile index 9279fbd8cebe..84f29ac2cc8d 100644 --- a/sys/modules/hptnr/Makefile +++ b/sys/modules/hptnr/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -HPTNR= ${.CURDIR}/../../dev/hptnr +HPTNR= ${SRCTOP}/sys/dev/hptnr .PATH: ${HPTNR} KMOD= hptnr diff --git a/sys/modules/hptrr/Makefile b/sys/modules/hptrr/Makefile index 7cbd7e85a243..8529886e3fa7 100644 --- a/sys/modules/hptrr/Makefile +++ b/sys/modules/hptrr/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile.def,v 1.18 2007/03/22 11:20:15 gmm Exp $ # $FreeBSD$ -HPTRR= ${.CURDIR}/../../dev/hptrr +HPTRR= ${SRCTOP}/sys/dev/hptrr .PATH: ${HPTRR} KMOD = hptrr SRCS = opt_scsi.h opt_cam.h bus_if.h device_if.h pci_if.h os_bsd.h diff --git a/sys/modules/hwpmc/Makefile b/sys/modules/hwpmc/Makefile index 5e6ea309c8e2..1db7a661c09c 100644 --- a/sys/modules/hwpmc/Makefile +++ b/sys/modules/hwpmc/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/hwpmc +.PATH: ${SRCTOP}/sys/dev/hwpmc KMOD= hwpmc diff --git a/sys/modules/hwpmc_mips24k/Makefile b/sys/modules/hwpmc_mips24k/Makefile index 772fa563b4cb..2ea54aafe478 100644 --- a/sys/modules/hwpmc_mips24k/Makefile +++ b/sys/modules/hwpmc_mips24k/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/hwpmc +.PATH: ${SRCTOP}/sys/dev/hwpmc KMOD= hwpmc_mips24k diff --git a/sys/modules/hwpmc_mips74k/Makefile b/sys/modules/hwpmc_mips74k/Makefile index 204455c9cf35..8316e6d2d715 100644 --- a/sys/modules/hwpmc_mips74k/Makefile +++ b/sys/modules/hwpmc_mips74k/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/hwpmc +.PATH: ${SRCTOP}/sys/dev/hwpmc KMOD= hwpmc_mips74k diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile index e2a253320cc7..dd28d13236cc 100644 --- a/sys/modules/hyperv/netvsc/Makefile +++ b/sys/modules/hyperv/netvsc/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/netvsc \ - ${.CURDIR}/../../../dev/hyperv/vmbus +.PATH: ${SRCTOP}/sys/dev/hyperv/netvsc \ + ${SRCTOP}/sys/dev/hyperv/vmbus KMOD= hv_netvsc SRCS= hn_nvs.c hn_rndis.c if_hn.c SRCS+= bus_if.h device_if.h vmbus_if.h SRCS+= opt_hn.h opt_inet.h opt_inet6.h opt_rss.h -CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/netvsc +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/netvsc .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/pcib/Makefile b/sys/modules/hyperv/pcib/Makefile index 1b63a138dc1f..83e960dde069 100644 --- a/sys/modules/hyperv/pcib/Makefile +++ b/sys/modules/hyperv/pcib/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/pcib \ - ${.CURDIR}/../../../dev/hyperv/vmbus +.PATH: ${SRCTOP}/sys/dev/hyperv/pcib \ + ${SRCTOP}/sys/dev/hyperv/vmbus KMOD= vmbus_pcib SRCS= vmbus_pcib.c SRCS+= bus_if.h device_if.h pci_if.h pcib_if.h vmbus_if.h -CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/pcib +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/pcib .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile index 5f38b1329862..a755772437f6 100644 --- a/sys/modules/hyperv/storvsc/Makefile +++ b/sys/modules/hyperv/storvsc/Makefile @@ -1,15 +1,15 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/storvsc \ - ${.CURDIR}/../../../dev/hyperv/vmbus \ +.PATH: ${SRCTOP}/sys/dev/hyperv/storvsc \ + ${SRCTOP}/sys/dev/hyperv/vmbus \ KMOD= hv_storvsc SRCS = hv_storvsc_drv_freebsd.c \ hv_vstorage.h SRCS+= bus_if.h device_if.h opt_cam.h vmbus_if.h -CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ - -I${.CURDIR}/../../../dev/hyperv/vmbus \ - -I${.CURDIR}/../../../dev/hyperv/storvsc +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \ + -I${SRCTOP}/sys/dev/hyperv/vmbus \ + -I${SRCTOP}/sys/dev/hyperv/storvsc .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile index deb2e8bc187e..53dc4b22ab96 100644 --- a/sys/modules/hyperv/utilities/Makefile +++ b/sys/modules/hyperv/utilities/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/utilities +.PATH: ${SRCTOP}/sys/dev/hyperv/utilities KMOD= hv_utils SRCS= vmbus_ic.c @@ -11,7 +11,7 @@ SRCS+= vmbus_shutdown.c SRCS+= vmbus_timesync.c SRCS+= bus_if.h device_if.h vmbus_if.h -CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ - -I${.CURDIR}/../../../dev/hyperv/vmbus +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \ + -I${SRCTOP}/sys/dev/hyperv/vmbus .include <bsd.kmod.mk> diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index d6052e51d754..e05ce851a4f8 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/hyperv/vmbus \ - ${.CURDIR}/../../../dev/hyperv/vmbus/${MACHINE_CPUARCH} +.PATH: ${SRCTOP}/sys/dev/hyperv/vmbus \ + ${SRCTOP}/sys/dev/hyperv/vmbus/${MACHINE_CPUARCH} KMOD= hv_vmbus SRCS= hyperv.c \ @@ -28,7 +28,7 @@ vmbus_vector.o: ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \ ${.IMPSRC} -o ${.TARGET} -CFLAGS+= -I${.CURDIR}/../../../dev/hyperv/include \ - -I${.CURDIR}/../../../dev/hyperv/vmbus +CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/include \ + -I${SRCTOP}/sys/dev/hyperv/vmbus .include <bsd.kmod.mk> diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile index adddfb796f39..4c6390d1cb18 100644 --- a/sys/modules/i2c/controllers/alpm/Makefile +++ b/sys/modules/i2c/controllers/alpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/alpm +.PATH: ${SRCTOP}/sys/dev/alpm KMOD = alpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ alpm.c diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile index 2f6fcec1201b..32478a8ea5d7 100644 --- a/sys/modules/i2c/controllers/amdpm/Makefile +++ b/sys/modules/i2c/controllers/amdpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/amdpm +.PATH: ${SRCTOP}/sys/dev/amdpm KMOD = amdpm SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ amdpm.c diff --git a/sys/modules/i2c/controllers/amdsmb/Makefile b/sys/modules/i2c/controllers/amdsmb/Makefile index 43d1122b9751..d1912e89987a 100644 --- a/sys/modules/i2c/controllers/amdsmb/Makefile +++ b/sys/modules/i2c/controllers/amdsmb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/amdsmb +.PATH: ${SRCTOP}/sys/dev/amdsmb KMOD= amdsmb SRCS= amdsmb.c diff --git a/sys/modules/i2c/controllers/ichiic/Makefile b/sys/modules/i2c/controllers/ichiic/Makefile index 97db5e8e4c62..a7bbcf133892 100644 --- a/sys/modules/i2c/controllers/ichiic/Makefile +++ b/sys/modules/i2c/controllers/ichiic/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/ichiic +.PATH: ${SRCTOP}/sys/dev/ichiic KMOD = ig4 SRCS = acpi_if.h device_if.h bus_if.h iicbus_if.h pci_if.h \ smbus_if.h ${ig4_acpi} ig4_iic.c ig4_pci.c ig4_reg.h \ diff --git a/sys/modules/i2c/controllers/ichsmb/Makefile b/sys/modules/i2c/controllers/ichsmb/Makefile index 7cb9957384f5..e65f1a938d02 100644 --- a/sys/modules/i2c/controllers/ichsmb/Makefile +++ b/sys/modules/i2c/controllers/ichsmb/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/ichsmb +.PATH: ${SRCTOP}/sys/dev/ichsmb KMOD = ichsmb SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ ichsmb.c ichsmb_pci.c ichsmb_reg.h ichsmb_var.h diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile index 73d5254076ee..fbc1fa0c2154 100644 --- a/sys/modules/i2c/controllers/intpm/Makefile +++ b/sys/modules/i2c/controllers/intpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/intpm +.PATH: ${SRCTOP}/sys/dev/intpm KMOD = intpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ opt_intpm.h intpmreg.h intpm.c diff --git a/sys/modules/i2c/controllers/ismt/Makefile b/sys/modules/i2c/controllers/ismt/Makefile index 411bab1468cf..1e9a6a732f24 100644 --- a/sys/modules/i2c/controllers/ismt/Makefile +++ b/sys/modules/i2c/controllers/ismt/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/ismt +.PATH: ${SRCTOP}/sys/dev/ismt KMOD = ismt SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ ismt.c diff --git a/sys/modules/i2c/controllers/lpbb/Makefile b/sys/modules/i2c/controllers/lpbb/Makefile index 77e84d2caf22..10b7e6a9561e 100644 --- a/sys/modules/i2c/controllers/lpbb/Makefile +++ b/sys/modules/i2c/controllers/lpbb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD = lpbb SRCS = device_if.h bus_if.h iicbb_if.h ppbus_if.h \ lpbb.c diff --git a/sys/modules/i2c/controllers/nfsmb/Makefile b/sys/modules/i2c/controllers/nfsmb/Makefile index bb2a0f2fe5a1..d5cb3d1c42c9 100644 --- a/sys/modules/i2c/controllers/nfsmb/Makefile +++ b/sys/modules/i2c/controllers/nfsmb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/nfsmb +.PATH: ${SRCTOP}/sys/dev/nfsmb KMOD= nfsmb SRCS= nfsmb.c diff --git a/sys/modules/i2c/controllers/pcf/Makefile b/sys/modules/i2c/controllers/pcf/Makefile index 27d9339822f3..94b4b0c22fc7 100644 --- a/sys/modules/i2c/controllers/pcf/Makefile +++ b/sys/modules/i2c/controllers/pcf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/pcf +.PATH: ${SRCTOP}/sys/dev/pcf KMOD= pcf SRCS= ${envctrl} pcf.c ${pcf_ebus} ${pcf_isa} diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile index f08b053c2cfa..ab8a3562fc6d 100644 --- a/sys/modules/i2c/controllers/viapm/Makefile +++ b/sys/modules/i2c/controllers/viapm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/viapm +.PATH: ${SRCTOP}/sys/dev/viapm KMOD = viapm SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ opt_isa.h viapm.c diff --git a/sys/modules/i2c/cyapa/Makefile b/sys/modules/i2c/cyapa/Makefile index eee4a62cde43..0f5b3aa26561 100644 --- a/sys/modules/i2c/cyapa/Makefile +++ b/sys/modules/i2c/cyapa/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/cyapa +.PATH: ${SRCTOP}/sys/dev/cyapa KMOD = cyapa SRCS = cyapa.c device_if.h bus_if.h iicbus_if.h vnode_if.h diff --git a/sys/modules/i2c/if_ic/Makefile b/sys/modules/i2c/if_ic/Makefile index 67dd7344585b..f928abb4e975 100644 --- a/sys/modules/i2c/if_ic/Makefile +++ b/sys/modules/i2c/if_ic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus KMOD = if_ic SRCS = device_if.h bus_if.h iicbus_if.h \ if_ic.c diff --git a/sys/modules/i2c/iic/Makefile b/sys/modules/i2c/iic/Makefile index 0ac8678c6d00..9de1b4cb4c0d 100644 --- a/sys/modules/i2c/iic/Makefile +++ b/sys/modules/i2c/iic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iic SRCS = device_if.h bus_if.h iicbus_if.h \ iic.c diff --git a/sys/modules/i2c/iicbb/Makefile b/sys/modules/i2c/iicbb/Makefile index 1235debe1ea9..c7737f09e8b9 100644 --- a/sys/modules/i2c/iicbb/Makefile +++ b/sys/modules/i2c/iicbb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" || \ ${MACHINE_CPUARCH} == "mips" || ${MACHINE_CPUARCH} == "powerpc" || \ ${MACHINE_CPUARCH} == "riscv" diff --git a/sys/modules/i2c/iicbus/Makefile b/sys/modules/i2c/iicbus/Makefile index c3fc8e3f5225..f1e3bd40eebc 100644 --- a/sys/modules/i2c/iicbus/Makefile +++ b/sys/modules/i2c/iicbus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iicbus SRCS = device_if.h bus_if.h iicbus_if.h iicbus_if.c \ iiconf.h iiconf.c iicbus.h iicbus.c diff --git a/sys/modules/i2c/iicsmb/Makefile b/sys/modules/i2c/iicsmb/Makefile index d0c676482e5c..0e83c864f1ce 100644 --- a/sys/modules/i2c/iicsmb/Makefile +++ b/sys/modules/i2c/iicsmb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/iicbus +.PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iicsmb SRCS = device_if.h bus_if.h iicbus_if.h \ smbus_if.h iicsmb.c diff --git a/sys/modules/i2c/isl/Makefile b/sys/modules/i2c/isl/Makefile index 697fdeab7862..0cff6b25ba8c 100644 --- a/sys/modules/i2c/isl/Makefile +++ b/sys/modules/i2c/isl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/isl +.PATH: ${SRCTOP}/sys/dev/isl KMOD = isl SRCS = isl.c device_if.h bus_if.h iicbus_if.h diff --git a/sys/modules/i2c/jedec_ts/Makefile b/sys/modules/i2c/jedec_ts/Makefile index 66e620619fd5..422c2557d74f 100644 --- a/sys/modules/i2c/jedec_ts/Makefile +++ b/sys/modules/i2c/jedec_ts/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/jedec_ts +.PATH: ${SRCTOP}/sys/dev/jedec_ts KMOD = jedec_ts SRCS = jedec_ts.c bus_if.h device_if.h smbus_if.h diff --git a/sys/modules/i2c/smb/Makefile b/sys/modules/i2c/smb/Makefile index f6f960c02126..b9a536d15bcf 100644 --- a/sys/modules/i2c/smb/Makefile +++ b/sys/modules/i2c/smb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/smbus +.PATH: ${SRCTOP}/sys/dev/smbus KMOD = smb SRCS = device_if.h bus_if.h smbus_if.h \ smb.c diff --git a/sys/modules/i2c/smbus/Makefile b/sys/modules/i2c/smbus/Makefile index 24462d038512..b5e78f223b89 100644 --- a/sys/modules/i2c/smbus/Makefile +++ b/sys/modules/i2c/smbus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/smbus +.PATH: ${SRCTOP}/sys/dev/smbus KMOD = smbus SRCS = device_if.h bus_if.h smbus_if.h smbus_if.c \ smbconf.h smbconf.c smbus.h smbus.c diff --git a/sys/modules/ibcore/Makefile b/sys/modules/ibcore/Makefile index 490a11a879b3..1845378d04af 100644 --- a/sys/modules/ibcore/Makefile +++ b/sys/modules/ibcore/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/core +.PATH: ${SRCTOP}/sys/ofed/drivers/infiniband/core KMOD= ibcore SRCS= addr.c iwcm.c sa_query.c ucma.c uverbs_cmd.c \ @@ -10,9 +10,9 @@ SRCS= addr.c iwcm.c sa_query.c ucma.c uverbs_cmd.c \ vnode_if.h device_if.h bus_if.h pci_if.h \ opt_inet.h opt_inet6.h -CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/core -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/drivers/infiniband/core +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include CFLAGS+= -DINET6 -DINET .include <bsd.kmod.mk> diff --git a/sys/modules/ibcs2/Makefile b/sys/modules/ibcs2/Makefile index 9407cb40f2d0..3041dc27f08c 100644 --- a/sys/modules/ibcs2/Makefile +++ b/sys/modules/ibcs2/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../i386/ibcs2 +.PATH: ${SRCTOP}/sys/i386/ibcs2 KMOD= ibcs2 SRCS= ibcs2_errno.c ibcs2_ipc.c ibcs2_stat.c ibcs2_misc.c \ diff --git a/sys/modules/ichwd/Makefile b/sys/modules/ichwd/Makefile index 21c143073cf3..2767b460fc2a 100644 --- a/sys/modules/ichwd/Makefile +++ b/sys/modules/ichwd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ichwd +.PATH: ${SRCTOP}/sys/dev/ichwd KMOD= ichwd SRCS= ichwd.c device_if.h bus_if.h pci_if.h isa_if.h diff --git a/sys/modules/ida/Makefile b/sys/modules/ida/Makefile index e97ac69db123..ff3391d7e17c 100644 --- a/sys/modules/ida/Makefile +++ b/sys/modules/ida/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ida +.PATH: ${SRCTOP}/sys/dev/ida KMOD= ida SRCS= ida.c ida_disk.c ida_pci.c \ diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile index c4febee5006b..011872877b63 100644 --- a/sys/modules/if_bridge/Makefile +++ b/sys/modules/if_bridge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_bridge SRCS= if_bridge.c opt_inet.h opt_inet6.h opt_carp.h diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile index 7a501f151c13..4b36b64f7539 100644 --- a/sys/modules/if_disc/Makefile +++ b/sys/modules/if_disc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_disc SRCS= if_disc.c opt_inet.h opt_inet6.h diff --git a/sys/modules/if_edsc/Makefile b/sys/modules/if_edsc/Makefile index af2704b942a9..b793289b494a 100644 --- a/sys/modules/if_edsc/Makefile +++ b/sys/modules/if_edsc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_edsc SRCS= if_edsc.c diff --git a/sys/modules/if_enc/Makefile b/sys/modules/if_enc/Makefile index 5ecdb9e63717..badc1b5baabb 100644 --- a/sys/modules/if_enc/Makefile +++ b/sys/modules/if_enc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/net diff --git a/sys/modules/if_epair/Makefile b/sys/modules/if_epair/Makefile index aaffa1f9880d..ee0757577c4f 100644 --- a/sys/modules/if_epair/Makefile +++ b/sys/modules/if_epair/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_epair SRCS= if_epair.c diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile index 4767ea65c353..5799a350c8ae 100644 --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6 diff --git a/sys/modules/if_gre/Makefile b/sys/modules/if_gre/Makefile index bb8ed0583fc4..5a6ea98d59ae 100644 --- a/sys/modules/if_gre/Makefile +++ b/sys/modules/if_gre/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6 .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile index 227c95f35eec..30e81d4dfaad 100644 --- a/sys/modules/if_lagg/Makefile +++ b/sys/modules/if_lagg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_lagg SRCS= if_lagg.c ieee8023ad_lacp.c opt_inet.h opt_inet6.h opt_ratelimit.h diff --git a/sys/modules/if_me/Makefile b/sys/modules/if_me/Makefile index 1fa716fca495..2a6a267b42b1 100644 --- a/sys/modules/if_me/Makefile +++ b/sys/modules/if_me/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_me SRCS= if_me.c diff --git a/sys/modules/if_ndis/Makefile b/sys/modules/if_ndis/Makefile index 79a9b884962b..ced1a4fb332c 100644 --- a/sys/modules/if_ndis/Makefile +++ b/sys/modules/if_ndis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/if_ndis +.PATH: ${SRCTOP}/sys/dev/if_ndis KMOD= if_ndis SRCS= if_ndis.c if_ndis_pci.c if_ndis_pccard.c if_ndis_usb.c diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile index 4eb2f01df560..8ce50335169f 100644 --- a/sys/modules/if_stf/Makefile +++ b/sys/modules/if_stf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_stf SRCS= if_stf.c diff --git a/sys/modules/if_tap/Makefile b/sys/modules/if_tap/Makefile index af35fdbb5bfa..854b57a09f64 100644 --- a/sys/modules/if_tap/Makefile +++ b/sys/modules/if_tap/Makefile @@ -2,7 +2,7 @@ # # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_tap SRCS= if_tap.c opt_compat.h opt_inet.h vnode_if.h diff --git a/sys/modules/if_tun/Makefile b/sys/modules/if_tun/Makefile index 4226329ddcde..ddfc8d32709d 100644 --- a/sys/modules/if_tun/Makefile +++ b/sys/modules/if_tun/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_tun SRCS= if_tun.c opt_inet.h opt_inet6.h diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile index 5f3f7e87794c..56b9cdaaf12f 100644 --- a/sys/modules/if_vlan/Makefile +++ b/sys/modules/if_vlan/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_vlan SRCS= if_vlan.c diff --git a/sys/modules/if_vxlan/Makefile b/sys/modules/if_vxlan/Makefile index 5d27eb3e13f1..5a17a58f17bc 100644 --- a/sys/modules/if_vxlan/Makefile +++ b/sys/modules/if_vxlan/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= if_vxlan SRCS= if_vxlan.c diff --git a/sys/modules/iir/Makefile b/sys/modules/iir/Makefile index 591fef8c0e88..daccc324055c 100644 --- a/sys/modules/iir/Makefile +++ b/sys/modules/iir/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ KMOD = iir -.PATH: ${.CURDIR}/../../dev/${KMOD} +.PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS = iir.c iir_ctrl.c iir_pci.c SRCS += opt_scsi.h opt_cam.h SRCS += device_if.h bus_if.h pci_if.h diff --git a/sys/modules/imgact_binmisc/Makefile b/sys/modules/imgact_binmisc/Makefile index 490a8bf44830..6d8f64530db3 100644 --- a/sys/modules/imgact_binmisc/Makefile +++ b/sys/modules/imgact_binmisc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= imgact_binmisc SRCS= imgact_binmisc.c diff --git a/sys/modules/intelspi/Makefile b/sys/modules/intelspi/Makefile index b53eca701160..b2bceee4b3f8 100644 --- a/sys/modules/intelspi/Makefile +++ b/sys/modules/intelspi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/intel +.PATH: ${SRCTOP}/sys/dev/intel KMOD= intelspi SRCS= spi.c SRCS+= acpi_if.h device_if.h bus_if.h opt_acpi.h spibus_if.h diff --git a/sys/modules/io/Makefile b/sys/modules/io/Makefile index 1612fa0eff5f..ae93daabf0ac 100644 --- a/sys/modules/io/Makefile +++ b/sys/modules/io/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/io -.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} +.PATH: ${SRCTOP}/sys/dev/io +.PATH: ${SRCTOP}/sys/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} KMOD= io SRCS= iodev.c io.c diff --git a/sys/modules/ioat/Makefile b/sys/modules/ioat/Makefile index 3e6baadb9990..329f9d91cb5e 100644 --- a/sys/modules/ioat/Makefile +++ b/sys/modules/ioat/Makefile @@ -2,7 +2,7 @@ # # $FreeBSD$ -IOAT_SRC_PATH = ${.CURDIR}/../.. +IOAT_SRC_PATH = ${SRCTOP}/sys .PATH: ${IOAT_SRC_PATH}/dev/ioat diff --git a/sys/modules/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile index a0f94f1e73f8..6a85b7c58c5b 100644 --- a/sys/modules/ip6_mroute_mod/Makefile +++ b/sys/modules/ip6_mroute_mod/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet6 +.PATH: ${SRCTOP}/sys/netinet6 KMOD= ip6_mroute diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile index 1c82717cbede..082d5ed877b3 100644 --- a/sys/modules/ip_mroute_mod/Makefile +++ b/sys/modules/ip_mroute_mod/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet ${.CURDIR}/../../netinet6 +.PATH: ${SRCTOP}/sys/netinet ${SRCTOP}/sys/netinet6 KMOD= ip_mroute diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile index f67ce4b5a171..463513b46b9f 100644 --- a/sys/modules/ipdivert/Makefile +++ b/sys/modules/ipdivert/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= ipdivert SRCS= ip_divert.c opt_inet.h opt_inet6.h opt_sctp.h diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile index f89588fd3271..d900c55e05d3 100644 --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -1,6 +1,6 @@ -# $FreeBSD$ +# $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/ipfilter/netinet +.PATH: ${SRCTOP}/sys/contrib/ipfilter/netinet KMOD= ipl SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \ @@ -9,7 +9,7 @@ SRCS= mlfk_ipl.c ip_nat.c ip_frag.c ip_state.c ip_proxy.c ip_auth.c \ ip_nat6.c ip_rules.c ip_scan.c ip_dstlist.c radix_ipf.c SRCS+= opt_bpf.h opt_inet6.h -CFLAGS+= -I${.CURDIR}/../../contrib/ipfilter +CFLAGS+= -I${SRCTOP}/sys/contrib/ipfilter CFLAGS+= -DIPFILTER=1 -DIPFILTER_LKM -DIPFILTER_LOG -DIPFILTER_LOOKUP # # If you don't want log functionality remove -DIPFILTER_LOG diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index a8348bd2dc43..1b0e79a4c3fd 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/ipfw +.PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= ipfw SRCS= ip_fw2.c ip_fw_pfil.c ip_fw_bpf.c diff --git a/sys/modules/ipfw_nat/Makefile b/sys/modules/ipfw_nat/Makefile index e4638a65616f..37e72c8f1896 100644 --- a/sys/modules/ipfw_nat/Makefile +++ b/sys/modules/ipfw_nat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/ipfw +.PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= ipfw_nat SRCS= ip_fw_nat.c diff --git a/sys/modules/ipfw_nat64/Makefile b/sys/modules/ipfw_nat64/Makefile index c64784548f87..c696f5bd5ab6 100644 --- a/sys/modules/ipfw_nat64/Makefile +++ b/sys/modules/ipfw_nat64/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/ipfw/nat64 +.PATH: ${SRCTOP}/sys/netpfil/ipfw/nat64 KMOD= ipfw_nat64 SRCS= ip_fw_nat64.c nat64_translate.c diff --git a/sys/modules/ipfw_nptv6/Makefile b/sys/modules/ipfw_nptv6/Makefile index a3cf004358b8..fb03f6eb4c17 100644 --- a/sys/modules/ipfw_nptv6/Makefile +++ b/sys/modules/ipfw_nptv6/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/ipfw/nptv6 +.PATH: ${SRCTOP}/sys/netpfil/ipfw/nptv6 KMOD= ipfw_nptv6 SRCS= ip_fw_nptv6.c nptv6.c opt_ipfw.h diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile index 7493b234c158..12de0068a410 100644 --- a/sys/modules/ipmi/Makefile +++ b/sys/modules/ipmi/Makefile @@ -2,7 +2,7 @@ SUBDIR+= ipmi_linux -.PATH: ${.CURDIR}/../../dev/ipmi +.PATH: ${SRCTOP}/sys/dev/ipmi # XXX - ipmi_smbus and ipmi_ssif depend on smbus # XXX - ipmi_acpi depends on acpi diff --git a/sys/modules/ipmi/ipmi_linux/Makefile b/sys/modules/ipmi/ipmi_linux/Makefile index bbdef1bde2f9..04020cb82c11 100644 --- a/sys/modules/ipmi/ipmi_linux/Makefile +++ b/sys/modules/ipmi/ipmi_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ipmi +.PATH: ${SRCTOP}/sys/dev/ipmi KMOD= ipmi_linux SRCS= ipmi_linux.c diff --git a/sys/modules/ipoib/Makefile b/sys/modules/ipoib/Makefile index a24c6168795c..11751ec70faf 100644 --- a/sys/modules/ipoib/Makefile +++ b/sys/modules/ipoib/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib +.PATH: ${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib KMOD= ipoib SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ @@ -7,9 +7,9 @@ SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ ipoib_cm.c ipoib_ib.c ipoib_main.c \ ipoib_multicast.c ipoib_verbs.c -CFLAGS+= -I${.CURDIR}/../../ofed/drivers/infiniband/ulp/ipoib -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/drivers/infiniband/ulp/ipoib +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile index 0be0e2a1385b..045002384411 100644 --- a/sys/modules/ips/Makefile +++ b/sys/modules/ips/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ips +.PATH: ${SRCTOP}/sys/dev/ips KMOD = ips SRCS = ips.c ips_pci.c ips.h ips_disk.c ips_disk.h ips_commands.c \ ips_ioctl.h ips_ioctl.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/ipsec/Makefile b/sys/modules/ipsec/Makefile index ed061f317768..d3f1811d1726 100644 --- a/sys/modules/ipsec/Makefile +++ b/sys/modules/ipsec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net ${.CURDIR}/../../netipsec +.PATH: ${SRCTOP}/sys/net ${.CURDIR}/../../netipsec KMOD= ipsec SRCS= if_ipsec.c ipsec.c ipsec_input.c ipsec_mbuf.c ipsec_mod.c \ diff --git a/sys/modules/ipw/Makefile b/sys/modules/ipw/Makefile index 741d85240dc1..521a51be41c4 100644 --- a/sys/modules/ipw/Makefile +++ b/sys/modules/ipw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ipw +.PATH: ${SRCTOP}/sys/dev/ipw KMOD = if_ipw SRCS = if_ipw.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/ipwfw/ipw_bss/Makefile b/sys/modules/ipwfw/ipw_bss/Makefile index 2f57711a3c97..7ae96cd1dea3 100644 --- a/sys/modules/ipwfw/ipw_bss/Makefile +++ b/sys/modules/ipwfw/ipw_bss/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/ipw +.PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_bss FIRMWS= ipw_bss:ipw_bss:130 @@ -8,8 +8,8 @@ FIRMWARE_LICENSE= intel_ipw CLEANFILES= ipw_bss -ipw_bss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu - uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3.fw.uu > ${.TARGET} +ipw_bss: ipw2100-1.3.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/ipwfw/ipw_ibss/Makefile b/sys/modules/ipwfw/ipw_ibss/Makefile index 10281b114a92..3f4d48e68a12 100644 --- a/sys/modules/ipwfw/ipw_ibss/Makefile +++ b/sys/modules/ipwfw/ipw_ibss/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/ipw +.PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_ibss FIRMWS= ipw_ibss:ipw_ibss:130 @@ -8,8 +8,8 @@ FIRMWARE_LICENSE= intel_ipw CLEANFILES= ipw_ibss -ipw_ibss: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu - uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-i.fw.uu > ${.TARGET} +ipw_ibss: ipw2100-1.3-i.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/ipwfw/ipw_monitor/Makefile b/sys/modules/ipwfw/ipw_monitor/Makefile index cdc28b22a9bb..1073a7ac2b8a 100644 --- a/sys/modules/ipwfw/ipw_monitor/Makefile +++ b/sys/modules/ipwfw/ipw_monitor/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/ipw +.PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_monitor FIRMWS= ipw_monitor:ipw_monitor:130 @@ -8,8 +8,8 @@ FIRMWARE_LICENSE= intel_ipw CLEANFILES= ipw_monitor -ipw_monitor: ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu - uudecode -p ${.CURDIR}/../../../contrib/dev/ipw/ipw2100-1.3-p.fw.uu > ${.TARGET} +ipw_monitor: ipw2100-1.3-p.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/isci/Makefile b/sys/modules/isci/Makefile index 82d401864dc2..9324efe9538a 100644 --- a/sys/modules/isci/Makefile +++ b/sys/modules/isci/Makefile @@ -2,7 +2,7 @@ # # $FreeBSD$ -ISCI_SRC_PATH = ${.CURDIR}/../.. +ISCI_SRC_PATH = ${SRCTOP}/sys .PATH: ${ISCI_SRC_PATH}/dev/isci ${ISCI_SRC_PATH}/dev/isci/scil diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile index 33f3cbf9d7c0..9b150f5c2213 100644 --- a/sys/modules/iscsi/Makefile +++ b/sys/modules/iscsi/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" -.PATH: ${.CURDIR}/../../dev/iscsi/ +.PATH: ${SRCTOP}/sys/dev/iscsi/ KMOD= iscsi SRCS= iscsi.c diff --git a/sys/modules/iscsi_initiator/Makefile b/sys/modules/iscsi_initiator/Makefile index 0ae7aa4b9738..50d543d2fe6f 100644 --- a/sys/modules/iscsi_initiator/Makefile +++ b/sys/modules/iscsi_initiator/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/iscsi_initiator +.PATH: ${SRCTOP}/sys/dev/iscsi_initiator KMOD=iscsi_initiator SRCS= iscsi.h iscsivar.h diff --git a/sys/modules/iser/Makefile b/sys/modules/iser/Makefile index 2f7955e56562..bb2fd0139172 100644 --- a/sys/modules/iser/Makefile +++ b/sys/modules/iser/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/iser/ +.PATH: ${SRCTOP}/sys/dev/iser/ .include <bsd.own.mk> @@ -18,7 +18,7 @@ SRCS+= bus_if.h SRCS+= device_if.h SRCS+= icl_conn_if.h -CFLAGS+= -I${.CURDIR}/../../ +CFLAGS+= -I${SRCTOP}/sys/ CFLAGS+= -I${SYSDIR}/ofed/include CFLAGS+= -I${SYSDIR}/compat/linuxkpi/common/include CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile index 1caeef6d21a2..d59d54036be6 100644 --- a/sys/modules/isp/Makefile +++ b/sys/modules/isp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/isp +.PATH: ${SRCTOP}/sys/dev/isp KMOD= isp SRCS= bus_if.h device_if.h pci_if.h \ diff --git a/sys/modules/ispfw/isp_1000/Makefile b/sys/modules/ispfw/isp_1000/Makefile index ef2189dff738..602984d6881b 100644 --- a/sys/modules/ispfw/isp_1000/Makefile +++ b/sys/modules/ispfw/isp_1000/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_1000 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_1040/Makefile b/sys/modules/ispfw/isp_1040/Makefile index 4227704816a2..38e8da7b0224 100644 --- a/sys/modules/ispfw/isp_1040/Makefile +++ b/sys/modules/ispfw/isp_1040/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_1040 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_1080/Makefile b/sys/modules/ispfw/isp_1080/Makefile index 0e383bfde72c..f30791f01975 100644 --- a/sys/modules/ispfw/isp_1080/Makefile +++ b/sys/modules/ispfw/isp_1080/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_1080 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_12160/Makefile b/sys/modules/ispfw/isp_12160/Makefile index 7c28442f9194..a984962c6aa1 100644 --- a/sys/modules/ispfw/isp_12160/Makefile +++ b/sys/modules/ispfw/isp_12160/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_12160 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_2100/Makefile b/sys/modules/ispfw/isp_2100/Makefile index 178f090bdea4..4919d15b5b77 100644 --- a/sys/modules/ispfw/isp_2100/Makefile +++ b/sys/modules/ispfw/isp_2100/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_2100 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_2200/Makefile b/sys/modules/ispfw/isp_2200/Makefile index 64a41f128c8c..d36e6eb74b4d 100644 --- a/sys/modules/ispfw/isp_2200/Makefile +++ b/sys/modules/ispfw/isp_2200/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_2200 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_2300/Makefile b/sys/modules/ispfw/isp_2300/Makefile index 4acceda7d4c3..d0f999478954 100644 --- a/sys/modules/ispfw/isp_2300/Makefile +++ b/sys/modules/ispfw/isp_2300/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_2300 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_2322/Makefile b/sys/modules/ispfw/isp_2322/Makefile index 3ebb30f0a177..e44f730474e8 100644 --- a/sys/modules/ispfw/isp_2322/Makefile +++ b/sys/modules/ispfw/isp_2322/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_2322 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_2400/Makefile b/sys/modules/ispfw/isp_2400/Makefile index 2655fd000e9e..fdaf959cc720 100644 --- a/sys/modules/ispfw/isp_2400/Makefile +++ b/sys/modules/ispfw/isp_2400/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_2400 SRCS= ispfw.c diff --git a/sys/modules/ispfw/isp_2500/Makefile b/sys/modules/ispfw/isp_2500/Makefile index 80a2ee3f1ffe..7067a8169a27 100644 --- a/sys/modules/ispfw/isp_2500/Makefile +++ b/sys/modules/ispfw/isp_2500/Makefile @@ -26,7 +26,7 @@ # -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= isp_2500 SRCS= ispfw.c diff --git a/sys/modules/ispfw/ispfw/Makefile b/sys/modules/ispfw/ispfw/Makefile index f3b869403d27..464ff85214cc 100644 --- a/sys/modules/ispfw/ispfw/Makefile +++ b/sys/modules/ispfw/ispfw/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ispfw +.PATH: ${SRCTOP}/sys/dev/ispfw KMOD= ispfw SRCS= ispfw.c diff --git a/sys/modules/iwi/Makefile b/sys/modules/iwi/Makefile index 60c60519bd90..a9c31a736a38 100644 --- a/sys/modules/iwi/Makefile +++ b/sys/modules/iwi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/iwi +.PATH: ${SRCTOP}/sys/dev/iwi KMOD = if_iwi SRCS = if_iwi.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/iwifw/iwi_bss/Makefile b/sys/modules/iwifw/iwi_bss/Makefile index 5bb7a466091b..9fdcf4a607d2 100644 --- a/sys/modules/iwifw/iwi_bss/Makefile +++ b/sys/modules/iwifw/iwi_bss/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/iwi +.PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_bss FIRMWS= iwi_bss:iwi_bss:300 @@ -8,8 +8,8 @@ FIRMWARE_LICENSE= intel_iwi CLEANFILES= iwi_bss -iwi_bss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu - uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET} +iwi_bss: ipw2200-bss.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/iwifw/iwi_ibss/Makefile b/sys/modules/iwifw/iwi_ibss/Makefile index 35d06565c489..3dfc5f341950 100644 --- a/sys/modules/iwifw/iwi_ibss/Makefile +++ b/sys/modules/iwifw/iwi_ibss/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/iwi +.PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_ibss FIRMWS= iwi_ibss:iwi_ibss:300 @@ -8,8 +8,8 @@ FIRMWARE_LICENSE= intel_iwi CLEANFILES= iwi_fw -iwi_ibss: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu - uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET} +iwi_ibss: ipw2200-ibss.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/iwifw/iwi_monitor/Makefile b/sys/modules/iwifw/iwi_monitor/Makefile index c05c6f1ee897..5ab5a39cdc02 100644 --- a/sys/modules/iwifw/iwi_monitor/Makefile +++ b/sys/modules/iwifw/iwi_monitor/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/dev/iwi +.PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_monitor FIRMWS= iwi_monitor:iwi_monitor:300 @@ -8,8 +8,7 @@ FIRMWARE_LICENSE= intel_iwi CLEANFILES= iwi_monitor -iwi_monitor: ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu - uudecode -p ${.CURDIR}/../../../contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET} +iwi_monitor: ipw2200-sniffer.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> - diff --git a/sys/modules/iwm/Makefile b/sys/modules/iwm/Makefile index 515b6e69646f..2952af086e1b 100644 --- a/sys/modules/iwm/Makefile +++ b/sys/modules/iwm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/iwm +.PATH: ${SRCTOP}/sys/dev/iwm KMOD= if_iwm # Main driver diff --git a/sys/modules/iwmfw/Makefile.inc b/sys/modules/iwmfw/Makefile.inc index 5f4aa379125a..eaa0e32d109e 100644 --- a/sys/modules/iwmfw/Makefile.inc +++ b/sys/modules/iwmfw/Makefile.inc @@ -14,5 +14,5 @@ FIRMWS= ${_FIRM}:${KMOD} # #FIRMWARE_LICENSE= -${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwm/${_FIRM}.uu +${_FIRM}: ${SRCTOP}/sys/contrib/dev/iwm/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/iwn/Makefile b/sys/modules/iwn/Makefile index e4f2c3e3f9b7..102c64b5f166 100644 --- a/sys/modules/iwn/Makefile +++ b/sys/modules/iwn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/iwn +.PATH: ${SRCTOP}/sys/dev/iwn KMOD = if_iwn SRCS = if_iwn.c device_if.h bus_if.h pci_if.h opt_iwn.h opt_wlan.h diff --git a/sys/modules/iwnfw/Makefile.inc b/sys/modules/iwnfw/Makefile.inc index 10ac9e14e62f..17d112785a20 100644 --- a/sys/modules/iwnfw/Makefile.inc +++ b/sys/modules/iwnfw/Makefile.inc @@ -14,5 +14,5 @@ FIRMWS= ${_FIRM}:${KMOD} # #FIRMWARE_LICENSE= -${_FIRM}: ${.CURDIR}/../../../contrib/dev/iwn/${_FIRM}.uu +${_FIRM}: ${SRCTOP}/sys/contrib/dev/iwn/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/ix/Makefile b/sys/modules/ix/Makefile index 8747bac6229a..0da729470774 100644 --- a/sys/modules/ix/Makefile +++ b/sys/modules/ix/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ixgbe +.PATH: ${SRCTOP}/sys/dev/ixgbe KMOD = if_ix SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h @@ -10,6 +10,6 @@ SRCS += if_ix.c ix_txrx.c ixgbe_osdep.c SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c SRCS += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c -CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP +CFLAGS+= -I${SRCTOP}/sys/dev/ixgbe -DSMP .include <bsd.kmod.mk> diff --git a/sys/modules/ixgb/Makefile b/sys/modules/ixgb/Makefile index 16e597591e5e..31877a9f0edc 100644 --- a/sys/modules/ixgb/Makefile +++ b/sys/modules/ixgb/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ixgb +.PATH: ${SRCTOP}/sys/dev/ixgb KMOD= if_ixgb SRCS= if_ixgb.c ixgb_hw.c ixgb_ee.c diff --git a/sys/modules/ixl/Makefile b/sys/modules/ixl/Makefile index a6b01f11a480..daacaec56a5a 100644 --- a/sys/modules/ixl/Makefile +++ b/sys/modules/ixl/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ixl +.PATH: ${SRCTOP}/sys/dev/ixl KMOD = if_ixl SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h diff --git a/sys/modules/ixlv/Makefile b/sys/modules/ixlv/Makefile index b79d8ccb0394..46f112a11502 100644 --- a/sys/modules/ixlv/Makefile +++ b/sys/modules/ixlv/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ixl +.PATH: ${SRCTOP}/sys/dev/ixl KMOD = if_ixlv SRCS = device_if.h bus_if.h pci_if.h diff --git a/sys/modules/ixv/Makefile b/sys/modules/ixv/Makefile index 66ea12902f07..814efa2801ec 100644 --- a/sys/modules/ixv/Makefile +++ b/sys/modules/ixv/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ixgbe +.PATH: ${SRCTOP}/sys/dev/ixgbe KMOD = if_ixv SRCS = device_if.h bus_if.h pci_if.h pci_iov_if.h @@ -10,6 +10,6 @@ SRCS += if_ixv.c ix_txrx.c ixgbe_osdep.c SRCS += ixgbe_common.c ixgbe_api.c ixgbe_phy.c ixgbe_mbx.c ixgbe_vf.c SRCS += ixgbe_dcb.c ixgbe_dcb_82598.c ixgbe_dcb_82599.c SRCS += ixgbe_82598.c ixgbe_82599.c ixgbe_x540.c ixgbe_x550.c -CFLAGS+= -I${.CURDIR}/../../dev/ixgbe -DSMP +CFLAGS+= -I${SRCTOP}/sys/dev/ixgbe -DSMP .include <bsd.kmod.mk> diff --git a/sys/modules/jme/Makefile b/sys/modules/jme/Makefile index 5c41523669e2..5a22ee1b84b2 100644 --- a/sys/modules/jme/Makefile +++ b/sys/modules/jme/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/jme +.PATH: ${SRCTOP}/sys/dev/jme KMOD= if_jme SRCS= if_jme.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/joy/Makefile b/sys/modules/joy/Makefile index 826ea6fcfdd1..ecd4f180d707 100644 --- a/sys/modules/joy/Makefile +++ b/sys/modules/joy/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/joy +.PATH: ${SRCTOP}/sys/dev/joy KMOD= joy SRCS= bus_if.h device_if.h isa_if.h joy.c joy_isa.c diff --git a/sys/modules/kbdmux/Makefile b/sys/modules/kbdmux/Makefile index 03feb8fb8b5c..079a779a2df9 100644 --- a/sys/modules/kbdmux/Makefile +++ b/sys/modules/kbdmux/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile,v 1.1 2005/06/23 00:30:50 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/kbdmux +.PATH: ${SRCTOP}/sys/dev/kbdmux KMOD= kbdmux SRCS= kbdmux.c opt_compat.h opt_evdev.h opt_kbd.h opt_kbdmux.h bus_if.h \ diff --git a/sys/modules/kgssapi/Makefile b/sys/modules/kgssapi/Makefile index c2c8e1303f29..a720cdd6a487 100644 --- a/sys/modules/kgssapi/Makefile +++ b/sys/modules/kgssapi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kgssapi ${.CURDIR}/../../rpc/rpcsec_gss +.PATH: ${SRCTOP}/sys/kgssapi ${SRCTOP}/sys/rpc/rpcsec_gss KMOD= kgssapi SRCS= gss_accept_sec_context.c \ @@ -40,7 +40,7 @@ SRCS+= kgss_if.h kgss_if.c SRCS+= gssd.h gssd_xdr.c gssd_clnt.c CLEANFILES= gssd.h gssd_xdr.c gssd_clnt.c -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys gssd.h: $S/kgssapi/gssd.x RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h diff --git a/sys/modules/kgssapi_krb5/Makefile b/sys/modules/kgssapi_krb5/Makefile index dfa4b998a4e7..3eb2465158b8 100644 --- a/sys/modules/kgssapi_krb5/Makefile +++ b/sys/modules/kgssapi_krb5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kgssapi/krb5 +.PATH: ${SRCTOP}/sys/kgssapi/krb5 KMOD= kgssapi_krb5 SRCS= krb5_mech.c \ @@ -14,7 +14,7 @@ SRCS= krb5_mech.c \ SRCS+= kgss_if.h gssd.h CLEANFILES= gssd.h -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys gssd.h: $S/kgssapi/gssd.x RPCGEN_CPP=${CPP:Q} rpcgen -hM $S/kgssapi/gssd.x | grep -v pthread.h > gssd.h diff --git a/sys/modules/khelp/h_ertt/Makefile b/sys/modules/khelp/h_ertt/Makefile index 956d419a6899..fa58264c3190 100644 --- a/sys/modules/khelp/h_ertt/Makefile +++ b/sys/modules/khelp/h_ertt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/khelp +.PATH: ${SRCTOP}/sys/netinet/khelp KMOD= h_ertt SRCS= h_ertt.c diff --git a/sys/modules/krpc/Makefile b/sys/modules/krpc/Makefile index 0f4b5362fff2..e66130f39a3a 100644 --- a/sys/modules/krpc/Makefile +++ b/sys/modules/krpc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../rpc ${.CURDIR}/../../xdr +.PATH: ${SRCTOP}/sys/rpc ${SRCTOP}/sys/xdr KMOD= krpc SRCS= auth_none.c \ auth_unix.c \ diff --git a/sys/modules/ksyms/Makefile b/sys/modules/ksyms/Makefile index e5480b823dc9..48deeed17089 100644 --- a/sys/modules/ksyms/Makefile +++ b/sys/modules/ksyms/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ksyms +.PATH: ${SRCTOP}/sys/dev/ksyms KMOD= ksyms SRCS= ksyms.c linker_if.h diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile index 4880af1d2caa..96a157c50ac9 100644 --- a/sys/modules/le/Makefile +++ b/sys/modules/le/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/le +.PATH: ${SRCTOP}/sys/dev/le KMOD= if_le SRCS= am7990.c am79900.c ${if_le_isa} ${if_le_lebuffer} diff --git a/sys/modules/lge/Makefile b/sys/modules/lge/Makefile index 810e220ca14c..38dbfa50abe5 100644 --- a/sys/modules/lge/Makefile +++ b/sys/modules/lge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/lge +.PATH: ${SRCTOP}/sys/dev/lge KMOD= if_lge SRCS= if_lge.c miibus_if.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/libalias/libalias/Makefile b/sys/modules/libalias/libalias/Makefile index d1030c801334..655e67bebb5e 100644 --- a/sys/modules/libalias/libalias/Makefile +++ b/sys/modules/libalias/libalias/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netinet/libalias +.PATH: ${SRCTOP}/sys/netinet/libalias KMOD= libalias SRCS= alias.c alias_db.c alias_proxy.c alias_util.c alias_mod.c alias_sctp.c diff --git a/sys/modules/libalias/modules/Makefile.inc b/sys/modules/libalias/modules/Makefile.inc index 78391c597b86..d130288bb7b4 100644 --- a/sys/modules/libalias/modules/Makefile.inc +++ b/sys/modules/libalias/modules/Makefile.inc @@ -1,3 +1,3 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../netinet/libalias +.PATH: ${SRCTOP}/sys/netinet/libalias diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile index dd14046e328c..c1033b01e30e 100644 --- a/sys/modules/libiconv/Makefile +++ b/sys/modules/libiconv/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../libkern ${.CURDIR}/../../sys +.PATH: ${SRCTOP}/sys/libkern ${SRCTOP}/sys/sys KMOD= libiconv SRCS= iconv.c iconv_ucs.c iconv_xlat.c iconv_xlat16.c -SRCS+= iconv.h +SRCS+= iconv.h SRCS+= iconv_converter_if.c iconv_converter_if.h EXPORT_SYMS= iconv_add \ diff --git a/sys/modules/libmbpool/Makefile b/sys/modules/libmbpool/Makefile index efd15ec759c7..2b694be83962 100644 --- a/sys/modules/libmbpool/Makefile +++ b/sys/modules/libmbpool/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= libmbpool SRCS= subr_mbpool.c diff --git a/sys/modules/libmchain/Makefile b/sys/modules/libmchain/Makefile index b8ab48e40885..f702c14072dd 100644 --- a/sys/modules/libmchain/Makefile +++ b/sys/modules/libmchain/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= libmchain SRCS= subr_mchain.c diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile index 979429fd2ae1..6408a9882147 100644 --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/linprocfs +.PATH: ${SRCTOP}/sys/compat/linprocfs KMOD= linprocfs SRCS= vnode_if.h \ diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile index 13230ff5e8ea..6eaa844e9ea5 100644 --- a/sys/modules/linsysfs/Makefile +++ b/sys/modules/linsysfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/linsysfs +.PATH: ${SRCTOP}/sys/compat/linsysfs KMOD= linsysfs SRCS= vnode_if.h \ diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index d37fcf57d122..00d1de712de0 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -5,7 +5,7 @@ SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 .endif -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX} +.PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE_CPUARCH}/linux${SFX} VDSO= linux${SFX}_vdso @@ -52,7 +52,7 @@ linux${SFX}_locore.o: linux${SFX}_assym.h assym.s ${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s \ -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib \ -fno-omit-frame-pointer -fPIC \ - -Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s \ + -Wl,-T${SRCTOP}/sys/${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s \ -Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-warn-common \ ${.IMPSRC} -o ${.TARGET} diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index a5c8723b1b62..ac40344edd01 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/linux ${.CURDIR}/../../${MACHINE_ARCH}/linux +.PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE_ARCH}/linux VDSO= linux_vdso @@ -31,7 +31,7 @@ linux_assym.h: linux_genassym.o linux_locore.o: linux_locore.s linux_assym.h ${CC} -x assembler-with-cpp -DLOCORE -shared -mcmodel=small \ -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -fPIC -nostdinc \ - -Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux/${VDSO}.lds.s \ + -Wl,-T${SRCTOP}/sys/${MACHINE_CPUARCH}/linux/${VDSO}.lds.s \ -Wl,-soname=${VDSO}.so.1,-warn-common -nostdlib \ ${.IMPSRC} -o ${.TARGET} diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 2301796230b0..8e08b39674b4 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/linux +.PATH: ${SRCTOP}/sys/compat/linux KMOD= linux_common SRCS= linux_common.c linux_mib.c linux_mmap.c linux_util.c linux_emul.c \ diff --git a/sys/modules/linuxkpi/Makefile b/sys/modules/linuxkpi/Makefile index 64f88c5ec872..1e87aefe31f0 100644 --- a/sys/modules/linuxkpi/Makefile +++ b/sys/modules/linuxkpi/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/linuxkpi/common/src +.PATH: ${SRCTOP}/sys/compat/linuxkpi/common/src KMOD= linuxkpi SRCS= linux_kmod.c \ @@ -21,7 +21,7 @@ SRCS+= bus_if.h \ usb_if.h \ opt_usb.h -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include -CFLAGS+= -I${.CURDIR}/../../contrib/ck/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include .include <bsd.kmod.mk> diff --git a/sys/modules/lmc/Makefile b/sys/modules/lmc/Makefile index 66fc0e652bb1..e5076744d8db 100644 --- a/sys/modules/lmc/Makefile +++ b/sys/modules/lmc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ KMOD = if_lmc -.PATH: ${.CURDIR}/../../dev/lmc +.PATH: ${SRCTOP}/sys/dev/lmc SRCS = if_lmc.c if_lmc.h SRCS += device_if.h bus_if.h pci_if.h diff --git a/sys/modules/lpt/Makefile b/sys/modules/lpt/Makefile index b57960d572f4..05425bba883a 100644 --- a/sys/modules/lpt/Makefile +++ b/sys/modules/lpt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= lpt SRCS= bus_if.h device_if.h ppbus_if.h \ opt_lpt.h \ diff --git a/sys/modules/mac_biba/Makefile b/sys/modules/mac_biba/Makefile index 76ae8e8265ce..0093ef6dccce 100644 --- a/sys/modules/mac_biba/Makefile +++ b/sys/modules/mac_biba/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_biba +.PATH: ${SRCTOP}/sys/security/mac_biba KMOD= mac_biba SRCS= vnode_if.h \ diff --git a/sys/modules/mac_bsdextended/Makefile b/sys/modules/mac_bsdextended/Makefile index 683e1b0483b5..32899e9e7a34 100644 --- a/sys/modules/mac_bsdextended/Makefile +++ b/sys/modules/mac_bsdextended/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_bsdextended +.PATH: ${SRCTOP}/sys/security/mac_bsdextended KMOD= mac_bsdextended SRCS= vnode_if.h \ diff --git a/sys/modules/mac_ifoff/Makefile b/sys/modules/mac_ifoff/Makefile index fc1a60037fc4..9d79eb085524 100644 --- a/sys/modules/mac_ifoff/Makefile +++ b/sys/modules/mac_ifoff/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_ifoff +.PATH: ${SRCTOP}/sys/security/mac_ifoff KMOD= mac_ifoff SRCS= vnode_if.h \ diff --git a/sys/modules/mac_lomac/Makefile b/sys/modules/mac_lomac/Makefile index 333109b88431..abc79f516fc8 100644 --- a/sys/modules/mac_lomac/Makefile +++ b/sys/modules/mac_lomac/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_lomac +.PATH: ${SRCTOP}/sys/security/mac_lomac KMOD= mac_lomac SRCS= vnode_if.h \ diff --git a/sys/modules/mac_mls/Makefile b/sys/modules/mac_mls/Makefile index d4aa5cec7e30..39e066aa3093 100644 --- a/sys/modules/mac_mls/Makefile +++ b/sys/modules/mac_mls/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_mls +.PATH: ${SRCTOP}/sys/security/mac_mls KMOD= mac_mls SRCS= vnode_if.h \ diff --git a/sys/modules/mac_none/Makefile b/sys/modules/mac_none/Makefile index b180f718794f..d86792f7a97a 100644 --- a/sys/modules/mac_none/Makefile +++ b/sys/modules/mac_none/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_none +.PATH: ${SRCTOP}/sys/security/mac_none KMOD= mac_none SRCS= vnode_if.h \ diff --git a/sys/modules/mac_partition/Makefile b/sys/modules/mac_partition/Makefile index b04d181777e5..be7c27e6c632 100644 --- a/sys/modules/mac_partition/Makefile +++ b/sys/modules/mac_partition/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_partition +.PATH: ${SRCTOP}/sys/security/mac_partition KMOD= mac_partition SRCS= vnode_if.h \ diff --git a/sys/modules/mac_portacl/Makefile b/sys/modules/mac_portacl/Makefile index f9bbe2355ef3..7bac0729987e 100644 --- a/sys/modules/mac_portacl/Makefile +++ b/sys/modules/mac_portacl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_portacl +.PATH: ${SRCTOP}/sys/security/mac_portacl KMOD= mac_portacl SRCS= mac_portacl.c diff --git a/sys/modules/mac_seeotheruids/Makefile b/sys/modules/mac_seeotheruids/Makefile index d27aefb947b9..d2f6d207dd08 100644 --- a/sys/modules/mac_seeotheruids/Makefile +++ b/sys/modules/mac_seeotheruids/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_seeotheruids +.PATH: ${SRCTOP}/sys/security/mac_seeotheruids KMOD= mac_seeotheruids SRCS= vnode_if.h \ diff --git a/sys/modules/mac_stub/Makefile b/sys/modules/mac_stub/Makefile index 3b98cb00e62d..431218604d9a 100644 --- a/sys/modules/mac_stub/Makefile +++ b/sys/modules/mac_stub/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_stub +.PATH: ${SRCTOP}/sys/security/mac_stub KMOD= mac_stub SRCS= vnode_if.h \ diff --git a/sys/modules/mac_test/Makefile b/sys/modules/mac_test/Makefile index 94b5aa87198f..7eabaea413a8 100644 --- a/sys/modules/mac_test/Makefile +++ b/sys/modules/mac_test/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../security/mac_test +.PATH: ${SRCTOP}/sys/security/mac_test KMOD= mac_test SRCS= vnode_if.h \ diff --git a/sys/modules/malo/Makefile b/sys/modules/malo/Makefile index 78861027dfa4..6173fc59b8b6 100644 --- a/sys/modules/malo/Makefile +++ b/sys/modules/malo/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/malo +.PATH: ${SRCTOP}/sys/dev/malo KMOD = if_malo SRCS = if_malo.c if_malohal.c if_malo_pci.c diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile index db2cd6739283..925798be0277 100644 --- a/sys/modules/md/Makefile +++ b/sys/modules/md/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/md +.PATH: ${SRCTOP}/sys/dev/md KMOD= geom_md SRCS= md.c opt_md.h opt_geom.h opt_rootdevname.h vnode_if.h diff --git a/sys/modules/mdio/Makefile b/sys/modules/mdio/Makefile index 0d7ed59bbd1d..fb388e23c03c 100644 --- a/sys/modules/mdio/Makefile +++ b/sys/modules/mdio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mdio +.PATH: ${SRCTOP}/sys/dev/mdio KMOD= mdio SRCS= mdio.c diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile index 0e47a286d491..b31cb73b4e46 100644 --- a/sys/modules/mem/Makefile +++ b/sys/modules/mem/Makefile @@ -1,10 +1,10 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mem -.PATH: ${.CURDIR}/../../${MACHINE}/${MACHINE} -.PATH: ${.CURDIR}/../../${MACHINE_CPUARCH}/${MACHINE_CPUARCH} +.PATH: ${SRCTOP}/sys/dev/mem +.PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE} +.PATH: ${SRCTOP}/sys/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} .if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" -.PATH: ${.CURDIR}/../../x86/x86 +.PATH: ${SRCTOP}/sys/x86/x86 .endif KMOD= mem diff --git a/sys/modules/mfi/Makefile b/sys/modules/mfi/Makefile index 71e68c6b2b62..cfe4aee98268 100644 --- a/sys/modules/mfi/Makefile +++ b/sys/modules/mfi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mfi +.PATH: ${SRCTOP}/sys/dev/mfi SUBDIR= mfip diff --git a/sys/modules/mfi/mfi_linux/Makefile b/sys/modules/mfi/mfi_linux/Makefile index 05d074572d69..cbc9a97b82b9 100644 --- a/sys/modules/mfi/mfi_linux/Makefile +++ b/sys/modules/mfi/mfi_linux/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mfi +.PATH: ${SRCTOP}/sys/dev/mfi KMOD= mfi_linux SRCS= mfi_linux.c diff --git a/sys/modules/mfi/mfip/Makefile b/sys/modules/mfi/mfip/Makefile index 2a97d7057a75..13b6b19367c9 100644 --- a/sys/modules/mfi/mfip/Makefile +++ b/sys/modules/mfi/mfip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mfi +.PATH: ${SRCTOP}/sys/dev/mfi KMOD= mfip SRCS= mfi_cam.c diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile index e24a96190f4a..51b4f056d0d2 100644 --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mii +.PATH: ${SRCTOP}/sys/dev/mii KMOD= miibus SRCS= acphy.c amphy.c atphy.c axphy.c bmtphy.c brgphy.c bus_if.h diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile index ba0951ac4e67..5d6fea3b92c8 100644 --- a/sys/modules/mlx/Makefile +++ b/sys/modules/mlx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mlx +.PATH: ${SRCTOP}/sys/dev/mlx KMOD= mlx SRCS= mlx.c mlx_pci.c mlx_disk.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/mlx4/Makefile b/sys/modules/mlx4/Makefile index 6fd4620dffcc..44ec725ee9ce 100644 --- a/sys/modules/mlx4/Makefile +++ b/sys/modules/mlx4/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mlx4/mlx4_core +.PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_core KMOD= mlx4 SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ @@ -25,8 +25,8 @@ SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ mlx4_resource_tracker.c \ mlx4_sys_tune.c -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/mlx4en/Makefile b/sys/modules/mlx4en/Makefile index 2be20987fe7e..b5b57f48c903 100644 --- a/sys/modules/mlx4en/Makefile +++ b/sys/modules/mlx4en/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mlx4/mlx4_en +.PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_en KMOD= mlx4en SRCS= device_if.h bus_if.h pci_if.h vnode_if.h \ @@ -12,7 +12,7 @@ SRCS= device_if.h bus_if.h pci_if.h vnode_if.h \ mlx4_en_rx.c \ mlx4_en_tx.c -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/mlx4ib/Makefile b/sys/modules/mlx4ib/Makefile index 5912fe0a5928..653b0f6840fc 100644 --- a/sys/modules/mlx4ib/Makefile +++ b/sys/modules/mlx4ib/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mlx4/mlx4_ib +.PATH: ${SRCTOP}/sys/dev/mlx4/mlx4_ib KMOD= mlx4ib SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ @@ -19,8 +19,8 @@ SRCS= device_if.h bus_if.h vnode_if.h pci_if.h \ mlx4_ib_wc.c \ mlx4_ib_cm.c -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include CFLAGS+= -DCONFIG_INFINIBAND_USER_MEM CFLAGS+= -DINET6 -DINET diff --git a/sys/modules/mlx5/Makefile b/sys/modules/mlx5/Makefile index 0fd0cccea597..c11a30190186 100644 --- a/sys/modules/mlx5/Makefile +++ b/sys/modules/mlx5/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mlx5/mlx5_core +.PATH: ${SRCTOP}/sys/dev/mlx5/mlx5_core KMOD=mlx5 SRCS= \ @@ -28,8 +28,8 @@ mlx5_wq.c \ device_if.h bus_if.h vnode_if.h pci_if.h \ opt_inet.h opt_inet6.h opt_rss.h -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/mlx5en/Makefile b/sys/modules/mlx5en/Makefile index a3f6d6be39b0..c154f774bc28 100644 --- a/sys/modules/mlx5en/Makefile +++ b/sys/modules/mlx5en/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mlx5/mlx5_en +.PATH: ${SRCTOP}/sys/dev/mlx5/mlx5_en KMOD=mlx5en SRCS= \ @@ -20,8 +20,8 @@ CFLAGS+= -DHAVE_PER_CQ_EVENT_PACKET CFLAGS+= -DHAVE_TCP_LRO_RX .endif -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/mly/Makefile b/sys/modules/mly/Makefile index e8773def4b9a..5f7f3136359d 100644 --- a/sys/modules/mly/Makefile +++ b/sys/modules/mly/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mly +.PATH: ${SRCTOP}/sys/dev/mly KMOD= mly SRCS= mly.c diff --git a/sys/modules/mmc/Makefile b/sys/modules/mmc/Makefile index b97e2a3e5891..70ae22d778fe 100644 --- a/sys/modules/mmc/Makefile +++ b/sys/modules/mmc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mmc +.PATH: ${SRCTOP}/sys/dev/mmc KMOD= mmc SRCS= mmc.c mmcbr_if.h mmcbus_if.h device_if.h bus_if.h diff --git a/sys/modules/mmcsd/Makefile b/sys/modules/mmcsd/Makefile index 30ce37dacff1..4294c593b755 100644 --- a/sys/modules/mmcsd/Makefile +++ b/sys/modules/mmcsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mmc +.PATH: ${SRCTOP}/sys/dev/mmc KMOD= mmcsd SRCS= bus_if.h device_if.h mmcbr_if.h mmcbus_if.h mmcsd.c diff --git a/sys/modules/mpr/Makefile b/sys/modules/mpr/Makefile index 426c20274d49..89c1e832fcff 100644 --- a/sys/modules/mpr/Makefile +++ b/sys/modules/mpr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mpr +.PATH: ${SRCTOP}/sys/dev/mpr KMOD= mpr SRCS= mpr_pci.c mpr.c mpr_sas.c mpr_table.c mpr_user.c diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile index bd9a52444cfe..4ac01dffb3df 100644 --- a/sys/modules/mps/Makefile +++ b/sys/modules/mps/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mps +.PATH: ${SRCTOP}/sys/dev/mps KMOD= mps SRCS= mps_pci.c mps.c mps_sas.c mps_table.c mps_user.c diff --git a/sys/modules/mpt/Makefile b/sys/modules/mpt/Makefile index 03bae4c2ed08..f07c95fe4e7e 100644 --- a/sys/modules/mpt/Makefile +++ b/sys/modules/mpt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mpt +.PATH: ${SRCTOP}/sys/dev/mpt KMOD= mpt SRCS= bus_if.h device_if.h pci_if.h \ diff --git a/sys/modules/mqueue/Makefile b/sys/modules/mqueue/Makefile index f86c78bc7566..9c8bd6d0b39b 100644 --- a/sys/modules/mqueue/Makefile +++ b/sys/modules/mqueue/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= mqueuefs SRCS= uipc_mqueue.c \ diff --git a/sys/modules/mrsas/Makefile b/sys/modules/mrsas/Makefile index 02bb52000db5..8d8695b4e4f2 100644 --- a/sys/modules/mrsas/Makefile +++ b/sys/modules/mrsas/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ KMOD=mrsas -.PATH: ${.CURDIR}/../../dev/${KMOD} +.PATH: ${SRCTOP}/sys/dev/${KMOD} .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" SUBDIR+= mrsas_linux diff --git a/sys/modules/mrsas/mrsas_linux/Makefile b/sys/modules/mrsas/mrsas_linux/Makefile index 3563892cfc7c..5bf79b24b7bb 100644 --- a/sys/modules/mrsas/mrsas_linux/Makefile +++ b/sys/modules/mrsas/mrsas_linux/Makefile @@ -1,7 +1,7 @@ # Makefile for mrsas driver # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mrsas +.PATH: ${SRCTOP}/sys/dev/mrsas KMOD= mrsas_linux SRCS= mrsas_linux.c diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile index a0fe95f0b6ec..0ba4e47e9c3f 100644 --- a/sys/modules/msdosfs/Makefile +++ b/sys/modules/msdosfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/msdosfs +.PATH: ${SRCTOP}/sys/fs/msdosfs KMOD= msdosfs SRCS= vnode_if.h \ diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile index 8d2e41da121e..add92276e076 100644 --- a/sys/modules/msdosfs_iconv/Makefile +++ b/sys/modules/msdosfs_iconv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/msdosfs +.PATH: ${SRCTOP}/sys/fs/msdosfs KMOD= msdosfs_iconv SRCS= msdosfs_iconv.c diff --git a/sys/modules/mse/Makefile b/sys/modules/mse/Makefile index af515b2e80b9..ea09b7cc9e61 100644 --- a/sys/modules/mse/Makefile +++ b/sys/modules/mse/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mse +.PATH: ${SRCTOP}/sys/dev/mse KMOD= mse SRCS= mse.c mse_isa.c device_if.h bus_if.h isa_if.h diff --git a/sys/modules/msk/Makefile b/sys/modules/msk/Makefile index 48a7649fec3c..826cd0b9c53c 100644 --- a/sys/modules/msk/Makefile +++ b/sys/modules/msk/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/msk +.PATH: ${SRCTOP}/sys/dev/msk KMOD= if_msk SRCS= if_msk.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/mthca/Makefile b/sys/modules/mthca/Makefile index 95157e28058f..2c057f254f8d 100644 --- a/sys/modules/mthca/Makefile +++ b/sys/modules/mthca/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../ofed/drivers/infiniband/hw/mthca +.PATH: ${SRCTOP}/sys/ofed/drivers/infiniband/hw/mthca KMOD = mthca SRCS = device_if.h bus_if.h pci_if.h vnode_if.h @@ -9,8 +9,8 @@ SRCS+= mthca_mr.c mthca_pd.c mthca_profile.c mthca_provider.c mthca_qp.c SRCS+= mthca_reset.c mthca_srq.c mthca_uar.c SRCS+= opt_inet.h opt_inet6.h -CFLAGS+= -I${.CURDIR}/../../ofed/include -CFLAGS+= -I${.CURDIR}/../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/mvs/Makefile b/sys/modules/mvs/Makefile index 5931492a329e..165d6c9edd3f 100644 --- a/sys/modules/mvs/Makefile +++ b/sys/modules/mvs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/mvs +.PATH: ${SRCTOP}/sys/dev/mvs KMOD= mvs SRCS= mvs.c mvs_pci.c mvs.h mvs_if.c mvs_if.h device_if.h bus_if.h pci_if.h opt_cam.h diff --git a/sys/modules/mwl/Makefile b/sys/modules/mwl/Makefile index f2c40d79cb5f..acbe75ca413c 100644 --- a/sys/modules/mwl/Makefile +++ b/sys/modules/mwl/Makefile @@ -29,7 +29,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/mwl +.PATH: ${SRCTOP}/sys/dev/mwl KMOD= if_mwl SRCS= if_mwl.c if_mwl_pci.c mwlhal.c diff --git a/sys/modules/mwlfw/Makefile b/sys/modules/mwlfw/Makefile index 9d7b226affe2..1e6a1e8503e2 100644 --- a/sys/modules/mwlfw/Makefile +++ b/sys/modules/mwlfw/Makefile @@ -5,10 +5,10 @@ FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot CLEANFILES+= mw88W8363.fw mwlboot.fw -mw88W8363.fw: ${.CURDIR}/../../contrib/dev/mwl/mw88W8363.fw.uu +mw88W8363.fw: ${SRCTOP}/sys/contrib/dev/mwl/mw88W8363.fw.uu uudecode -p $? > ${.TARGET} -mwlboot.fw: ${.CURDIR}/../../contrib/dev/mwl/mwlboot.fw.uu +mwlboot.fw: ${SRCTOP}/sys/contrib/dev/mwl/mwlboot.fw.uu uudecode -p $? > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/mxge/mxge/Makefile b/sys/modules/mxge/mxge/Makefile index 3f1f80f4ef59..a924aef52021 100644 --- a/sys/modules/mxge/mxge/Makefile +++ b/sys/modules/mxge/mxge/Makefile @@ -1,6 +1,6 @@ #$FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mxge +.PATH: ${SRCTOP}/sys/dev/mxge KMOD= if_mxge SRCS= if_mxge.c device_if.h bus_if.h pci_if.h opt_inet.h opt_inet6.h diff --git a/sys/modules/mxge/mxge_eth_z8e/Makefile b/sys/modules/mxge/mxge_eth_z8e/Makefile index 3454581d21d4..6ee14187ab93 100644 --- a/sys/modules/mxge/mxge_eth_z8e/Makefile +++ b/sys/modules/mxge/mxge_eth_z8e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mxge +.PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_eth_z8e SRCS= mxge_eth_z8e.c diff --git a/sys/modules/mxge/mxge_ethp_z8e/Makefile b/sys/modules/mxge/mxge_ethp_z8e/Makefile index e9f9b31725b2..d0f0f48bc338 100644 --- a/sys/modules/mxge/mxge_ethp_z8e/Makefile +++ b/sys/modules/mxge/mxge_ethp_z8e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mxge +.PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_ethp_z8e SRCS= mxge_ethp_z8e.c diff --git a/sys/modules/mxge/mxge_rss_eth_z8e/Makefile b/sys/modules/mxge/mxge_rss_eth_z8e/Makefile index 46c545cc7a34..5cd4487738ab 100644 --- a/sys/modules/mxge/mxge_rss_eth_z8e/Makefile +++ b/sys/modules/mxge/mxge_rss_eth_z8e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mxge +.PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_rss_eth_z8e SRCS= mxge_rss_eth_z8e.c diff --git a/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile b/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile index de8dc4e763ed..a2a965d1d3cd 100644 --- a/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile +++ b/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/mxge +.PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_rss_ethp_z8e SRCS= mxge_rss_ethp_z8e.c diff --git a/sys/modules/my/Makefile b/sys/modules/my/Makefile index 596284ee9dd9..28ea8dbffc84 100644 --- a/sys/modules/my/Makefile +++ b/sys/modules/my/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/my +.PATH: ${SRCTOP}/sys/dev/my KMOD= if_my SRCS= if_my.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/nand/Makefile b/sys/modules/nand/Makefile index 4f66295c7734..c9d9962e897f 100644 --- a/sys/modules/nand/Makefile +++ b/sys/modules/nand/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nand +.PATH: ${SRCTOP}/sys/dev/nand KMOD = nand SRCS= nand.c nand_bbt.c nand_cdev.c nand_generic.c nand_geom.c \ diff --git a/sys/modules/nandfs/Makefile b/sys/modules/nandfs/Makefile index 0748e3d3ad55..f13858c57c7b 100644 --- a/sys/modules/nandfs/Makefile +++ b/sys/modules/nandfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/nandfs +.PATH: ${SRCTOP}/sys/fs/nandfs KMOD= nandfs SRCS= vnode_if.h opt_ddb.h \ diff --git a/sys/modules/nandsim/Makefile b/sys/modules/nandsim/Makefile index 0a729eb1c087..4f0aeca9eb4b 100644 --- a/sys/modules/nandsim/Makefile +++ b/sys/modules/nandsim/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nand +.PATH: ${SRCTOP}/sys/dev/nand KMOD= nandsim SRCS= nandsim.c nandsim_chip.c nandsim_swap.c nandsim_ctrl.c nandsim_log.c\ diff --git a/sys/modules/ncr/Makefile b/sys/modules/ncr/Makefile index 7ba6c68381a5..a2060bf5c502 100644 --- a/sys/modules/ncr/Makefile +++ b/sys/modules/ncr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ncr +.PATH: ${SRCTOP}/sys/dev/ncr KMOD= ncr SRCS= ncr.c diff --git a/sys/modules/nctgpio/Makefile b/sys/modules/nctgpio/Makefile index 88e133d7f74b..7ab56ee5e6d5 100644 --- a/sys/modules/nctgpio/Makefile +++ b/sys/modules/nctgpio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nctgpio +.PATH: ${SRCTOP}/sys/dev/nctgpio KMOD= nctgpio SRCS= nctgpio.c SRCS+= device_if.h bus_if.h isa_if.h gpio_if.h opt_platform.h diff --git a/sys/modules/ncv/Makefile b/sys/modules/ncv/Makefile index 0181db8c0958..3d66308576bf 100644 --- a/sys/modules/ncv/Makefile +++ b/sys/modules/ncv/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ncv +.PATH: ${SRCTOP}/sys/dev/ncv KMOD= ncv SRCS= ncr53c500_pccard.c ncr53c500.c diff --git a/sys/modules/ndis/Makefile b/sys/modules/ndis/Makefile index b4dc428bdb51..24a887eec949 100644 --- a/sys/modules/ndis/Makefile +++ b/sys/modules/ndis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../compat/ndis +.PATH: ${SRCTOP}/sys/compat/ndis KMOD= ndis SRCS= subr_pe.c subr_ndis.c subr_hal.c subr_ntoskrnl.c kern_ndis.c diff --git a/sys/modules/netfpga10g/nf10bmac/Makefile b/sys/modules/netfpga10g/nf10bmac/Makefile index adc447194c1e..57f16ed275c6 100644 --- a/sys/modules/netfpga10g/nf10bmac/Makefile +++ b/sys/modules/netfpga10g/nf10bmac/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/netfpga10g/nf10bmac +.PATH: ${SRCTOP}/sys/dev/netfpga10g/nf10bmac KMOD= if_nf10bmac SRCS= if_nf10bmac.c diff --git a/sys/modules/netgraph/Makefile b/sys/modules/netgraph/Makefile index c9b5748a7b4b..ac674d16d812 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 3d2fd195b5ce..0a25d0f8e817 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 ebd94e13f40e..2cd6d9decc27 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 1ad4bb6b6079..f495cdbbda78 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 8bf741d4def7..3cf9070dfc50 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 278159f26797..3d747c766ed8 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 b9334dd98ab3..3270f1355d72 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 57c20b0265e3..a260fcac2747 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 35c3ead6e5c2..2e25d8e37cb5 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 36514b136f41..47c4f7a0f140 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 f8dfc96d6dab..808f44c9dd2c 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 729ea7b5b234..1e970c9a568e 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 5b66e0988f72..03ee080d01ee 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 38e90f5326f5..36bc4e9fbd0f 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 b9ff0c1dcda3..b41fc36c7d4e 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 4c5c8131af26..19a00ba504aa 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 adef38f81e17..3fcc4acf4fe1 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 1ab69e64bad9..0cd02f7df9c0 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 10345c1517e5..365c99b3ddbe 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 4921ac953bb2..4e4d361c8efb 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 diff --git a/sys/modules/netmap/Makefile b/sys/modules/netmap/Makefile index 978a4858edb9..44c5195ee4ba 100644 --- a/sys/modules/netmap/Makefile +++ b/sys/modules/netmap/Makefile @@ -6,9 +6,9 @@ .include <bsd.own.mk> # FreeBSD 10 and earlier # .include "${SYSDIR}/conf/kern.opts.mk" -.PATH: ${.CURDIR}/../../dev/netmap -.PATH.h: ${.CURDIR}/../../net -CFLAGS += -I${.CURDIR}/../../ -D INET +.PATH: ${SRCTOP}/sys/dev/netmap +.PATH.h: ${SRCTOP}/sys/net +CFLAGS += -I${SRCTOP}/sys/ -D INET KMOD = netmap SRCS = device_if.h bus_if.h pci_if.h opt_netmap.h SRCS += netmap.c netmap.h netmap_kern.h diff --git a/sys/modules/nfe/Makefile b/sys/modules/nfe/Makefile index 6fe8bc3c1cdc..cb3c2334428f 100644 --- a/sys/modules/nfe/Makefile +++ b/sys/modules/nfe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nfe +.PATH: ${SRCTOP}/sys/dev/nfe KMOD= if_nfe SRCS= if_nfe.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile index 171b1e1c644f..5da77b268f10 100644 --- a/sys/modules/nfscl/Makefile +++ b/sys/modules/nfscl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/nfsclient ${.CURDIR}/../../nfs +.PATH: ${SRCTOP}/sys/fs/nfsclient ${SRCTOP}/sys/nfs KMOD= nfscl SRCS= vnode_if.h \ nfs_clrpcops.c \ diff --git a/sys/modules/nfscommon/Makefile b/sys/modules/nfscommon/Makefile index 18a343e7cf0c..c83ea1251951 100644 --- a/sys/modules/nfscommon/Makefile +++ b/sys/modules/nfscommon/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/nfs +.PATH: ${SRCTOP}/sys/fs/nfs KMOD= nfscommon SRCS= vnode_if.h \ nfs_commonacl.c \ diff --git a/sys/modules/nfsd/Makefile b/sys/modules/nfsd/Makefile index 2b57f30d26b2..c9447f906cf4 100644 --- a/sys/modules/nfsd/Makefile +++ b/sys/modules/nfsd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/nfsserver ${.CURDIR}/../../nfs +.PATH: ${SRCTOP}/sys/fs/nfsserver ${SRCTOP}/sys/nfs KMOD= nfsd SRCS= vnode_if.h \ nfs_fha.c \ diff --git a/sys/modules/nfslock/Makefile b/sys/modules/nfslock/Makefile index 0a1e208be5d2..05cb17d498d1 100644 --- a/sys/modules/nfslock/Makefile +++ b/sys/modules/nfslock/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../nfs +.PATH: ${SRCTOP}/sys/nfs KMOD= nfslock SRCS= vnode_if.h \ nfs_lock.c \ diff --git a/sys/modules/nfslockd/Makefile b/sys/modules/nfslockd/Makefile index 407a4aba0221..1f6acaa55f29 100644 --- a/sys/modules/nfslockd/Makefile +++ b/sys/modules/nfslockd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../nlm ${.CURDIR}/../../rpc +.PATH: ${SRCTOP}/sys/nlm ${SRCTOP}/sys/rpc KMOD= nfslockd SRCS= vnode_if.h \ nlm_advlock.c \ diff --git a/sys/modules/nfssvc/Makefile b/sys/modules/nfssvc/Makefile index 0073d1300393..ff9462c685f7 100644 --- a/sys/modules/nfssvc/Makefile +++ b/sys/modules/nfssvc/Makefile @@ -1,7 +1,6 @@ - # $FreeBSD$ -.PATH: ${.CURDIR}/../../nfs +.PATH: ${SRCTOP}/sys/nfs KMOD= nfssvc SRCS= nfs_nfssvc.c \ opt_nfs.h diff --git a/sys/modules/nge/Makefile b/sys/modules/nge/Makefile index 4bb68cd5d0db..8bc377521151 100644 --- a/sys/modules/nge/Makefile +++ b/sys/modules/nge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nge +.PATH: ${SRCTOP}/sys/dev/nge KMOD= if_nge SRCS= if_nge.c miibus_if.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/nmdm/Makefile b/sys/modules/nmdm/Makefile index 25e9470a8521..84a57a8a1efa 100644 --- a/sys/modules/nmdm/Makefile +++ b/sys/modules/nmdm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nmdm +.PATH: ${SRCTOP}/sys/dev/nmdm KMOD= nmdm SRCS= nmdm.c diff --git a/sys/modules/nsp/Makefile b/sys/modules/nsp/Makefile index 1773286a7bca..c51967115255 100644 --- a/sys/modules/nsp/Makefile +++ b/sys/modules/nsp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nsp +.PATH: ${SRCTOP}/sys/dev/nsp KMOD= nsp SRCS= nsp.c nsp_pccard.c diff --git a/sys/modules/ntb/if_ntb/Makefile b/sys/modules/ntb/if_ntb/Makefile index 468593d161cb..acdc859bf743 100644 --- a/sys/modules/ntb/if_ntb/Makefile +++ b/sys/modules/ntb/if_ntb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ntb/if_ntb +.PATH: ${SRCTOP}/sys/dev/ntb/if_ntb KMOD = if_ntb SRCS = if_ntb.c diff --git a/sys/modules/ntb/ntb/Makefile b/sys/modules/ntb/ntb/Makefile index c3f647bbe4e6..ec6421ac7b66 100644 --- a/sys/modules/ntb/ntb/Makefile +++ b/sys/modules/ntb/ntb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ntb +.PATH: ${SRCTOP}/sys/dev/ntb KMOD = ntb SRCS = ntb.c ntb_if.c diff --git a/sys/modules/ntb/ntb_hw/Makefile b/sys/modules/ntb/ntb_hw/Makefile index f3e76452e8f3..ad77e97cc935 100644 --- a/sys/modules/ntb/ntb_hw/Makefile +++ b/sys/modules/ntb/ntb_hw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ntb/ntb_hw +.PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw SRCS = ntb_hw.c diff --git a/sys/modules/ntb/ntb_transport/Makefile b/sys/modules/ntb/ntb_transport/Makefile index 2a8fcbce2b3d..df39148f64da 100644 --- a/sys/modules/ntb/ntb_transport/Makefile +++ b/sys/modules/ntb/ntb_transport/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ntb +.PATH: ${SRCTOP}/sys/dev/ntb KMOD = ntb_transport SRCS = ntb_transport.c diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile index 22cbf003afbd..5252a8f8e514 100644 --- a/sys/modules/nullfs/Makefile +++ b/sys/modules/nullfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/nullfs +.PATH: ${SRCTOP}/sys/fs/nullfs KMOD= nullfs SRCS= vnode_if.h \ diff --git a/sys/modules/nvd/Makefile b/sys/modules/nvd/Makefile index 3b8d778efa02..d47ac9184759 100644 --- a/sys/modules/nvd/Makefile +++ b/sys/modules/nvd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nvd +.PATH: ${SRCTOP}/sys/dev/nvd KMOD= nvd SRCS= nvd.c opt_geom.h device_if.h bus_if.h diff --git a/sys/modules/nvme/Makefile b/sys/modules/nvme/Makefile index 6fa35310d2a8..c65d3b43528a 100644 --- a/sys/modules/nvme/Makefile +++ b/sys/modules/nvme/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nvme +.PATH: ${SRCTOP}/sys/dev/nvme KMOD = nvme diff --git a/sys/modules/nvram/Makefile b/sys/modules/nvram/Makefile index 7af468d041fe..09eb07de7063 100644 --- a/sys/modules/nvram/Makefile +++ b/sys/modules/nvram/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nvram +.PATH: ${SRCTOP}/sys/dev/nvram KMOD= nvram SRCS= nvram.c diff --git a/sys/modules/nxge/Makefile b/sys/modules/nxge/Makefile index b7ffc491c3b1..92b8cec52ff9 100644 --- a/sys/modules/nxge/Makefile +++ b/sys/modules/nxge/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/nxge -.PATH: ${.CURDIR}/../../dev/nxge/xgehal +.PATH: ${SRCTOP}/sys/dev/nxge +.PATH: ${SRCTOP}/sys/dev/nxge/xgehal CFLAGS_NXGE = diff --git a/sys/modules/oce/Makefile b/sys/modules/oce/Makefile index 95e828d5318e..5565d2dec31a 100644 --- a/sys/modules/oce/Makefile +++ b/sys/modules/oce/Makefile @@ -2,12 +2,12 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/oce +.PATH: ${SRCTOP}/sys/dev/oce KMOD = if_oce SRCS = oce_if.c oce_hw.c oce_mbox.c oce_util.c oce_queue.c oce_sysctl.c SRCS += bus_if.h device_if.h pci_if.h opt_inet.h opt_inet6.h -CFLAGS+= -I${.CURDIR}/../../dev/oce -DSMP +CFLAGS+= -I${SRCTOP}/sys/dev/oce -DSMP # uncomment for lock profiling statistics #CFLAGS += -DLOCK_PROFILING diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile index c22c64c6367b..8bf2ece515a5 100644 --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?= ${.CURDIR}/../.. +SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/compat/opensolaris/kern diff --git a/sys/modules/otus/Makefile b/sys/modules/otus/Makefile index b263c06ab2df..56c37b239d48 100644 --- a/sys/modules/otus/Makefile +++ b/sys/modules/otus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/otus +.PATH: ${SRCTOP}/sys/dev/otus KMOD = if_otus SRCS = if_otus.c if_otusreg.h \ diff --git a/sys/modules/otusfw/otusfw_init/Makefile b/sys/modules/otusfw/otusfw_init/Makefile index d188e9a83d94..3a6e571cdc4c 100644 --- a/sys/modules/otusfw/otusfw_init/Makefile +++ b/sys/modules/otusfw/otusfw_init/Makefile @@ -5,7 +5,7 @@ FIRMWS= otusfw_init:otusfw_init:1 CLEANFILES= otus_init -otusfw_init: ${.CURDIR}/../../../contrib/dev/otus/otus-init - cp ${.CURDIR}/../../../contrib/dev/otus/otus-init ${.TARGET} +otusfw_init: ${SRCTOP}/sys/contrib/dev/otus/otus-init + cp ${.ALLSRC} ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/otusfw/otusfw_main/Makefile b/sys/modules/otusfw/otusfw_main/Makefile index 94e1aeec1daf..7ef78a912255 100644 --- a/sys/modules/otusfw/otusfw_main/Makefile +++ b/sys/modules/otusfw/otusfw_main/Makefile @@ -5,7 +5,7 @@ FIRMWS= otusfw_main:otusfw_main:1 CLEANFILES= otusfw_main -otusfw_main: ${.CURDIR}/../../../contrib/dev/otus/otus-main - cp ${.CURDIR}/../../../contrib/dev/otus/otus-main ${.TARGET} +otusfw_main: ${SRCTOP}/sys/contrib/dev/otus/otus-main + cp ${.ALLSRC} ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/ow/Makefile b/sys/modules/ow/Makefile index 13d7739928b7..5cc630e65b20 100644 --- a/sys/modules/ow/Makefile +++ b/sys/modules/ow/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" SUBDIR = ow owc ow_temp diff --git a/sys/modules/ow/ow/Makefile b/sys/modules/ow/ow/Makefile index 49634064be70..fdc8fe93ae2b 100644 --- a/sys/modules/ow/ow/Makefile +++ b/sys/modules/ow/ow/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ow +.PATH: ${SRCTOP}/sys/dev/ow KMOD= ow SRCS= ow.c diff --git a/sys/modules/ow/ow_temp/Makefile b/sys/modules/ow/ow_temp/Makefile index 6bd623e95a1d..00f3ee5a8b66 100644 --- a/sys/modules/ow/ow_temp/Makefile +++ b/sys/modules/ow/ow_temp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ow +.PATH: ${SRCTOP}/sys/dev/ow KMOD= ow_temp SRCS= ow_temp.c diff --git a/sys/modules/ow/owc/Makefile b/sys/modules/ow/owc/Makefile index 4aaccf9ebb41..909c2382ad7d 100644 --- a/sys/modules/ow/owc/Makefile +++ b/sys/modules/ow/owc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/ow +.PATH: ${SRCTOP}/sys/dev/ow KMOD= owc SRCS= owc_gpiobus.c diff --git a/sys/modules/padlock/Makefile b/sys/modules/padlock/Makefile index 14a8b56563fb..7100733c1d41 100644 --- a/sys/modules/padlock/Makefile +++ b/sys/modules/padlock/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/via +.PATH: ${SRCTOP}/sys/crypto/via KMOD= padlock SRCS= padlock.c padlock_cipher.c padlock_hash.c diff --git a/sys/modules/padlock_rng/Makefile b/sys/modules/padlock_rng/Makefile index 25bf24fe7189..2988079d2946 100644 --- a/sys/modules/padlock_rng/Makefile +++ b/sys/modules/padlock_rng/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/random +.PATH: ${SRCTOP}/sys/dev/random KMOD= padlock_rng SRCS= nehemiah.c SRCS+= bus_if.h device_if.h -CFLAGS+= -I${.CURDIR}/../.. +CFLAGS+= -I${SRCTOP}/sys .include <bsd.kmod.mk> diff --git a/sys/modules/patm/Makefile b/sys/modules/patm/Makefile index 7df3165d3eea..4f59aa765fc8 100644 --- a/sys/modules/patm/Makefile +++ b/sys/modules/patm/Makefile @@ -2,7 +2,7 @@ # # Author: Harti Brandt <harti@freebsd.org> # -.PATH: ${.CURDIR}/../../dev/patm +.PATH: ${SRCTOP}/sys/dev/patm KMOD= if_patm SRCS= if_patm.c if_patm_attach.c if_patm_ioctl.c if_patm_intr.c \ diff --git a/sys/modules/pccard/Makefile b/sys/modules/pccard/Makefile index 95bcf3fc344c..f7822da784d7 100644 --- a/sys/modules/pccard/Makefile +++ b/sys/modules/pccard/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/pccard +.PATH: ${SRCTOP}/sys/dev/pccard KMOD= pccard SRCS= pccard.c pccard_cis.c pccard_cis_quirks.c pccard_device.c \ diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile index 107a0674ba21..c49cf15f0569 100644 --- a/sys/modules/pcfclock/Makefile +++ b/sys/modules/pcfclock/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= pcfclock SRCS= pcfclock.c opt_pcfclock.h diff --git a/sys/modules/pcn/Makefile b/sys/modules/pcn/Makefile index 9955c6c09397..aa772f235896 100644 --- a/sys/modules/pcn/Makefile +++ b/sys/modules/pcn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/pcn +.PATH: ${SRCTOP}/sys/dev/pcn KMOD= if_pcn SRCS= if_pcn.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index b934e0566133..30a742a3b627 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/pf +.PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pf SRCS= pf.c pf_if.c pf_lb.c pf_osfp.c pf_ioctl.c pf_norm.c pf_table.c \ diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile index 36656dcb1905..0c4697ce2c6e 100644 --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/pf +.PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pflog SRCS= if_pflog.c \ diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile index 89af6f91452c..f691db672719 100644 --- a/sys/modules/pfsync/Makefile +++ b/sys/modules/pfsync/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netpfil/pf +.PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pfsync SRCS= if_pfsync.c \ diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile index 9aa5bd41c378..0b214f3b3281 100644 --- a/sys/modules/plip/Makefile +++ b/sys/modules/plip/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= plip SRCS= bus_if.h device_if.h ppbus_if.h \ opt_plip.h \ diff --git a/sys/modules/pms/Makefile b/sys/modules/pms/Makefile index 128fe0868289..4dc00b75ff6f 100644 --- a/sys/modules/pms/Makefile +++ b/sys/modules/pms/Makefile @@ -2,20 +2,20 @@ # 5/31/2012 #PATH shall include all directories -.PATH: ${.CURDIR}/../../dev/pms/freebsd/driver/ini/src \ - ${.CURDIR}/../../dev/pms/RefTisa/sallsdk/api \ - ${.CURDIR}/../../dev/pms/RefTisa/sallsdk/spc \ - ${.CURDIR}/../../dev/pms/RefTisa/sallsdk/hda/64k \ - ${.CURDIR}/../../dev/pms/RefTisa/discovery/api \ - ${.CURDIR}/../../dev/pms/RefTisa/discovery/dm \ - ${.CURDIR}/../../dev/pms/RefTisa/sat/api \ - ${.CURDIR}/../../dev/pms/RefTisa/sat/src \ - ${.CURDIR}/../../dev/pms/RefTisa/tisa/api \ - ${.CURDIR}/../../dev/pms/RefTisa/tisa/sassata/common \ - ${.CURDIR}/../../dev/pms/RefTisa/tisa/sassata/sas/common \ - ${.CURDIR}/../../dev/pms/RefTisa/tisa/sassata/sas/ini \ - ${.CURDIR}/../../dev/pms/RefTisa/tisa/sassata/sata/host \ - ${.CURDIR}/../../dev/pms/freebsd/driver/common +.PATH: ${SRCTOP}/sys/dev/pms/freebsd/driver/ini/src \ + ${SRCTOP}/sys/dev/pms/RefTisa/sallsdk/api \ + ${SRCTOP}/sys/dev/pms/RefTisa/sallsdk/spc \ + ${SRCTOP}/sys/dev/pms/RefTisa/sallsdk/hda/64k \ + ${SRCTOP}/sys/dev/pms/RefTisa/discovery/api \ + ${SRCTOP}/sys/dev/pms/RefTisa/discovery/dm \ + ${SRCTOP}/sys/dev/pms/RefTisa/sat/api \ + ${SRCTOP}/sys/dev/pms/RefTisa/sat/src \ + ${SRCTOP}/sys/dev/pms/RefTisa/tisa/api \ + ${SRCTOP}/sys/dev/pms/RefTisa/tisa/sassata/common \ + ${SRCTOP}/sys/dev/pms/RefTisa/tisa/sassata/sas/common \ + ${SRCTOP}/sys/dev/pms/RefTisa/tisa/sassata/sas/ini \ + ${SRCTOP}/sys/dev/pms/RefTisa/tisa/sassata/sata/host \ + ${SRCTOP}/sys/dev/pms/freebsd/driver/common CFLAGS+=-fno-builtin CFLAGS+=-fms-extensions @@ -50,12 +50,10 @@ SRCS+= tdinit.c tdmisc.c tdesgl.c tdport.c tdint.c tdioctl.c tdhw.c ossacmnapi.c SRCS+= tdtimers.c itdio.c itdcb.c itdinit.c itddisc.c sat.c ossasat.c sathw.c #header files -SRCS+= agtiapi.h agtiproto.h agdef.h +SRCS+= agtiapi.h agtiproto.h agdef.h # SRCS+= osenv.h ostypes.h SRCS+= opt_scsi.h opt_cam.h SRCS+= device_if.h bus_if.h pci_if.h -#INCSRC= ../../common - .include <bsd.kmod.mk> diff --git a/sys/modules/powermac_nvram/Makefile b/sys/modules/powermac_nvram/Makefile index 95a38c833949..fe9bbbaba41a 100644 --- a/sys/modules/powermac_nvram/Makefile +++ b/sys/modules/powermac_nvram/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/powermac_nvram +.PATH: ${SRCTOP}/sys/dev/powermac_nvram KMOD= powermac_nvram SRCS= powermac_nvram.c powermac_nvramvar.h diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile index 1347e6482bcb..6b29f6985236 100644 --- a/sys/modules/ppbus/Makefile +++ b/sys/modules/ppbus/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= ppbus SRCS= bus_if.h device_if.h ppbus_if.h ppbus_if.c \ opt_ppb_1284.h \ diff --git a/sys/modules/ppc/Makefile b/sys/modules/ppc/Makefile index 76323b4cd065..af2057a15203 100644 --- a/sys/modules/ppc/Makefile +++ b/sys/modules/ppc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppc +.PATH: ${SRCTOP}/sys/dev/ppc KMOD= ppc SRCS= bus_if.h device_if.h ppbus_if.h isa_if.h pci_if.h serdev_if.h \ opt_ppc.h opt_isa.h \ diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile index 568fddfd4282..ec594a99b5b4 100644 --- a/sys/modules/ppi/Makefile +++ b/sys/modules/ppi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= ppi SRCS= bus_if.h device_if.h ppbus_if.h \ opt_ppb_1284.h \ diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile index 7e70bb2973ad..0e55150b6c96 100644 --- a/sys/modules/pps/Makefile +++ b/sys/modules/pps/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= pps SRCS= bus_if.h device_if.h ppbus_if.h \ pps.c diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile index 2b3b0620bbe7..e5c16142f369 100644 --- a/sys/modules/procfs/Makefile +++ b/sys/modules/procfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/procfs +.PATH: ${SRCTOP}/sys/fs/procfs KMOD= procfs SRCS= diff --git a/sys/modules/proto/Makefile b/sys/modules/proto/Makefile index 80a0050c1c9f..331c2c6835d2 100644 --- a/sys/modules/proto/Makefile +++ b/sys/modules/proto/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/proto +.PATH: ${SRCTOP}/sys/dev/proto KMOD= proto SRCS= \ diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile index 6ddb74929f94..45afba941428 100644 --- a/sys/modules/pseudofs/Makefile +++ b/sys/modules/pseudofs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/pseudofs +.PATH: ${SRCTOP}/sys/fs/pseudofs KMOD= pseudofs SRCS= opt_pseudofs.h \ diff --git a/sys/modules/pst/Makefile b/sys/modules/pst/Makefile index 46e552ddaf74..4b8ff3db1397 100644 --- a/sys/modules/pst/Makefile +++ b/sys/modules/pst/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/pst +.PATH: ${SRCTOP}/sys/dev/pst KMOD= pst SRCS= pst-pci.c pst-iop.c pst-raid.c diff --git a/sys/modules/pty/Makefile b/sys/modules/pty/Makefile index fd563fe1e2ff..73bc8cfe319b 100644 --- a/sys/modules/pty/Makefile +++ b/sys/modules/pty/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/pty +.PATH: ${SRCTOP}/sys/dev/pty KMOD= pty SRCS= pty.c diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile index 628a3b63daa4..042ae102abef 100644 --- a/sys/modules/puc/Makefile +++ b/sys/modules/puc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/puc +.PATH: ${SRCTOP}/sys/dev/puc KMOD= puc SRCS= puc.c puc_cfg.c puc_pci.c puc_pccard.c pucdata.c diff --git a/sys/modules/qlxgb/Makefile b/sys/modules/qlxgb/Makefile index caea34a44ecd..cb53184d3154 100644 --- a/sys/modules/qlxgb/Makefile +++ b/sys/modules/qlxgb/Makefile @@ -29,7 +29,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/qlxgb +.PATH: ${SRCTOP}/sys/dev/qlxgb KMOD= if_qlxgb SRCS= qla_os.c qla_dbg.c qla_hw.c qla_misc.c qla_isr.c qla_ioctl.c diff --git a/sys/modules/qlxgbe/Makefile b/sys/modules/qlxgbe/Makefile index 543e72a73bef..d94b08e50885 100644 --- a/sys/modules/qlxgbe/Makefile +++ b/sys/modules/qlxgbe/Makefile @@ -32,7 +32,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/qlxgbe +.PATH: ${SRCTOP}/sys/dev/qlxgbe KMOD=if_qlxgbe SRCS=ql_os.c ql_dbg.c ql_hw.c ql_misc.c ql_isr.c ql_ioctl.c diff --git a/sys/modules/qlxge/Makefile b/sys/modules/qlxge/Makefile index b34488a48801..54351b68cb3e 100644 --- a/sys/modules/qlxge/Makefile +++ b/sys/modules/qlxge/Makefile @@ -32,7 +32,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/qlxge +.PATH: ${SRCTOP}/sys/dev/qlxge KMOD=if_qlxge SRCS=qls_os.c qls_dbg.c qls_hw.c qls_isr.c qls_dump.c diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile index cc5d3421dbde..5c89e93aa5af 100644 --- a/sys/modules/ral/Makefile +++ b/sys/modules/ral/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ral +.PATH: ${SRCTOP}/sys/dev/ral KMOD= if_ral SRCS= rt2560.c rt2661.c rt2860.c if_ral_pci.c diff --git a/sys/modules/ralfw/Makefile.inc b/sys/modules/ralfw/Makefile.inc index 2dc6b47a1043..9922352372ea 100644 --- a/sys/modules/ralfw/Makefile.inc +++ b/sys/modules/ralfw/Makefile.inc @@ -11,5 +11,5 @@ CLEANFILES+= ${_FIRM} FIRMWS= ${_FIRM}:${KMOD} -${_FIRM}: ${.CURDIR}/../../../contrib/dev/ral/${_FIRM}.uu +${_FIRM}: ${SRCTOP}/sys/contrib/dev/ral/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/random_fortuna/Makefile b/sys/modules/random_fortuna/Makefile index d28ae4d291dd..e1290eb32f46 100644 --- a/sys/modules/random_fortuna/Makefile +++ b/sys/modules/random_fortuna/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/random +.PATH: ${SRCTOP}/sys/dev/random KMOD = random_fortuna SRCS = randomdev.c hash.c fortuna.c diff --git a/sys/modules/random_other/Makefile b/sys/modules/random_other/Makefile index 6ce586bf057b..14a0051efef8 100644 --- a/sys/modules/random_other/Makefile +++ b/sys/modules/random_other/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/random +.PATH: ${SRCTOP}/sys/dev/random KMOD = random_OTHER SRCS = randomdev.c hash.c other_algorithm.c diff --git a/sys/modules/random_yarrow/Makefile b/sys/modules/random_yarrow/Makefile index 1750af445500..90ff3597a728 100644 --- a/sys/modules/random_yarrow/Makefile +++ b/sys/modules/random_yarrow/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/random +.PATH: ${SRCTOP}/sys/dev/random KMOD = random_yarrow SRCS = randomdev.c hash.c yarrow.c diff --git a/sys/modules/rc/Makefile b/sys/modules/rc/Makefile index ffa6163afa83..a30f91d516e3 100644 --- a/sys/modules/rc/Makefile +++ b/sys/modules/rc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rc +.PATH: ${SRCTOP}/sys/dev/rc KMOD= rc SRCS= rc.c device_if.h bus_if.h isa_if.h diff --git a/sys/modules/rc4/Makefile b/sys/modules/rc4/Makefile index 95f609eac016..21d2d85856a1 100644 --- a/sys/modules/rc4/Makefile +++ b/sys/modules/rc4/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/rc4 +.PATH: ${SRCTOP}/sys/crypto/rc4 KMOD= rc4 SRCS= rc4.c diff --git a/sys/modules/rccgpio/Makefile b/sys/modules/rccgpio/Makefile index d6a7572d981a..5e7aa49db19c 100644 --- a/sys/modules/rccgpio/Makefile +++ b/sys/modules/rccgpio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rccgpio +.PATH: ${SRCTOP}/sys/dev/rccgpio KMOD= rccgpio SRCS= rccgpio.c SRCS+= device_if.h bus_if.h isa_if.h gpio_if.h opt_platform.h diff --git a/sys/modules/rdma/krping/Makefile b/sys/modules/rdma/krping/Makefile index ecc24a5f014f..9f530e0f818f 100644 --- a/sys/modules/rdma/krping/Makefile +++ b/sys/modules/rdma/krping/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/rdma/krping +.PATH: ${SRCTOP}/sys/contrib/rdma/krping KMOD= krping SRCS= krping.c krping_dev.c getopt.c SRCS+= bus_if.h device_if.h pci_if.h pcib_if.h vnode_if.h SRCS+= opt_sched.h opt_inet.h opt_inet6.h -CFLAGS+= -I${.CURDIR}/../../../ofed/include -CFLAGS+= -I${.CURDIR}/../../../compat/linuxkpi/common/include +CFLAGS+= -I${SRCTOP}/sys/ofed/include +CFLAGS+= -I${SRCTOP}/sys/compat/linuxkpi/common/include .include <bsd.kmod.mk> diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile index 9d5adc334145..7f14c080a260 100644 --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/random +.PATH: ${SRCTOP}/sys/dev/random KMOD= rdrand_rng SRCS= ivy.c SRCS+= bus_if.h device_if.h -CFLAGS+= -I${.CURDIR}/../.. +CFLAGS+= -I${SRCTOP}/sys .include <bsd.kmod.mk> diff --git a/sys/modules/re/Makefile b/sys/modules/re/Makefile index abc9e49522ba..782519b4d331 100644 --- a/sys/modules/re/Makefile +++ b/sys/modules/re/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/re +.PATH: ${SRCTOP}/sys/dev/re KMOD= if_re SRCS= if_re.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile index 16046adc59bb..51a4faec75bb 100644 --- a/sys/modules/rl/Makefile +++ b/sys/modules/rl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rl +.PATH: ${SRCTOP}/sys/dev/rl KMOD= if_rl SRCS= if_rl.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/rndtest/Makefile b/sys/modules/rndtest/Makefile index f818704a861e..64ad388d028f 100644 --- a/sys/modules/rndtest/Makefile +++ b/sys/modules/rndtest/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rndtest +.PATH: ${SRCTOP}/sys/dev/rndtest KMOD = rndtest SRCS = rndtest.c SRCS += device_if.h bus_if.h diff --git a/sys/modules/rp/Makefile b/sys/modules/rp/Makefile index 9326dffdae62..a766394c568a 100644 --- a/sys/modules/rp/Makefile +++ b/sys/modules/rp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rp +.PATH: ${SRCTOP}/sys/dev/rp KMOD= rp SRCS= rp.c rp_pci.c device_if.h bus_if.h pci_if.h opt_compat.h diff --git a/sys/modules/rpi_ft5406/Makefile b/sys/modules/rpi_ft5406/Makefile index 3a1bbf5762ac..f5ba45e5bd43 100644 --- a/sys/modules/rpi_ft5406/Makefile +++ b/sys/modules/rpi_ft5406/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../arm/broadcom/bcm2835/ +.PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= rpi_ft5406 SRCS= bcm2835_ft5406.c diff --git a/sys/modules/rtwn/Makefile b/sys/modules/rtwn/Makefile index b9c2b0053055..d08b903fde86 100644 --- a/sys/modules/rtwn/Makefile +++ b/sys/modules/rtwn/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rtwn +.PATH: ${SRCTOP}/sys/dev/rtwn -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" KMOD = if_rtwn @@ -14,30 +14,30 @@ SRCS = if_rtwn.c if_rtwn_tx.c if_rtwn_rx.c if_rtwn_beacon.c \ bus_if.h device_if.h \ opt_bus.h opt_rtwn.h opt_wlan.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8192c +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8192c SRCS += r92c_attach.c r92c_beacon.c r92c_calib.c r92c_chan.c r92c_fw.c \ r92c_init.c r92c_llt.c r92c_rf.c r92c_rom.c r92c_rx.c r92c_tx.c \ r92c.h r92c_priv.h r92c_reg.h r92c_var.h r92c_rom_defs.h \ r92c_rom_image.h r92c_fw_cmd.h r92c_rx_desc.h r92c_tx_desc.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8188e +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8188e SRCS += r88e_beacon.c r88e_calib.c r88e_chan.c r88e_fw.c r88e_init.c \ r88e_led.c r88e_rf.c r88e_rom.c r88e_rx.c r88e_tx.c r88e.h \ r88e_priv.h r88e_reg.h r88e_rom_defs.h r88e_rom_image.h \ r88e_fw_cmd.h r88e_rx_desc.h r88e_tx_desc.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8192e +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8192e SRCS += r92e_chan.c r92e_fw.c r92e_init.c r92e_led.c r92e_rf.c \ r92e_rom.c r92e_rx.c r92e.h r92e_priv.h r92e_reg.h \ r92e_rom_image.h r92e_rom_defs.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8812a +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8812a SRCS += r12a_beacon.c r12a_calib.c r12a_caps.c r12a_chan.c r12a_fw.c \ r12a_init.c r12a_led.c r12a_rf.c r12a_rom.c r12a_rx.c r12a_tx.c \ r12a.h r12a_priv.h r12a_reg.h r12a_var.h r12a_rom_defs.h \ r12a_rom_image.h r12a_fw_cmd.h r12a_rx_desc.h r12a_tx_desc.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8821a +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8821a SRCS += r21a_beacon.c r21a_calib.c r21a_chan.c r21a_fw.c r21a_init.c \ r21a_led.c r21a_rom.c r21a_rx.c r21a.h r21a_priv.h r21a_reg.h diff --git a/sys/modules/rtwn_pci/Makefile b/sys/modules/rtwn_pci/Makefile index 25cc718b9bee..730991eedcd6 100644 --- a/sys/modules/rtwn_pci/Makefile +++ b/sys/modules/rtwn_pci/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rtwn/pci +.PATH: ${SRCTOP}/sys/dev/rtwn/pci -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" KMOD = if_rtwn_pci @@ -12,7 +12,7 @@ SRCS = rtwn_pci_attach.c rtwn_pci_reg.c rtwn_pci_rx.c rtwn_pci_tx.c \ device_if.h bus_if.h pci_if.h \ opt_bus.h opt_rtwn.h opt_wlan.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8192c/pci +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8192c/pci SRCS += r92ce_attach.c r92ce_calib.c r92ce_fw.c r92ce_init.c r92ce_led.c \ r92ce_rx.c r92ce_tx.c \ r92ce.h r92ce_priv.h r92ce_reg.h r92ce_rx_desc.h r92ce_tx_desc.h diff --git a/sys/modules/rtwn_usb/Makefile b/sys/modules/rtwn_usb/Makefile index 20d3577af35b..ddba626f90b3 100644 --- a/sys/modules/rtwn_usb/Makefile +++ b/sys/modules/rtwn_usb/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/rtwn/usb +.PATH: ${SRCTOP}/sys/dev/rtwn/usb -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" KMOD = if_rtwn_usb @@ -12,22 +12,22 @@ SRCS = rtwn_usb_attach.c rtwn_usb_ep.c rtwn_usb_reg.c rtwn_usb_rx.c \ bus_if.h device_if.h \ opt_bus.h opt_rtwn.h opt_usb.h opt_wlan.h usb_if.h usbdevs.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8188e/usb +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8188e/usb SRCS += r88eu_attach.c r88eu_init.c r88eu_rx.c \ r88eu.h r88eu_reg.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8192c/usb +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8192c/usb SRCS += r92cu_attach.c r92cu_init.c r92cu_led.c r92cu_rx.c r92cu_tx.c \ r92cu.h r92cu_priv.h r92cu_reg.h r92cu_tx_desc.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8192e/usb +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8192e/usb SRCS += r92eu_attach.c r92eu_init.c r92eu.h r92eu_reg.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8812a/usb +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8812a/usb SRCS += r12au_attach.c r12au_init.c r12au_rx.c r12au_tx.c \ r12au.h r12au_reg.h r12au_tx_desc.h -.PATH: ${.CURDIR}/../../dev/rtwn/rtl8821a/usb +.PATH: ${SRCTOP}/sys/dev/rtwn/rtl8821a/usb SRCS += r21au_attach.c r21au_init.c r21au_dfs.c \ r21au.h r21au_reg.h diff --git a/sys/modules/rtwnfw/Makefile.inc b/sys/modules/rtwnfw/Makefile.inc index a101166e7063..2a7865d94bf4 100644 --- a/sys/modules/rtwnfw/Makefile.inc +++ b/sys/modules/rtwnfw/Makefile.inc @@ -11,5 +11,5 @@ FIRMWS= ${_FIRM}:${KMOD}:111 # FIRMWARE_LICENSE= realtek -${_FIRM}: ${.CURDIR}/../../../contrib/dev/rtwn/${_FIRM}.uu +${_FIRM}: ${SRCTOP}/sys/contrib/dev/rtwn/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/s3/Makefile b/sys/modules/s3/Makefile index c0babcbc3717..84755770b53a 100644 --- a/sys/modules/s3/Makefile +++ b/sys/modules/s3/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/fb +.PATH: ${SRCTOP}/sys/dev/fb KMOD= s3 SRCS= device_if.h bus_if.h isa_if.h pci_if.h \ diff --git a/sys/modules/safe/Makefile b/sys/modules/safe/Makefile index 6c61aa3ede33..21e3454431db 100644 --- a/sys/modules/safe/Makefile +++ b/sys/modules/safe/Makefile @@ -26,7 +26,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../dev/safe +.PATH: ${SRCTOP}/sys/dev/safe KMOD = safe SRCS = safe.c opt_safe.h SRCS += device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sbni/Makefile b/sys/modules/sbni/Makefile index 9dfab90f59ab..270b592447ec 100644 --- a/sys/modules/sbni/Makefile +++ b/sys/modules/sbni/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sbni +.PATH: ${SRCTOP}/sys/dev/sbni KMOD= if_sbni SRCS= if_sbni.c if_sbni_isa.c if_sbni_pci.c diff --git a/sys/modules/scc/Makefile b/sys/modules/scc/Makefile index b6cbd3be9f78..05a67b2db85d 100644 --- a/sys/modules/scc/Makefile +++ b/sys/modules/scc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/scc +.PATH: ${SRCTOP}/sys/dev/scc .if ${MACHINE} == "sparc64" scc_bfe= scc_bfe_ebus.c scc_bfe_sbus.c diff --git a/sys/modules/scsi_low/Makefile b/sys/modules/scsi_low/Makefile index 892e7291731d..d7e3a4b281cb 100644 --- a/sys/modules/scsi_low/Makefile +++ b/sys/modules/scsi_low/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../cam/scsi +.PATH: ${SRCTOP}/sys/cam/scsi KMOD= scsi_low SRCS= scsi_low.c SRCS+= opt_ddb.h opt_scsi.h opt_cam.h bus_if.h device_if.h diff --git a/sys/modules/sdhci/Makefile b/sys/modules/sdhci/Makefile index 9ee954057cd8..941b4d51ada4 100644 --- a/sys/modules/sdhci/Makefile +++ b/sys/modules/sdhci/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sdhci +.PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci SRCS= sdhci.c sdhci.h sdhci_if.c sdhci_if.h device_if.h bus_if.h mmcbr_if.h diff --git a/sys/modules/sdhci_acpi/Makefile b/sys/modules/sdhci_acpi/Makefile index 0d348050d116..d3f2e406436b 100644 --- a/sys/modules/sdhci_acpi/Makefile +++ b/sys/modules/sdhci_acpi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sdhci +.PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci_acpi SRCS= sdhci_acpi.c sdhci.h sdhci_if.h diff --git a/sys/modules/sdhci_pci/Makefile b/sys/modules/sdhci_pci/Makefile index fcff490cf253..1572e0ba63b1 100644 --- a/sys/modules/sdhci_pci/Makefile +++ b/sys/modules/sdhci_pci/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sdhci +.PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci_pci SRCS= sdhci_pci.c sdhci.h sdhci_if.h device_if.h bus_if.h pci_if.h mmcbr_if.h diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile index 927630d87b4c..c5457e14e438 100644 --- a/sys/modules/sem/Makefile +++ b/sys/modules/sem/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= sem SRCS= uipc_sem.c opt_compat.h opt_posix.h vnode_if.h diff --git a/sys/modules/send/Makefile b/sys/modules/send/Makefile index 1cb976b9b8d8..bcf5345cdeee 100644 --- a/sys/modules/send/Makefile +++ b/sys/modules/send/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet6 +.PATH: ${SRCTOP}/sys/netinet6 KMOD= send SRCS= send.c diff --git a/sys/modules/sf/Makefile b/sys/modules/sf/Makefile index c67287eda1c7..3b5221f273c1 100644 --- a/sys/modules/sf/Makefile +++ b/sys/modules/sf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sf +.PATH: ${SRCTOP}/sys/dev/sf KMOD= if_sf SRCS= if_sf.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile index 01d782e84157..a905663dea22 100644 --- a/sys/modules/sfxge/Makefile +++ b/sys/modules/sfxge/Makefile @@ -2,18 +2,18 @@ KMOD= sfxge -SFXGE= ${.CURDIR}/../../dev/sfxge +SFXGE= ${SRCTOP}/sys/dev/sfxge SRCS= device_if.h bus_if.h pci_if.h SRCS+= opt_inet.h opt_inet6.h opt_sched.h opt_rss.h -.PATH: ${.CURDIR}/../../dev/sfxge +.PATH: ${SRCTOP}/sys/dev/sfxge SRCS+= sfxge.c sfxge_dma.c sfxge_ev.c SRCS+= sfxge_intr.c sfxge_mcdi.c sfxge_nvram.c SRCS+= sfxge_port.c sfxge_rx.c sfxge_tx.c SRCS+= sfxge.h sfxge_rx.h sfxge_tx.h sfxge_version.h -.PATH: ${.CURDIR}/../../dev/sfxge/common +.PATH: ${SRCTOP}/sys/dev/sfxge/common SRCS+= efx_bootcfg.c efx_crc32.c efx_ev.c efx_intr.c efx_lic.c efx_mac.c SRCS+= efx_mcdi.c efx_mon.c efx_nic.c SRCS+= efx_nvram.c efx_phy.c efx_port.c efx_rx.c efx_sram.c efx_tx.c diff --git a/sys/modules/sge/Makefile b/sys/modules/sge/Makefile index 5f8c58795548..c2d0e238a918 100644 --- a/sys/modules/sge/Makefile +++ b/sys/modules/sge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sge +.PATH: ${SRCTOP}/sys/dev/sge KMOD= if_sge SRCS= if_sge.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/siba_bwn/Makefile b/sys/modules/siba_bwn/Makefile index 02fbd5db9a24..9091f2338757 100644 --- a/sys/modules/siba_bwn/Makefile +++ b/sys/modules/siba_bwn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/siba +.PATH: ${SRCTOP}/sys/dev/siba KMOD= siba_bwn SRCS= siba_core.c siba_bwn.c sibareg.h sibavar.h diff --git a/sys/modules/siftr/Makefile b/sys/modules/siftr/Makefile index 773d215c5563..bb92bb2ac4c5 100644 --- a/sys/modules/siftr/Makefile +++ b/sys/modules/siftr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= siftr SRCS= siftr.c diff --git a/sys/modules/siis/Makefile b/sys/modules/siis/Makefile index dfd6b77b3257..5c85b948c128 100644 --- a/sys/modules/siis/Makefile +++ b/sys/modules/siis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/siis +.PATH: ${SRCTOP}/sys/dev/siis KMOD= siis SRCS= siis.c siis.h device_if.h bus_if.h pci_if.h opt_cam.h diff --git a/sys/modules/sio/Makefile b/sys/modules/sio/Makefile index 9e162807b66a..5f3c4beb8e83 100644 --- a/sys/modules/sio/Makefile +++ b/sys/modules/sio/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sio +.PATH: ${SRCTOP}/sys/dev/sio KMOD= sio SRCS= bus_if.h card_if.h device_if.h isa_if.h pci_if.h serdev_if.h \ diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile index c98dda062f3d..759886c52357 100644 --- a/sys/modules/sis/Makefile +++ b/sys/modules/sis/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sis +.PATH: ${SRCTOP}/sys/dev/sis KMOD= if_sis SRCS= if_sis.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile index 833550a54304..2b3e88afec40 100644 --- a/sys/modules/sk/Makefile +++ b/sys/modules/sk/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sk +.PATH: ${SRCTOP}/sys/dev/sk KMOD= if_sk SRCS= if_sk.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index 04ffc9a65c9a..850650efccb7 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,11 +1,11 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../crypto/des \ - ${.CURDIR}/../../crypto/des/arch/${MACHINE_CPUARCH} \ - ${.CURDIR}/../../kern \ - ${.CURDIR}/../../libkern \ - ${.CURDIR}/../../netsmb \ - ${.CURDIR}/../../fs/smbfs +.PATH: ${SRCTOP}/sys/crypto/des \ + ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ + ${SRCTOP}/sys/kern \ + ${SRCTOP}/sys/libkern \ + ${SRCTOP}/sys/netsmb \ + ${SRCTOP}/sys/fs/smbfs KMOD= smbfs diff --git a/sys/modules/sn/Makefile b/sys/modules/sn/Makefile index b248c757643c..a9e30eb60d0b 100644 --- a/sys/modules/sn/Makefile +++ b/sys/modules/sn/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sn +.PATH: ${SRCTOP}/sys/dev/sn KMOD= if_sn SRCS= if_sn.c if_sn_isa.c if_sn_pccard.c device_if.h bus_if.h isa_if.h \ diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile index f4441df8f01b..10ae7b42b8ee 100644 --- a/sys/modules/snp/Makefile +++ b/sys/modules/snp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/snp +.PATH: ${SRCTOP}/sys/dev/snp KMOD= snp SRCS= snp.c diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile index 7adecbcbc9d5..d00ccaa10286 100644 --- a/sys/modules/sound/driver/Makefile +++ b/sys/modules/sound/driver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" # Modules that include binary-only blobs of microcode should be selectable by diff --git a/sys/modules/sound/driver/ad1816/Makefile b/sys/modules/sound/driver/ad1816/Makefile index 9c7fa9ec5d85..16d4ad3d46de 100644 --- a/sys/modules/sound/driver/ad1816/Makefile +++ b/sys/modules/sound/driver/ad1816/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/isa +.PATH: ${SRCTOP}/sys/dev/sound/isa KMOD= snd_ad1816 SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/ai2s/Makefile b/sys/modules/sound/driver/ai2s/Makefile index 5f56ba6a5c5e..4a5267a42da3 100644 --- a/sys/modules/sound/driver/ai2s/Makefile +++ b/sys/modules/sound/driver/ai2s/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/macio +.PATH: ${SRCTOP}/sys/dev/sound/macio KMOD= snd_ai2s SRCS= device_if.h bus_if.h ofw_bus_if.h diff --git a/sys/modules/sound/driver/als4000/Makefile b/sys/modules/sound/driver/als4000/Makefile index 59dc73ac05bd..ab18b650a44d 100644 --- a/sys/modules/sound/driver/als4000/Makefile +++ b/sys/modules/sound/driver/als4000/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_als4000 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/atiixp/Makefile b/sys/modules/sound/driver/atiixp/Makefile index db49eb2bf155..00b4c78ec42c 100644 --- a/sys/modules/sound/driver/atiixp/Makefile +++ b/sys/modules/sound/driver/atiixp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_atiixp SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/audiocs/Makefile b/sys/modules/sound/driver/audiocs/Makefile index ff67554f9e1f..0cd516cc8bc0 100644 --- a/sys/modules/sound/driver/audiocs/Makefile +++ b/sys/modules/sound/driver/audiocs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/sbus +.PATH: ${SRCTOP}/sys/dev/sound/sbus KMOD= snd_audiocs SRCS= device_if.h bus_if.h ofw_bus_if.h diff --git a/sys/modules/sound/driver/cmi/Makefile b/sys/modules/sound/driver/cmi/Makefile index 551af426babf..4c7af371ce58 100644 --- a/sys/modules/sound/driver/cmi/Makefile +++ b/sys/modules/sound/driver/cmi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_cmi SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/cs4281/Makefile b/sys/modules/sound/driver/cs4281/Makefile index ed3ddbc1574b..da5161cc2a2a 100644 --- a/sys/modules/sound/driver/cs4281/Makefile +++ b/sys/modules/sound/driver/cs4281/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_cs4281 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/csa/Makefile b/sys/modules/sound/driver/csa/Makefile index 521005e143e2..af02ef4f4e0d 100644 --- a/sys/modules/sound/driver/csa/Makefile +++ b/sys/modules/sound/driver/csa/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_csa SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/davbus/Makefile b/sys/modules/sound/driver/davbus/Makefile index b5616fefefe5..5ea77b3032fc 100644 --- a/sys/modules/sound/driver/davbus/Makefile +++ b/sys/modules/sound/driver/davbus/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/macio +.PATH: ${SRCTOP}/sys/dev/sound/macio KMOD= snd_davbus SRCS= device_if.h bus_if.h ofw_bus_if.h diff --git a/sys/modules/sound/driver/driver/Makefile b/sys/modules/sound/driver/driver/Makefile index 56a8461e3e6f..8aea6ff00acf 100644 --- a/sys/modules/sound/driver/driver/Makefile +++ b/sys/modules/sound/driver/driver/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound +.PATH: ${SRCTOP}/sys/dev/sound KMOD= snd_driver SRCS= device_if.h bus_if.h diff --git a/sys/modules/sound/driver/ds1/Makefile b/sys/modules/sound/driver/ds1/Makefile index c8f90ec781d6..57d57674397d 100644 --- a/sys/modules/sound/driver/ds1/Makefile +++ b/sys/modules/sound/driver/ds1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_ds1 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/emu10k1/Makefile b/sys/modules/sound/driver/emu10k1/Makefile index 090ece6c676c..2180fe8c366a 100644 --- a/sys/modules/sound/driver/emu10k1/Makefile +++ b/sys/modules/sound/driver/emu10k1/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_emu10k1 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/emu10kx/Makefile b/sys/modules/sound/driver/emu10kx/Makefile index 3b5920cb9704..51394a055b57 100644 --- a/sys/modules/sound/driver/emu10kx/Makefile +++ b/sys/modules/sound/driver/emu10kx/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_emu10kx diff --git a/sys/modules/sound/driver/envy24/Makefile b/sys/modules/sound/driver/envy24/Makefile index ec1bf4c67bfb..28c37ec41b30 100644 --- a/sys/modules/sound/driver/envy24/Makefile +++ b/sys/modules/sound/driver/envy24/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_envy24 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/envy24ht/Makefile b/sys/modules/sound/driver/envy24ht/Makefile index e6b0d452bb1b..d71295826037 100644 --- a/sys/modules/sound/driver/envy24ht/Makefile +++ b/sys/modules/sound/driver/envy24ht/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_envy24ht SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/es137x/Makefile b/sys/modules/sound/driver/es137x/Makefile index d2a2d58cc343..3989c6656981 100644 --- a/sys/modules/sound/driver/es137x/Makefile +++ b/sys/modules/sound/driver/es137x/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_es137x SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/ess/Makefile b/sys/modules/sound/driver/ess/Makefile index 73da252e9fd3..943cd063f8ad 100644 --- a/sys/modules/sound/driver/ess/Makefile +++ b/sys/modules/sound/driver/ess/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/isa +.PATH: ${SRCTOP}/sys/dev/sound/isa KMOD= snd_ess SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/fm801/Makefile b/sys/modules/sound/driver/fm801/Makefile index a8ed6bd95ee4..864033d75e4a 100644 --- a/sys/modules/sound/driver/fm801/Makefile +++ b/sys/modules/sound/driver/fm801/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_fm801 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/hda/Makefile b/sys/modules/sound/driver/hda/Makefile index f1369368d20c..5646724efd94 100644 --- a/sys/modules/sound/driver/hda/Makefile +++ b/sys/modules/sound/driver/hda/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci/hda +.PATH: ${SRCTOP}/sys/dev/sound/pci/hda KMOD= snd_hda SRCS= device_if.h bus_if.h pci_if.h channel_if.h mixer_if.h hdac_if.h diff --git a/sys/modules/sound/driver/hdspe/Makefile b/sys/modules/sound/driver/hdspe/Makefile index fcf83fe0e756..9ee5abba1ca2 100644 --- a/sys/modules/sound/driver/hdspe/Makefile +++ b/sys/modules/sound/driver/hdspe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_hdspe SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/ich/Makefile b/sys/modules/sound/driver/ich/Makefile index e0f2ce7e3626..def838a320cb 100644 --- a/sys/modules/sound/driver/ich/Makefile +++ b/sys/modules/sound/driver/ich/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD = snd_ich SRCS = device_if.h bus_if.h pci_if.h SRCS += ich.c diff --git a/sys/modules/sound/driver/maestro/Makefile b/sys/modules/sound/driver/maestro/Makefile index 4816f22b9143..fe69bd6ce578 100644 --- a/sys/modules/sound/driver/maestro/Makefile +++ b/sys/modules/sound/driver/maestro/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_maestro SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/maestro3/Makefile b/sys/modules/sound/driver/maestro3/Makefile index d4378b8b790a..332f01eef9cc 100644 --- a/sys/modules/sound/driver/maestro3/Makefile +++ b/sys/modules/sound/driver/maestro3/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_maestro3 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/mss/Makefile b/sys/modules/sound/driver/mss/Makefile index 44880788998b..4032bf3e004d 100644 --- a/sys/modules/sound/driver/mss/Makefile +++ b/sys/modules/sound/driver/mss/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/isa +.PATH: ${SRCTOP}/sys/dev/sound/isa KMOD= snd_mss SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/neomagic/Makefile b/sys/modules/sound/driver/neomagic/Makefile index 9eabb5ccaf99..17d0c4c29471 100644 --- a/sys/modules/sound/driver/neomagic/Makefile +++ b/sys/modules/sound/driver/neomagic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_neomagic SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/sb16/Makefile b/sys/modules/sound/driver/sb16/Makefile index bf009f7035b8..083a7203e860 100644 --- a/sys/modules/sound/driver/sb16/Makefile +++ b/sys/modules/sound/driver/sb16/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/isa +.PATH: ${SRCTOP}/sys/dev/sound/isa KMOD= snd_sb16 SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/sb8/Makefile b/sys/modules/sound/driver/sb8/Makefile index f2b0da834c7a..7d9ff49e3e78 100644 --- a/sys/modules/sound/driver/sb8/Makefile +++ b/sys/modules/sound/driver/sb8/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/isa +.PATH: ${SRCTOP}/sys/dev/sound/isa KMOD= snd_sb8 SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/sbc/Makefile b/sys/modules/sound/driver/sbc/Makefile index 8e2343df2663..d7894d644e6a 100644 --- a/sys/modules/sound/driver/sbc/Makefile +++ b/sys/modules/sound/driver/sbc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/isa +.PATH: ${SRCTOP}/sys/dev/sound/isa KMOD= snd_sbc SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/solo/Makefile b/sys/modules/sound/driver/solo/Makefile index 01059faf3536..cdd79723087d 100644 --- a/sys/modules/sound/driver/solo/Makefile +++ b/sys/modules/sound/driver/solo/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_solo SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/spicds/Makefile b/sys/modules/sound/driver/spicds/Makefile index 35ec8799e938..87ab0bbf8b55 100644 --- a/sys/modules/sound/driver/spicds/Makefile +++ b/sys/modules/sound/driver/spicds/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_spicds SRCS= device_if.h bus_if.h isa_if.h pci_if.h diff --git a/sys/modules/sound/driver/t4dwave/Makefile b/sys/modules/sound/driver/t4dwave/Makefile index 7cd91402f49e..1deff4a84efe 100644 --- a/sys/modules/sound/driver/t4dwave/Makefile +++ b/sys/modules/sound/driver/t4dwave/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_t4dwave SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile index 1dd449315653..e725436adb34 100644 --- a/sys/modules/sound/driver/uaudio/Makefile +++ b/sys/modules/sound/driver/uaudio/Makefile @@ -1,12 +1,10 @@ # $FreeBSD$ -S= ${.CURDIR}/../../../.. - -.PATH: $S/dev/sound/usb +.PATH: ${SRCTOP}/sys/dev/sound/usb KMOD= snd_uaudio SRCS= bus_if.h device_if.h usb_if.h vnode_if.h SRCS+= opt_usb.h opt_bus.h feeder_if.h channel_if.h usbdevs.h -SRCS+= uaudio_pcm.c uaudio.c +SRCS+= uaudio_pcm.c uaudio.c .include <bsd.kmod.mk> diff --git a/sys/modules/sound/driver/via8233/Makefile b/sys/modules/sound/driver/via8233/Makefile index fa3fd960185c..18840d808b8e 100644 --- a/sys/modules/sound/driver/via8233/Makefile +++ b/sys/modules/sound/driver/via8233/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_via8233 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/via82c686/Makefile b/sys/modules/sound/driver/via82c686/Makefile index d53576ce9fce..0abb86b76ca1 100644 --- a/sys/modules/sound/driver/via82c686/Makefile +++ b/sys/modules/sound/driver/via82c686/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_via82c686 SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/vibes/Makefile b/sys/modules/sound/driver/vibes/Makefile index 663d8a00969c..a81720803e6d 100644 --- a/sys/modules/sound/driver/vibes/Makefile +++ b/sys/modules/sound/driver/vibes/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../../dev/sound/pci +.PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_vibes SRCS= device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 274d25f69170..adbc14a38020 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/dev/sound .PATH: ${SYSDIR}/dev/sound/pcm diff --git a/sys/modules/speaker/Makefile b/sys/modules/speaker/Makefile index 1a4c5ac163a4..9dcb5d964530 100644 --- a/sys/modules/speaker/Makefile +++ b/sys/modules/speaker/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/speaker +.PATH: ${SRCTOP}/sys/dev/speaker KMOD= speaker SRCS= spkr.c diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile index a169fdfec21a..83a3fae29f77 100644 --- a/sys/modules/splash/bmp/Makefile +++ b/sys/modules/splash/bmp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/fb +.PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_bmp SRCS= splash_bmp.c diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile index 188dafcd0f02..4317972cc059 100644 --- a/sys/modules/splash/pcx/Makefile +++ b/sys/modules/splash/pcx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/fb +.PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_pcx SRCS= splash_pcx.c diff --git a/sys/modules/splash/txt/Makefile b/sys/modules/splash/txt/Makefile index 7b41a17549fc..d99143369aef 100644 --- a/sys/modules/splash/txt/Makefile +++ b/sys/modules/splash/txt/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/fb +.PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_txt SRCS= splash_txt.c diff --git a/sys/modules/sppp/Makefile b/sys/modules/sppp/Makefile index 643308e54045..017940e6d4ad 100644 --- a/sys/modules/sppp/Makefile +++ b/sys/modules/sppp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net +.PATH: ${SRCTOP}/sys/net KMOD= sppp SRCS= if_spppfr.c if_spppsubr.c slcompress.c diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile index 6d767b1d952b..25b1ddcd2716 100644 --- a/sys/modules/ste/Makefile +++ b/sys/modules/ste/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ste +.PATH: ${SRCTOP}/sys/dev/ste KMOD= if_ste SRCS= if_ste.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/stg/Makefile b/sys/modules/stg/Makefile index b8c0ae8da5f5..610c605c1bd5 100644 --- a/sys/modules/stg/Makefile +++ b/sys/modules/stg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/stg +.PATH: ${SRCTOP}/sys/dev/stg KMOD= stg SRCS= tmc18c30.c tmc18c30_subr.c \ diff --git a/sys/modules/stge/Makefile b/sys/modules/stge/Makefile index 721a42da83e8..b67e3b044baf 100644 --- a/sys/modules/stge/Makefile +++ b/sys/modules/stge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/stge +.PATH: ${SRCTOP}/sys/dev/stge KMOD= if_stge SRCS= if_stge.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sym/Makefile b/sys/modules/sym/Makefile index 198c98245aa5..3701b1451872 100644 --- a/sys/modules/sym/Makefile +++ b/sys/modules/sym/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/sym +.PATH: ${SRCTOP}/sys/dev/sym KMOD= sym SRCS= sym_hipd.c opt_sym.h opt_cam.h opt_scsi.h diff --git a/sys/modules/syscons/apm/Makefile b/sys/modules/syscons/apm/Makefile index d2e31d8c15ba..9214d2d90a00 100644 --- a/sys/modules/syscons/apm/Makefile +++ b/sys/modules/syscons/apm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/apm +.PATH: ${SRCTOP}/sys/dev/syscons/apm KMOD= apm_saver SRCS= apm_saver.c diff --git a/sys/modules/syscons/beastie/Makefile b/sys/modules/syscons/beastie/Makefile index 4f0865bd96e4..03fe93f1c4f5 100644 --- a/sys/modules/syscons/beastie/Makefile +++ b/sys/modules/syscons/beastie/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/logo +.PATH: ${SRCTOP}/sys/dev/syscons/logo KMOD= beastie_saver SRCS= beastie.c logo_saver.c diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile index 673b6bd2ff55..29ec9fc73e57 100644 --- a/sys/modules/syscons/blank/Makefile +++ b/sys/modules/syscons/blank/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/blank +.PATH: ${SRCTOP}/sys/dev/syscons/blank KMOD= blank_saver SRCS= blank_saver.c diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile index b027972c8d83..cdbe0116ac81 100644 --- a/sys/modules/syscons/daemon/Makefile +++ b/sys/modules/syscons/daemon/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/daemon +.PATH: ${SRCTOP}/sys/dev/syscons/daemon KMOD= daemon_saver SRCS= daemon_saver.c diff --git a/sys/modules/syscons/dragon/Makefile b/sys/modules/syscons/dragon/Makefile index 95ebecd53982..f72d534fec21 100644 --- a/sys/modules/syscons/dragon/Makefile +++ b/sys/modules/syscons/dragon/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/dragon +.PATH: ${SRCTOP}/sys/dev/syscons/dragon KMOD= dragon_saver SRCS= dragon_saver.c diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile index 76919617dae8..2121debb3ffe 100644 --- a/sys/modules/syscons/fade/Makefile +++ b/sys/modules/syscons/fade/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/fade +.PATH: ${SRCTOP}/sys/dev/syscons/fade KMOD= fade_saver SRCS= fade_saver.c diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile index 219017e7f897..86c589e7de9e 100644 --- a/sys/modules/syscons/fire/Makefile +++ b/sys/modules/syscons/fire/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/fire +.PATH: ${SRCTOP}/sys/dev/syscons/fire KMOD= fire_saver SRCS= fire_saver.c diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile index 255171ebb445..5ae5ca94a062 100644 --- a/sys/modules/syscons/green/Makefile +++ b/sys/modules/syscons/green/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/green +.PATH: ${SRCTOP}/sys/dev/syscons/green KMOD= green_saver SRCS= green_saver.c diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile index b4439f2ddb99..b32f48240fe3 100644 --- a/sys/modules/syscons/logo/Makefile +++ b/sys/modules/syscons/logo/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/logo +.PATH: ${SRCTOP}/sys/dev/syscons/logo KMOD= logo_saver SRCS= logo_saver.c logo.c diff --git a/sys/modules/syscons/plasma/Makefile b/sys/modules/syscons/plasma/Makefile index c71c864349fd..6864a5e4ecb2 100644 --- a/sys/modules/syscons/plasma/Makefile +++ b/sys/modules/syscons/plasma/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/plasma +.PATH: ${SRCTOP}/sys/dev/syscons/plasma KMOD= plasma_saver SRCS= fp16.c plasma_saver.c diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile index 5c0d1265a198..d0964b8b730d 100644 --- a/sys/modules/syscons/rain/Makefile +++ b/sys/modules/syscons/rain/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/rain +.PATH: ${SRCTOP}/sys/dev/syscons/rain KMOD= rain_saver SRCS= rain_saver.c diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile index 9edf83006817..ab04b750cd4a 100644 --- a/sys/modules/syscons/snake/Makefile +++ b/sys/modules/syscons/snake/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/snake +.PATH: ${SRCTOP}/sys/dev/syscons/snake KMOD= snake_saver SRCS= snake_saver.c diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile index ca3075fe1e84..771d46459b71 100644 --- a/sys/modules/syscons/star/Makefile +++ b/sys/modules/syscons/star/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/star +.PATH: ${SRCTOP}/sys/dev/syscons/star KMOD= star_saver SRCS= star_saver.c diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile index 3ff59d3c4ea3..5fa2ab6ccbc1 100644 --- a/sys/modules/syscons/warp/Makefile +++ b/sys/modules/syscons/warp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/syscons/warp +.PATH: ${SRCTOP}/sys/dev/syscons/warp KMOD= warp_saver SRCS= warp_saver.c diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile index 38fc2a24596b..c30ecac1f5bd 100644 --- a/sys/modules/sysvipc/sysvmsg/Makefile +++ b/sys/modules/sysvipc/sysvmsg/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= sysvmsg SRCS= sysv_msg.c opt_sysvipc.h opt_compat.h diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile index abc95448c058..37d31b22f46b 100644 --- a/sys/modules/sysvipc/sysvsem/Makefile +++ b/sys/modules/sysvipc/sysvsem/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= sysvsem SRCS= sysv_sem.c opt_sysvipc.h opt_compat.h diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile index fde9d34f440b..3ca31d602d5c 100644 --- a/sys/modules/sysvipc/sysvshm/Makefile +++ b/sys/modules/sysvipc/sysvshm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../kern +.PATH: ${SRCTOP}/sys/kern KMOD= sysvshm SRCS= sysv_shm.c opt_sysvipc.h opt_compat.h diff --git a/sys/modules/tcp/fastpath/Makefile b/sys/modules/tcp/fastpath/Makefile index c6469fea7ace..389d49e2e966 100644 --- a/sys/modules/tcp/fastpath/Makefile +++ b/sys/modules/tcp/fastpath/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../netinet/tcp_stacks +.PATH: ${SRCTOP}/sys/netinet/tcp_stacks KMOD= fastpath SRCS= fastpath.c diff --git a/sys/modules/tcp/tcpmd5/Makefile b/sys/modules/tcp/tcpmd5/Makefile index 1337f1d5fd2d..a92e78747948 100644 --- a/sys/modules/tcp/tcpmd5/Makefile +++ b/sys/modules/tcp/tcpmd5/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../netipsec +.PATH: ${SRCTOP}/sys/netipsec KMOD= tcpmd5 SRCS= xform_tcp.c opt_inet.h opt_inet6.h opt_ipsec.h diff --git a/sys/modules/tests/callout_test/Makefile b/sys/modules/tests/callout_test/Makefile index 4781488af3b8..f0a5c2f1daa2 100644 --- a/sys/modules/tests/callout_test/Makefile +++ b/sys/modules/tests/callout_test/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../tests/callout_test +.PATH: ${SRCTOP}/sys/tests/callout_test KMOD= callout_test SRCS= callout_test.c diff --git a/sys/modules/tests/framework/Makefile b/sys/modules/tests/framework/Makefile index f5f608fb0465..8623e01a3ea9 100644 --- a/sys/modules/tests/framework/Makefile +++ b/sys/modules/tests/framework/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/../../../tests/framework +.PATH: ${SRCTOP}/sys/tests/framework KMOD= kern_testfrwk SRCS= kern_testfrwk.c diff --git a/sys/modules/ti/Makefile b/sys/modules/ti/Makefile index 7b87b6f30835..84114ccfbbe9 100644 --- a/sys/modules/ti/Makefile +++ b/sys/modules/ti/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ti +.PATH: ${SRCTOP}/sys/dev/ti KMOD= if_ti SRCS= if_ti.c device_if.h bus_if.h pci_if.h opt_ti.h diff --git a/sys/modules/tl/Makefile b/sys/modules/tl/Makefile index 60fbc277e0c6..b3c1a461d96d 100644 --- a/sys/modules/tl/Makefile +++ b/sys/modules/tl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/tl +.PATH: ${SRCTOP}/sys/dev/tl KMOD= if_tl SRCS= if_tl.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/tmpfs/Makefile b/sys/modules/tmpfs/Makefile index 85aaaca856a0..7ae719e70ca9 100644 --- a/sys/modules/tmpfs/Makefile +++ b/sys/modules/tmpfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/tmpfs +.PATH: ${SRCTOP}/sys/fs/tmpfs KMOD= tmpfs SRCS= vnode_if.h \ diff --git a/sys/modules/toecore/Makefile b/sys/modules/toecore/Makefile index ab2a857d4dec..d3bf3b820da3 100644 --- a/sys/modules/toecore/Makefile +++ b/sys/modules/toecore/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../netinet +.PATH: ${SRCTOP}/sys/netinet KMOD= toecore SRCS= toecore.c diff --git a/sys/modules/tpm/Makefile b/sys/modules/tpm/Makefile index fdfc016ea315..2f5adfbb2a0c 100644 --- a/sys/modules/tpm/Makefile +++ b/sys/modules/tpm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/tpm +.PATH: ${SRCTOP}/sys/dev/tpm KMOD= tpm diff --git a/sys/modules/trm/Makefile b/sys/modules/trm/Makefile index 7c42e401a678..e5f30040d5be 100644 --- a/sys/modules/trm/Makefile +++ b/sys/modules/trm/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/trm +.PATH: ${SRCTOP}/sys/dev/trm KMOD= trm SRCS= trm.c trm.h opt_cam.h device_if.h bus_if.h \ diff --git a/sys/modules/tsec/Makefile b/sys/modules/tsec/Makefile index 678d611e3808..f63facef76cb 100644 --- a/sys/modules/tsec/Makefile +++ b/sys/modules/tsec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/dev/tsec diff --git a/sys/modules/twa/Makefile b/sys/modules/twa/Makefile index e5539e1a2b28..08e2fd681eac 100644 --- a/sys/modules/twa/Makefile +++ b/sys/modules/twa/Makefile @@ -33,7 +33,7 @@ # KMOD = twa -.PATH: ${.CURDIR}/../../dev/${KMOD} +.PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS= tw_osl_freebsd.c tw_osl_cam.c \ tw_cl_init.c tw_cl_io.c tw_cl_intr.c tw_cl_misc.c \ bus_if.h device_if.h pci_if.h opt_scsi.h opt_cam.h opt_twa.h @@ -42,6 +42,6 @@ SRCS= tw_osl_freebsd.c tw_osl_cam.c \ #CFLAGS+= -DTWA_ENCLOSURE_SUPPORT #CFLAGS+= -DTWA_DEBUG=0 -CFLAGS+= -I${.CURDIR}/../../dev/${KMOD} +CFLAGS+= -I${SRCTOP}/sys/dev/${KMOD} .include <bsd.kmod.mk> diff --git a/sys/modules/twe/Makefile b/sys/modules/twe/Makefile index a74a58dfb143..f5d09e4463e1 100644 --- a/sys/modules/twe/Makefile +++ b/sys/modules/twe/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ KMOD= twe -.PATH: ${.CURDIR}/../../dev/${KMOD} +.PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS= bus_if.h device_if.h pci_if.h twe.c twe_freebsd.c #CFLAGS+=-DTWE_DEBUG=0 diff --git a/sys/modules/tws/Makefile b/sys/modules/tws/Makefile index af26579279ec..899f1106892a 100644 --- a/sys/modules/tws/Makefile +++ b/sys/modules/tws/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ KMOD= tws -.PATH: ${.CURDIR}/../../dev/${KMOD} +.PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS= tws.c tws_services.c tws_cam.c tws_hdm.c tws_user.c SRCS+= device_if.h bus_if.h pci_if.h opt_cam.h opt_scsi.h diff --git a/sys/modules/tx/Makefile b/sys/modules/tx/Makefile index 1fe6ba119a86..598970389475 100644 --- a/sys/modules/tx/Makefile +++ b/sys/modules/tx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/tx +.PATH: ${SRCTOP}/sys/dev/tx KMOD= if_tx SRCS= if_tx.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/txp/Makefile b/sys/modules/txp/Makefile index 379f3e3d2362..c867e56b5aae 100644 --- a/sys/modules/txp/Makefile +++ b/sys/modules/txp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/txp +.PATH: ${SRCTOP}/sys/dev/txp KMOD= if_txp SRCS= if_txp.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile index b9e4a7ae469b..cfdb172d52e2 100644 --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/uart +.PATH: ${SRCTOP}/sys/dev/uart .if ${MACHINE_CPUARCH} == "sparc64" uart_bus_ebus= uart_bus_ebus.c diff --git a/sys/modules/ubsec/Makefile b/sys/modules/ubsec/Makefile index d7835fa0d79b..5eebe9749ccc 100644 --- a/sys/modules/ubsec/Makefile +++ b/sys/modules/ubsec/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ubsec +.PATH: ${SRCTOP}/sys/dev/ubsec KMOD = ubsec SRCS = ubsec.c opt_ubsec.h SRCS += device_if.h bus_if.h pci_if.h diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile index 8807bed8b915..39414cc95fca 100644 --- a/sys/modules/ubser/Makefile +++ b/sys/modules/ubser/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial KMOD= ubser diff --git a/sys/modules/uchcom/Makefile b/sys/modules/uchcom/Makefile index 65cdacd44c55..3d1ce84d4bd7 100644 --- a/sys/modules/uchcom/Makefile +++ b/sys/modules/uchcom/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb KMOD= uchcom diff --git a/sys/modules/ucycom/Makefile b/sys/modules/ucycom/Makefile index d5849a93f520..751b7081bc25 100644 --- a/sys/modules/ucycom/Makefile +++ b/sys/modules/ucycom/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb KMOD= ucycom diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile index 220cba1e08ce..2f97e9155df3 100644 --- a/sys/modules/udf/Makefile +++ b/sys/modules/udf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/udf +.PATH: ${SRCTOP}/sys/fs/udf KMOD= udf diff --git a/sys/modules/udf_iconv/Makefile b/sys/modules/udf_iconv/Makefile index 008f722bcba1..21d31bb8c225 100644 --- a/sys/modules/udf_iconv/Makefile +++ b/sys/modules/udf_iconv/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/udf +.PATH: ${SRCTOP}/sys/fs/udf KMOD= udf_iconv SRCS= udf_iconv.c -CFLAGS+= -I${.CURDIR}/../../ +CFLAGS+= -I${SRCTOP}/sys/ .include <bsd.kmod.mk> diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile index 5b90df74ba22..e587cf0f9b9d 100644 --- a/sys/modules/ufs/Makefile +++ b/sys/modules/ufs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../ufs/ufs ${.CURDIR}/../../ufs/ffs +.PATH: ${SRCTOP}/sys/ufs/ufs ${SRCTOP}/sys/ufs/ffs KMOD= ufs SRCS= opt_ddb.h opt_directio.h opt_ffs.h opt_quota.h opt_suiddir.h opt_ufs.h \ diff --git a/sys/modules/uinput/Makefile b/sys/modules/uinput/Makefile index bdb9739bce25..c1ecb52f29d8 100644 --- a/sys/modules/uinput/Makefile +++ b/sys/modules/uinput/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/evdev +.PATH: ${SRCTOP}/sys/dev/evdev KMOD= uinput SRCS= uinput.c diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile index 64d38c5f2a82..88c698465d4d 100644 --- a/sys/modules/unionfs/Makefile +++ b/sys/modules/unionfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../fs/unionfs +.PATH: ${SRCTOP}/sys/fs/unionfs KMOD= unionfs SRCS= vnode_if.h \ diff --git a/sys/modules/usb/Makefile b/sys/modules/usb/Makefile index 83cf2a5083e8..6b8b0245db4d 100644 --- a/sys/modules/usb/Makefile +++ b/sys/modules/usb/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" # diff --git a/sys/modules/usb/at91dci/Makefile b/sys/modules/usb/at91dci/Makefile index 5bd646a12fea..76aca16cbcce 100644 --- a/sys/modules/usb/at91dci/Makefile +++ b/sys/modules/usb/at91dci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/atmegadci/Makefile b/sys/modules/usb/atmegadci/Makefile index 0f73c37571d0..481de3c00d0a 100644 --- a/sys/modules/usb/atmegadci/Makefile +++ b/sys/modules/usb/atmegadci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/atp/Makefile b/sys/modules/usb/atp/Makefile index 8e68d1c48715..21ff164a31cc 100644 --- a/sys/modules/usb/atp/Makefile +++ b/sys/modules/usb/atp/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/aue/Makefile b/sys/modules/usb/aue/Makefile index ac1ace19cf74..6e67128c3ddf 100644 --- a/sys/modules/usb/aue/Makefile +++ b/sys/modules/usb/aue/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/avr32dci/Makefile b/sys/modules/usb/avr32dci/Makefile index ea7d9c280ec4..095cf517c4c9 100644 --- a/sys/modules/usb/avr32dci/Makefile +++ b/sys/modules/usb/avr32dci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/axe/Makefile b/sys/modules/usb/axe/Makefile index 10719f0adf3c..41f9c5e38500 100644 --- a/sys/modules/usb/axe/Makefile +++ b/sys/modules/usb/axe/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/axge/Makefile b/sys/modules/usb/axge/Makefile index bad4b94a5593..873f4e8f0e57 100644 --- a/sys/modules/usb/axge/Makefile +++ b/sys/modules/usb/axge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/net +.PATH: ${SRCTOP}/sys/dev/usb/net KMOD= if_axge SRCS+= if_axge.c usbdevs.h diff --git a/sys/modules/usb/cdce/Makefile b/sys/modules/usb/cdce/Makefile index c16b794a886e..0b1db335ffc8 100644 --- a/sys/modules/usb/cdce/Makefile +++ b/sys/modules/usb/cdce/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/cfumass/Makefile b/sys/modules/usb/cfumass/Makefile index f659b9b92093..584783ddffe2 100644 --- a/sys/modules/usb/cfumass/Makefile +++ b/sys/modules/usb/cfumass/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/storage +.PATH: ${SRCTOP}/sys/dev/usb/storage KMOD= cfumass SRCS= bus_if.h device_if.h opt_bus.h opt_usb.h usb_if.h usbdevs.h \ diff --git a/sys/modules/usb/cue/Makefile b/sys/modules/usb/cue/Makefile index b13f7bef831d..2ba17e296958 100644 --- a/sys/modules/usb/cue/Makefile +++ b/sys/modules/usb/cue/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/dwc_otg/Makefile b/sys/modules/usb/dwc_otg/Makefile index 6ab1bfcb09fd..07d08d103d6a 100644 --- a/sys/modules/usb/dwc_otg/Makefile +++ b/sys/modules/usb/dwc_otg/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/ehci/Makefile b/sys/modules/usb/ehci/Makefile index 4f558ccab9b9..bc79da0ecd9b 100644 --- a/sys/modules/usb/ehci/Makefile +++ b/sys/modules/usb/ehci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/g_audio/Makefile b/sys/modules/usb/g_audio/Makefile index 7425adeccfd8..efeae06252c1 100644 --- a/sys/modules/usb/g_audio/Makefile +++ b/sys/modules/usb/g_audio/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/usb/gadget +.PATH: ${SRCTOP}/sys/dev/usb/gadget KMOD= g_audio diff --git a/sys/modules/usb/g_keyboard/Makefile b/sys/modules/usb/g_keyboard/Makefile index 302a24294d3c..9caeca2550b7 100644 --- a/sys/modules/usb/g_keyboard/Makefile +++ b/sys/modules/usb/g_keyboard/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/usb/gadget +.PATH: ${SRCTOP}/sys/dev/usb/gadget KMOD= g_keyboard diff --git a/sys/modules/usb/g_modem/Makefile b/sys/modules/usb/g_modem/Makefile index 980849efe3c9..abc425f07c91 100644 --- a/sys/modules/usb/g_modem/Makefile +++ b/sys/modules/usb/g_modem/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/usb/gadget +.PATH: ${SRCTOP}/sys/dev/usb/gadget KMOD= g_modem diff --git a/sys/modules/usb/g_mouse/Makefile b/sys/modules/usb/g_mouse/Makefile index b6d30de1622c..e69232684732 100644 --- a/sys/modules/usb/g_mouse/Makefile +++ b/sys/modules/usb/g_mouse/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/usb/gadget +.PATH: ${SRCTOP}/sys/dev/usb/gadget KMOD= g_mouse diff --git a/sys/modules/usb/ipheth/Makefile b/sys/modules/usb/ipheth/Makefile index b0553743957c..c65ae779e642 100644 --- a/sys/modules/usb/ipheth/Makefile +++ b/sys/modules/usb/ipheth/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/kue/Makefile b/sys/modules/usb/kue/Makefile index 0205f5c4a405..2b3e504cf88e 100644 --- a/sys/modules/usb/kue/Makefile +++ b/sys/modules/usb/kue/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/mos/Makefile b/sys/modules/usb/mos/Makefile index 5d63649f6336..cd61474cb616 100644 --- a/sys/modules/usb/mos/Makefile +++ b/sys/modules/usb/mos/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/musb/Makefile b/sys/modules/usb/musb/Makefile index 0dbd65edc804..5002c30d3016 100644 --- a/sys/modules/usb/musb/Makefile +++ b/sys/modules/usb/musb/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/ohci/Makefile b/sys/modules/usb/ohci/Makefile index 40ed8749ec4f..b04117a01a59 100644 --- a/sys/modules/usb/ohci/Makefile +++ b/sys/modules/usb/ohci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/quirk/Makefile b/sys/modules/usb/quirk/Makefile index 1bb5d8831122..15b85d9687e7 100644 --- a/sys/modules/usb/quirk/Makefile +++ b/sys/modules/usb/quirk/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/quirk diff --git a/sys/modules/usb/rsu/Makefile b/sys/modules/usb/rsu/Makefile index 755f4b82a56d..c3c8fcbf60cd 100644 --- a/sys/modules/usb/rsu/Makefile +++ b/sys/modules/usb/rsu/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/wlan +.PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_rsu SRCS = if_rsu.c if_rsureg.h \ diff --git a/sys/modules/usb/rsufw/Makefile.inc b/sys/modules/usb/rsufw/Makefile.inc index 3792b33e3c80..2f9817762efb 100644 --- a/sys/modules/usb/rsufw/Makefile.inc +++ b/sys/modules/usb/rsufw/Makefile.inc @@ -11,5 +11,5 @@ FIRMWS= ${_FIRM}:${KMOD}:120 # FIRMWARE_LICENSE= realtek -${_FIRM}: ${.CURDIR}/../../../../contrib/dev/rsu/${_FIRM}.uu +${_FIRM}: ${SRCTOP}/sys/contrib/dev/rsu/${_FIRM}.uu uudecode -p $? > ${.TARGET} diff --git a/sys/modules/usb/rue/Makefile b/sys/modules/usb/rue/Makefile index e7e236ee851d..69db3fe626e4 100644 --- a/sys/modules/usb/rue/Makefile +++ b/sys/modules/usb/rue/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/rum/Makefile b/sys/modules/usb/rum/Makefile index de8d70262da4..31c097bc072c 100644 --- a/sys/modules/usb/rum/Makefile +++ b/sys/modules/usb/rum/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/wlan diff --git a/sys/modules/usb/run/Makefile b/sys/modules/usb/run/Makefile index 5acada486ff6..05769bc6e9f5 100644 --- a/sys/modules/usb/run/Makefile +++ b/sys/modules/usb/run/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/wlan diff --git a/sys/modules/usb/runfw/Makefile b/sys/modules/usb/runfw/Makefile index 3734153fc146..47d09a56c42c 100644 --- a/sys/modules/usb/runfw/Makefile +++ b/sys/modules/usb/runfw/Makefile @@ -5,7 +5,7 @@ FIRMWS= run.fw:runfw:1 CLEANFILES= run.fw -run.fw: ${.CURDIR}/../../../contrib/dev/run/rt2870.fw.uu +run.fw: ${SRCTOP}/sys/contrib/dev/run/rt2870.fw.uu uudecode -p $? > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/usb/saf1761otg/Makefile b/sys/modules/usb/saf1761otg/Makefile index f9d0e6f9e131..446e750f3f61 100644 --- a/sys/modules/usb/saf1761otg/Makefile +++ b/sys/modules/usb/saf1761otg/Makefile @@ -29,7 +29,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/smsc/Makefile b/sys/modules/usb/smsc/Makefile index eca1c9c520fc..c7fe271e28f7 100644 --- a/sys/modules/usb/smsc/Makefile +++ b/sys/modules/usb/smsc/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/template/Makefile b/sys/modules/usb/template/Makefile index 4164177e8e22..99e2b1d51d8e 100644 --- a/sys/modules/usb/template/Makefile +++ b/sys/modules/usb/template/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/template diff --git a/sys/modules/usb/u3g/Makefile b/sys/modules/usb/u3g/Makefile index 545c379da712..3e254330d139 100644 --- a/sys/modules/usb/u3g/Makefile +++ b/sys/modules/usb/u3g/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/uark/Makefile b/sys/modules/usb/uark/Makefile index 7ef981eabaac..b681f33cfa75 100644 --- a/sys/modules/usb/uark/Makefile +++ b/sys/modules/usb/uark/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/uath/Makefile b/sys/modules/usb/uath/Makefile index a734dfcbb034..48ef747852c9 100644 --- a/sys/modules/usb/uath/Makefile +++ b/sys/modules/usb/uath/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/wlan +.PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_uath SRCS = if_uath.c if_uathvar.h if_uathreg.h \ diff --git a/sys/modules/usb/ubsa/Makefile b/sys/modules/usb/ubsa/Makefile index 8e5d6b41f6fb..9ac95dc82363 100644 --- a/sys/modules/usb/ubsa/Makefile +++ b/sys/modules/usb/ubsa/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ubser/Makefile b/sys/modules/usb/ubser/Makefile index 1d023f761d80..efa030bd4b46 100644 --- a/sys/modules/usb/ubser/Makefile +++ b/sys/modules/usb/ubser/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/uchcom/Makefile b/sys/modules/usb/uchcom/Makefile index b6922e36eec7..bf1184d41dfa 100644 --- a/sys/modules/usb/uchcom/Makefile +++ b/sys/modules/usb/uchcom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ucom/Makefile b/sys/modules/usb/ucom/Makefile index b7836a83aab3..21dd99508f8f 100644 --- a/sys/modules/usb/ucom/Makefile +++ b/sys/modules/usb/ucom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ucycom/Makefile b/sys/modules/usb/ucycom/Makefile index f52e9497e050..17ceba268f81 100644 --- a/sys/modules/usb/ucycom/Makefile +++ b/sys/modules/usb/ucycom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/udav/Makefile b/sys/modules/usb/udav/Makefile index b3944f0ebcee..242ae7fb73b7 100644 --- a/sys/modules/usb/udav/Makefile +++ b/sys/modules/usb/udav/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/udbp/Makefile b/sys/modules/usb/udbp/Makefile index 13097d8d4c81..ecebf18b79e2 100644 --- a/sys/modules/usb/udbp/Makefile +++ b/sys/modules/usb/udbp/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/misc diff --git a/sys/modules/usb/udl/Makefile b/sys/modules/usb/udl/Makefile index 53238838e17d..5a14280b950f 100644 --- a/sys/modules/usb/udl/Makefile +++ b/sys/modules/usb/udl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/video diff --git a/sys/modules/usb/uep/Makefile b/sys/modules/usb/uep/Makefile index 4ffacde56b8d..2ea4527736a3 100644 --- a/sys/modules/usb/uep/Makefile +++ b/sys/modules/usb/uep/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/uether/Makefile b/sys/modules/usb/uether/Makefile index ade780ffbec2..66e55b357fdb 100644 --- a/sys/modules/usb/uether/Makefile +++ b/sys/modules/usb/uether/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/ufm/Makefile b/sys/modules/usb/ufm/Makefile index a09ddec0fc77..d19c5ecee0f7 100644 --- a/sys/modules/usb/ufm/Makefile +++ b/sys/modules/usb/ufm/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/misc diff --git a/sys/modules/usb/ufoma/Makefile b/sys/modules/usb/ufoma/Makefile index 5a62576029d3..96062f2998da 100644 --- a/sys/modules/usb/ufoma/Makefile +++ b/sys/modules/usb/ufoma/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/uftdi/Makefile b/sys/modules/usb/uftdi/Makefile index 6a6433da0c24..7a697985957a 100644 --- a/sys/modules/usb/uftdi/Makefile +++ b/sys/modules/usb/uftdi/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ugensa/Makefile b/sys/modules/usb/ugensa/Makefile index 975847ae74a4..9fc20ca92c5c 100644 --- a/sys/modules/usb/ugensa/Makefile +++ b/sys/modules/usb/ugensa/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ugold/Makefile b/sys/modules/usb/ugold/Makefile index 48af6efa0eb9..a6361ca6467d 100644 --- a/sys/modules/usb/ugold/Makefile +++ b/sys/modules/usb/ugold/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/misc diff --git a/sys/modules/usb/uhci/Makefile b/sys/modules/usb/uhci/Makefile index d5204effabe3..23d4b3ca363d 100644 --- a/sys/modules/usb/uhci/Makefile +++ b/sys/modules/usb/uhci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/uhid/Makefile b/sys/modules/usb/uhid/Makefile index 406ed3644438..f1fa4f660b36 100644 --- a/sys/modules/usb/uhid/Makefile +++ b/sys/modules/usb/uhid/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/uhso/Makefile b/sys/modules/usb/uhso/Makefile index b08dc42136cf..fb29a7f33546 100644 --- a/sys/modules/usb/uhso/Makefile +++ b/sys/modules/usb/uhso/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/uipaq/Makefile b/sys/modules/usb/uipaq/Makefile index cf87d186bfd6..ccb19d88940d 100644 --- a/sys/modules/usb/uipaq/Makefile +++ b/sys/modules/usb/uipaq/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ukbd/Makefile b/sys/modules/usb/ukbd/Makefile index 3db978a486ce..bbd721a0a513 100644 --- a/sys/modules/usb/ukbd/Makefile +++ b/sys/modules/usb/ukbd/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/uled/Makefile b/sys/modules/usb/uled/Makefile index d53f3024734e..2cd3ada8375b 100644 --- a/sys/modules/usb/uled/Makefile +++ b/sys/modules/usb/uled/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/misc diff --git a/sys/modules/usb/ulpt/Makefile b/sys/modules/usb/ulpt/Makefile index 1e28742bb5cf..37c585ad5147 100644 --- a/sys/modules/usb/ulpt/Makefile +++ b/sys/modules/usb/ulpt/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/umass/Makefile b/sys/modules/usb/umass/Makefile index 7b3b6747a184..bc3382019294 100644 --- a/sys/modules/usb/umass/Makefile +++ b/sys/modules/usb/umass/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/storage diff --git a/sys/modules/usb/umcs/Makefile b/sys/modules/usb/umcs/Makefile index be75fb56d643..58b7838bef8a 100644 --- a/sys/modules/usb/umcs/Makefile +++ b/sys/modules/usb/umcs/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/umct/Makefile b/sys/modules/usb/umct/Makefile index 263fc40ba4df..2b154c8c1842 100644 --- a/sys/modules/usb/umct/Makefile +++ b/sys/modules/usb/umct/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/umodem/Makefile b/sys/modules/usb/umodem/Makefile index c7675732a656..05b2683205b4 100644 --- a/sys/modules/usb/umodem/Makefile +++ b/sys/modules/usb/umodem/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/umoscom/Makefile b/sys/modules/usb/umoscom/Makefile index 7851780f78d0..4b857896e030 100644 --- a/sys/modules/usb/umoscom/Makefile +++ b/sys/modules/usb/umoscom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ums/Makefile b/sys/modules/usb/ums/Makefile index 197415f6e2f2..17826e569e06 100644 --- a/sys/modules/usb/ums/Makefile +++ b/sys/modules/usb/ums/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/upgt/Makefile b/sys/modules/usb/upgt/Makefile index 74aa1450700a..d8d97f3ca8e5 100644 --- a/sys/modules/usb/upgt/Makefile +++ b/sys/modules/usb/upgt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/wlan +.PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_upgt SRCS = if_upgt.c if_upgtvar.h \ diff --git a/sys/modules/usb/uplcom/Makefile b/sys/modules/usb/uplcom/Makefile index c07e78bddf92..54cf7abf97aa 100644 --- a/sys/modules/usb/uplcom/Makefile +++ b/sys/modules/usb/uplcom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/ural/Makefile b/sys/modules/usb/ural/Makefile index 7e605de24c9f..afd56be8214d 100644 --- a/sys/modules/usb/ural/Makefile +++ b/sys/modules/usb/ural/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/wlan diff --git a/sys/modules/usb/ure/Makefile b/sys/modules/usb/ure/Makefile index 61dfc378b37a..d08514a73184 100644 --- a/sys/modules/usb/ure/Makefile +++ b/sys/modules/usb/ure/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/net +.PATH: ${SRCTOP}/sys/dev/usb/net KMOD= if_ure SRCS+= if_ure.c usbdevs.h diff --git a/sys/modules/usb/urio/Makefile b/sys/modules/usb/urio/Makefile index 0dfc605401fb..267f7c38a66d 100644 --- a/sys/modules/usb/urio/Makefile +++ b/sys/modules/usb/urio/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/storage diff --git a/sys/modules/usb/urndis/Makefile b/sys/modules/usb/urndis/Makefile index 929572dd6152..51fe5a94e974 100644 --- a/sys/modules/usb/urndis/Makefile +++ b/sys/modules/usb/urndis/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/urtw/Makefile b/sys/modules/usb/urtw/Makefile index e06ad0622bef..2d282a282a57 100644 --- a/sys/modules/usb/urtw/Makefile +++ b/sys/modules/usb/urtw/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../dev/usb/wlan +.PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_urtw SRCS = if_urtw.c if_urtwreg.h if_urtwvar.h \ diff --git a/sys/modules/usb/usb/Makefile b/sys/modules/usb/usb/Makefile index 704895ec8ec3..02c01ade0955 100644 --- a/sys/modules/usb/usb/Makefile +++ b/sys/modules/usb/usb/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb $S/dev/usb/controller diff --git a/sys/modules/usb/usfs/Makefile b/sys/modules/usb/usfs/Makefile index a34aae1ab82a..92e2dec433fd 100644 --- a/sys/modules/usb/usfs/Makefile +++ b/sys/modules/usb/usfs/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/storage diff --git a/sys/modules/usb/usie/Makefile b/sys/modules/usb/usie/Makefile index f7d7c07da280..7b43e2c88444 100644 --- a/sys/modules/usb/usie/Makefile +++ b/sys/modules/usb/usie/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/usb/net +.PATH: ${SRCTOP}/sys/dev/usb/net KMOD = usie SRCS = if_usie.c diff --git a/sys/modules/usb/uslcom/Makefile b/sys/modules/usb/uslcom/Makefile index adf3de770df7..9ef28d55f3ce 100644 --- a/sys/modules/usb/uslcom/Makefile +++ b/sys/modules/usb/uslcom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/uss820dci/Makefile b/sys/modules/usb/uss820dci/Makefile index 743464ab9818..b91e8279bed5 100644 --- a/sys/modules/usb/uss820dci/Makefile +++ b/sys/modules/usb/uss820dci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/uvisor/Makefile b/sys/modules/usb/uvisor/Makefile index c48325950f33..6a732d211cb4 100644 --- a/sys/modules/usb/uvisor/Makefile +++ b/sys/modules/usb/uvisor/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/uvscom/Makefile b/sys/modules/usb/uvscom/Makefile index 18589f12c962..de860bc7d2c6 100644 --- a/sys/modules/usb/uvscom/Makefile +++ b/sys/modules/usb/uvscom/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/usb/wsp/Makefile b/sys/modules/usb/wsp/Makefile index 9f85b6a7f979..a5215c0150f5 100644 --- a/sys/modules/usb/wsp/Makefile +++ b/sys/modules/usb/wsp/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/xhci/Makefile b/sys/modules/usb/xhci/Makefile index 07dcba0259c7..f1330861b226 100644 --- a/sys/modules/usb/xhci/Makefile +++ b/sys/modules/usb/xhci/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/controller diff --git a/sys/modules/usb/zyd/Makefile b/sys/modules/usb/zyd/Makefile index 48dd9eb6f768..9852e5cc4fc8 100644 --- a/sys/modules/usb/zyd/Makefile +++ b/sys/modules/usb/zyd/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/usb/wlan diff --git a/sys/modules/utopia/Makefile b/sys/modules/utopia/Makefile index c1a444516c14..f9993705dc8e 100644 --- a/sys/modules/utopia/Makefile +++ b/sys/modules/utopia/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/utopia +.PATH: ${SRCTOP}/sys/dev/utopia KMOD= utopia SRCS= utopia.c suni.c idtphy.c bus_if.h device_if.h diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile index 69a0c330688b..610226f4e02c 100644 --- a/sys/modules/vesa/Makefile +++ b/sys/modules/vesa/Makefile @@ -4,10 +4,10 @@ KMOD= vesa SRCS= opt_vga.h opt_vesa.h SRCS+= bus_if.h device_if.h pci_if.h -.PATH: ${.CURDIR}/../../dev/fb +.PATH: ${SRCTOP}/sys/dev/fb SRCS+= vesa.c -.PATH: ${.CURDIR}/../../dev/syscons +.PATH: ${SRCTOP}/sys/dev/syscons SRCS+= scvesactl.c .include <bsd.kmod.mk> diff --git a/sys/modules/vge/Makefile b/sys/modules/vge/Makefile index a06ee56ff72d..2866aaca9ec5 100644 --- a/sys/modules/vge/Makefile +++ b/sys/modules/vge/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/vge +.PATH: ${SRCTOP}/sys/dev/vge KMOD= if_vge SRCS= if_vge.c miibus_if.h device_if.h bus_if.h pci_if.h diff --git a/sys/modules/viawd/Makefile b/sys/modules/viawd/Makefile index c14c3e0c7af9..c075977b88ef 100644 --- a/sys/modules/viawd/Makefile +++ b/sys/modules/viawd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/viawd +.PATH: ${SRCTOP}/sys/dev/viawd KMOD= viawd SRCS= viawd.c device_if.h bus_if.h pci_if.h isa_if.h diff --git a/sys/modules/videomode/Makefile b/sys/modules/videomode/Makefile index 9b09aaed858c..80f7aeec00d7 100644 --- a/sys/modules/videomode/Makefile +++ b/sys/modules/videomode/Makefile @@ -25,7 +25,7 @@ # SUCH DAMAGE. # -S= ${.CURDIR}/../.. +S= ${SRCTOP}/sys .PATH: $S/dev/videomode diff --git a/sys/modules/virtio/balloon/Makefile b/sys/modules/virtio/balloon/Makefile index 39c8b1cd9ba3..59359a0dec66 100644 --- a/sys/modules/virtio/balloon/Makefile +++ b/sys/modules/virtio/balloon/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/balloon +.PATH: ${SRCTOP}/sys/dev/virtio/balloon KMOD= virtio_balloon SRCS= virtio_balloon.c diff --git a/sys/modules/virtio/block/Makefile b/sys/modules/virtio/block/Makefile index 5b73a6d02a29..8afaf7d72c8a 100644 --- a/sys/modules/virtio/block/Makefile +++ b/sys/modules/virtio/block/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/block +.PATH: ${SRCTOP}/sys/dev/virtio/block KMOD= virtio_blk SRCS= virtio_blk.c diff --git a/sys/modules/virtio/console/Makefile b/sys/modules/virtio/console/Makefile index 7490720fb244..d4da9fcc73ae 100644 --- a/sys/modules/virtio/console/Makefile +++ b/sys/modules/virtio/console/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/console +.PATH: ${SRCTOP}/sys/dev/virtio/console KMOD= virtio_console SRCS= virtio_console.c diff --git a/sys/modules/virtio/network/Makefile b/sys/modules/virtio/network/Makefile index 6dc3d864c97f..beeddc7ca092 100644 --- a/sys/modules/virtio/network/Makefile +++ b/sys/modules/virtio/network/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/network +.PATH: ${SRCTOP}/sys/dev/virtio/network KMOD= if_vtnet SRCS= if_vtnet.c diff --git a/sys/modules/virtio/pci/Makefile b/sys/modules/virtio/pci/Makefile index 4d85669d76c4..3dbf4032a7cf 100644 --- a/sys/modules/virtio/pci/Makefile +++ b/sys/modules/virtio/pci/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/pci +.PATH: ${SRCTOP}/sys/dev/virtio/pci KMOD= virtio_pci SRCS= virtio_pci.c diff --git a/sys/modules/virtio/random/Makefile b/sys/modules/virtio/random/Makefile index 25954d03d25b..3421480d9585 100644 --- a/sys/modules/virtio/random/Makefile +++ b/sys/modules/virtio/random/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/random +.PATH: ${SRCTOP}/sys/dev/virtio/random KMOD= virtio_random SRCS= virtio_random.c diff --git a/sys/modules/virtio/scsi/Makefile b/sys/modules/virtio/scsi/Makefile index 0363909f346a..83c6505f9880 100644 --- a/sys/modules/virtio/scsi/Makefile +++ b/sys/modules/virtio/scsi/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio/scsi +.PATH: ${SRCTOP}/sys/dev/virtio/scsi KMOD= virtio_scsi SRCS= virtio_scsi.c diff --git a/sys/modules/virtio/virtio/Makefile b/sys/modules/virtio/virtio/Makefile index e99b52961f44..ed67f03ea9f9 100644 --- a/sys/modules/virtio/virtio/Makefile +++ b/sys/modules/virtio/virtio/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/virtio +.PATH: ${SRCTOP}/sys/dev/virtio KMOD= virtio diff --git a/sys/modules/vkbd/Makefile b/sys/modules/vkbd/Makefile index 500274cf94b1..250653b4f6cf 100644 --- a/sys/modules/vkbd/Makefile +++ b/sys/modules/vkbd/Makefile @@ -1,7 +1,7 @@ # $Id: Makefile,v 1.1 2004/08/13 18:30:24 max Exp $ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/vkbd +.PATH: ${SRCTOP}/sys/dev/vkbd KMOD= vkbd SRCS= vkbd.c opt_compat.h opt_kbd.h diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 86cb58cfd915..882864a69b2e 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -7,13 +7,13 @@ SRCS+= vmx_assym.h svm_assym.h DPSRCS= vmx_genassym.c svm_genassym.c CFLAGS+= -DVMM_KEEP_STATS -DSMP -CFLAGS+= -I${.CURDIR}/../../amd64/vmm -CFLAGS+= -I${.CURDIR}/../../amd64/vmm/io -CFLAGS+= -I${.CURDIR}/../../amd64/vmm/intel -CFLAGS+= -I${.CURDIR}/../../amd64/vmm/amd +CFLAGS+= -I${SRCTOP}/sys/amd64/vmm +CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/io +CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/intel +CFLAGS+= -I${SRCTOP}/sys/amd64/vmm/amd # generic vmm support -.PATH: ${.CURDIR}/../../amd64/vmm +.PATH: ${SRCTOP}/sys/amd64/vmm SRCS+= vmm.c \ vmm_dev.c \ vmm_host.c \ @@ -25,7 +25,7 @@ SRCS+= vmm.c \ vmm_util.c \ x86.c -.PATH: ${.CURDIR}/../../amd64/vmm/io +.PATH: ${SRCTOP}/sys/amd64/vmm/io SRCS+= iommu.c \ ppt.c \ vatpic.c \ @@ -37,7 +37,7 @@ SRCS+= iommu.c \ vrtc.c # intel-specific files -.PATH: ${.CURDIR}/../../amd64/vmm/intel +.PATH: ${SRCTOP}/sys/amd64/vmm/intel SRCS+= ept.c \ vmcs.c \ vmx_msr.c \ @@ -46,7 +46,7 @@ SRCS+= ept.c \ vtd.c # amd-specific files -.PATH: ${.CURDIR}/../../amd64/vmm/amd +.PATH: ${SRCTOP}/sys/amd64/vmm/amd SRCS+= vmcb.c \ svm.c \ svm_support.S \ diff --git a/sys/modules/vmware/vmxnet3/Makefile b/sys/modules/vmware/vmxnet3/Makefile index 340e593c25bc..9debcc6744ce 100644 --- a/sys/modules/vmware/vmxnet3/Makefile +++ b/sys/modules/vmware/vmxnet3/Makefile @@ -23,7 +23,7 @@ # SUCH DAMAGE. # -.PATH: ${.CURDIR}/../../../dev/vmware/vmxnet3 +.PATH: ${SRCTOP}/sys/dev/vmware/vmxnet3 KMOD= if_vmx SRCS= if_vmx.c diff --git a/sys/modules/vnic/Makefile b/sys/modules/vnic/Makefile index 69d159060552..d1e0a8e2d915 100644 --- a/sys/modules/vnic/Makefile +++ b/sys/modules/vnic/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" CFLAGS+= -DFDT diff --git a/sys/modules/vnic/mrmlbus/Makefile b/sys/modules/vnic/mrmlbus/Makefile index 1d1eb3453ccd..e3d3b2806823 100644 --- a/sys/modules/vnic/mrmlbus/Makefile +++ b/sys/modules/vnic/mrmlbus/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/vnic diff --git a/sys/modules/vnic/thunder_bgx/Makefile b/sys/modules/vnic/thunder_bgx/Makefile index 4926e7a68519..d1284382d222 100644 --- a/sys/modules/vnic/thunder_bgx/Makefile +++ b/sys/modules/vnic/thunder_bgx/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/vnic diff --git a/sys/modules/vnic/thunder_mdio/Makefile b/sys/modules/vnic/thunder_mdio/Makefile index 78ca8f848ce0..33c3b9c9e1f4 100644 --- a/sys/modules/vnic/thunder_mdio/Makefile +++ b/sys/modules/vnic/thunder_mdio/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/vnic diff --git a/sys/modules/vnic/vnicpf/Makefile b/sys/modules/vnic/vnicpf/Makefile index 206f75f53df7..111de738686b 100644 --- a/sys/modules/vnic/vnicpf/Makefile +++ b/sys/modules/vnic/vnicpf/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/vnic diff --git a/sys/modules/vnic/vnicvf/Makefile b/sys/modules/vnic/vnicvf/Makefile index 9614cc0e1bc0..52a3c232420c 100644 --- a/sys/modules/vnic/vnicvf/Makefile +++ b/sys/modules/vnic/vnicvf/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" -S= ${.CURDIR}/../../.. +S= ${SRCTOP}/sys .PATH: $S/dev/vnic diff --git a/sys/modules/vpo/Makefile b/sys/modules/vpo/Makefile index cad169a856fb..afb5eb163c7b 100644 --- a/sys/modules/vpo/Makefile +++ b/sys/modules/vpo/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/ppbus +.PATH: ${SRCTOP}/sys/dev/ppbus KMOD= vpo SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile index e3ce623aba09..3f56ee873de3 100644 --- a/sys/modules/vr/Makefile +++ b/sys/modules/vr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/vr +.PATH: ${SRCTOP}/sys/dev/vr KMOD= if_vr SRCS= if_vr.c device_if.h bus_if.h pci_if.h diff --git a/sys/modules/vte/Makefile b/sys/modules/vte/Makefile index 932181c4698a..f6628a471470 100644 --- a/sys/modules/vte/Makefile +++ b/sys/modules/vte/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/vte +.PATH: ${SRCTOP}/sys/dev/vte KMOD= if_vte SRCS= if_vte.c device_if.h bus_if.h pci_if.h miibus_if.h diff --git a/sys/modules/vx/Makefile b/sys/modules/vx/Makefile index 21e033a7b371..bdd8b19519b9 100644 --- a/sys/modules/vx/Makefile +++ b/sys/modules/vx/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" .PATH: ${SYSDIR}/dev/vx diff --git a/sys/modules/vxge/Makefile b/sys/modules/vxge/Makefile index d86440076692..8435941303b9 100644 --- a/sys/modules/vxge/Makefile +++ b/sys/modules/vxge/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/vxge -VPATH = ${.CURDIR}/../../dev/vxge/vxgehal +.PATH: ${SRCTOP}/sys/dev/vxge +VPATH = ${SRCTOP}/sys/dev/vxge/vxgehal CFLAGS_VXGE = diff --git a/sys/modules/wb/Makefile b/sys/modules/wb/Makefile index 77b63b5350c7..faaabaec19c9 100644 --- a/sys/modules/wb/Makefile +++ b/sys/modules/wb/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/wb +.PATH: ${SRCTOP}/sys/dev/wb KMOD= if_wb SRCS= if_wb.c device_if.h diff --git a/sys/modules/wbwd/Makefile b/sys/modules/wbwd/Makefile index e727302e2d25..28fa9514846b 100644 --- a/sys/modules/wbwd/Makefile +++ b/sys/modules/wbwd/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/wbwd +.PATH: ${SRCTOP}/sys/dev/wbwd KMOD= wbwd SRCS= wbwd.c diff --git a/sys/modules/wi/Makefile b/sys/modules/wi/Makefile index 46215a8ffade..6268ddb83074 100644 --- a/sys/modules/wi/Makefile +++ b/sys/modules/wi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/wi +.PATH: ${SRCTOP}/sys/dev/wi KMOD= if_wi SRCS= if_wi.c if_wi_pccard.c if_wi_pci.c \ diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index 25f2fdc7503d..f50aa7502809 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan SRCS= ieee80211.c ieee80211_action.c ieee80211_ageq.c \ diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile index f0ce538ab1e0..13d7ec2adceb 100644 --- a/sys/modules/wlan_acl/Makefile +++ b/sys/modules/wlan_acl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_acl SRCS= ieee80211_acl.c diff --git a/sys/modules/wlan_amrr/Makefile b/sys/modules/wlan_amrr/Makefile index 1c9ef8c3ece6..226111f3ec58 100644 --- a/sys/modules/wlan_amrr/Makefile +++ b/sys/modules/wlan_amrr/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_amrr SRCS= ieee80211_amrr.c diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile index 99274dc6805c..21978232a73f 100644 --- a/sys/modules/wlan_ccmp/Makefile +++ b/sys/modules/wlan_ccmp/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 -.PATH: ${.CURDIR}/../../crypto/rijndael +.PATH: ${SRCTOP}/sys/net80211 +.PATH: ${SRCTOP}/sys/crypto/rijndael KMOD= wlan_ccmp SRCS= ieee80211_crypto_ccmp.c diff --git a/sys/modules/wlan_rssadapt/Makefile b/sys/modules/wlan_rssadapt/Makefile index 732db05b1e2f..5a446a7fd93c 100644 --- a/sys/modules/wlan_rssadapt/Makefile +++ b/sys/modules/wlan_rssadapt/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_rssadapt SRCS= ieee80211_rssadapt.c diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile index 13ea0638899b..d451b0517803 100644 --- a/sys/modules/wlan_tkip/Makefile +++ b/sys/modules/wlan_tkip/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_tkip SRCS= ieee80211_crypto_tkip.c diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile index 6ebbdb03baa5..2a446b78b110 100644 --- a/sys/modules/wlan_wep/Makefile +++ b/sys/modules/wlan_wep/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_wep SRCS= ieee80211_crypto_wep.c diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile index 308d8f2ebb94..afe3c1728fde 100644 --- a/sys/modules/wlan_xauth/Makefile +++ b/sys/modules/wlan_xauth/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../net80211 +.PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_xauth SRCS= ieee80211_xauth.c diff --git a/sys/modules/wpi/Makefile b/sys/modules/wpi/Makefile index 2e0da73b1894..a4bb0d5a6beb 100644 --- a/sys/modules/wpi/Makefile +++ b/sys/modules/wpi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/wpi +.PATH: ${SRCTOP}/sys/dev/wpi KMOD = if_wpi SRCS = if_wpi.c device_if.h bus_if.h pci_if.h opt_wpi.h opt_wlan.h diff --git a/sys/modules/wpifw/Makefile b/sys/modules/wpifw/Makefile index d035a801be08..bb23f3c89cf0 100644 --- a/sys/modules/wpifw/Makefile +++ b/sys/modules/wpifw/Makefile @@ -1,13 +1,13 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/dev/wpi +.PATH: ${SRCTOP}/sys/contrib/dev/wpi KMOD= wpifw FIRMWS= iwlwifi-3945-15.32.2.9.fw:wpifw:153229 CLEANFILES= iwlwifi-3945-15.32.2.9.fw -iwlwifi-3945-15.32.2.9.fw: ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu - uudecode -p ${.CURDIR}/../../contrib/dev/wpi/iwlwifi-3945-15.32.2.9.fw.uu > ${.TARGET} +iwlwifi-3945-15.32.2.9.fw: iwlwifi-3945-15.32.2.9.fw.uu + uudecode -p ${.ALLSRC} > ${.TARGET} .include <bsd.kmod.mk> diff --git a/sys/modules/wtap/Makefile b/sys/modules/wtap/Makefile index 58f60fb2ef6a..4386bf0dd7ad 100644 --- a/sys/modules/wtap/Makefile +++ b/sys/modules/wtap/Makefile @@ -5,13 +5,13 @@ KMOD = wtap # Enumerate Source files for kernel module -.PATH: ${.CURDIR}/../../dev/wtap +.PATH: ${SRCTOP}/sys/dev/wtap SRCS = if_wtap_module.c if_wtap.c if_medium.c -.PATH: ${.CURDIR}/../../dev/wtap/wtap_hal +.PATH: ${SRCTOP}/sys/dev/wtap/wtap_hal SRCS += hal.c -.PATH: ${.CURDIR}/../../dev/wtap/plugins +.PATH: ${SRCTOP}/sys/dev/wtap/plugins SRCS += visibility.c SRCS += opt_global.h diff --git a/sys/modules/x86bios/Makefile b/sys/modules/x86bios/Makefile index f8cc606ad030..5d5885673dd9 100644 --- a/sys/modules/x86bios/Makefile +++ b/sys/modules/x86bios/Makefile @@ -4,8 +4,8 @@ KMOD= x86bios SRCS= opt_x86bios.h SRCS+= bus_if.h device_if.h pci_if.h -.PATH: ${.CURDIR}/../../contrib/x86emu -.PATH: ${.CURDIR}/../../compat/x86bios +.PATH: ${SRCTOP}/sys/contrib/x86emu +.PATH: ${SRCTOP}/sys/compat/x86bios SRCS+= x86bios.c .if ${MACHINE_ARCH} != "i386" SRCS+= x86emu.c diff --git a/sys/modules/xe/Makefile b/sys/modules/xe/Makefile index f900854352b4..8ebd53f115c3 100644 --- a/sys/modules/xe/Makefile +++ b/sys/modules/xe/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/xe +.PATH: ${SRCTOP}/sys/dev/xe KMOD= if_xe SRCS= if_xe.c if_xe_pccard.c diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile index 417f3fcc2710..7809a3352aba 100644 --- a/sys/modules/xl/Makefile +++ b/sys/modules/xl/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/xl +.PATH: ${SRCTOP}/sys/dev/xl KMOD= if_xl SRCS= bus_if.h device_if.h if_xl.c miibus_if.h miidevs.h pci_if.h xlphy.c diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index b02254d9c5b6..0ce0ac936ff1 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -SYSDIR?=${.CURDIR}/../.. +SYSDIR?=${SRCTOP}/sys KMOD= zfs diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile index 235d1c7c3cb2..26a023c536f3 100644 --- a/sys/modules/zlib/Makefile +++ b/sys/modules/zlib/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../libkern +.PATH: ${SRCTOP}/sys/libkern KMOD= zlib SRCS= zlib.c |