hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-18 14:01:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

usr.sbin: normalize paths using SRCTOP-relative paths or :H when possible

Browse Source 
This simplifies make logic/output

MFC after:	1 month
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Enji Cooper 2017-03-04 11:38:03 +00:00
parent b71fb1a4aa
commit 64a0982bee
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=314659
67 changed files with 116 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/acpi/Makefile.inc
View File

@ -1,13 +1,13 @@
# $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $ # $Id: Makefile.inc,v 1.1 2000/07/14 18:16:22 iwasaki Exp $
# $FreeBSD$ # $FreeBSD$
ACPICA_DIR= ${.CURDIR}/../../../sys/contrib/dev/acpica ACPICA_DIR= ${SRCTOP}/sys/contrib/dev/acpica
CFLAGS+= -I${.CURDIR}/../../../sys CFLAGS+= -I${SRCTOP}/sys
PACKAGE= acpi PACKAGE= acpi
.if exists(${.CURDIR}/../../Makefile.inc) .if exists(${.CURDIR:H:H}/Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR:H:H}/Makefile.inc"
.endif .endif
.PATH: ${ACPICA_DIR} \ .PATH: ${ACPICA_DIR} \

16
usr.sbin/amd/Makefile.inc
View File

@ -13,13 +13,13 @@
PACKAGE= amd PACKAGE= amd
CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I. -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR:H}/include
.if exists(${.OBJDIR}/../include) .if exists(${.OBJDIR:H}/include)
CFLAGS+= -I${.OBJDIR}/../include CFLAGS+= -I${.OBJDIR:H}/include
.endif .endif
CFLAGS+= -I${.CURDIR}/../../../contrib/amd/include CFLAGS+= -I${SRCTOP}/contrib/amd/include
CFLAGS+= -I${.CURDIR}/../../../contrib/amd CFLAGS+= -I${SRCTOP}/contrib/amd
CFLAGS+= -DHAVE_CONFIG_H CFLAGS+= -DHAVE_CONFIG_H
.if ${MK_NIS} == "no" .if ${MK_NIS} == "no"
CFLAGS+= -DHAVE_LOCALCONFIG_H CFLAGS+= -DHAVE_LOCALCONFIG_H
@ -37,6 +37,6 @@ NFS_PROT_X= ${SRCTOP}/include/rpcsvc/nfs_prot.x
WARNS?= 1 WARNS?= 1
.if exists(${.CURDIR}/../../Makefile.inc) .if exists(${.CURDIR:H:H}/Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR:H:H}/Makefile.inc"
.endif .endif

4
usr.sbin/amd/amd/Makefile
View File

@ -28,7 +28,7 @@ SRCS+= srvr_amfs_auto.c srvr_nfs.c sun_map.c
CFLAGS+= -I${SRCTOP}/contrib/amd/amd \ CFLAGS+= -I${SRCTOP}/contrib/amd/amd \
-I${SRCTOP}/contrib/amd/include \ -I${SRCTOP}/contrib/amd/include \
-I${.OBJDIR}/../../../include/rpcsvc -I${OBJTOP}/include/rpcsvc
LIBADD= amu LIBADD= amu
@ -62,7 +62,7 @@ SRCS+= mount_xdr.c
CLEANFILES+= mount_xdr.c CLEANFILES+= mount_xdr.c
mount_xdr.c: ${MOUNT_X} mount_xdr.c: ${MOUNT_X}
${RPCCOM} -c -DWANT_NFS3 ${MOUNT_X} -o ${.TARGET} ${RPCCOM} -c -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET}
.if ${MK_HESIOD} != "no" .if ${MK_HESIOD} != "no"
SRCS+= info_hesiod.c SRCS+= info_hesiod.c

4
usr.sbin/amd/libamu/Makefile
View File

@ -23,10 +23,10 @@ SRCS+= nfs_prot_x.c xdr_func_%undef.c
CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c CLEANFILES+= nfs_prot_x.c xdr_func_%undef.c
CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \ CFLAGS+= -I${SRCTOP}/contrib/amd/libamu \
-I${.OBJDIR}/../../../include/rpcsvc -I${OBJTOP}/include/rpcsvc
nfs_prot_x.c: ${NFS_PROT_X} nfs_prot_x.c: ${NFS_PROT_X}
${RPCCOM} -c -C -DWANT_NFS3 ${NFS_PROT_X} -o ${.TARGET} ${RPCCOM} -c -C -DWANT_NFS3 ${.ALLSRC} -o ${.TARGET}
XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${SRCTOP}/contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}' XDRDEFS!= grep 'ifndef.*HAVE_XDR' ${SRCTOP}/contrib/amd/libamu/xdr_func.c | awk '{print "-D"$$2}'

2
usr.sbin/ancontrol/Makefile
View File

@ -4,7 +4,7 @@ PROG= ancontrol
MAN= ancontrol.8 MAN= ancontrol.8
WARNS?= 3 WARNS?= 3
CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys CFLAGS+= -DANCACHE -I${SRCTOP}/sys
LIBADD= md LIBADD= md

2
usr.sbin/audit/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
# #
OPENBSMDIR=${.CURDIR}/../../contrib/openbsm OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/audit .PATH: ${OPENBSMDIR}/bin/audit
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}

2
usr.sbin/auditd/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
# #
OPENBSMDIR=${.CURDIR}/../../contrib/openbsm OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditd .PATH: ${OPENBSMDIR}/bin/auditd
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}

2
usr.sbin/auditdistd/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
# #
OPENBSMDIR=${.CURDIR}/../../contrib/openbsm OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditdistd .PATH: ${OPENBSMDIR}/bin/auditdistd
# Addition of auditdistd because otherwise generated parse.c can't find # Addition of auditdistd because otherwise generated parse.c can't find

2
usr.sbin/auditreduce/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
# #
OPENBSMDIR=${.CURDIR}/../../contrib/openbsm OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/auditreduce .PATH: ${OPENBSMDIR}/bin/auditreduce
CFLAGS+= -I${OPENBSMDIR} CFLAGS+= -I${OPENBSMDIR}

2
usr.sbin/authpf/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/pf/authpf .PATH: ${SRCTOP}/contrib/pf/authpf
PROG= authpf PROG= authpf
MAN= authpf.8 MAN= authpf.8

4
usr.sbin/autofs/Makefile
View File

@ -13,14 +13,14 @@ SRCS+= popen.c
SRCS+= token.l SRCS+= token.l
CFLAGS+=-I${.CURDIR} CFLAGS+=-I${.CURDIR}
CFLAGS+=-I${.CURDIR}/../../sys/fs/autofs CFLAGS+=-I${SRCTOP}/sys/fs/autofs
MAN= automount.8 automountd.8 autounmountd.8 auto_master.5 MAN= automount.8 automountd.8 autounmountd.8 auto_master.5
LIBADD= util LIBADD= util
# Needed for getmntopts.c # Needed for getmntopts.c
MOUNT= ${.CURDIR}/../../sbin/mount MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+=-I${MOUNT} CFLAGS+=-I${MOUNT}
WARNS= 6 WARNS= 6

2
usr.sbin/bhyvectl/Makefile
View File

@ -12,6 +12,6 @@ LIBADD= vmmapi util
WARNS?= 3 WARNS?= 3
CFLAGS+= -I${.CURDIR}/../../sys/amd64/vmm CFLAGS+= -I${SRCTOP}/sys/amd64/vmm
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/bhyveload/Makefile
View File

@ -9,6 +9,6 @@ LIBADD= vmmapi
WARNS?= 3 WARNS?= 3
CFLAGS+=-I${.CURDIR}/../../sys/boot/userboot CFLAGS+=-I${SRCTOP}/sys/boot/userboot
.include <bsd.prog.mk> .include <bsd.prog.mk>

3
usr.sbin/bluetooth/Makefile.inc
View File

@ -1,4 +1,3 @@
# $FreeBSD$ # $FreeBSD$
.include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR:H:H}/Makefile.inc"

4
usr.sbin/bluetooth/bthidcontrol/Makefile
View File

@ -1,13 +1,13 @@
# $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $ # $Id: Makefile,v 1.2 2004/02/13 21:44:41 max Exp $
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../bthidd .PATH: ${.CURDIR:H}/bthidd
PROG= bthidcontrol PROG= bthidcontrol
MAN= bthidcontrol.8 MAN= bthidcontrol.8
SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c SRCS= bthidcontrol.c hid.c lexer.l parser.y sdp.c
WARNS?= 1 WARNS?= 1
CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR}/../bthidd CFLAGS+= -DBTHIDCONTROL=1 -I${.CURDIR:H}/bthidd
LIBADD+= bluetooth sdp usbhid LIBADD+= bluetooth sdp usbhid

2
usr.sbin/bluetooth/rfcomm_pppd/Makefile
View File

@ -1,7 +1,7 @@
# $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $ # $Id: Makefile,v 1.7 2003/09/07 18:32:11 max Exp $
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../../usr.bin/bluetooth/rfcomm_sppd .PATH: ${SRCTOP}/usr.bin/bluetooth/rfcomm_sppd
PROG= rfcomm_pppd PROG= rfcomm_pppd
MAN= rfcomm_pppd.8 MAN= rfcomm_pppd.8

2
usr.sbin/bsnmpd/bsnmpd/Makefile
View File

@ -4,7 +4,7 @@
.include <src.opts.mk> .include <src.opts.mk>
CONTRIB=${.CURDIR}/../../../contrib/bsnmp CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/snmpd .PATH: ${CONTRIB}/snmpd
PROG= bsnmpd PROG= bsnmpd

2
usr.sbin/bsnmpd/gensnmptree/Makefile
View File

@ -2,7 +2,7 @@
# #
# Author: Harti Brandt <harti@freebsd.org> # Author: Harti Brandt <harti@freebsd.org>
CONTRIB=${.CURDIR}/../../../contrib/bsnmp CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/gensnmptree .PATH: ${CONTRIB}/gensnmptree
PROG= gensnmptree PROG= gensnmptree

6
usr.sbin/bsnmpd/tools/Makefile.inc
View File

@ -6,10 +6,10 @@ PACKAGE= bsnmp
CFLAGS+= -I. -I${.CURDIR} CFLAGS+= -I. -I${.CURDIR}
.if exists(${.OBJDIR}/../libbsnmptools) .if exists(${.OBJDIR:H}/libbsnmptools)
LIBBSNMPTOOLSDIR= ${.OBJDIR}/../libbsnmptools LIBBSNMPTOOLSDIR= ${.OBJDIR:H}/libbsnmptools
.else .else
LIBBSNMPTOOLSDIR= ${.CURDIR}/../libbsnmptools LIBBSNMPTOOLSDIR= ${.CURDIR:H}/libbsnmptools
.endif .endif
LIBBSNMPTOOLS= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a LIBBSNMPTOOLS= ${LIBBSNMPTOOLSDIR}/libbsnmptools.a

2
usr.sbin/camdd/Makefile
View File

@ -2,7 +2,7 @@
PROG= camdd PROG= camdd
SRCS= camdd.c SRCS= camdd.c
SDIR= ${.CURDIR}/../../sys SDIR= ${SRCTOP}/sys
LIBADD= cam mt util pthread LIBADD= cam mt util pthread
NO_WTHREAD_SAFETY= 1 NO_WTHREAD_SAFETY= 1
MAN= camdd.8 MAN= camdd.8

2
usr.sbin/ckdist/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../usr.bin/cksum .PATH: ${SRCTOP}/usr.bin/cksum
PROG= ckdist PROG= ckdist
SRCS= ckdist.c crc.c SRCS= ckdist.c crc.c

2
usr.sbin/cron/crontab/Makefile
View File

@ -10,7 +10,7 @@ PRECIOUSPROG=
WARNS?= 3 WARNS?= 3
CFLAGS+= -I${.CURDIR}/../cron CFLAGS+= -I${.CURDIR:H}/cron
LIBADD= cron md util LIBADD= cron md util

2
usr.sbin/cron/lib/Makefile
View File

@ -6,7 +6,7 @@ SRCS= entry.c env.c misc.c
WARNS?= 3 WARNS?= 3
CFLAGS+= -I${.CURDIR}/../cron CFLAGS+= -I${.CURDIR:H}/cron
CFLAGS+= -DLOGIN_CAP -DPAM CFLAGS+= -DLOGIN_CAP -DPAM
.include <bsd.lib.mk> .include <bsd.lib.mk>

4
usr.sbin/ctladm/Makefile
View File

@ -2,8 +2,8 @@
PROG= ctladm PROG= ctladm
SRCS= ctladm.c util.c ctl_util.c ctl_scsi_all.c SRCS= ctladm.c util.c ctl_util.c ctl_scsi_all.c
.PATH: ${.CURDIR}/../../sys/cam/ctl .PATH: ${SRCTOP}/sys/cam/ctl
SDIR= ${.CURDIR}/../../sys SDIR= ${SRCTOP}/sys
CFLAGS+= -I${SDIR} CFLAGS+= -I${SDIR}
# This is necessary because of these warnings: # This is necessary because of these warnings:
# warning: cast increases required alignment of target type # warning: cast increases required alignment of target type

10
usr.sbin/ctld/Makefile
View File

@ -1,15 +1,15 @@
# $FreeBSD$ # $FreeBSD$
CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include CFLAGS+=-I${SRCTOP}/contrib/libucl/include
.PATH: ${.CURDIR}/../../contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include
PROG= ctld PROG= ctld
SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c SRCS= chap.c ctld.c discovery.c isns.c kernel.c keys.c log.c
SRCS+= login.c parse.y pdu.c token.l y.tab.h uclparse.c SRCS+= login.c parse.y pdu.c token.l y.tab.h uclparse.c
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../sys CFLAGS+= -I${SRCTOP}/sys
CFLAGS+= -I${.CURDIR}/../../sys/cam/ctl CFLAGS+= -I${SRCTOP}/sys/cam/ctl
CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi CFLAGS+= -I${SRCTOP}/sys/dev/iscsi
#CFLAGS+= -DICL_KERNEL_PROXY #CFLAGS+= -DICL_KERNEL_PROXY
MAN= ctld.8 ctl.conf.5 MAN= ctld.8 ctl.conf.5

4
usr.sbin/ctm/Makefile.inc
View File

@ -1,5 +1,5 @@
# $FreeBSD$ # $FreeBSD$
.if exists(${.CURDIR}/../../Makefile.inc) .if exists(${.CURDIR:H:H}/Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR:H:H}/Makefile.inc"
.endif .endif

4
usr.sbin/ctm/ctm/Makefile
View File

@ -18,7 +18,7 @@ LIBADD= md
WARNS?= 2 WARNS?= 2
.if exists(${.CURDIR}/../../Makefile.inc) .if exists(${.CURDIR:H:H}/Makefile.inc)
.include "${.CURDIR}/../../Makefile.inc" .include "${.CURDIR:H:H}/Makefile.inc"
.endif .endif
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.sbin/ctm/ctm_dequeue/Makefile
View File

@ -1,12 +1,12 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../ctm_rmail .PATH: ${.CURDIR:H}/ctm_rmail
PROG= ctm_dequeue PROG= ctm_dequeue
MAN= MAN=
SRCS= ctm_dequeue.c error.c SRCS= ctm_dequeue.c error.c
CFLAGS+= -I${.CURDIR}/../ctm_rmail CFLAGS+= -I${.CURDIR:H}/ctm_rmail
WARNS?= 1 WARNS?= 1

4
usr.sbin/ctm/ctm_smail/Makefile
View File

@ -1,12 +1,12 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../ctm_rmail .PATH: ${.CURDIR:H}/ctm_rmail
PROG= ctm_smail PROG= ctm_smail
MAN= MAN=
SRCS= ctm_smail.c error.c SRCS= ctm_smail.c error.c
CFLAGS+= -I${.CURDIR}/../ctm_rmail CFLAGS+= -I${.CURDIR:H}/ctm_rmail
WARNS?= 2 WARNS?= 2

2
usr.sbin/dconschat/Makefile
View File

@ -3,7 +3,7 @@
PROG= dconschat PROG= dconschat
MAN= dconschat.8 MAN= dconschat.8
CFLAGS+= -I${.CURDIR}/../../sys CFLAGS+= -I${SRCTOP}/sys
LIBADD= kvm LIBADD= kvm

2
usr.sbin/editmap/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/editmap .PATH: ${SENDMAIL_DIR}/editmap
PROG= editmap PROG= editmap

4
usr.sbin/eeprom/Makefile
View File

@ -1,11 +1,11 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../ofwdump .PATH: ${.CURDIR:H}/ofwdump
PROG= eeprom PROG= eeprom
MAN= eeprom.8 MAN= eeprom.8
MANSUBDIR= /sparc64 MANSUBDIR= /sparc64
SRCS= eeprom.c ofw_options.c ofw_util.c SRCS= eeprom.c ofw_options.c ofw_util.c
CFLAGS+= -I${.CURDIR}/../ofwdump CFLAGS+= -I${.CURDIR:H}/ofwdump
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.sbin/fdcontrol/Makefile
View File

@ -1,10 +1,10 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../fdread .PATH: ${.CURDIR:H}/fdread
PROG= fdcontrol PROG= fdcontrol
SRCS= fdcontrol.c fdutil.c SRCS= fdcontrol.c fdutil.c
CFLAGS+= -I${.CURDIR}/../fdread CFLAGS+= -I${.CURDIR:H}/fdread
MAN= fdcontrol.8 MAN= fdcontrol.8
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.sbin/fdformat/Makefile
View File

@ -1,10 +1,10 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../fdread .PATH: ${.CURDIR:H}/fdread
PROG= fdformat PROG= fdformat
SRCS= fdformat.c fdutil.c SRCS= fdformat.c fdutil.c
CFLAGS+= -I${.CURDIR}/../fdread CFLAGS+= -I${.CURDIR:H}/fdread
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/fmtree/Makefile
View File

@ -3,7 +3,7 @@
.include <bsd.own.mk> .include <bsd.own.mk>
.PATH: ${.CURDIR}/../../usr.bin/cksum .PATH: ${SRCTOP}/usr.bin/cksum
PROG= fmtree PROG= fmtree
MAN= fmtree.8 MAN= fmtree.8

2
usr.sbin/fstyp/Makefile
View File

@ -20,7 +20,7 @@ WARNS?= 2
SUBDIR+= tests SUBDIR+= tests
.endif .endif
CFLAGS+=-I${.CURDIR}/../../sys CFLAGS+=-I${SRCTOP}/sys
.if ${MK_ZFS} != "no" .if ${MK_ZFS} != "no"
IGNORE_PRAGMA= YES IGNORE_PRAGMA= YES

4
usr.sbin/ftp-proxy/Makefile
View File

@ -1,13 +1,13 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/pf/ftp-proxy .PATH: ${SRCTOP}/contrib/pf/ftp-proxy
PROG= ftp-proxy PROG= ftp-proxy
MAN= ftp-proxy.8 MAN= ftp-proxy.8
SRCS= ftp-proxy.c filter.c SRCS= ftp-proxy.c filter.c
CFLAGS+=-I${.CURDIR}/../../contrib/pf/libevent CFLAGS+=-I${SRCTOP}/contrib/pf/libevent
LIBADD= event LIBADD= event

4
usr.sbin/fwcontrol/Makefile
View File

@ -5,9 +5,9 @@ SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpegts.c
MAN= fwcontrol.8 MAN= fwcontrol.8
WARNS?= 3 WARNS?= 3
.PATH: ${.CURDIR}/../../sys/dev/firewire .PATH: ${SRCTOP}/sys/dev/firewire
SDIR= ${.CURDIR}/../../sys SDIR= ${SRCTOP}/sys
CFLAGS+=-I${.CURDIR} -I${SDIR} CFLAGS+=-I${.CURDIR} -I${SDIR}
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/gpioctl/Makefile
View File

@ -3,7 +3,7 @@
PROG= gpioctl PROG= gpioctl
MAN= gpioctl.8 MAN= gpioctl.8
CFLAGS+= -I${.CURDIR}/../../lib/libgpio CFLAGS+= -I${SRCTOP}/lib/libgpio
LIBADD= gpio LIBADD= gpio

4
usr.sbin/gssd/Makefile
View File

@ -18,7 +18,7 @@ CFLAGS+= -DWITHOUT_KERBEROS
CLEANFILES= gssd_svc.c gssd_xdr.c gssd.h CLEANFILES= gssd_svc.c gssd_xdr.c gssd.h
RPCSRC= ${.CURDIR}/../../sys/kgssapi/gssd.x RPCSRC= ${SRCTOP}/sys/kgssapi/gssd.x
RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C -M RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C -M
gssd_svc.c: ${RPCSRC} gssd.h gssd_svc.c: ${RPCSRC} gssd.h
@ -30,6 +30,6 @@ gssd_xdr.c: ${RPCSRC} gssd.h
gssd.h: ${RPCSRC} gssd.h: ${RPCSRC}
${RPCGEN} -h -o ${.TARGET} ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${RPCSRC}
.PATH: ${.CURDIR}/../../sys/kgssapi .PATH: ${SRCTOP}/sys/kgssapi
.include <bsd.prog.mk> .include <bsd.prog.mk>

8
usr.sbin/hyperv/tools/kvp/Makefile
View File

@ -2,12 +2,12 @@
.include <bsd.own.mk> .include <bsd.own.mk>
HV_KVP_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools HV_KVP_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools
.PATH: ${HV_KVP_DAEMON_DISTDIR} .PATH: ${HV_KVP_DAEMON_DISTDIR}
PROG= hv_kvp_daemon PROG= hv_kvp_daemon
MAN= hv_kvp_daemon.8 MAN= hv_kvp_daemon.8
CFLAGS+= -I${.CURDIR}/../../../../sys/dev/hyperv/utilities CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/utilities
.include <bsd.prog.mk> .include <bsd.prog.mk>

8
usr.sbin/hyperv/tools/vss/Makefile
View File

@ -3,12 +3,12 @@ DIRDEPS = lib/libc
.include <bsd.own.mk> .include <bsd.own.mk>
HV_VSS_DAEMON_DISTDIR?= ${.CURDIR}/../../../../contrib/hyperv/tools HV_VSS_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools
.PATH: ${HV_VSS_DAEMON_DISTDIR} .PATH: ${HV_VSS_DAEMON_DISTDIR}
PROG= hv_vss_daemon PROG= hv_vss_daemon
MAN= hv_vss_daemon.8 MAN= hv_vss_daemon.8
CFLAGS+= -I${.CURDIR}/../../../../sys/dev/hyperv/utilities CFLAGS+= -I${SRCTOP}/sys/dev/hyperv/utilities
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/iovctl/Makefile
View File

@ -4,7 +4,7 @@ PROG= iovctl
SRCS= iovctl.c parse.c validate.c SRCS= iovctl.c parse.c validate.c
LIBADD= nv ucl m LIBADD= nv ucl m
CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include CFLAGS+=-I${SRCTOP}/contrib/libucl/include
WARNS?=6 WARNS?=6

2
usr.sbin/ipfwpcap/Makefile
View File

@ -7,7 +7,7 @@
PROG= ipfwpcap PROG= ipfwpcap
LIBADD= pcap LIBADD= pcap
CFLAGS+=-I${.CURDIR}/../../contrib/libpcap CFLAGS+=-I${SRCTOP}/contrib/libpcap
MAN= ipfwpcap.8 MAN= ipfwpcap.8

4
usr.sbin/iscsid/Makefile
View File

@ -4,8 +4,8 @@ PACKAGE= iscsi
PROG= iscsid PROG= iscsid
SRCS= chap.c discovery.c iscsid.c keys.c log.c login.c pdu.c SRCS= chap.c discovery.c iscsid.c keys.c log.c login.c pdu.c
CFLAGS+= -I${.CURDIR} CFLAGS+= -I${.CURDIR}
CFLAGS+= -I${.CURDIR}/../../sys/cam CFLAGS+= -I${SRCTOP}/sys/cam
CFLAGS+= -I${.CURDIR}/../../sys/dev/iscsi CFLAGS+= -I${SRCTOP}/sys/dev/iscsi
CFLAGS+= -DICL_KERNEL_PROXY CFLAGS+= -DICL_KERNEL_PROXY
MAN= iscsid.8 MAN= iscsid.8

2
usr.sbin/mailstats/Makefile
View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96 # @(#)Makefile 8.2 (Berkeley) 9/21/96
# $FreeBSD$ # $FreeBSD$
SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mailstats .PATH: ${SENDMAIL_DIR}/mailstats
PROG= mailstats PROG= mailstats

2
usr.sbin/mailwrapper/Makefile
View File

@ -27,7 +27,7 @@ SYMLINKS+= ${BINDIR}/mailwrapper /bin/rmail
.if ${MK_MAILWRAPPER} != "no" .if ${MK_MAILWRAPPER} != "no"
.if !exists(${DESTDIR}/etc/mail/mailer.conf) .if !exists(${DESTDIR}/etc/mail/mailer.conf)
FILES= ${.CURDIR}/../../etc/mail/mailer.conf FILES= ${SRCTOP}/etc/mail/mailer.conf
FILESDIR= /etc/mail FILESDIR= /etc/mail
FILESMODE= 644 FILESMODE= 644
.endif .endif

2
usr.sbin/makemap/Makefile
View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.4 (Berkeley) 6/10/97 # @(#)Makefile 8.4 (Berkeley) 6/10/97
# $FreeBSD$ # $FreeBSD$
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/makemap .PATH: ${SENDMAIL_DIR}/makemap
PROG= makemap PROG= makemap

2
usr.sbin/mlxcontrol/Makefile
View File

@ -4,7 +4,7 @@ PROG= mlxcontrol
MAN= mlxcontrol.8 MAN= mlxcontrol.8
SRCS= command.c config.c interface.c util.c SRCS= command.c config.c interface.c util.c
CFLAGS+= -I${.CURDIR}/../../sys CFLAGS+= -I${SRCTOP}/sys
WARNS?= 2 WARNS?= 2

4
usr.sbin/mount_smbfs/Makefile
View File

@ -4,8 +4,8 @@ PROG= mount_smbfs
SRCS= mount_smbfs.c getmntopts.c SRCS= mount_smbfs.c getmntopts.c
MAN= mount_smbfs.8 MAN= mount_smbfs.8
MOUNTDIR= ${.CURDIR}/../../sbin/mount MOUNTDIR= ${SRCTOP}/sbin/mount
CONTRIBDIR= ${.CURDIR}/../../contrib/smbfs CONTRIBDIR= ${SRCTOP}/contrib/smbfs
CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include CFLAGS+= -DSMBFS -I${MOUNTDIR} -I${CONTRIBDIR}/include
LIBADD= smb LIBADD= smb

2
usr.sbin/mountd/Makefile
View File

@ -5,7 +5,7 @@ PROG= mountd
SRCS= mountd.c getmntopts.c SRCS= mountd.c getmntopts.c
MAN= exports.5 netgroup.5 mountd.8 MAN= exports.5 netgroup.5 mountd.8
MOUNT= ${.CURDIR}/../../sbin/mount MOUNT= ${SRCTOP}/sbin/mount
CFLAGS+= -I${MOUNT} CFLAGS+= -I${MOUNT}
WARNS?= 2 WARNS?= 2

2
usr.sbin/mpsutil/Makefile
View File

@ -10,7 +10,7 @@ WARNS?= 3
LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil LINKS= ${BINDIR}/mpsutil ${BINDIR}/mprutil
MLINKS= mpsutil.8 mprutil.8 MLINKS= mpsutil.8 mprutil.8
CFLAGS+= -I${.CURDIR}/../../sys -I. -DUSE_MPT_IOCTLS CFLAGS+= -I${SRCTOP}/sys -I. -DUSE_MPT_IOCTLS
# Avoid dirdep dependency on libutil # Avoid dirdep dependency on libutil
CFLAGS+= -I${SRCTOP}/lib/libutil CFLAGS+= -I${SRCTOP}/lib/libutil

4
usr.sbin/ndiscvt/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../sys/compat/ndis .PATH: ${SRCTOP}/sys/compat/ndis
PROG= ndiscvt PROG= ndiscvt
SRCS= ndiscvt.c SRCS= ndiscvt.c
@ -17,7 +17,7 @@ LIBADD= l
YFLAGS+=-v YFLAGS+=-v
CFLAGS+=-I. -I${.CURDIR} -I${.CURDIR}/../../sys CFLAGS+=-I. -I${.CURDIR} -I${SRCTOP}/sys
CLEANFILES= y.output CLEANFILES= y.output

4
usr.sbin/ndp/Makefile
View File

@ -13,13 +13,13 @@
# A PARTICULAR PURPOSE. # A PARTICULAR PURPOSE.
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/tcpdump .PATH: ${SRCTOP}/contrib/tcpdump
PROG= ndp PROG= ndp
MAN= ndp.8 MAN= ndp.8
SRCS= ndp.c gmt2local.c SRCS= ndp.c gmt2local.c
CFLAGS+= -I. -I${.CURDIR} -I${.CURDIR}/../../contrib/tcpdump CFLAGS+= -I. -I${.CURDIR} -I${SRCTOP}/contrib/tcpdump
CFLAGS+= -D_U_="" CFLAGS+= -D_U_=""
WARNS?= 1 WARNS?= 1

8
usr.sbin/nmtree/Makefile
View File

@ -2,18 +2,18 @@
.include <src.opts.mk> .include <src.opts.mk>
.PATH: ${.CURDIR}/../../contrib/mtree .PATH: ${SRCTOP}/contrib/mtree
PROG= mtree PROG= mtree
MAN= mtree.5 mtree.8 MAN= mtree.5 mtree.8
SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \ SRCS= compare.c crc.c create.c excludes.c getid.c misc.c mtree.c \
only.c spec.c specspec.c verify.c only.c spec.c specspec.c verify.c
CFLAGS+= -I${.CURDIR}/../../contrib/mknod CFLAGS+= -I${SRCTOP}/contrib/mknod
.PATH: ${.CURDIR}/../../contrib/mknod .PATH: ${SRCTOP}/contrib/mknod
SRCS+= pack_dev.c SRCS+= pack_dev.c
CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd CFLAGS+= -I${SRCTOP}/lib/libnetbsd
LIBADD= netbsd md util LIBADD= netbsd md util
LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree LINKS= ${BINDIR}/mtree ${BINDIR}/nmtree

4
usr.sbin/pkg/Makefile
View File

@ -4,8 +4,8 @@ PROG= pkg
SRCS= pkg.c dns_utils.c config.c SRCS= pkg.c dns_utils.c config.c
MAN= pkg.7 MAN= pkg.7
CFLAGS+=-I${.CURDIR}/../../contrib/libucl/include CFLAGS+=-I${SRCTOP}/contrib/libucl/include
.PATH: ${.CURDIR}/../../contrib/libucl/include .PATH: ${SRCTOP}/contrib/libucl/include
LIBADD= archive fetch ucl sbuf crypto ssl LIBADD= archive fetch ucl sbuf crypto ssl
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
usr.sbin/pnpinfo/Makefile
View File

@ -1,11 +1,11 @@
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../contrib/pnpinfo .PATH: ${SRCTOP}/contrib/pnpinfo
PROG= pnpinfo PROG= pnpinfo
MAN= pnpinfo.8 MAN= pnpinfo.8
CFLAGS+= -I${.CURDIR}/../../sys CFLAGS+= -I${SRCTOP}/sys
WARNS?= 2 WARNS?= 2

2
usr.sbin/praliases/Makefile
View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.2 (Berkeley) 9/21/96 # @(#)Makefile 8.2 (Berkeley) 9/21/96
# $FreeBSD$ # $FreeBSD$
SENDMAIL_DIR= ${.CURDIR}/../../contrib/sendmail SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail
.PATH: ${SENDMAIL_DIR}/praliases .PATH: ${SENDMAIL_DIR}/praliases
PROG= praliases PROG= praliases

2
usr.sbin/praudit/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
# #
OPENBSMDIR=${.CURDIR}/../../contrib/openbsm OPENBSMDIR=${SRCTOP}/contrib/openbsm
.PATH: ${OPENBSMDIR}/bin/praudit .PATH: ${OPENBSMDIR}/bin/praudit
PROG= praudit PROG= praudit

4
usr.sbin/pwd_mkdb/Makefile
View File

@ -1,12 +1,12 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../../lib/libc/gen # for pw_scan.c .PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c
PROG= pwd_mkdb PROG= pwd_mkdb
MAN= pwd_mkdb.8 MAN= pwd_mkdb.8
SRCS= pw_scan.c pwd_mkdb.c SRCS= pw_scan.c pwd_mkdb.c
CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h CFLAGS+= -I${SRCTOP}/lib/libc/gen # for pw_scan.h
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/rip6query/Makefile
View File

@ -4,6 +4,6 @@
PROG= rip6query PROG= rip6query
MAN= rip6query.8 MAN= rip6query.8
CFLAGS+= -I${.CURDIR}/../route6d CFLAGS+= -I${.CURDIR:H}/route6d
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/rpcbind/tests/Makefile
View File

@ -5,7 +5,7 @@
.PATH: ${.CURDIR}/.. .PATH: ${.CURDIR}/..
ATF_TESTS_C= addrmerge_test ATF_TESTS_C= addrmerge_test
CFLAGS+= -I${.CURDIR}/.. -Wno-cast-qual CFLAGS+= -I${.CURDIR:H} -Wno-cast-qual
SRCS.addrmerge_test= addrmerge_test.c util.c SRCS.addrmerge_test= addrmerge_test.c util.c
.if ${MK_INET6_SUPPORT} != "no" .if ${MK_INET6_SUPPORT} != "no"

4
usr.sbin/rtadvctl/Makefile
View File

@ -1,13 +1,13 @@
# $FreeBSD$ # $FreeBSD$
# #
.PATH: ${.CURDIR}/../rtadvd .PATH: ${.CURDIR:H}/rtadvd
PROG= rtadvctl PROG= rtadvctl
MAN= rtadvctl.8 MAN= rtadvctl.8
SRCS= rtadvctl.c control.c control_client.c if.c timer_subr.c SRCS= rtadvctl.c control.c control_client.c if.c timer_subr.c
CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../rtadvd CFLAGS+= -I${.CURDIR} -I${.CURDIR:H}/rtadvd
WARNS?= 1 WARNS?= 1
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.sbin/sa/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk> .include <src.opts.mk>
.PATH: ${.CURDIR}/../../usr.bin/lastcomm .PATH: ${SRCTOP}/usr.bin/lastcomm
PROG= sa PROG= sa
MAN= sa.8 MAN= sa.8

4
usr.sbin/sendmail/Makefile
View File

@ -4,14 +4,14 @@
.include <src.opts.mk> .include <src.opts.mk>
PACKAGE=sendmail PACKAGE=sendmail
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail
SMDIR= ${SENDMAIL_DIR}/src SMDIR= ${SENDMAIL_DIR}/src
.PATH: ${SMDIR} .PATH: ${SMDIR}
BINDIR= ${LIBEXECDIR}/sendmail BINDIR= ${LIBEXECDIR}/sendmail
PROG= sendmail PROG= sendmail
MAN= mailq.1 newaliases.1 aliases.5 sendmail.8 MAN= mailq.1 newaliases.1 aliases.5 sendmail.8
MLINKS+=sendmail.8 hoststat.8 MLINKS+=sendmail.8 hoststat.8
MLINKS+=sendmail.8 purgestat.8 MLINKS+=sendmail.8 purgestat.8
SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \ SRCS= alias.c arpadate.c bf.c collect.c conf.c control.c \

2
usr.sbin/tcpdump/tcpdump/Makefile
View File

@ -2,7 +2,7 @@
.include <src.opts.mk> .include <src.opts.mk>
TCPDUMP_DISTDIR?= ${.CURDIR}/../../../contrib/tcpdump TCPDUMP_DISTDIR?= ${SRCTOP}/contrib/tcpdump
.PATH: ${TCPDUMP_DISTDIR} .PATH: ${TCPDUMP_DISTDIR}
PROG= tcpdump PROG= tcpdump

2
usr.sbin/timed/timedc/Makefile
View File

@ -1,7 +1,7 @@
# @(#)Makefile 8.1 (Berkeley) 6/6/93 # @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$ # $FreeBSD$
.PATH: ${.CURDIR}/../timed .PATH: ${.CURDIR:H}/timed
PROG= timedc PROG= timedc
MAN= timedc.8 MAN= timedc.8