diff options
73 files changed, 129 insertions, 114 deletions
diff --git a/usr.sbin/amd/Makefile.inc b/usr.sbin/amd/Makefile.inc index fb29b81b489d..dd65ed3a8029 100644 --- a/usr.sbin/amd/Makefile.inc +++ b/usr.sbin/amd/Makefile.inc @@ -31,7 +31,6 @@ RPCCOM= rpcgen MOUNT_X= ${DESTDIR}/usr/include/rpcsvc/mount.x NFS_PROT_X= ${DESTDIR}/usr/include/rpcsvc/nfs_prot.x - .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" .endif diff --git a/usr.sbin/ancontrol/Makefile b/usr.sbin/ancontrol/Makefile index f5a89afde14e..8181a0809c79 100644 --- a/usr.sbin/ancontrol/Makefile +++ b/usr.sbin/ancontrol/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -PROG= ancontrol -MAN= ancontrol.8 +PROG= ancontrol +MAN= ancontrol.8 -CFLAGS+= -I${.CURDIR}/../../sys -DANCACHE -DPADD= ${LIBMD} -LDADD= -lmd +WARNS?= 2 +CFLAGS+= -DANCACHE -I${.CURDIR}/../../sys -WARNS?= 2 +DPADD= ${LIBMD} +LDADD= -lmd .include <bsd.prog.mk> diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index 5ab8df17ab90..c9f283de6644 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PROG= apm -LINKS= ${BINDIR}/apm ${BINDIR}/zzz -MAN= apm.8 -MLINKS= apm.8 apmconf.8 apm.8 zzz.8 +PROG= apm +LINKS= ${BINDIR}/apm ${BINDIR}/zzz +MAN= apm.8 +MLINKS= apm.8 apmconf.8 apm.8 zzz.8 .include <bsd.prog.mk> diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile index 474886a29b4f..cb8d236e6b04 100644 --- a/usr.sbin/arp/Makefile +++ b/usr.sbin/arp/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= arp -WARNS?= 2 MAN= arp.4 arp.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile index ed5f5f6ff8eb..3f87438a35a5 100644 --- a/usr.sbin/boot0cfg/Makefile +++ b/usr.sbin/boot0cfg/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= boot0cfg -WARNS?= 2 MAN= boot0cfg.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index 0f4d993cc220..40addadc52ef 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ PROG= cdcontrol + WARNS?= 2 DPADD= ${LIBEDIT} ${LIBTERMCAP} diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 10dec2ca561d..017ed610a937 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -3,7 +3,8 @@ PROG= chown LINKS= ${BINDIR}/chown /usr/bin/chgrp -WARNS?= 2 MAN= chgrp.1 chown.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile index d83dfa2917da..d28de6668e26 100644 --- a/usr.sbin/chroot/Makefile +++ b/usr.sbin/chroot/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= chroot -WARNS?= 2 MAN= chroot.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/ctm/ctm/Makefile b/usr.sbin/ctm/ctm/Makefile index 00140dedf180..c0cf79a64d92 100644 --- a/usr.sbin/ctm/ctm/Makefile +++ b/usr.sbin/ctm/ctm/Makefile @@ -7,15 +7,15 @@ # # $FreeBSD$ -PROG= ctm -MAN= ctm.1 ctm.5 -SRCS= ctm.c ctm_input.c ctm_pass1.c ctm_pass2.c ctm_pass3.c \ - ctm_passb.c ctm_syntax.c ctm_ed.c +PROG= ctm +MAN= ctm.1 ctm.5 +SRCS= ctm.c ctm_input.c ctm_pass1.c ctm_pass2.c ctm_pass3.c \ + ctm_passb.c ctm_syntax.c ctm_ed.c -NOTYET= ctm_ed.c +NOTYET= ctm_ed.c -LDADD= -lmd -DPADD= ${LIBMD} +LDADD= -lmd +DPADD= ${LIBMD} .if exists(${.CURDIR}/../../Makefile.inc) .include "${.CURDIR}/../../Makefile.inc" diff --git a/usr.sbin/ctm/ctm_rmail/Makefile b/usr.sbin/ctm/ctm_rmail/Makefile index 9c7453e261ec..e2052b9228c7 100644 --- a/usr.sbin/ctm/ctm_rmail/Makefile +++ b/usr.sbin/ctm/ctm_rmail/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ -PROG= ctm_rmail -SRCS= ctm_rmail.c error.c -MLINKS+= ctm_rmail.1 ctm_smail.1 -MLINKS+= ctm_rmail.1 ctm_dequeue.1 +PROG= ctm_rmail +MLINKS= ctm_rmail.1 ctm_smail.1 \ + ctm_rmail.1 ctm_dequeue.1 +SRCS= ctm_rmail.c error.c .include <bsd.prog.mk> diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile index 1ec255d76f2d..6bf5aebce90e 100644 --- a/usr.sbin/ctm/mkCTM/Makefile +++ b/usr.sbin/ctm/mkCTM/Makefile @@ -4,6 +4,7 @@ PROG= mkctm NOMAN= 1 SRCS= mkctm.c +DPADD= ${LIBMD} LDADD= -lmd test: mkctm diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile index ab9f706ffd85..34803934d623 100644 --- a/usr.sbin/daemon/Makefile +++ b/usr.sbin/daemon/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= daemon -WARNS?= 2 MAN= daemon.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/digictl/Makefile b/usr.sbin/digictl/Makefile index 750a2537d7f1..029dfee11e53 100644 --- a/usr.sbin/digictl/Makefile +++ b/usr.sbin/digictl/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= digictl -WARNS?= 2 MAN= digictl.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile index 1bace7bc8479..e5a3b12559aa 100644 --- a/usr.sbin/edquota/Makefile +++ b/usr.sbin/edquota/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= edquota -WARNS?= 4 MAN= edquota.8 +WARNS?= 4 + .include <bsd.prog.mk> diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile index 52142afa573b..5eb1945d3b94 100644 --- a/usr.sbin/extattrctl/Makefile +++ b/usr.sbin/extattrctl/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= extattrctl -WARNS?= 2 MAN= extattrctl.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile index 38f9a1ed3bb0..32196b78fbd1 100644 --- a/usr.sbin/fdcontrol/Makefile +++ b/usr.sbin/fdcontrol/Makefile @@ -1,12 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../fdread +.PATH: ${.CURDIR}/../fdread PROG= fdcontrol SRCS= fdcontrol.c fdutil.c MAN= fdcontrol.8 WARNS?= 2 -CFLAGS+= -I${.CURDIR}/../fdread +CFLAGS+= -I${.CURDIR}/../fdread .include <bsd.prog.mk> diff --git a/usr.sbin/i4b/isdnd/Makefile b/usr.sbin/i4b/isdnd/Makefile index 9ef7e032e64a..644df2fac3e1 100644 --- a/usr.sbin/i4b/isdnd/Makefile +++ b/usr.sbin/i4b/isdnd/Makefile @@ -7,14 +7,14 @@ SRCS= rc_parse.y rc_scan.l main.c rc_config.c log.c curses.c \ exec.c dial.c monitor.c pcause.c controller.c alias.c \ y.tab.h holiday.c -COPTS+= -I. -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.CURDIR} - # compile debug support COPTS+= -DDEBUG # enable rtprio usage COPTS+= -DUSE_RTPRIO +COPTS+= -I. -I${.CURDIR}/../isdnmonitor -I${.CURDIR}/../isdntel -I${.CURDIR} + .include "${.CURDIR}/../Makefile.inc" .if !defined(I4B_WITHOUT_CURSES) diff --git a/usr.sbin/i4b/isdnmonitor/Makefile b/usr.sbin/i4b/isdnmonitor/Makefile index 84f5c160c88a..7be43b91c7e7 100644 --- a/usr.sbin/i4b/isdnmonitor/Makefile +++ b/usr.sbin/i4b/isdnmonitor/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PROG= isdnmonitor -SRCS= main.c curses.c MAN= isdnmonitor.8 +SRCS= main.c curses.c # compile debug support COPTS+= -DDEBUG diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile index bda9b68a756d..4d6cc888fc8a 100644 --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -5,7 +5,7 @@ PROG= ifmcstat MAN= ifmcstat.8 BINMODE= 550 -LDADD= -lkvm DPADD= ${LIBKVM} +LDADD= -lkvm .include <bsd.prog.mk> diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile index 002a250898d3..bf9eb8a7d5e6 100644 --- a/usr.sbin/iostat/Makefile +++ b/usr.sbin/iostat/Makefile @@ -4,8 +4,9 @@ MAINTAINER= ken@FreeBSD.ORG PROG= iostat +MAN= iostat.8 + DPADD= ${LIBKVM} ${LIBDEVSTAT} ${LIBM} LDADD= -lkvm -ldevstat -lm -MAN= iostat.8 .include <bsd.prog.mk> diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile index e7088a7eb1a5..ca1b6e697bd4 100644 --- a/usr.sbin/kbdcontrol/Makefile +++ b/usr.sbin/kbdcontrol/Makefile @@ -5,11 +5,10 @@ MAN= kbdcontrol.1 kbdmap.5 MLINKS= kbdmap.5 keymap.5 SRCS= kbdcontrol.c lex.l +WARNS?= 4 CFLAGS+= -I${.CURDIR} DPADD= ${LIBL} LDADD= -ll -WARNS?= 4 - .include <bsd.prog.mk> diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile index e7fa5c8ba073..c270085f420b 100644 --- a/usr.sbin/kldxref/Makefile +++ b/usr.sbin/kldxref/Makefile @@ -1,9 +1,10 @@ # $FreeBSD$ PROG= kldxref +MAN= kldxref.8 SRCS= kldxref.c ef.c + WARNS?= 2 -MAN= kldxref.8 .if exists(ef_${MACHINE_ARCH}.c) SRCS+= ef_${MACHINE_ARCH}.c diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index 92d9dd91085a..b4a6482dd6e5 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -2,8 +2,8 @@ MAINTAINER= dougb@FreeBSD.org -SCRIPTS= mergemaster.sh -MAN= mergemaster.8 +SCRIPTS=mergemaster.sh +MAN= mergemaster.8 .include <bsd.prog.mk> diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile index 04cd28f0fddc..d9b363b2a6f2 100644 --- a/usr.sbin/mountd/Makefile +++ b/usr.sbin/mountd/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= mountd -WARNS= 0 MAN= exports.5 netgroup.5 mountd.8 +WARNS?= 0 + .include <bsd.prog.mk> diff --git a/usr.sbin/mrouted/map-mbone/Makefile b/usr.sbin/mrouted/map-mbone/Makefile index f99247b62500..2b642708bda8 100644 --- a/usr.sbin/mrouted/map-mbone/Makefile +++ b/usr.sbin/mrouted/map-mbone/Makefile @@ -10,6 +10,6 @@ SRCS= mapper.c CFLAGS+= -I$S DPADD= ${LIBMROUTED} -LDADD= ${LIBMROUTED} +LDADD= ../common/libmrouted.a .include <bsd.prog.mk> diff --git a/usr.sbin/mrouted/mrinfo/Makefile b/usr.sbin/mrouted/mrinfo/Makefile index f111aa981663..3fcb4f9d06c4 100644 --- a/usr.sbin/mrouted/mrinfo/Makefile +++ b/usr.sbin/mrouted/mrinfo/Makefile @@ -11,6 +11,6 @@ BINMODE= 4555 CFLAGS+= -I$S DPADD= ${LIBMROUTED} -LDADD= ${LIBMROUTED} +LDADD= ../common/libmrouted.a .include <bsd.prog.mk> diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index 5dda83436325..5bd825cdfe1b 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -3,8 +3,7 @@ USE_LIBBIND= true .include "${.CURDIR}/Makefile.inc" -.PATH: ${BIND_DIR}/bin/named -.PATH: ${BIND_DIR}/doc/man +.PATH: ${BIND_DIR}/bin/named ${BIND_DIR}/doc/man PROG= named MAN= named.conf.5 named.8 named-bootconf.8 nsupdate.8 @@ -18,14 +17,14 @@ SRCS= tmp_version.c pathnames.h \ ns_sort.c ns_notify.c .if exists(${.OBJDIR}/../../lib/libisc) -LIBISCDIR:= ${.OBJDIR}/../../lib/libisc +LIBISCDIR:= ${.OBJDIR}/../../lib/libisc .else -LIBISCDIR!= cd ${.CURDIR}/../../lib/libisc; make -V .OBJDIR +LIBISCDIR!= cd ${.CURDIR}/../../lib/libisc; make -V .OBJDIR .endif -LIBISC:= ${LIBISCDIR}/libisc.a +LIBISC:= ${LIBISCDIR}/libisc.a -DPADD+= ${LIBISC} -LDADD+= ${LIBISC} +DPADD+= ${LIBISC} +LDADD+= -lisc HTMLS= acl.html address_list.html comments.html config.html controls.html \ docdef.html example.html include.html index.html key.html \ diff --git a/usr.sbin/named/Makefile.inc b/usr.sbin/named/Makefile.inc index 27b8c40aab66..30e1d2a11de1 100644 --- a/usr.sbin/named/Makefile.inc +++ b/usr.sbin/named/Makefile.inc @@ -55,5 +55,5 @@ pathnames.h: ${BIND_DIR}/bin/named/pathtemplate.h \ .endif -.include "Makefile.maninc" +.include "Makefile.maninc" .endif diff --git a/usr.sbin/ndc/Makefile b/usr.sbin/ndc/Makefile index 99f978485297..daed12a6a291 100644 --- a/usr.sbin/ndc/Makefile +++ b/usr.sbin/ndc/Makefile @@ -3,8 +3,7 @@ USE_LIBBIND= true .include "${.CURDIR}/../named/Makefile.inc" -.PATH: ${BIND_DIR}/bin/ndc -.PATH: ${BIND_DIR}/doc/man +.PATH: ${BIND_DIR}/bin/ndc ${BIND_DIR}/doc/man PROG= ndc MAN= ndc.8 diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile index e43192ac8e25..5a7fe974cf8d 100644 --- a/usr.sbin/nfsd/Makefile +++ b/usr.sbin/nfsd/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= nfsd -WARNS= 0 MAN= nfsd.8 +WARNS?= 0 + .include <bsd.prog.mk> diff --git a/usr.sbin/nslookup/Makefile b/usr.sbin/nslookup/Makefile index 0ed4fc24b2af..788b18f644d6 100644 --- a/usr.sbin/nslookup/Makefile +++ b/usr.sbin/nslookup/Makefile @@ -3,8 +3,7 @@ USE_LIBBIND= yes .include "${.CURDIR}/../named/Makefile.inc" -.PATH: ${BIND_DIR}/bin/nslookup -.PATH: ${BIND_DIR}/doc/man +.PATH: ${BIND_DIR}/bin/nslookup ${BIND_DIR}/doc/man PROG= nslookup MAN= nslookup.8 @@ -13,8 +12,8 @@ SRCS= main.c getinfo.c debug.c send.c skip.c list.c subr.c commands.l CFLAGS+= -D_PATH_HELPFILE=\"${DESTHELP}/nslookup.help\" CFLAGS+= -I${.CURDIR}/../../contrib/bind/bin/nslookup -LDADD+= -ll -ledit -ltermcap DPADD+= ${LIBL} ${LIBEDIT} ${LIBTERMCAP} +LDADD+= -ll -ledit -ltermcap FILES= nslookup.help FILESDIR= ${DESTHELP} diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index d4101a9e5570..37ef176f3aa9 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -3,20 +3,20 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/libntp LIB= ntp -INTERNALLIB= true +INTERNALLIB= true SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c \ - atouint.c audio.c authencrypt.c authkeys.c \ + atouint.c audio.c authencrypt.c authkeys.c \ authparity.c authreadkeys.c authusekey.c binio.c \ buftvtots.c caljulian.c calleapwhen.c caltontp.c \ calyearstart.c clocktime.c clocktypes.c decodenetnum.c \ dofptoa.c dolfptoa.c emalloc.c findconfig.c \ - fptoa.c fptoms.c getopt.c gpstolfp.c \ + fptoa.c fptoms.c getopt.c gpstolfp.c \ hextoint.c hextolfp.c humandate.c icom.c \ ieee754io.c inttoa.c iosignal.c lib_strbuf.c \ - machines.c md5c.c memmove.c mfp_mul.c \ + machines.c md5c.c memmove.c mfp_mul.c \ mfptoa.c mfptoms.c modetoa.c mstolfp.c \ - msutotsf.c msyslog.c netof.c numtoa.c \ + msutotsf.c msyslog.c netof.c numtoa.c \ numtohost.c octtoint.c prettydate.c ranny.c \ recvbuff.c refnumtoa.c statestr.c syssignal.c \ systime.c tsftomsu.c tstotv.c tvtoa.c \ diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index 6176726be842..10b97965792b 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -3,12 +3,12 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/libparse LIB= parse -INTERNALLIB= true +INTERNALLIB= true SRCS= clk_computime.c clk_dcf7000.c clk_hopf6021.c clk_meinberg.c \ clk_rawdcf.c clk_rcc8000.c clk_schmid.c clk_trimtaip.c \ clk_trimtsip.c clk_varitext.c clk_wharton.c data_mbg.c \ - info_trimble.c parse.c parse_conf.c trim_info.c + info_trimble.c parse.c parse_conf.c trim_info.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntp-genkeys/Makefile b/usr.sbin/ntp/ntp-genkeys/Makefile index 7a60029dc959..10a81068bdaf 100644 --- a/usr.sbin/ntp/ntp-genkeys/Makefile +++ b/usr.sbin/ntp/ntp-genkeys/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../../contrib/ntp/util \ - ${.CURDIR}/../../../contrib/ntp/ntpd +.PATH: ${.CURDIR}/../../../contrib/ntp/util \ + ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntp-genkeys NOMAN= yes diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index 495b697ad2ef..fc9785674584 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -28,7 +28,7 @@ SRCS= cmd_args.c map_vme.c ntp_config.c \ CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ -DPADD= ${LIBPARSE} ${LIBNTP} -lm +DPADD= ${LIBPARSE} ${LIBNTP} ${LIBM} LDADD= ${LIBPARSE} ${LIBNTP} -lm CLEANFILES+= .version version.c diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile index 4cbc3e051865..44959bb91fb1 100644 --- a/usr.sbin/ofwdump/Makefile +++ b/usr.sbin/ofwdump/Makefile @@ -3,6 +3,7 @@ PROG= ofwdump MAN= ofwdump.8 SRCS= ofwdump.c ofw_util.c + WARNS?= 5 .include <bsd.prog.mk> diff --git a/usr.sbin/pccard/pccardc/Makefile b/usr.sbin/pccard/pccardc/Makefile index aa833b1017da..d0649a2dc42c 100644 --- a/usr.sbin/pccard/pccardc/Makefile +++ b/usr.sbin/pccard/pccardc/Makefile @@ -2,6 +2,8 @@ # # $FreeBSD$ +.PATH: ${.CURDIR}/../pccardd + PROG= pccardc MAN= pccardc.8 SRCS= beep.c dumpcis.c dumpcisfile.c enabler.c pccardc.c pccardmem.c power.c \ @@ -10,4 +12,3 @@ SRCS= beep.c dumpcis.c dumpcisfile.c enabler.c pccardc.c pccardmem.c power.c \ CFLAGS+= -I${.CURDIR}/../pccardd .include <bsd.prog.mk> -.PATH: ${.CURDIR}/../pccardd diff --git a/usr.sbin/pccard/pccardd/Makefile b/usr.sbin/pccard/pccardd/Makefile index 0fb8c6e9b0a5..b7fae27df8bc 100644 --- a/usr.sbin/pccard/pccardd/Makefile +++ b/usr.sbin/pccard/pccardd/Makefile @@ -1,6 +1,8 @@ # Makefile for pccardd # $FreeBSD$ +.PATH: ${.CURDIR}/../pccardc + PROG= pccardd MAN= pccard.conf.5 pccardd.8 SRCS= pccardd.c cardd.c file.c util.c readcis.c printcis.c server.c @@ -11,4 +13,3 @@ DPADD= ${LIBUTIL} LDADD= -lutil .include <bsd.prog.mk> -.PATH: ${.CURDIR}/../pccardc diff --git a/usr.sbin/pcvt/kcon/Makefile b/usr.sbin/pcvt/kcon/Makefile index 61c273f272f8..564cd847b4c3 100644 --- a/usr.sbin/pcvt/kcon/Makefile +++ b/usr.sbin/pcvt/kcon/Makefile @@ -2,7 +2,9 @@ PROG= kcon DEVICE= /dev/ttyv0 + CFLAGS+= -I${.CURDIR}/../keycap -DKEYB_DEVICE=\"${DEVICE}\" + DPADD= ${LIBKEYCAP} LDADD= -lkeycap diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile index 24f87a6acfeb..31fbc7f2300c 100644 --- a/usr.sbin/pnpinfo/Makefile +++ b/usr.sbin/pnpinfo/Makefile @@ -14,6 +14,7 @@ CFLAGS+= -DPC98 .if ${MACHINE_ARCH} == "alpha" LDADD+= -lio +DPADD= ${LIBIO} .endif .include <bsd.prog.mk> diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index 8da3f50f177b..7af75f849598 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -3,7 +3,7 @@ PROG= pppctl MAN= pppctl.8 -LDADD= -lc_r -ledit -ltermcap DPADD= ${LIBC_R} ${LIBEDIT} ${LIBTERMCAP} +LDADD= -lc_r -ledit -ltermcap .include <bsd.prog.mk> diff --git a/usr.sbin/pppd/Makefile b/usr.sbin/pppd/Makefile index a628fb84ee31..4432435fa615 100644 --- a/usr.sbin/pppd/Makefile +++ b/usr.sbin/pppd/Makefile @@ -13,8 +13,8 @@ BINGRP= dialer CFLAGS+= -DHAVE_PATHS_H -LDADD= -lcrypt -lutil -lmd DPADD= ${LIBCRYPT} ${LIBUTIL} ${LIBMD} +LDADD= -lcrypt -lutil -lmd # Support SPX/IPX - not quite ready #CFLAGS+= -DIPX_CHANGE @@ -26,8 +26,8 @@ SRCS+= cbcp.c # Filter support CFLAGS+= -DPPP_FILTER -LDADD+= -lpcap DPADD+= ${LIBPCAP} +LDADD+= -lpcap # MS-CHAP support. Requires the DES library. .if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) && !defined(RELEASE_CRUNCH) diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index 34493cb0cb92..9d1dffeb2b4f 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PROG= pstat -WARNS?= 2 LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo MAN= pstat.8 MLINKS= pstat.8 swapinfo.8 -WARNS?= 4 + +WARNS?= 2 DPADD= ${LIBKVM} LDADD= -lkvm diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile index 630ba6008233..8937124f22f4 100644 --- a/usr.sbin/pw/Makefile +++ b/usr.sbin/pw/Makefile @@ -6,7 +6,7 @@ SRCS= pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \ grupd.c pwupd.c fileupd.c edgroup.c psdate.c \ bitmap.c cpdir.c rm_r.c -LDADD= -lcrypt -lutil DPADD= ${LIBCRYPT} ${LIBUTIL} +LDADD= -lcrypt -lutil .include <bsd.prog.mk> diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile index 2f2a473c1016..c3aaeb3398d8 100644 --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -7,8 +7,7 @@ PROG= pwd_mkdb MAN= pwd_mkdb.8 SRCS= pw_scan.c pwd_mkdb.c -CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h - WARNS?= 4 +CFLAGS+= -I${.CURDIR}/../../lib/libc/gen # for pw_scan.h .include <bsd.prog.mk> diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index fd0416cdc952..07bcc7eff1cf 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ PROG= quot -WARNS?= 2 MAN= quot.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile index 036fedf8527e..087e890ed356 100644 --- a/usr.sbin/repquota/Makefile +++ b/usr.sbin/repquota/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= repquota -WARNS?= 4 MAN= repquota.8 +WARNS?= 4 + .include <bsd.prog.mk> diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile index 987f764e5eac..579a02bb6689 100644 --- a/usr.sbin/rmt/Makefile +++ b/usr.sbin/rmt/Makefile @@ -2,9 +2,10 @@ # $FreeBSD$ PROG= rmt -WARNS?= 4 MAN= rmt.8 +WARNS?= 4 + # called from /usr/src/etc/Makefile etc-rmt: rm -f ${DESTDIR}/etc/rmt diff --git a/usr.sbin/rpc.lockd/Makefile b/usr.sbin/rpc.lockd/Makefile index 1ed07f6224e0..00864cfe7575 100644 --- a/usr.sbin/rpc.lockd/Makefile +++ b/usr.sbin/rpc.lockd/Makefile @@ -5,8 +5,6 @@ PROG= rpc.lockd MAN= rpc.lockd.8 MLINKS= rpc.lockd.8 lockd.8 SRCS= kern.c nlm_prot_svc.c lockd.c lock_proc.c lockd_lock.c -NO_WERROR= YES -WARNS?= 4 CFLAGS+= -I. -I${DESTDIR}/usr/include/rpcsvc diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile index 23ab98381b0f..0eedee55bd51 100644 --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -14,9 +14,6 @@ CLEANFILES= sm_inter_svc.c sm_inter.h RPCSRC= ${DESTDIR}/usr/include/rpcsvc/sm_inter.x RPCGEN= rpcgen -L -C -WARNS?= 4 -NO_WERROR= 1 - sm_inter_svc.c: ${RPCSRC} ${RPCGEN} -m -o ${.TARGET} ${RPCSRC} diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index f4eeaa145ac4..bc2269bd9bf4 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -12,12 +12,11 @@ SRCS= util.c yp_access.c yp_dblookup.c yp_dbwrite.c \ GENSRCS=yp.h yp_clnt.c yppasswd.h yppasswd_private.h yppasswd_private_svc.c \ yppasswd_private_xdr.c yppasswd_svc.c +WARNS?= 4 CFLAGS+= -I${.CURDIR}/../../usr.sbin/vipw \ -I${.CURDIR}/../../usr.sbin/ypserv \ -I${.CURDIR}/../../libexec/ypxfr \ -I${.CURDIR} -I. -WARNS?= 4 - DPADD= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL} LDADD= -lrpcsvc -lcrypt -lutil diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index 78dec492c7a7..a5780613a3e4 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -8,8 +8,8 @@ SRCS= ypupdate_prot_svc.c ypupdate_prot.h ypupdated_main.c \ yp_error.c update.c ypupdated_server.c \ yp_dblookup.c yp_dbwrite.c yp_dbdelete.c yp_dbupdate.c -CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr #CFLAGS+= -DYP +CFLAGS+= -I${.CURDIR}/../ypserv -I. -I${.CURDIR}/../../libexec/ypxfr DPADD= ${LIBRPCSVC} LDADD= -lrpcsvc diff --git a/usr.sbin/rpcbind/Makefile b/usr.sbin/rpcbind/Makefile index ba5099296db9..f597ce213096 100644 --- a/usr.sbin/rpcbind/Makefile +++ b/usr.sbin/rpcbind/Makefile @@ -15,7 +15,7 @@ SRCS= check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \ CFLAGS+= -I${LIBCRPCDIR} -I${LIBCINCLUDE} -DPORTMAP -DINET6 -DLIBWRAP -LDADD= -lwrap -lutil DPADD= ${LIBWRAP} ${LIBUTIL} +LDADD= -lwrap -lutil .include <bsd.prog.mk> diff --git a/usr.sbin/rtadvd/Makefile b/usr.sbin/rtadvd/Makefile index 5b935fa53935..99a668d331d4 100644 --- a/usr.sbin/rtadvd/Makefile +++ b/usr.sbin/rtadvd/Makefile @@ -20,7 +20,7 @@ SRCS= rtadvd.c rrenum.c advcap.c if.c config.c timer.c dump.c CFLAGS+= -DINET6 -LDADD= -lcompat DPADD= ${LIBCOMPAT} +LDADD= -lcompat .include <bsd.prog.mk> diff --git a/usr.sbin/rtsold/Makefile b/usr.sbin/rtsold/Makefile index b2d5c6b0d344..bc0f4be1831a 100644 --- a/usr.sbin/rtsold/Makefile +++ b/usr.sbin/rtsold/Makefile @@ -21,7 +21,7 @@ SRCS= rtsold.c rtsol.c if.c probe.c dump.c rtsock.c CFLAGS+= -DINET6 -DHAVE_GETIFADDRS -DHAVE_ARC4RANDOM -LDADD= -lkvm DPADD= ${LIBKVM} +LDADD= -lkvm .include <bsd.prog.mk> diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile index 5061e1e2e9dd..def0e6e14591 100644 --- a/usr.sbin/rwhod/Makefile +++ b/usr.sbin/rwhod/Makefile @@ -2,8 +2,9 @@ # $FreeBSD$ PROG= rwhod +MAN= rwhod.8 + # XXX breaks on Alpha due to alignment constraints #WARNS?= 4 -MAN= rwhod.8 .include <bsd.prog.mk> diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile index d02438944b04..2f9537a076ae 100644 --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,8 +1,9 @@ # $FreeBSD$ PROG= sa -WARNS?= 4 MAN= sa.8 SRCS= main.c pdb.c usrdb.c +WARNS?= 4 + .include <bsd.prog.mk> diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index f67ac34c3680..31c4281854c7 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -14,11 +14,11 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \ SRCS+= pccard.c .endif -CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. CFLAGS+= -DX_AS_PKG -DUSE_GZIP=1 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif +CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index 32b5e89cf1b3..7411ef3f61e2 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -64,8 +64,8 @@ CLEANFILES+=sm_os.h # STARTTLS support DISTRIBUTION= crypto CFLAGS+= -DSTARTTLS -D_FFR_TLS_1 -LDADD+= -lssl -lcrypto DPADD+= ${LIBSSL} ${LIBCRYPTO} +LDADD+= -lssl -lcrypto .endif # User customizations to the sendmail build environment diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile index c262fb67c4fd..bc3c21ea9d82 100644 --- a/usr.sbin/setfmac/Makefile +++ b/usr.sbin/setfmac/Makefile @@ -1,11 +1,10 @@ # $FreeBSD$ PROG= setfmac +LINKS= ${BINDIR}/setfmac ${BINDIR}/setfsmac MAN= setfmac.8 setfsmac.8 SRCS= setfmac.c -LINKS+= ${BINDIR}/setfmac ${BINDIR}/setfsmac - WARNS?= 2 .include <bsd.prog.mk> diff --git a/usr.sbin/slstat/Makefile b/usr.sbin/slstat/Makefile index 09556eadf0c0..650e2216aef0 100644 --- a/usr.sbin/slstat/Makefile +++ b/usr.sbin/slstat/Makefile @@ -2,7 +2,8 @@ # $FreeBSD$ PROG= slstat -WARNS?= 2 MAN= slstat.8 +WARNS?= 2 + .include <bsd.prog.mk> diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index f67ac34c3680..31c4281854c7 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -14,11 +14,11 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \ SRCS+= pccard.c .endif -CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. CFLAGS+= -DX_AS_PKG -DUSE_GZIP=1 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif +CFLAGS+= -I${.CURDIR}/../../gnu/lib/libdialog -I. DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lutil -ldisk -lftpio diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index 35510429789f..a961eb9aea08 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -7,7 +7,7 @@ PROG= syslogd MAN= syslog.conf.5 syslogd.8 SRCS= syslogd.c ttymsg.c -CFLAGS+=-DINET6 -I${.CURDIR}/../../usr.bin/wall WARNS?= 1 +CFLAGS+=-DINET6 -I${.CURDIR}/../../usr.bin/wall .include <bsd.prog.mk> diff --git a/usr.sbin/trpt/Makefile b/usr.sbin/trpt/Makefile index 8dc4b1792b21..cf1680b2eec3 100644 --- a/usr.sbin/trpt/Makefile +++ b/usr.sbin/trpt/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PROG= trpt -WARNS?= 4 MAN= trpt.8 BINGRP= kmem BINMODE= 2555 +WARNS?= 4 CFLAGS+= -DINET6 .include <bsd.prog.mk> diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile index 7b557cfb9359..0596967a07e2 100644 --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -5,7 +5,7 @@ MAN= tzsetup.8 CFLAGS+= -I${.CURDIR} -LDADD= -ldialog -lncurses DPADD= ${LIBDIALOG} ${LIBNCURSES} +LDADD= -ldialog -lncurses .include <bsd.prog.mk> diff --git a/usr.sbin/ugidfw/Makefile b/usr.sbin/ugidfw/Makefile index b87f492a4c01..d89bc857f5bf 100644 --- a/usr.sbin/ugidfw/Makefile +++ b/usr.sbin/ugidfw/Makefile @@ -2,6 +2,7 @@ PROG= ugidfw MAN= ugidfw.8 + DPADD= ${LIBUGIDFW} LDADD= -lugidfw diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile index 1dd091a5ce88..69a9df9c5ba9 100644 --- a/usr.sbin/vipw/Makefile +++ b/usr.sbin/vipw/Makefile @@ -3,8 +3,10 @@ PROG= vipw MAN= vipw.8 + +WARNS?= 4 + DPADD= ${LIBUTIL} LDADD= -lutil -WARNS?= 4 .include <bsd.prog.mk> diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile index 2718d1649e4e..e8a8ea6ab698 100644 --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -5,7 +5,7 @@ MAN= watch.8 WARNS?= 2 -LDADD= -ltermcap DPADD= ${LIBTERMCAP} +LDADD= -ltermcap .include <bsd.prog.mk> diff --git a/usr.sbin/wicontrol/Makefile b/usr.sbin/wicontrol/Makefile index e336ad871ccf..b8ac802a7442 100644 --- a/usr.sbin/wicontrol/Makefile +++ b/usr.sbin/wicontrol/Makefile @@ -3,8 +3,7 @@ PROG= wicontrol MAN= wicontrol.8 -CFLAGS+= -DWICACHE - WARNS?= 2 +CFLAGS+= -DWICACHE .include <bsd.prog.mk> diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile index 54cc30cad574..973da6ee0559 100644 --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -6,7 +6,7 @@ PROG= yp_mkdb MAN= yp_mkdb.8 SRCS= yp_mkdb.c yp_dblookup.c yp_dbwrite.c -CFLAGS+= -Dyp_error=warnx -I${.CURDIR}/../../libexec/ypxfr -CFLAGS+= -I${.CURDIR}/../../usr.sbin/ypserv +CFLAGS+= -Dyp_error=warnx +CFLAGS+= -I${.CURDIR}/../../libexec/ypxfr -I${.CURDIR}/../../usr.sbin/ypserv .include <bsd.prog.mk> diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index b86d0c2fd623..db215237126e 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -8,11 +8,11 @@ MAN= ypserv.8 ypinit.8 SRCS= yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \ ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c +CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I. + DPADD= ${LIBWRAP} LDADD= -lwrap -CFLAGS+= -I. -DDB_CACHE -DTCP_WRAPPER - CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h RPCGEN= rpcgen -I -C diff --git a/usr.sbin/zic/zdump/Makefile b/usr.sbin/zic/zdump/Makefile index 620d8b00c11d..127946f7c438 100644 --- a/usr.sbin/zic/zdump/Makefile +++ b/usr.sbin/zic/zdump/Makefile @@ -6,8 +6,8 @@ PROG= zdump MAN= ${.CURDIR}/../zdump.8 SRCS= zdump.c ialloc.c scheck.c -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir +CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime .include <bsd.prog.mk> diff --git a/usr.sbin/zic/zic/Makefile b/usr.sbin/zic/zic/Makefile index 8f3c622c5710..c98799cf5bbe 100644 --- a/usr.sbin/zic/zic/Makefile +++ b/usr.sbin/zic/zic/Makefile @@ -6,9 +6,9 @@ PROG= zic MAN= ${.CURDIR}/../zic.8 SRCS= zic.c ialloc.c scheck.c -CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime CFLAGS+= -DTM_GMTOFF=tm_gmtoff -DTM_ZONE=tm_zone -DSTD_INSPIRED -DPCTS CFLAGS+= -DHAVE_LONG_DOUBLE -DTZDIR=\"/usr/share/zoneinfo\" -Demkdir=mkdir CFLAGS+= -DHAVE_STRERROR -DHAVE_UNISTD_H +CFLAGS+= -I${.CURDIR}/.. -I${.CURDIR}/../../../lib/libc/stdtime .include <bsd.prog.mk> |