diff options
| author | ngie <ngie@FreeBSD.org> | 2017-05-30 04:11:12 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-05-30 04:11:12 +0000 |
| commit | 96dc1cf1ed7b32083e3c2518b615049a51e28805 (patch) | |
| tree | cc073c28e12eab20ba91fc4b06400c1131b8d67d /sys/modules/vmm/Makefile | |
| parent | 61642a6713ab173381f65410feaddc6c99f97b54 (diff) | |
| download | FreeBSD-src-96dc1cf1ed7b32083e3c2518b615049a51e28805.zip FreeBSD-src-96dc1cf1ed7b32083e3c2518b615049a51e28805.tar.gz | |
MFC r314651,r318439,r318440:
r314651:
sys/modules: normalize .CURDIR-relative paths to SRCTOP
This simplifies make output/logic
Tested with: `cd sys/modules; make ALL_MODULES=` on amd64
r318439:
Normalize .PATH on SRCTOP
This will help Jenkins dedupe 9 warnings between the static build and
the module build of ipsec(4).
Missed in SRCTOP conversion in r314651.
MFC with: r314651
r318440:
Normalize SYSDIR on SRCTOP instead of .CURDIR
This is being done to simplify pathing for CFLAGS and source files.
Diffstat (limited to 'sys/modules/vmm/Makefile')
| -rw-r--r-- | sys/modules/vmm/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 86cb58c..882864a 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 \ |
