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/geom/geom_uzip/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/geom/geom_uzip/Makefile')
| -rw-r--r-- | sys/modules/geom/geom_uzip/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile index dd2bd46..2a7cba7 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 |
