diff options
| author | Ruslan Ermilov <ru@FreeBSD.org> | 2004-10-24 15:33:08 +0000 |
|---|---|---|
| committer | Ruslan Ermilov <ru@FreeBSD.org> | 2004-10-24 15:33:08 +0000 |
| commit | a35d88931c87cfe6bd38f01d7bad22140b3b38f3 (patch) | |
| tree | 2a28a087684353f3fc60fa304d31bd2590e83ab7 | |
| parent | 88348311f3943c504b62ed3ffad125c06e3dea7a (diff) | |
| download | src-a35d88931c87cfe6bd38f01d7bad22140b3b38f3.tar.gz src-a35d88931c87cfe6bd38f01d7bad22140b3b38f3.zip | |
For variables that are only checked with defined(), don't provide
any fake value.
Notes
Notes:
svn path=/head/; revision=136910
258 files changed, 308 insertions, 301 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 4a17c7ce8b02..d5fffd0bb34f 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -502,7 +502,7 @@ redistribute: .if !defined(KERNCONF) && defined(KERNEL) KERNCONF= ${KERNEL} -KERNWARN= yes +KERNWARN= .else KERNCONF?= GENERIC .endif diff --git a/etc/defaults/Makefile b/etc/defaults/Makefile index 9e100922978d..701867fa1bd7 100644 --- a/etc/defaults/Makefile +++ b/etc/defaults/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ FILES= devfs.rules pccard.conf periodic.conf rc.conf -NOOBJ= noobj +NOOBJ= FILESDIR= /etc/defaults FILESMODE= 444 diff --git a/etc/mtree/Makefile b/etc/mtree/Makefile index cbd5d376b9fe..97a1bc60e294 100644 --- a/etc/mtree/Makefile +++ b/etc/mtree/Makefile @@ -17,7 +17,7 @@ _BIND.include.dist= BIND.include.dist .endif .endif -NOOBJ= noobj +NOOBJ= FILESDIR= /etc/mtree .include <bsd.prog.mk> diff --git a/etc/namedb/Makefile b/etc/namedb/Makefile index db52d470a7f8..22fb64d4499c 100644 --- a/etc/namedb/Makefile +++ b/etc/namedb/Makefile @@ -2,7 +2,7 @@ FILES= PROTO.localhost.rev PROTO.localhost-v6.rev named.conf named.root \ make-localhost -NOOBJ= noobj +NOOBJ= FILESDIR= /etc/namedb FILESMODE= 644 diff --git a/etc/pam.d/Makefile b/etc/pam.d/Makefile index 604e1a88a2dd..1fd307ef701d 100644 --- a/etc/pam.d/Makefile +++ b/etc/pam.d/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= README ftpd gdm imap kde login other passwd pop3 \ rexecd rsh sshd su system telnetd xdm FILESDIR= /etc/pam.d diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile index c5469abea6fe..b7fa7cf20803 100644 --- a/games/fortune/unstr/Makefile +++ b/games/fortune/unstr/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= unstr -NOMAN= noman +NOMAN= CFLAGS+=-Wall -I${.CURDIR}/../strfile .include <bsd.prog.mk> diff --git a/games/ppt/Makefile b/games/ppt/Makefile index 9dedd3a95b49..958759d58716 100644 --- a/games/ppt/Makefile +++ b/games/ppt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= ppt -NOMAN= noman +NOMAN= WARNS?= 6 diff --git a/games/primes/Makefile b/games/primes/Makefile index edf216f863a3..67b32aa79983 100644 --- a/games/primes/Makefile +++ b/games/primes/Makefile @@ -1,8 +1,9 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 +# $FreeBSD$ PROG= primes SRCS= pattern.c pr_tbl.c primes.c -NOMAN= noman +NOMAN= DPADD= ${LIBM} LDADD= -lm diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc index 63395eba3b77..b1acfb93f874 100644 --- a/gnu/Makefile.inc +++ b/gnu/Makefile.inc @@ -3,4 +3,4 @@ # Do not lint the GNU stuff. It is all externally maintained and # lint output is wasteful noise here. -NOLINT= true +NOLINT= diff --git a/gnu/lib/libgcc/Makefile b/gnu/lib/libgcc/Makefile index 48eee7a655c1..a40848856816 100644 --- a/gnu/lib/libgcc/Makefile +++ b/gnu/lib/libgcc/Makefile @@ -13,7 +13,7 @@ LIB= gcc #SHLIB_MAJOR= 1 # We need to install libgcc_pic.a as well, for use by shared libs. -INSTALL_PIC_ARCHIVE= yes +INSTALL_PIC_ARCHIVE= # # XXX This is a hack, but it seems to work. diff --git a/gnu/lib/libgcov/Makefile b/gnu/lib/libgcov/Makefile index 04ad011becd0..c44741302167 100644 --- a/gnu/lib/libgcov/Makefile +++ b/gnu/lib/libgcov/Makefile @@ -6,7 +6,7 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc .PATH: ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} LIB= gcov -NOPROFILE= yes +NOPROFILE= CFLAGS+= -DIN_GCC -DIN_LIBGCC2 -D__GCC_FLOAT_NOT_NEEDED CFLAGS+= -D_PTHREADS -DGTHREAD_USE_WEAK diff --git a/gnu/lib/libobjc/Makefile b/gnu/lib/libobjc/Makefile index 2e5a3b6dcad5..72bc0f76ec6a 100644 --- a/gnu/lib/libobjc/Makefile +++ b/gnu/lib/libobjc/Makefile @@ -6,12 +6,12 @@ GCCDIR= ${.CURDIR}/../../../contrib/gcc .PATH: ${OBJCDIR}/objc ${OBJCDIR} LIB= objc -NOMAN= sorry +NOMAN= .if ${MACHINE_ARCH} == "amd64" SHLIB_MAJOR= 1 .else # XXX is this still correct? -NOPIC= works but method lookup slowdown is significant +NOPIC= # works but method lookup slowdown is significant .endif SRCS= archive.c class.c encoding.c gc.c hash.c init.c misc.c \ diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index bb2f137d023f..905b07ecd462 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -24,7 +24,7 @@ SUBDIR= bc \ texinfo .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "powerpc" -NO_GDB= not yet +NO_GDB= # not yet .endif .if !defined(NO_CXX) diff --git a/gnu/usr.bin/binutils/as/Makefile b/gnu/usr.bin/binutils/as/Makefile index 2d522848f907..eccfd4d354c5 100644 --- a/gnu/usr.bin/binutils/as/Makefile +++ b/gnu/usr.bin/binutils/as/Makefile @@ -4,7 +4,7 @@ # BINDIR .include "${.CURDIR}/../../Makefile.inc" WARNS?= 2 -NO_WERROR= yes +NO_WERROR= .include "${.CURDIR}/../Makefile.inc0" .PATH: ${SRCDIR}/gas ${SRCDIR}/gas/config diff --git a/gnu/usr.bin/binutils/gdbreplay/Makefile b/gnu/usr.bin/binutils/gdbreplay/Makefile index ef1ff5369dd7..6811831c60c9 100644 --- a/gnu/usr.bin/binutils/gdbreplay/Makefile +++ b/gnu/usr.bin/binutils/gdbreplay/Makefile @@ -10,7 +10,7 @@ GDBDIR= ${.CURDIR}/../../../../contrib/gdb .PATH: ${GDBDIR}/gdb PROG= gdbreplay -NOMAN= yes +NOMAN= SRCS= gdbreplay.c diff --git a/gnu/usr.bin/binutils/libbfd/Makefile b/gnu/usr.bin/binutils/libbfd/Makefile index 84dfdff51b86..c90281ad0c59 100644 --- a/gnu/usr.bin/binutils/libbfd/Makefile +++ b/gnu/usr.bin/binutils/libbfd/Makefile @@ -17,7 +17,7 @@ WARNS?= 2 .endif CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/bfd -INTERNALLIB= true +INTERNALLIB= CLEANFILES+= bfdver.h config.h targmatch.h SELARCH= diff --git a/gnu/usr.bin/binutils/libbinutils/Makefile b/gnu/usr.bin/binutils/libbinutils/Makefile index 03909292858e..d8dc0469f5f0 100644 --- a/gnu/usr.bin/binutils/libbinutils/Makefile +++ b/gnu/usr.bin/binutils/libbinutils/Makefile @@ -14,6 +14,6 @@ CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\" CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/binutils CFLAGS+= -I${SRCDIR}/bfd -INTERNALLIB= true +INTERNALLIB= .include <bsd.lib.mk> diff --git a/gnu/usr.bin/binutils/libiberty/Makefile b/gnu/usr.bin/binutils/libiberty/Makefile index f7bcd3664519..37895aa4aca4 100644 --- a/gnu/usr.bin/binutils/libiberty/Makefile +++ b/gnu/usr.bin/binutils/libiberty/Makefile @@ -16,6 +16,6 @@ SRCS+= regex.c splay-tree.c WARNS?= 1 CFLAGS+= -DHAVE_CONFIG_H -INTERNALLIB= true +INTERNALLIB= .include <bsd.lib.mk> diff --git a/gnu/usr.bin/binutils/libopcodes/Makefile b/gnu/usr.bin/binutils/libopcodes/Makefile index f740e867fc44..a2b271201d05 100644 --- a/gnu/usr.bin/binutils/libopcodes/Makefile +++ b/gnu/usr.bin/binutils/libopcodes/Makefile @@ -8,7 +8,7 @@ LIB= opcodes SRCS+= dis-buf.c dis-init.c disassemble.c CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/opcodes -I${SRCDIR}/bfd -INTERNALLIB= true +INTERNALLIB= # If set, BINUTILSDISTDIR is the path to a directory containing the full GNU # binutils release. FreeBSD only distributes the bits that are required to diff --git a/gnu/usr.bin/cc/c++/Makefile b/gnu/usr.bin/cc/c++/Makefile index a681f673e677..05ee4ece30e2 100644 --- a/gnu/usr.bin/cc/c++/Makefile +++ b/gnu/usr.bin/cc/c++/Makefile @@ -9,7 +9,7 @@ PROG= c++ SRCS= gcc.c g++spec.c LINKS= ${BINDIR}/c++ ${BINDIR}/g++ LINKS+= ${BINDIR}/c++ ${BINDIR}/CC -NOMAN= 1 +NOMAN= DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} diff --git a/gnu/usr.bin/cc/c++filt/Makefile b/gnu/usr.bin/cc/c++filt/Makefile index 045d33f820ec..15aa9361d432 100644 --- a/gnu/usr.bin/cc/c++filt/Makefile +++ b/gnu/usr.bin/cc/c++filt/Makefile @@ -6,7 +6,7 @@ PROG= c++filt SRCS= cp-demangle.c cplus-dem+%DIKED.c -NOMAN= 1 +NOMAN= CFLAGS+= -DSTANDALONE_DEMANGLER -DIN_GCC -DVERSION=\"$(version)\" diff --git a/gnu/usr.bin/cc/cc1/Makefile b/gnu/usr.bin/cc/cc1/Makefile index ec116518f12c..48c492ad61eb 100644 --- a/gnu/usr.bin/cc/cc1/Makefile +++ b/gnu/usr.bin/cc/cc1/Makefile @@ -7,7 +7,7 @@ PROG= cc1 SRCS= main.c c-parse+%DIKED.c c-lang.c stub-objc.c BINDIR= /usr/libexec -NOMAN= 1 +NOMAN= NOSHARED?=yes CFLAGS+= -I. diff --git a/gnu/usr.bin/cc/cc1obj/Makefile b/gnu/usr.bin/cc/cc1obj/Makefile index c0257438a74e..5df82f502307 100644 --- a/gnu/usr.bin/cc/cc1obj/Makefile +++ b/gnu/usr.bin/cc/cc1obj/Makefile @@ -7,7 +7,7 @@ PROG= cc1obj SRCS= main.c objc-parse+DIKED.c objc-act.c objc-lang.c c-decl.c BINDIR= /usr/libexec -NOMAN= 1 +NOMAN= NOSHARED?=yes CFLAGS+= -I${GCCDIR}/objc -I. diff --git a/gnu/usr.bin/cc/cc1plus/Makefile b/gnu/usr.bin/cc/cc1plus/Makefile index c26703d6b599..9ca7fae5dd1c 100644 --- a/gnu/usr.bin/cc/cc1plus/Makefile +++ b/gnu/usr.bin/cc/cc1plus/Makefile @@ -12,12 +12,12 @@ SRCS+= main.c cp-lang.c c-opts.c call.c class.c cvt.c cxx-pretty-print.c \ search.c semantics.c tree.c typeck.c typeck2.c optimize.c BINDIR= /usr/libexec -NOMAN= 1 +NOMAN= NOSHARED?=yes CFLAGS+= -I${GCCDIR}/cp -I. -PADD= ${LIBCC_INT} +DPADD= ${LIBCC_INT} LDADD= ${LIBCC_INT} #----------------------------------------------------------------------- diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile index 4e7408236178..c45565185d33 100644 --- a/gnu/usr.bin/cc/cc_int/Makefile +++ b/gnu/usr.bin/cc/cc_int/Makefile @@ -5,7 +5,7 @@ .PATH: ../cc_tools ${GCCDIR}/config/${GCC_CPU} ${GCCDIR} LIB= cc_int -INTERNALLIB= YES +INTERNALLIB= # Files from libiberty. SRCS= choose-temp.c concat.c cp-demangle.c cp-demint.c cplus-dem.c \ diff --git a/gnu/usr.bin/cvs/lib/Makefile b/gnu/usr.bin/cvs/lib/Makefile index d09550d1e284..888fd4802221 100644 --- a/gnu/usr.bin/cvs/lib/Makefile +++ b/gnu/usr.bin/cvs/lib/Makefile @@ -9,7 +9,7 @@ MAINTAINER= peter@FreeBSD.org .PATH: ${CVSDIR}/man LIB= cvs -INTERNALLIB= YES +INTERNALLIB= # gnu must be before lib to pick correct regex.h CFLAGS+= -I. -I${CVSDIR}/src -I${DESTDIR}/usr/include/gnu \ diff --git a/gnu/usr.bin/cvs/libdiff/Makefile b/gnu/usr.bin/cvs/libdiff/Makefile index edf4ebc95f3d..b5def757cdd6 100644 --- a/gnu/usr.bin/cvs/libdiff/Makefile +++ b/gnu/usr.bin/cvs/libdiff/Makefile @@ -7,7 +7,7 @@ MAINTAINER= peter@FreeBSD.org .PATH: ${CVSDIR}/diff LIB= diff -INTERNALLIB= YES +INTERNALLIB= # gnu must be before lib to pick correct regex.h CFLAGS+= -I../lib -I${DESTDIR}/usr/include/gnu \ diff --git a/gnu/usr.bin/dialog/TESTS/Makefile b/gnu/usr.bin/dialog/TESTS/Makefile index 314a3ae07024..f07d07cebc69 100644 --- a/gnu/usr.bin/dialog/TESTS/Makefile +++ b/gnu/usr.bin/dialog/TESTS/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= README checklist ftreebox infobox inputbox menubox msgbox \ prgbox radiolist textbox treebox yesno FILESDIR= ${SHAREDIR}/examples/dialog diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile index c627aefc8d20..0f6f319eed46 100644 --- a/gnu/usr.bin/gdb/gdbtui/Makefile +++ b/gnu/usr.bin/gdb/gdbtui/Makefile @@ -2,7 +2,7 @@ PROG= gdbtui SRCS= tui-main.c -NOMAN= noman +NOMAN= BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \ ${OBJ_BU}/libiberty/libiberty.a diff --git a/gnu/usr.bin/gdb/libgdb/Makefile b/gnu/usr.bin/gdb/libgdb/Makefile index 8857f76f5611..6fb9bf39e675 100644 --- a/gnu/usr.bin/gdb/libgdb/Makefile +++ b/gnu/usr.bin/gdb/libgdb/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= gdb -INTERNALLIB= yes +INTERNALLIB= SRCS= annotate.c arch-utils.c auxv.c ax-gdb.c ax-general.c bcache.c \ bfd-target.c block.c blockframe.c breakpoint.c buildsym.c \ c-exp.y c-lang.c c-typeprint.c c-valprint.c charset.c \ diff --git a/gnu/usr.bin/groff/src/devices/grohtml/Makefile b/gnu/usr.bin/groff/src/devices/grohtml/Makefile index db7099e7f0f7..36d7056a5931 100644 --- a/gnu/usr.bin/groff/src/devices/grohtml/Makefile +++ b/gnu/usr.bin/groff/src/devices/grohtml/Makefile @@ -4,6 +4,6 @@ PROG_CXX= post-grohtml SRCS= post-html.cpp html-table.cpp html-text.cpp output.cpp DPADD= ${LIBDRIVER} ${LIBGROFF} ${LIBM} LDADD= ${LIBDRIVER} ${LIBGROFF} -lm -NOMAN= YES +NOMAN= .include <bsd.prog.mk> diff --git a/gnu/usr.bin/groff/src/libs/libbib/Makefile b/gnu/usr.bin/groff/src/libs/libbib/Makefile index c66b8a94c8d7..ed1fd2fc7a6d 100644 --- a/gnu/usr.bin/groff/src/libs/libbib/Makefile +++ b/gnu/usr.bin/groff/src/libs/libbib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= bib -INTERNALLIB= YES +INTERNALLIB= SRCS= common.cpp index.cpp linear.cpp search.cpp map.c .include <bsd.lib.mk> diff --git a/gnu/usr.bin/groff/src/libs/libdriver/Makefile b/gnu/usr.bin/groff/src/libs/libdriver/Makefile index deb3e3b66156..0c107b4918f8 100644 --- a/gnu/usr.bin/groff/src/libs/libdriver/Makefile +++ b/gnu/usr.bin/groff/src/libs/libdriver/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= driver -INTERNALLIB= YES +INTERNALLIB= SRCS= input.cpp printer.cpp .include <bsd.lib.mk> diff --git a/gnu/usr.bin/groff/src/libs/libgroff/Makefile b/gnu/usr.bin/groff/src/libs/libgroff/Makefile index f44789f63425..ea66a9d23628 100644 --- a/gnu/usr.bin/groff/src/libs/libgroff/Makefile +++ b/gnu/usr.bin/groff/src/libs/libgroff/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= groff -INTERNALLIB= YES +INTERNALLIB= SRCS= assert.cpp change_lf.cpp cmap.cpp color.cpp cset.cpp device.cpp errarg.cpp\ error.cpp fatal.cpp filename.cpp font.cpp fontfile.cpp geometry.cpp\ htmlhint.cpp invalid.cpp lf.cpp lineno.cpp macropath.cpp\ diff --git a/gnu/usr.bin/groff/src/preproc/html/Makefile b/gnu/usr.bin/groff/src/preproc/html/Makefile index 65839d20d807..759d76ff85d6 100644 --- a/gnu/usr.bin/groff/src/preproc/html/Makefile +++ b/gnu/usr.bin/groff/src/preproc/html/Makefile @@ -4,6 +4,6 @@ PROG_CXX= pre-grohtml SRCS= pre-html.cpp pushback.cpp DPADD= ${LIBGROFF} LDADD= ${LIBGROFF} -NOMAN= YES +NOMAN= .include <bsd.prog.mk> diff --git a/gnu/usr.bin/man/lib/Makefile b/gnu/usr.bin/man/lib/Makefile index 243d141eaf1f..d707316a2684 100644 --- a/gnu/usr.bin/man/lib/Makefile +++ b/gnu/usr.bin/man/lib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= man -INTERNALLIB= true +INTERNALLIB= CFLAGS+= -DSTDC_HEADERS CLEANFILES+= config.h diff --git a/gnu/usr.bin/rcs/lib/Makefile b/gnu/usr.bin/rcs/lib/Makefile index ce0865143bd0..f21fda1e8100 100644 --- a/gnu/usr.bin/rcs/lib/Makefile +++ b/gnu/usr.bin/rcs/lib/Makefile @@ -9,6 +9,6 @@ SRCS = maketime.c partime.c rcsedit.c rcsfcmp.c rcsfnms.c rcsgen.c \ rcskeep.c rcskeys.c rcslex.c rcsmap.c rcsrev.c rcssyn.c rcstime.c \ rcsutil.c merger.c version.c -INTERNALLIB= true +INTERNALLIB= .include <bsd.lib.mk> diff --git a/gnu/usr.bin/texinfo/infokey/Makefile b/gnu/usr.bin/texinfo/infokey/Makefile index 4f06ef23b3f1..12c04041006b 100644 --- a/gnu/usr.bin/texinfo/infokey/Makefile +++ b/gnu/usr.bin/texinfo/infokey/Makefile @@ -2,7 +2,7 @@ PROG= infokey SRCS= infokey.c key.c -NOMAN= noman +NOMAN= DPADD= ${LIBTXI} LDADD= ${LIBTXI} diff --git a/gnu/usr.bin/texinfo/libtxi/Makefile b/gnu/usr.bin/texinfo/libtxi/Makefile index 70986567cded..8decad1daed4 100644 --- a/gnu/usr.bin/texinfo/libtxi/Makefile +++ b/gnu/usr.bin/texinfo/libtxi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= txi -INTERNALLIB= true +INTERNALLIB= SRCS= substring.c xexit.c xmalloc.c xstrdup.c diff --git a/include/arpa/Makefile b/include/arpa/Makefile index 2e6086bc4988..6ad9e475635d 100644 --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= INCS= ftp.h inet.h nameser.h nameser_compat.h telnet.h tftp.h INCSDIR=${INCLUDEDIR}/arpa diff --git a/include/protocols/Makefile b/include/protocols/Makefile index 3c79142557a6..4ee43a118b35 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h INCSDIR=${INCLUDEDIR}/protocols diff --git a/lib/bind/lwres/Makefile b/lib/bind/lwres/Makefile index 81375c78a7ff..55b59ebd3610 100644 --- a/lib/bind/lwres/Makefile +++ b/lib/bind/lwres/Makefile @@ -7,7 +7,7 @@ SRCDIR= ${BIND_DIR}/lib/lwres # Unlike other BIND libs, this should be installed unless the user says NO. .if !defined(NO_BIND_LIBS_LWRES) -WITH_BIND_LIBS= YES +WITH_BIND_LIBS= .endif .include "${LIB_BIND_DIR}/config.mk" diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile index f59f1f7112dd..dc6eb2df2617 100644 --- a/lib/libalias/Makefile +++ b/lib/libalias/Makefile @@ -9,6 +9,6 @@ SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ alias_util.c alias_old.c INCS= alias.h WARNS?= 6 -NO_WERROR= true +NO_WERROR= .include <bsd.lib.mk> diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc index 09d6f14dc934..8a8fde0964bd 100644 --- a/lib/libbsnmp/Makefile.inc +++ b/lib/libbsnmp/Makefile.inc @@ -2,5 +2,5 @@ SHLIB_MAJOR= 2 WARNS?= 6 -NO_WERROR= yes +NO_WERROR= INCSDIR= ${INCLUDEDIR}/bsnmp diff --git a/lib/libc/Makefile b/lib/libc/Makefile index a8196bb9e756..95356b9af697 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -16,8 +16,8 @@ WARNS?= 2 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH} CLEANFILES+=tags -INSTALL_PIC_ARCHIVE= yes -PRECIOUSLIB= yes +INSTALL_PIC_ARCHIVE= +PRECIOUSLIB= # Define (empty) variables so that make doesn't give substitution # errors if the included makefiles don't change these: diff --git a/lib/libc/alpha/Makefile.inc b/lib/libc/alpha/Makefile.inc index 5a4d48e4a5d0..eff6caf6a280 100644 --- a/lib/libc/alpha/Makefile.inc +++ b/lib/libc/alpha/Makefile.inc @@ -6,4 +6,4 @@ # # Alpha is 64-bit, so it doesn't need quad functions: # -NO_QUAD=1 +NO_QUAD= diff --git a/lib/libc/amd64/Makefile.inc b/lib/libc/amd64/Makefile.inc index fb0879503a71..0f14cafc35cb 100644 --- a/lib/libc/amd64/Makefile.inc +++ b/lib/libc/amd64/Makefile.inc @@ -6,4 +6,4 @@ # # AMD64 is 64-bit, so it doesn't need quad functions: # -NO_QUAD=1 +NO_QUAD= diff --git a/lib/libc/ia64/Makefile.inc b/lib/libc/ia64/Makefile.inc index 58afd5d7e739..5c60862de06f 100644 --- a/lib/libc/ia64/Makefile.inc +++ b/lib/libc/ia64/Makefile.inc @@ -6,4 +6,4 @@ # # IA-64 is 64-bit, so it doesn't need quad functions: # -NO_QUAD=1 +NO_QUAD= diff --git a/lib/libc/sparc64/Makefile.inc b/lib/libc/sparc64/Makefile.inc index ebac893acc80..afacb91ed60d 100644 --- a/lib/libc/sparc64/Makefile.inc +++ b/lib/libc/sparc64/Makefile.inc @@ -8,4 +8,4 @@ # # sparc64 is 64-bit, so it doesn't need quad functions. # -NO_QUAD=1 +NO_QUAD= diff --git a/lib/libc_r/Makefile b/lib/libc_r/Makefile index b6072004b09d..a0e98e181aea 100644 --- a/lib/libc_r/Makefile +++ b/lib/libc_r/Makefile @@ -20,7 +20,7 @@ CFLAGS+=-D_LOCK_DEBUG # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -PRECIOUSLIB= yes +PRECIOUSLIB= .include "${.CURDIR}/uthread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" diff --git a/lib/libcrypt/Makefile b/lib/libcrypt/Makefile index a406a9f97a14..67438d87213d 100644 --- a/lib/libcrypt/Makefile +++ b/lib/libcrypt/Makefile @@ -30,6 +30,6 @@ SRCS+= auth.c property.c CFLAGS+= -D${sym}=__${sym} .endfor -PRECIOUSLIB= yes +PRECIOUSLIB= .include <bsd.lib.mk> diff --git a/lib/libdisk/Makefile b/lib/libdisk/Makefile index a9786341ff97..d47da8f69b68 100644 --- a/lib/libdisk/Makefile +++ b/lib/libdisk/Makefile @@ -21,8 +21,8 @@ CFLAGS+= -DPC98 .endif CLEANFILES+= tmp.c tst01 tst01.o -NOPROFILE= yes -NOPIC= yes +NOPROFILE= +NOPIC= MAN= libdisk.3 diff --git a/lib/libio/Makefile b/lib/libio/Makefile index 71e1c9e09cc6..73431ee69a70 100644 --- a/lib/libio/Makefile +++ b/lib/libio/Makefile @@ -6,6 +6,6 @@ SRCS= io.c swiz.c bwx.c alpha_sethae.c CFLAGS+= -Wall -Wa,-mev56 -NOMAN=1 +NOMAN= .include <bsd.lib.mk> diff --git a/lib/libkse/Makefile b/lib/libkse/Makefile index c0f0399f3723..65525aaa7734 100644 --- a/lib/libkse/Makefile +++ b/lib/libkse/Makefile @@ -36,7 +36,7 @@ LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -Wall -PRECIOUSLIB= yes +PRECIOUSLIB= .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" .include "${.CURDIR}/support/Makefile.inc" diff --git a/lib/libncurses/Makefile b/lib/libncurses/Makefile index 25aeb2edfb14..1eb3eb46b538 100644 --- a/lib/libncurses/Makefile +++ b/lib/libncurses/Makefile @@ -556,6 +556,6 @@ MLINKS+=curs_window.3 delwin.3 curs_window.3 derwin.3 curs_window.3 dupwin.3 \ MLINKS+=default_colors.3 assume_default_colors.3 \ default_colors.3 use_default_colors.3 -NOLINT= true +NOLINT= .include <bsd.lib.mk> diff --git a/lib/libpam/libpam/Makefile b/lib/libpam/libpam/Makefile index 2d6498ab9f28..e6763e9483ea 100644 --- a/lib/libpam/libpam/Makefile +++ b/lib/libpam/libpam/Makefile @@ -39,7 +39,7 @@ OPENPAM= ${.CURDIR}/../../../contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/lib ${OPENPAM}/doc/man LIB= pam -NOPROFILE= YES +NOPROFILE= SRCS= openpam_borrow_cred.c \ openpam_configure.c \ diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index b21a93d52553..1fa92e89800a 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -2,8 +2,8 @@ PAMDIR= ${.CURDIR}/../../../../contrib/openpam -NOINSTALLLIB= yes -NOPROFILE= yes +NOINSTALLLIB= +NOPROFILE= CFLAGS+= -I${PAMDIR}/include -I${.CURDIR}/../../libpam WARNS?= 4 @@ -12,7 +12,7 @@ WARNS?= 4 # For the static case, libpam.a depends on the modules. # For the dynamic case, the modules depend on libpam.so.N .if defined(_NO_LIBPAM_SO_YET) -NOPIC= YES +NOPIC= .else SHLIB_NAME?= ${LIB}.so.${SHLIB_MAJOR} DPADD+= ${LIBPAM} diff --git a/lib/libpthread/Makefile b/lib/libpthread/Makefile index c0f0399f3723..65525aaa7734 100644 --- a/lib/libpthread/Makefile +++ b/lib/libpthread/Makefile @@ -36,7 +36,7 @@ LDFLAGS= -Wl,--version-script=${.CURDIR}/pthread.map # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -Wall -PRECIOUSLIB= yes +PRECIOUSLIB= .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" .include "${.CURDIR}/support/Makefile.inc" diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 2927f142d12c..c572249570e2 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -23,7 +23,7 @@ SRCS+= ${GENSRCS} ${OTHERSRCS} ${SECRPCSRCS} CLEANFILES+= ${GENSRCS} -NOMAN= noman +NOMAN= .include <bsd.lib.mk> diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index ef0e194939fa..a248736950e3 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -29,7 +29,7 @@ SRCS+= assert.c debug.c errstring.c exc.c heap.c match.c rpool.c \ niprop.c mpeix.c CLEANFILES+=sm_os.h -INTERNALLIB= true +INTERNALLIB= sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index bbba436e1d50..b796deb5acd7 100644 --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -15,7 +15,7 @@ SRCS+= sm_os.h SRCS+= smdb.c smdb1.c smdb2.c smndbm.c CLEANFILES+=sm_os.h -INTERNALLIB= true +INTERNALLIB= sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index ec23f2336d0c..2e835fd76fdd 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -15,7 +15,7 @@ SRCS+= sm_os.h SRCS+= debug.c err.c lockfile.c safefile.c snprintf.c cf.c CLEANFILES+=sm_os.h -INTERNALLIB= true +INTERNALLIB= sm_os.h: ln -sf ${SENDMAIL_DIR}/include/sm/os/sm_os_freebsd.h sm_os.h diff --git a/lib/libstand/Makefile b/lib/libstand/Makefile index 4a817461be32..3261f34caaf2 100644 --- a/lib/libstand/Makefile +++ b/lib/libstand/Makefile @@ -7,8 +7,8 @@ # LIB= stand -NOPROFILE= YES -NOPIC= YES +NOPROFILE= +NOPIC= INCS= stand.h MAN= libstand.3 diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index a8753671d62d..544f21c880be 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -6,7 +6,7 @@ TELNETDIR= ${.CURDIR}/../../contrib/telnet LIB= telnet -INTERNALLIB= yes +INTERNALLIB= SRCS= genget.c getent.c misc.c CFLAGS+= -I${TELNETDIR} diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index aaf94e38c3a3..93e86e21fde8 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -18,7 +18,7 @@ CFLAGS+=-I${.CURDIR}/../../libexec/rtld-elf # enable extra internal consistancy checks CFLAGS+=-D_PTHREADS_INVARIANTS -PRECIOUSLIB= yes +PRECIOUSLIB= WARNS?= 2 diff --git a/lib/libxpg4/Makefile b/lib/libxpg4/Makefile index 8d05099ee5b8..cb3a26eb34fe 100644 --- a/lib/libxpg4/Makefile +++ b/lib/libxpg4/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 3 SRCS= fakelib.c -NOMAN= YES +NOMAN= .include <bsd.lib.mk> diff --git a/lib/liby/Makefile b/lib/liby/Makefile index 27266b82b0e9..417f43173c72 100644 --- a/lib/liby/Makefile +++ b/lib/liby/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 2 SRCS= main.c yyerror.c -NOPIC= true +NOPIC= .include <bsd.lib.mk> diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index 25aeb2edfb14..1eb3eb46b538 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -556,6 +556,6 @@ MLINKS+=curs_window.3 delwin.3 curs_window.3 derwin.3 curs_window.3 dupwin.3 \ MLINKS+=default_colors.3 assume_default_colors.3 \ default_colors.3 use_default_colors.3 -NOLINT= true +NOLINT= .include <bsd.lib.mk> diff --git a/libexec/bootpd/bootpgw/Makefile b/libexec/bootpd/bootpgw/Makefile index 4a658533741f..e02887474848 100644 --- a/libexec/bootpd/bootpgw/Makefile +++ b/libexec/bootpd/bootpgw/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= bootpgw -NOMAN= true +NOMAN= SRCS= bootpgw.c getif.c hwaddr.c report.c rtmsg.c SRCDIR= ${.CURDIR}/.. diff --git a/libexec/pt_chown/Makefile b/libexec/pt_chown/Makefile index 974a730f0374..1295040ecb37 100644 --- a/libexec/pt_chown/Makefile +++ b/libexec/pt_chown/Makefile @@ -4,6 +4,6 @@ PROG= pt_chown SRCS= pt_chown.c BINOWN= root BINMODE=4555 -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index bbd5a52093ea..68d63635c506 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -25,7 +25,7 @@ MLINKS= rtld.1 ld-elf.so.1.1 \ .if defined(LDSCRIPT) KERN_OSRELDATE!= /sbin/sysctl -n kern.osreldate 2>/dev/null || echo 0 .if ${KERN_OSRELDATE} >= 400001 -LDSO_IS_EXECUTABLE= yes +LDSO_IS_EXECUTABLE= .endif .endif diff --git a/release/picobsd/tinyware/aps/Makefile b/release/picobsd/tinyware/aps/Makefile index cda9bdddba1c..a88d92d8284b 100644 --- a/release/picobsd/tinyware/aps/Makefile +++ b/release/picobsd/tinyware/aps/Makefile @@ -2,7 +2,7 @@ # PROG=ps SRCS+=main.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/help/Makefile b/release/picobsd/tinyware/help/Makefile index 2bf727af61b7..d9b00dd8e1f0 100644 --- a/release/picobsd/tinyware/help/Makefile +++ b/release/picobsd/tinyware/help/Makefile @@ -2,7 +2,7 @@ # PROG=help SRCS+=help.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/msg/Makefile b/release/picobsd/tinyware/msg/Makefile index 840868872c5e..a0ecde0457af 100644 --- a/release/picobsd/tinyware/msg/Makefile +++ b/release/picobsd/tinyware/msg/Makefile @@ -2,7 +2,7 @@ # PROG=msg SRCS= msg.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/ns/Makefile b/release/picobsd/tinyware/ns/Makefile index 99fd4e4d91b4..3dd7537e88ff 100644 --- a/release/picobsd/tinyware/ns/Makefile +++ b/release/picobsd/tinyware/ns/Makefile @@ -4,6 +4,6 @@ PROG= ns SRCS= ns.c CFLAGS+= -DBRIDGING -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/oinit/Makefile b/release/picobsd/tinyware/oinit/Makefile index c655bb7bb7de..269e0e0e0238 100644 --- a/release/picobsd/tinyware/oinit/Makefile +++ b/release/picobsd/tinyware/oinit/Makefile @@ -15,7 +15,7 @@ CFLAGS= -DSH_PATH=\"${SH_PATH}\" -DSH_NAME=\"${SH_NAME}\" \ #LDADD= -lutil -ledit -ltermcap LDADD=-lutil -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/simple_httpd/Makefile b/release/picobsd/tinyware/simple_httpd/Makefile index 524040efb534..0f4b442b1f93 100644 --- a/release/picobsd/tinyware/simple_httpd/Makefile +++ b/release/picobsd/tinyware/simple_httpd/Makefile @@ -2,6 +2,6 @@ # PROG=simple_httpd SRCS= simple_httpd.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/sps/Makefile b/release/picobsd/tinyware/sps/Makefile index 8997087da65e..f7ca89a8d23e 100644 --- a/release/picobsd/tinyware/sps/Makefile +++ b/release/picobsd/tinyware/sps/Makefile @@ -2,7 +2,7 @@ # PROG=sps SRCS= sps.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/view/Makefile b/release/picobsd/tinyware/view/Makefile index 1c0399d12787..bd07e7c0c3b3 100644 --- a/release/picobsd/tinyware/view/Makefile +++ b/release/picobsd/tinyware/view/Makefile @@ -4,6 +4,6 @@ PROG=view SRCS=view.c CFLAGS+=-I/usr/local/include LDADD+=-L/usr/local/lib -lpng -lvgl -lz -lm -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/release/picobsd/tinyware/vm/Makefile b/release/picobsd/tinyware/vm/Makefile index 359aa3e9cfc4..f865abedcd82 100644 --- a/release/picobsd/tinyware/vm/Makefile +++ b/release/picobsd/tinyware/vm/Makefile @@ -3,7 +3,7 @@ PROG=vm #CFLAGS+= SRCS= vm.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/rescue/librescue/Makefile b/rescue/librescue/Makefile index c504eae031ac..c53c23d543d2 100644 --- a/rescue/librescue/Makefile +++ b/rescue/librescue/Makefile @@ -15,7 +15,7 @@ ${.CURDIR}/../../lib/libutil LIB= rescue -INTERNALLIB= yes # Don't install this library +INTERNALLIB= # Don't install this library SRCS= exec.c getusershell.c login_class.c popen.c rcmdsh.c \ sysctl.c system.c diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index b8326a09560b..004600d61d55 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -215,7 +215,7 @@ CANONICALOBJDIR:= ${MAKEOBJDIRPREFIX}${.CURDIR} CANONICALOBJDIR:= /usr/obj${.CURDIR} .endif -NOMAN= true +NOMAN= CLEANFILES+= $(CONF) *.o *.lo *.c *.mk *.cache *.a *.h # Program names and their aliases contribute hardlinks to 'rescue' executable, diff --git a/sbin/dhclient/common/Makefile b/sbin/dhclient/common/Makefile index 5d4bb92f6e83..8ce6d112d668 100644 --- a/sbin/dhclient/common/Makefile +++ b/sbin/dhclient/common/Makefile @@ -6,7 +6,7 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/common LIB= dhcp -INTERNALLIB= true +INTERNALLIB= SRCS= alloc.c bpf.c comapi.c conflex.c ctrace.c discover.c dispatch.c \ dlpi.c dns.c ethernet.c execute.c fddi.c icmp.c inet.c lpf.c \ diff --git a/sbin/dhclient/dhcpctl/Makefile b/sbin/dhclient/dhcpctl/Makefile index 1f3ecbd07164..15041a14ae35 100644 --- a/sbin/dhclient/dhcpctl/Makefile +++ b/sbin/dhclient/dhcpctl/Makefile @@ -5,11 +5,11 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/dhcpctl LIB= dhcpctl -INTERNALLIB= true +INTERNALLIB= SRCS= dhcpctl.c callback.c remote.c MAN= dhcpctl.3 -NOMAN= true +NOMAN= .include <bsd.lib.mk> diff --git a/sbin/dhclient/dst/Makefile b/sbin/dhclient/dst/Makefile index b501a2e8f6ea..b200f0d196b9 100644 --- a/sbin/dhclient/dst/Makefile +++ b/sbin/dhclient/dst/Makefile @@ -6,7 +6,7 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/dst LIB= dst -INTERNALLIB= true +INTERNALLIB= SRCS= base64.c dst_api.c dst_support.c hmac_link.c md5_dgst.c prandom.c diff --git a/sbin/dhclient/minires/Makefile b/sbin/dhclient/minires/Makefile index e0013b47737c..df5d18e2cf73 100644 --- a/sbin/dhclient/minires/Makefile +++ b/sbin/dhclient/minires/Makefile @@ -6,7 +6,7 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/minires LIB= res -INTERNALLIB= true +INTERNALLIB= SRCS= ns_date.c ns_name.c ns_parse%FIXED.c ns_samedomain.c ns_sign.c ns_verify.c \ res_comp.c res_findzonecut.c res_init.c res_mkquery.c res_mkupdate.c \ diff --git a/sbin/dhclient/omapip/Makefile b/sbin/dhclient/omapip/Makefile index f2b5fbda968e..f597e21cf708 100644 --- a/sbin/dhclient/omapip/Makefile +++ b/sbin/dhclient/omapip/Makefile @@ -6,13 +6,13 @@ DIST_DIR= ${.CURDIR}/../../../contrib/isc-dhcp .PATH: ${DIST_DIR}/omapip LIB= omapi -INTERNALLIB= true +INTERNALLIB= SRCS= alloc.c array.c auth.c buffer.c connection.c convert.c dispatch.c \ errwarn.c generic.c handle.c hash.c inet_addr.c listener.c \ message.c mrtrace.c protocol.c result.c support.c toisc.c trace.c MAN= omapi.3 -NOMAN= true +NOMAN= .include <bsd.lib.mk> diff --git a/sbin/growfs/Makefile b/sbin/growfs/Makefile index 21b559682b28..4bbac9cf4c70 100644 --- a/sbin/growfs/Makefile +++ b/sbin/growfs/Makefile @@ -4,7 +4,7 @@ # $FreeBSD$ # -#GFSDBG=YES +#GFSDBG= PROG= growfs SRCS= growfs.c diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index f56580d94d08..d013826e8a5e 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -2,7 +2,7 @@ PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c -NOMAN= notyet +NOMAN= # not yet CFLAGS+= -I${.CURDIR}/../../sys diff --git a/sbin/mca/Makefile b/sbin/mca/Makefile index 0aeed64e6183..e7729b11bdc8 100644 --- a/sbin/mca/Makefile +++ b/sbin/mca/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= mca WARNS?= 4 -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile index f667aec9ea21..a3a578d061b5 100644 --- a/sbin/recoverdisk/Makefile +++ b/sbin/recoverdisk/Makefile @@ -2,7 +2,7 @@ PROG= recoverdisk -NOMAN=1 +NOMAN= WARNS?= 5 diff --git a/sbin/rtsol/Makefile b/sbin/rtsol/Makefile index 0bdbdaa0ba67..66d39e52bd68 100644 --- a/sbin/rtsol/Makefile +++ b/sbin/rtsol/Makefile @@ -21,7 +21,7 @@ SRCS= rtsold.c rtsol.c if.c probe.c rtsock.c CFLAGS+=-DINET6 -DHAVE_ARC4RANDOM -DHAVE_POLL_H -DSMALL WARNS?= 0 -NOMAN= yes +NOMAN= .PATH: ${SRCDIR} diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 22c367f7a2fd..512b90a0e35e 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -4,7 +4,7 @@ LIB= crypto SHLIBDIR?= /lib SHLIB_MAJOR= 3 -NOLINT= true +NOLINT= .if exists(Makefile.man) .include "Makefile.man" diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index 3fe9175d78c3..72b94021ea14 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -30,7 +30,7 @@ DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN} LDADD+= -lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken .endif -NOLINT= true +NOLINT= DPADD+= ${LIBCRYPTO} ${LIBCRYPT} LDADD+= -lcrypto -lcrypt diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index a3d109fd3af1..07c6f67fa6e8 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -3,7 +3,7 @@ LIB= ssl SHLIB_MAJOR= 3 -NOLINT= true +NOLINT= .if exists(Makefile.man) .include "Makefile.man" diff --git a/share/dict/Makefile b/share/dict/Makefile index 34d25c30f19e..cf3c9b5b051b 100644 --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -NOOBJ= noobj +NOOBJ= # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile index 4e4f34fbbe84..ed5dce0cd289 100644 --- a/share/doc/IPv6/Makefile +++ b/share/doc/IPv6/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= IMPLEMENTATION FILESDIR= ${SHAREDIR}/doc/IPv6 diff --git a/share/doc/bind9/Makefile b/share/doc/bind9/Makefile index 6fe2bc6431e4..af8cf9ab5ab0 100644 --- a/share/doc/bind9/Makefile +++ b/share/doc/bind9/Makefile @@ -5,7 +5,7 @@ SRCDIR= ${BIND_DIR}/doc .PATH: ${BIND_DIR} ${SRCDIR}/arm ${SRCDIR}/misc -NOOBJ= noobj +NOOBJ= FILESGROUPS= TOP ARM MISC TOP= CHANGES COPYRIGHT FAQ KNOWN_DEFECTS README diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile index 524ee04ea347..9bdd4874fb20 100644 --- a/share/doc/papers/bufbio/Makefile +++ b/share/doc/papers/bufbio/Makefile @@ -5,7 +5,7 @@ DOC= bio SRCS= bio.ms-patched EXTRA= bufsize.eps MACROS= -ms -USE_PIC= YES +USE_PIC= CLEANFILES= bio.ms-patched bio.ms-patched: bio.ms diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile index 8683c94c20aa..53a79fccab9a 100644 --- a/share/doc/papers/devfs/Makefile +++ b/share/doc/papers/devfs/Makefile @@ -4,6 +4,6 @@ VOLUME= papers DOC= devfs SRCS= paper.me MACROS= -me -USE_PIC= YES +USE_PIC= .include <bsd.doc.mk> diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile index 41acd7a8b0fa..7f7670c45533 100644 --- a/share/doc/papers/diskperf/Makefile +++ b/share/doc/papers/diskperf/Makefile @@ -6,6 +6,6 @@ DOC= diskperf SRCS= abs.ms motivation.ms equip.ms methodology.ms tests.ms \ results.ms conclusions.ms appendix.ms MACROS= -ms -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile index 8e9fd287d791..5d493542ea98 100644 --- a/share/doc/papers/jail/Makefile +++ b/share/doc/papers/jail/Makefile @@ -5,7 +5,7 @@ DOC= jail SRCS= paper.ms-patched EXTRA= implementation.ms mgt.ms future.ms jail01.eps MACROS= -ms -USE_SOELIM= YES +USE_SOELIM= CLEANFILES= paper.ms-patched paper.ms-patched: paper.ms diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile index ebb5cdefcf91..e706f0a38962 100644 --- a/share/doc/papers/kernmalloc/Makefile +++ b/share/doc/papers/kernmalloc/Makefile @@ -6,10 +6,10 @@ DOC= kernmalloc SRCS= kernmalloc.t appendix.ms EXTRA= alloc.fig usage.tbl MACROS= -ms -USE_EQN= YES -USE_PIC= YES -USE_SOELIM= YES -USE_TBL= YES +USE_EQN= +USE_PIC= +USE_SOELIM= +USE_TBL= CLEANFILES= appendix.ms appendix.ms: appendix.t diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile index 53e5a4987030..33416d6e3c1b 100644 --- a/share/doc/papers/kerntune/Makefile +++ b/share/doc/papers/kerntune/Makefile @@ -6,9 +6,9 @@ DOC= kerntune SRCS= 0.t 1.t 2.t 3.t 4.t EXTRA= fig2.pic MACROS= -ms -USE_EQN= YES -USE_PIC= YES -USE_SOELIM= YES -USE_TBL= YES +USE_EQN= +USE_PIC= +USE_SOELIM= +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/papers/nqnfs/Makefile b/share/doc/papers/nqnfs/Makefile index 788873c921fc..f968068f4878 100644 --- a/share/doc/papers/nqnfs/Makefile +++ b/share/doc/papers/nqnfs/Makefile @@ -5,7 +5,7 @@ VOLUME= papers DOC= nqnfs SRCS= nqnfs.me MACROS= -me -USE_PIC= YES -USE_TBL= YES +USE_PIC= +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/papers/px/Makefile b/share/doc/papers/px/Makefile index 54a8e1c39cb2..aa314495a7c5 100644 --- a/share/doc/papers/px/Makefile +++ b/share/doc/papers/px/Makefile @@ -7,8 +7,8 @@ SRCS= tmac.p pxin0.n pxin1.n pxin2.n pxin3.n pxin4.n EXTRA= fig1.1.n fig1.2.n fig1.3.n fig2.3.n fig2.4.n fig3.2.n \ fig3.3.n table2.1.n table2.2.n table2.3.n table3.1.n MACROS= -ms -USE_SOELIM= YES -USE_TBL= YES +USE_SOELIM= +USE_TBL= CLEANFILES= fig2.3.n fig2.3.n: fig2.3.raw diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile index ad7e38ed4e9d..88ab5afcc287 100644 --- a/share/doc/papers/relengr/Makefile +++ b/share/doc/papers/relengr/Makefile @@ -6,7 +6,7 @@ DOC= releng SRCS= stubs 0.t 1.t 2.t 3.t EXTRA= ref.bib MACROS= -ms -USE_REFER= YES +USE_REFER= CLEANFILES= stubs stubs: diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile index a6e89f538fbb..9ddbc9df5474 100644 --- a/share/doc/papers/sysperf/Makefile +++ b/share/doc/papers/sysperf/Makefile @@ -6,8 +6,8 @@ DOC= sysperf SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.tmp EXTRA= a1.t a2.t MACROS= -ms -USE_EQN= YES -USE_TBL= YES +USE_EQN= +USE_TBL= CLEANFILES= appendix.tmp appendix.tmp: a1.t a2.t diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile index 252dba347761..f6d158ba4034 100644 --- a/share/doc/papers/timecounter/Makefile +++ b/share/doc/papers/timecounter/Makefile @@ -9,9 +9,9 @@ SRCS= tmac.usenix timecounter.ms-patched EXTRA= fig1.eps fig2.eps fig3.eps fig4.eps fig5.eps gps.ps intr.ps MACROS= -ms CLEANFILES= timecounter.ms-patched -USE_PIC=1 -USE_EQN=1 -USE_TBL=1 +USE_PIC= +USE_EQN= +USE_TBL= timecounter.ms-patched: timecounter.ms sed -E -e 's;(gps|intr).ps;${.CURDIR}/&;' -e 's;fig[0-9].eps;${.CURDIR}/&;' \ diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile index 78c7eb027929..14a2f703e5b9 100644 --- a/share/doc/psd/01.cacm/Makefile +++ b/share/doc/psd/01.cacm/Makefile @@ -5,8 +5,8 @@ VOLUME= psd/01.cacm SRCS= stubs p.mac p1 p2 p3 p4 p5 p6 EXTRA= ref.bib MACROS= -ms -USE_REFER= YES -USE_TBL= YES +USE_REFER= +USE_TBL= CLEANFILES= stubs stubs: diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile index 51aaa80d54ab..89d0dc3c3b95 100644 --- a/share/doc/psd/02.implement/Makefile +++ b/share/doc/psd/02.implement/Makefile @@ -5,9 +5,9 @@ VOLUME= psd/02.implement SRCS= stubs implement EXTRA= ref.bib MACROS= -ms -USE_PIC= YES -USE_REFER= YES -USE_SOELIM= YES +USE_PIC= +USE_REFER= +USE_SOELIM= CLEANFILES= stubs stubs: diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile index 48b9414e3123..2c0ec7b8c9d3 100644 --- a/share/doc/psd/05.sysman/Makefile +++ b/share/doc/psd/05.sysman/Makefile @@ -5,6 +5,6 @@ VOLUME= psd/05.sysman SRCS= 0.t 1.0.t 1.1.t 1.2.t 1.3.t 1.4.t 1.5.t 1.6.t 1.7.t \ 2.0.t 2.1.t 2.2.t 2.3.t 2.4.t 2.5.t a.t MACROS= -ms -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile index cbd9af2cfe97..877a97cd7073 100644 --- a/share/doc/psd/06.Clang/Makefile +++ b/share/doc/psd/06.Clang/Makefile @@ -4,6 +4,6 @@ VOLUME= psd/06.Clang SRCS= Clang.ms MACROS= -ms -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/psd/13.rcs/rcs/Makefile b/share/doc/psd/13.rcs/rcs/Makefile index 41a630e9a8c7..6d94aed2bb44 100644 --- a/share/doc/psd/13.rcs/rcs/Makefile +++ b/share/doc/psd/13.rcs/rcs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ SRCS= rcs.ms -USE_PIC= YES -USE_TBL= YES +USE_PIC= +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile index e597df292a0b..4381c98d7f86 100644 --- a/share/doc/psd/15.yacc/Makefile +++ b/share/doc/psd/15.yacc/Makefile @@ -6,7 +6,7 @@ SRCS= stubs ss.. ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \ ssA ssB ssa ssb ssc ssd EXTRA= ref.bib MACROS= -ms -USE_REFER= YES +USE_REFER= CLEANFILES= stubs stubs: diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile index 4049bd6f34f0..6dea7c028991 100644 --- a/share/doc/psd/16.lex/Makefile +++ b/share/doc/psd/16.lex/Makefile @@ -4,6 +4,6 @@ VOLUME= psd/16.lex SRCS= lex.ms MACROS= -ms -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile index 30ec4e09810e..1097072fe0eb 100644 --- a/share/doc/psd/18.gprof/Makefile +++ b/share/doc/psd/18.gprof/Makefile @@ -6,10 +6,10 @@ SRCS= header.me abstract.me intro.me profiling.me gathering.me \ postp.me present.me refs.me EXTRA= postp1.pic postp2.pic postp3.pic pres1.pic pres2.pic MACROS= -me -USE_SOELIM= YES -USE_PIC= YES -USE_TBL= YES -USE_EQN= YES +USE_SOELIM= +USE_PIC= +USE_TBL= +USE_EQN= SRCDIR= ${.CURDIR}/../../../../usr.bin/gprof/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile index aabef1087790..934cdeaf5eb6 100644 --- a/share/doc/psd/20.ipctut/Makefile +++ b/share/doc/psd/20.ipctut/Makefile @@ -7,8 +7,8 @@ MACROS= -me EXTRA= dgramread.c dgramsend.c fig2.pic fig3.pic fig8.pic pipe.c \ socketpair.c strchkread.c streamread.c streamwrite.c \ udgramread.c udgramsend.c ustreamread.c ustreamwrite.c -USE_SOELIM= YES -USE_PIC= YES -USE_TBL= YES +USE_SOELIM= +USE_PIC= +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile index 67ceab8c22db..67c3d6c40a17 100644 --- a/share/doc/psd/21.ipc/Makefile +++ b/share/doc/psd/21.ipc/Makefile @@ -4,6 +4,6 @@ VOLUME= psd/21.ipc SRCS= 0.t 1.t 2.t 3.t 4.t 5.t MACROS= -ms -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile index 4d14019317ef..4c38add5ba8c 100644 --- a/share/doc/psd/22.rpcgen/Makefile +++ b/share/doc/psd/22.rpcgen/Makefile @@ -3,7 +3,7 @@ VOLUME= psd/22.rpcgen SRCS= stubs rpcgen.ms MACROS= -ms -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile index 00e15d81f03b..77849b657aa9 100644 --- a/share/doc/psd/23.rpc/Makefile +++ b/share/doc/psd/23.rpc/Makefile @@ -3,8 +3,8 @@ VOLUME= psd/23.rpc SRCS= stubs rpc.prog.ms MACROS= -ms -USE_TBL= YES -USE_PIC= YES +USE_TBL= +USE_PIC= SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile index 23381523d9bf..878dca1c280e 100644 --- a/share/doc/psd/24.xdr/Makefile +++ b/share/doc/psd/24.xdr/Makefile @@ -3,7 +3,7 @@ VOLUME= psd/24.xdr SRCS= stubs xdr.nts.ms MACROS= -ms -USE_EQN= YES +USE_EQN= SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile index 07e5ec11d8a2..105135e217bc 100644 --- a/share/doc/psd/25.xdrrfc/Makefile +++ b/share/doc/psd/25.xdrrfc/Makefile @@ -3,7 +3,7 @@ VOLUME= psd/25.xdrrfc SRCS= stubs xdr.rfc.ms MACROS= -ms -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile index 233aa999d6fd..79214f1c5971 100644 --- a/share/doc/psd/26.rpcrfc/Makefile +++ b/share/doc/psd/26.rpcrfc/Makefile @@ -3,7 +3,7 @@ VOLUME= psd/26.rpcrfc SRCS= stubs rpc.rfc.ms MACROS= -ms -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile index 3eaa6e8265e0..590478780cef 100644 --- a/share/doc/psd/27.nfsrpc/Makefile +++ b/share/doc/psd/27.nfsrpc/Makefile @@ -3,7 +3,7 @@ VOLUME= psd/27.nfsrfc SRCS= stubs nfs.rfc.ms MACROS= -ms -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../lib/libc/rpc/PSD.doc .include <bsd.doc.mk> diff --git a/share/doc/psd/28.cvs/Makefile b/share/doc/psd/28.cvs/Makefile index 92f9339e9ca2..a62473284e36 100644 --- a/share/doc/psd/28.cvs/Makefile +++ b/share/doc/psd/28.cvs/Makefile @@ -3,8 +3,8 @@ VOLUME= psd/28.cvs SRCS= cvs-paper.ms MACROS= -ms -USE_PIC= YES -USE_TBL= YES +USE_PIC= +USE_TBL= SRCDIR= ${.CURDIR}/../../../../contrib/cvs/doc .include <bsd.doc.mk> diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile index 3572f4cd33b4..b2d9c301b16b 100644 --- a/share/doc/smm/01.setup/Makefile +++ b/share/doc/smm/01.setup/Makefile @@ -4,6 +4,6 @@ VOLUME= smm/01.setup SRCS= stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t MACROS= -ms -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile index e801d6ba50fd..26ed70a09779 100644 --- a/share/doc/smm/02.config/Makefile +++ b/share/doc/smm/02.config/Makefile @@ -4,7 +4,7 @@ VOLUME= smm/02.config SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t a.t b.t c.t d.t e.t MACROS= -ms -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../usr.sbin/config/SMM.doc .include <bsd.doc.mk> diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile index 4454d6316654..d63aae2d877d 100644 --- a/share/doc/smm/05.fastfs/Makefile +++ b/share/doc/smm/05.fastfs/Makefile @@ -4,7 +4,7 @@ VOLUME= smm/05.fastfs SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t MACROS= -ms -USE_TBL= YES -USE_EQN= YES +USE_TBL= +USE_EQN= .include <bsd.doc.mk> diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile index a23664729ae0..482ed798a95e 100644 --- a/share/doc/smm/08.sendmailop/Makefile +++ b/share/doc/smm/08.sendmailop/Makefile @@ -4,8 +4,8 @@ VOLUME= smm/08.sendmailop SRCS= op.me MACROS= -me -USE_PIC= YES -USE_EQN= YES +USE_PIC= +USE_EQN= SRCDIR= ${.CURDIR}/../../../../contrib/sendmail/doc/op .include <bsd.doc.mk> diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile index b926b87724fc..1d9ed5c2eab5 100644 --- a/share/doc/smm/12.timed/Makefile +++ b/share/doc/smm/12.timed/Makefile @@ -5,8 +5,8 @@ VOLUME= smm/12.timed SRCS= timed.ms EXTRA= date loop time unused MACROS= -ms -USE_SOELIM= YES -USE_TBL= YES +USE_SOELIM= +USE_TBL= SRCDIR= ${.CURDIR}/../../../../usr.sbin/timed/SMM.doc/timed .include <bsd.doc.mk> diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile index e917c82a2f73..d22a7b928970 100644 --- a/share/doc/usd/04.csh/Makefile +++ b/share/doc/usd/04.csh/Makefile @@ -4,7 +4,7 @@ VOLUME= usd/04.csh SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g MACROS= -ms -USE_SOELIM= YES +USE_SOELIM= SRCDIR= ${.CURDIR}/../../../../bin/csh/USD.doc .include <bsd.doc.mk> diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile index f858309dfab9..d5a6d3c0b554 100644 --- a/share/doc/usd/07.mail/Makefile +++ b/share/doc/usd/07.mail/Makefile @@ -5,7 +5,7 @@ VOLUME= usd/07.mail SRCS= mail0.nr mail1.nr mail2.nr mail3.nr mail4.nr mail5.nr mail6.nr \ mail7.nr mail8.nr mail9.nr maila.nr MACROS= -me -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../usr.bin/mail/USD.doc .include <bsd.doc.mk> diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile index 17fbbecea139..143333f6ea2c 100644 --- a/share/doc/usd/10.exref/summary/Makefile +++ b/share/doc/usd/10.exref/summary/Makefile @@ -2,6 +2,6 @@ DOC= summary SRCS= ex.summary -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile index ab44651fb028..f412b627fa92 100644 --- a/share/doc/usd/11.vitut/Makefile +++ b/share/doc/usd/11.vitut/Makefile @@ -4,7 +4,7 @@ VOLUME= usd/11.edit SRCS= edittut.ms MACROS= -ms -USE_TBL= YES +USE_TBL= SRCDIR= ${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/edit # index for versatec is different from the one in edit.tut diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile index ab55a90f08a5..425536dce4d6 100644 --- a/share/doc/usd/12.vi/summary/Makefile +++ b/share/doc/usd/12.vi/summary/Makefile @@ -2,6 +2,6 @@ DOC= summary SRCS= vi.summary -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile index 3809036327ce..6021b092e236 100644 --- a/share/doc/usd/12.vi/vi/Makefile +++ b/share/doc/usd/12.vi/vi/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ SRCS= vi.in vi.chars -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile index ac9f088c3657..d7bb392ef844 100644 --- a/share/doc/usd/13.viref/Makefile +++ b/share/doc/usd/13.viref/Makefile @@ -7,8 +7,8 @@ EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff MACROS= -me CLEANFILES= vi.ref-patched index TRFLAGS= -U # this is to hide warnings only -USE_SOELIM= YES -USE_TBL= YES +USE_SOELIM= +USE_TBL= SRCDIR= ${.CURDIR}/../../../../contrib/nvi/docs/USD.doc/vi.ref vi.ref-patched: vi.ref diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile index 0f9bfa2804f9..92ed42959bf4 100644 --- a/share/doc/usd/21.troff/Makefile +++ b/share/doc/usd/21.troff/Makefile @@ -3,6 +3,6 @@ VOLUME= usd/21.troff SRCS= m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2 -USE_TBL= YES +USE_TBL= .include <bsd.doc.mk> diff --git a/share/examples/Makefile b/share/examples/Makefile index d28482110131..06587558bc93 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -251,7 +251,7 @@ XFILES= BSD_daemon/FreeBSD.pfa \ BINDIR= ${SHAREDIR}/examples -NOOBJ= noobj +NOOBJ= # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies''); (latter useful diff --git a/share/examples/autofs/driver/Makefile b/share/examples/autofs/driver/Makefile index 558af68e7d36..58e7697b0417 100644 --- a/share/examples/autofs/driver/Makefile +++ b/share/examples/autofs/driver/Makefile @@ -4,7 +4,7 @@ PROG=autodriver SRCS= autodriver.c -NOMAN= YES +NOMAN= WARNS= 4 CFLAGS+= -g BINDIR?= /sbin diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile index 5ddabd3fd70d..f6574f8a20df 100644 --- a/share/examples/ipfilter/Makefile +++ b/share/examples/ipfilter/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= README diff --git a/share/examples/isdn/v21/Makefile b/share/examples/isdn/v21/Makefile index 5fa4f0c8647e..0229ebe9815b 100644 --- a/share/examples/isdn/v21/Makefile +++ b/share/examples/isdn/v21/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= v21modem -NOMAN= 1 +NOMAN= DPADD= ${LIBUTIL} ${LIBM} LDADD= -lutil -lm CFLAGS+= -g -Wall diff --git a/share/examples/kld/syscall/test/Makefile b/share/examples/kld/syscall/test/Makefile index 5968689e31de..5f11f061737a 100644 --- a/share/examples/kld/syscall/test/Makefile +++ b/share/examples/kld/syscall/test/Makefile @@ -1,6 +1,7 @@ # Makefile for simple caller of syscall +# $FreeBSD$ PROG = call -NOMAN = noman +NOMAN = .include <bsd.prog.mk> diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile index 080a74d134a4..3f06217c1f51 100644 --- a/share/examples/libvgl/Makefile +++ b/share/examples/libvgl/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= demo -NOMAN= yes +NOMAN= DPADD= ${LIBVGL} LDADD= -lvgl diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile index fbc655cb65b4..9abced71d11d 100644 --- a/share/examples/pf/Makefile +++ b/share/examples/pf/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ diff --git a/share/examples/ppi/Makefile b/share/examples/ppi/Makefile index 1836d8abc17c..7d3627e9dd6e 100644 --- a/share/examples/ppi/Makefile +++ b/share/examples/ppi/Makefile @@ -3,6 +3,6 @@ # $FreeBSD$ PROG= ppilcd -NOMAN= YES +NOMAN= .include <bsd.prog.mk> diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile index 609dfc39239a..82c06f5137ca 100644 --- a/share/examples/smbfs/Makefile +++ b/share/examples/smbfs/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= BINDIR= /usr/share/examples/smbfs FILES= dot.nsmbrc diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile index 2370801e8e5b..0e465db35b71 100644 --- a/share/examples/smbfs/print/Makefile +++ b/share/examples/smbfs/print/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= BINDIR= /usr/share/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj diff --git a/share/info/Makefile b/share/info/Makefile index 2f19ee8674f8..024d6ce4b20a 100644 --- a/share/info/Makefile +++ b/share/info/Makefile @@ -1,7 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 # $FreeBSD$ -NOOBJ= noobj +NOOBJ= .include <bsd.prog.mk> diff --git a/share/misc/Makefile b/share/misc/Makefile index 2303dddcad10..413b3128d1c0 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -4,7 +4,7 @@ FILES= ascii birthtoken bsd-family-tree eqnchar flowers init.ee \ iso3166 iso639 latin1 man.template mdoc.template operator pci_vendors \ scsi_modes usb_hid_usages -NOOBJ= noobj +NOOBJ= FILESDIR= ${BINDIR}/misc .include <bsd.prog.mk> diff --git a/share/mk/Makefile b/share/mk/Makefile index 7cedf1f498c8..0a2fe21c6bd6 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -10,7 +10,7 @@ FILES+= bsd.obj.mk bsd.own.mk FILES+= bsd.port.mk bsd.port.post.mk bsd.port.pre.mk bsd.port.subdir.mk FILES+= bsd.prog.mk bsd.subdir.mk bsd.sys.mk FILES+= sys.mk -NOOBJ= noobj +NOOBJ= FILESDIR= ${BINDIR}/mk .include <bsd.prog.mk> diff --git a/share/security/Makefile b/share/security/Makefile index 0484e0dedf0e..8303eea8f031 100644 --- a/share/security/Makefile +++ b/share/security/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ FILES= lomac-policy.contexts -NOOBJ= noobj +NOOBJ= FILESDIR= ${BINDIR}/security .include "${.CURDIR}/../Makefile.inc" diff --git a/share/sendmail/Makefile b/share/sendmail/Makefile index 9574e6884064..2b4a9d195911 100644 --- a/share/sendmail/Makefile +++ b/share/sendmail/Makefile @@ -9,7 +9,7 @@ CFFILES!= (cd ${SENDMAIL_DIR}; find -L ${CFDIR} \( -name CVS -prune \) -o -type DDIR= ${DESTDIR}/usr/share/sendmail -NOOBJ= noobj +NOOBJ= # Define SHARED to indicate whether you want symbolic links to the system # source (``symlinks''), or a separate copy (``copies'') diff --git a/share/skel/Makefile b/share/skel/Makefile index 1626964e9cd4..0422a8732ef8 100644 --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -9,6 +9,6 @@ FILES1DIR= /usr/share/skel FILES2DIR= /usr/share/skel FILES1MODE= 0644 FILES2MODE= 0600 -NOOBJ= noobj +NOOBJ= .include <bsd.prog.mk> diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile index c7aad2d9d8bc..e79dbc0ac2d8 100644 --- a/share/snmp/mibs/Makefile +++ b/share/snmp/mibs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ FILES= FREEBSD-MIB.txt -NOOBJ= noobj +NOOBJ= FILESDIR= ${SHAREDIR}/snmp/mibs .include <bsd.prog.mk> diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 44db821fcb79..534630d115bd 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -32,6 +32,6 @@ FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ FILESDIR= ${SHAREDIR}/syscons/fonts -NOOBJ= noobj +NOOBJ= .include <bsd.prog.mk> diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index 5a189e4d4e6a..aa7d1cac04d4 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -45,6 +45,6 @@ FILES= INDEX.keymaps \ FILESDIR= ${SHAREDIR}/syscons/keymaps -NOOBJ= noobj +NOOBJ= .include <bsd.prog.mk> diff --git a/sys/boot/alpha/libalpha/Makefile b/sys/boot/alpha/libalpha/Makefile index caba16cedca7..596611678631 100644 --- a/sys/boot/alpha/libalpha/Makefile +++ b/sys/boot/alpha/libalpha/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= alpha -INTERNALLIB= true +INTERNALLIB= #CFLAGS+= -DDISK_DEBUG diff --git a/sys/boot/arc/lib/Makefile b/sys/boot/arc/lib/Makefile index 7944374909d2..26336c4f81bf 100644 --- a/sys/boot/arc/lib/Makefile +++ b/sys/boot/arc/lib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= arc -INTERNALLIB= true +INTERNALLIB= CFLAGS+= -ffreestanding .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile index 9ecd4c7b6a6d..c5b1e0fe6c4e 100644 --- a/sys/boot/efi/libefi/Makefile +++ b/sys/boot/efi/libefi/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../${MACHINE_ARCH}/${MACHINE_ARCH} LIB= efi -INTERNALLIB= true +INTERNALLIB= SRCS= libefi.c efi_console.c time.c copy.c devicename.c module.c SRCS+= delay.c efifs.c efinet.c elf_freebsd.c bootinfo.c pal.S diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile index c455e7a1bb53..e041b784b33d 100644 --- a/sys/boot/ficl/Makefile +++ b/sys/boot/ficl/Makefile @@ -29,7 +29,7 @@ PROG= testmain .include <bsd.prog.mk> .else LIB= ficl -INTERNALLIB= yes +INTERNALLIB= .include <bsd.lib.mk> .endif diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index bfae7ce013a5..2c388e3206b9 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # LIB= i386 -INTERNALLIB= true +INTERNALLIB= SRCS= biosacpi.c bioscd.c biosdisk.c biosmem.c biospnp.c \ biospci.c biossmap.c bootinfo.c bootinfo32.c bootinfo64.c \ diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile index a153f4fb07f5..8a56a778f76f 100644 --- a/sys/boot/ofw/libofw/Makefile +++ b/sys/boot/ofw/libofw/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= ofw -INTERNALLIB= true +INTERNALLIB= SRCS= devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \ ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ diff --git a/sys/boot/pc98/libpc98/Makefile b/sys/boot/pc98/libpc98/Makefile index c3ebc16db08b..c5162b430e77 100644 --- a/sys/boot/pc98/libpc98/Makefile +++ b/sys/boot/pc98/libpc98/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ # LIB= pc98 -INTERNALLIB= true +INTERNALLIB= .PATH: ${.CURDIR}/../../i386/libi386 diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 17f1097797d7..9fb1ebe047e6 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -20,7 +20,7 @@ %VERSREQ= 600000 # Temporary stuff while we're still embryonic -NO_MODULES?= yes +NO_MODULES= STD8X16FONT?= iso diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc index 93c219cc6a96..b992f38fe287 100644 --- a/sys/conf/Makefile.powerpc +++ b/sys/conf/Makefile.powerpc @@ -20,7 +20,7 @@ %VERSREQ= 600000 # Temporary stuff while we're still embryonic -NO_MODULES?= yes +NO_MODULES= STD8X16FONT?= iso diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile index 2d76c7d83177..59f8e1c32e2d 100644 --- a/sys/crypto/rijndael/Makefile +++ b/sys/crypto/rijndael/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG=test00 -NOMAN=1 +NOMAN= SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c CFLAGS += -I${.CURDIR}/../.. -g -static diff --git a/sys/dev/aic7xxx/aicasm/Makefile b/sys/dev/aic7xxx/aicasm/Makefile index fa35af3e1744..41499b2a86fe 100644 --- a/sys/dev/aic7xxx/aicasm/Makefile +++ b/sys/dev/aic7xxx/aicasm/Makefile @@ -33,7 +33,7 @@ CFLAGS+= ${NOSTDINC} -I/usr/include -I. .ifdef MAKESRCPATH CFLAGS+= -I${MAKESRCPATH} .endif -NOMAN= noman +NOMAN= YFLAGS= -b ${.TARGET:R} ${.TARGET:M*macro*:S/$(.TARGET)/-p mm/} -d LFLAGS+= ${.TARGET:M*macro*:S/$(.TARGET)/-Pmm/} diff --git a/sys/dev/patm/genrtab/Makefile b/sys/dev/patm/genrtab/Makefile index 9c067004a5a7..a46a04bf577e 100644 --- a/sys/dev/patm/genrtab/Makefile +++ b/sys/dev/patm/genrtab/Makefile @@ -6,7 +6,7 @@ PROG= genrtab INTERNALPROG= WARNS?= 5 -NOMAN= true +NOMAN= DPADD= ${LIBM} LDADD= -lm diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index 0c2b2973fdf3..c9a0d19eb500 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -19,7 +19,7 @@ SRCS= vnode_if.h \ smbfs_vfsops.c smbfs_node.c smbfs_io.c smbfs_vnops.c \ smbfs_subr.c smbfs_smb.c -NETSMBCRYPTO=yes +NETSMBCRYPTO= .if defined(NETSMBCRYPTO) SRCS+= des_ecb.c des_setkey.c diff --git a/sys/netinet/libalias/Makefile b/sys/netinet/libalias/Makefile index f59f1f7112dd..dc6eb2df2617 100644 --- a/sys/netinet/libalias/Makefile +++ b/sys/netinet/libalias/Makefile @@ -9,6 +9,6 @@ SRCS= alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \ alias_util.c alias_old.c INCS= alias.h WARNS?= 6 -NO_WERROR= true +NO_WERROR= .include <bsd.lib.mk> diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile index 14cd360a22b3..312bec32e7cd 100644 --- a/tools/diag/dumpvfscache/Makefile +++ b/tools/diag/dumpvfscache/Makefile @@ -4,7 +4,7 @@ PROG= dumpvfscache DPADD= ${LIBKVM} LDADD= -lkvm -NOMAN= 1 +NOMAN= test: ${PROG} ./${PROG} > a diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile index 2136e3086004..a09e40097e45 100644 --- a/tools/diag/localeck/Makefile +++ b/tools/diag/localeck/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= localeck -NOMAN= noman +NOMAN= WARNS?= 4 LOCALEDIR?= /usr/share/locale diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile index c459487ab4c0..45dc649f91ac 100644 --- a/tools/regression/fsx/Makefile +++ b/tools/regression/fsx/Makefile @@ -2,6 +2,6 @@ PROG= fsx -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile index 2166aee20fa1..c8b1e18fb181 100644 --- a/tools/regression/gaithrstress/Makefile +++ b/tools/regression/gaithrstress/Makefile @@ -3,5 +3,5 @@ PROG= gaithrstress LDADD+= -pthread -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile index e4ac676a5dcc..8cd166122300 100644 --- a/tools/regression/geom/ConfCmp/Makefile +++ b/tools/regression/geom/ConfCmp/Makefile @@ -6,7 +6,7 @@ SRCS+= subr_sbuf.c .PATH: ../../../../sys/kern -NOOBJ= youbet +NOOBJ= WARNS?= 5 CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static # Uncomment for ElectricFence @@ -15,7 +15,7 @@ CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith - DPADD += ${LIBBSDXML} LDADD += -lbsdxml -NOMAN= yeah +NOMAN= CLEANFILES += _* .include <bsd.prog.mk> diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile index ef8972cde7e2..57fd8f19a546 100644 --- a/tools/regression/geom/MdLoad/Makefile +++ b/tools/regression/geom/MdLoad/Makefile @@ -4,7 +4,7 @@ PROG= MdLoad DPADD= ${LIBSBUF} ${LIBBSDXML} LDADD= -lsbuf -lbsdxml -NOMAN= sorry +NOMAN= WARNS?= 4 diff --git a/tools/regression/ia64_unaligned/Makefile b/tools/regression/ia64_unaligned/Makefile index a5f110755ba0..de17b19c17d4 100644 --- a/tools/regression/ia64_unaligned/Makefile +++ b/tools/regression/ia64_unaligned/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= unaligned -NOMAN= t +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile index 16dcb594d4e5..3ed7480bcfb2 100644 --- a/tools/regression/include/tgmath/Makefile +++ b/tools/regression/include/tgmath/Makefile @@ -2,6 +2,6 @@ PROG= tgmath CFLAGS+= -fno-builtin -std=c99 -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/netatalk/simple_send/Makefile b/tools/regression/netatalk/simple_send/Makefile index 54e486f4c10d..9fa445cbcf27 100644 --- a/tools/regression/netatalk/simple_send/Makefile +++ b/tools/regression/netatalk/simple_send/Makefile @@ -3,6 +3,6 @@ # PROG= simple_send -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/netinet/ipsockopt/Makefile b/tools/regression/netinet/ipsockopt/Makefile index 25af26a388c1..dd83aa96c7cf 100644 --- a/tools/regression/netinet/ipsockopt/Makefile +++ b/tools/regression/netinet/ipsockopt/Makefile @@ -3,6 +3,6 @@ # PROG= ipsockopt -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/netinet/tcpconnect/Makefile b/tools/regression/netinet/tcpconnect/Makefile index abc9535e93e6..9d5a8d9ee928 100644 --- a/tools/regression/netinet/tcpconnect/Makefile +++ b/tools/regression/netinet/tcpconnect/Makefile @@ -3,6 +3,6 @@ # PROG= tcpconnect -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/netinet/tcpstream/Makefile b/tools/regression/netinet/tcpstream/Makefile index 296eebbfa96e..0da68d9b3d89 100644 --- a/tools/regression/netinet/tcpstream/Makefile +++ b/tools/regression/netinet/tcpstream/Makefile @@ -4,6 +4,6 @@ CFLAGS+= -Wall PROG= tcpstream -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile index 54a7b9d0effa..e18acbea8adc 100644 --- a/tools/regression/nfsmmap/test1/Makefile +++ b/tools/regression/nfsmmap/test1/Makefile @@ -1,5 +1,7 @@ +# $FreeBSD$ + PROG= test1 -NOMAN= t +NOMAN= NFSSERVER?= herring.nlsystems.com CLEANFILES= test1.zeros test1.good test1.data test1.scratch diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile index 460c0b231666..6b5ed59e9026 100644 --- a/tools/regression/nfsmmap/test2/Makefile +++ b/tools/regression/nfsmmap/test2/Makefile @@ -1,5 +1,7 @@ +# $FreeBSD$ + PROG= test2 -NOMAN= t +NOMAN= NFSSERVER?= herring.nlsystems.com CLEANFILES= test2.zeros test2.good test2.data test2.scratch diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile index f19516db1b58..d137245bda43 100644 --- a/tools/regression/p1003_1b/Makefile +++ b/tools/regression/p1003_1b/Makefile @@ -11,7 +11,7 @@ SRCS=\ sched.c \ yield.c -NOMAN=1 +NOMAN= CFLAGS+=-DNO_MEMLOCK .include <bsd.prog.mk> diff --git a/tools/regression/pipe/Makefile b/tools/regression/pipe/Makefile index ff9f501775b1..9d2237353491 100644 --- a/tools/regression/pipe/Makefile +++ b/tools/regression/pipe/Makefile @@ -4,7 +4,7 @@ # "make" then "make regress". # PROG= bigpipetest -NOMAN= yes +NOMAN= regress: @if ./bigpipetest; then \ diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile index 4b8039fc1c5d..16e796f06ab9 100644 --- a/tools/regression/security/access/Makefile +++ b/tools/regression/security/access/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= testaccess -NOMAN= yes +NOMAN= SRCS= testaccess.c CFLAGS += -Wall diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile index 65323f4ab365..3950943ad8db 100644 --- a/tools/regression/security/proc_to_proc/Makefile +++ b/tools/regression/security/proc_to_proc/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= testuid -NOMAN= yes +NOMAN= ADDITIONAL_FLAGS=-DSETSUGID_SUPPORTED #ADDITIONAL_FLAGS= -DSETSUGID_SUPPORTED_BUT_NO_LIBC_STUB diff --git a/tools/regression/sockets/accept_fd_leak/Makefile b/tools/regression/sockets/accept_fd_leak/Makefile index 69ac015e1852..7512f89e6e09 100644 --- a/tools/regression/sockets/accept_fd_leak/Makefile +++ b/tools/regression/sockets/accept_fd_leak/Makefile @@ -3,7 +3,7 @@ # PROG= accept_fd_leak -NOMAN= yes +NOMAN= regress: ./accept_fd_leak diff --git a/tools/regression/sockets/accf_data_attach/Makefile b/tools/regression/sockets/accf_data_attach/Makefile index 66ae99a85a84..0110cbb1fd83 100644 --- a/tools/regression/sockets/accf_data_attach/Makefile +++ b/tools/regression/sockets/accf_data_attach/Makefile @@ -3,7 +3,7 @@ # PROG= accf_data_attach -NOMAN= yes +NOMAN= accf_data_attach: accf_data_attach.c gcc -Wall -o accf_data_attach accf_data_attach.c diff --git a/tools/regression/sockets/socketpair/Makefile b/tools/regression/sockets/socketpair/Makefile index bf389c9ea50f..2c51e890721e 100644 --- a/tools/regression/sockets/socketpair/Makefile +++ b/tools/regression/sockets/socketpair/Makefile @@ -3,7 +3,7 @@ # PROG= socketpair -NOMAN= yes +NOMAN= socketpair: socketpair.c gcc -Wall -o socketpair socketpair.c diff --git a/tools/regression/sysvmsg/Makefile b/tools/regression/sysvmsg/Makefile index 45f7b72e87d5..ec23650922e0 100644 --- a/tools/regression/sysvmsg/Makefile +++ b/tools/regression/sysvmsg/Makefile @@ -3,7 +3,7 @@ # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:56:59 thorpej Exp $ PROG= msgtest -NOMAN= yes +NOMAN= regress: @if ./msgtest ./msgtest; then \ diff --git a/tools/regression/sysvsem/Makefile b/tools/regression/sysvsem/Makefile index f5a37268f0df..4426cccfd008 100644 --- a/tools/regression/sysvsem/Makefile +++ b/tools/regression/sysvsem/Makefile @@ -3,7 +3,7 @@ # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $ PROG= semtest -NOMAN= yes +NOMAN= regress: @if ./semtest ./semtest; then \ diff --git a/tools/regression/sysvshm/Makefile b/tools/regression/sysvshm/Makefile index 990538558da7..d34b203d0dfc 100644 --- a/tools/regression/sysvshm/Makefile +++ b/tools/regression/sysvshm/Makefile @@ -3,7 +3,7 @@ # Obtained from: $NetBSD: Makefile,v 1.3 2002/03/05 21:57:00 thorpej Exp $ PROG= shmtest -NOMAN= yes +NOMAN= regress: @if ./shmtest ./shmtest; then \ diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile index b3fe79eb079c..c3c853d86962 100644 --- a/tools/regression/tls/libxx/Makefile +++ b/tools/regression/tls/libxx/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 1 SRCS= xx.c #CFLAGS+=-mtls-dialect=sun -NOMAN= t +NOMAN= .include <bsd.lib.mk> diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile index c425977f611c..e9627e486d7c 100644 --- a/tools/regression/tls/libyy/Makefile +++ b/tools/regression/tls/libyy/Makefile @@ -5,6 +5,6 @@ SHLIB_MAJOR= 1 SRCS= yy.c CFLAGS+=-fpic -NOMAN= t +NOMAN= .include <bsd.lib.mk> diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile index 86ed613b73db..5a5e58aa8b67 100644 --- a/tools/regression/tls/ttls1/Makefile +++ b/tools/regression/tls/ttls1/Makefile @@ -3,7 +3,7 @@ PROG= ttls1 LDADD+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx LDADD+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy -NOMAN= t +NOMAN= DEBUG_FLAGS= -g .include <bsd.prog.mk> diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile index 63b5d07eaec8..ba348a4f614b 100644 --- a/tools/regression/tls/ttls2/Makefile +++ b/tools/regression/tls/ttls2/Makefile @@ -2,7 +2,7 @@ PROG= ttls2 LDADD+= -lpthread -NOMAN= t +NOMAN= DEBUG_FLAGS= -g .include <bsd.prog.mk> diff --git a/tools/test/malloc/Makefile b/tools/test/malloc/Makefile index 6637ab1ba33a..74878154ac0e 100644 --- a/tools/test/malloc/Makefile +++ b/tools/test/malloc/Makefile @@ -3,7 +3,7 @@ PROG= malloc SRCS= main.c .PATH: ${.CURDIR}/../../../lib/libc/stdlib -NOMAN= sorry +NOMAN= test: malloc @echo diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile index e9670fe25241..99d29f5147f2 100644 --- a/tools/test/ppsapi/Makefile +++ b/tools/test/ppsapi/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= ppsapitest -NOMAN= yeah +NOMAN= WARNS?= 5 diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile index 4267b72d85c6..337cc31a0b15 100644 --- a/tools/tools/aac/Makefile +++ b/tools/tools/aac/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= aac_checkq -NOMAN= sorry +NOMAN= BINDIR?=/usr/local/bin .include <bsd.prog.mk> diff --git a/tools/tools/gdb_regofs/Makefile b/tools/tools/gdb_regofs/Makefile index 28b62a6ec76e..b4396509a3e8 100644 --- a/tools/tools/gdb_regofs/Makefile +++ b/tools/tools/gdb_regofs/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ PROG=gdb_regofs SRCS=${MACHINE_ARCH}.c -NOMAN=yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/tools/ministat/Makefile b/tools/tools/ministat/Makefile index 17e26c2b63e9..547e4bcbb553 100644 --- a/tools/tools/ministat/Makefile +++ b/tools/tools/ministat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= ministat -NOMAN= yes +NOMAN= DPADD= ${LIBM} LDADD= -lm diff --git a/tools/tools/netrate/netblast/Makefile b/tools/tools/netrate/netblast/Makefile index 910fa6306d18..0f5afc9cfa95 100644 --- a/tools/tools/netrate/netblast/Makefile +++ b/tools/tools/netrate/netblast/Makefile @@ -3,6 +3,6 @@ # PROG= netblast -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/tools/netrate/netreceive/Makefile b/tools/tools/netrate/netreceive/Makefile index 998ad0bf6548..f3bb15aa7ac3 100644 --- a/tools/tools/netrate/netreceive/Makefile +++ b/tools/tools/netrate/netreceive/Makefile @@ -3,6 +3,6 @@ # PROG= netreceive -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/tools/netrate/netsend/Makefile b/tools/tools/netrate/netsend/Makefile index a26b629397e1..3225f098e8dd 100644 --- a/tools/tools/netrate/netsend/Makefile +++ b/tools/tools/netrate/netsend/Makefile @@ -4,6 +4,6 @@ CFLAGS+= -Wall PROG= netsend -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile index 10871434cfbd..a7999529c606 100644 --- a/tools/tools/pirtool/Makefile +++ b/tools/tools/pirtool/Makefile @@ -2,6 +2,6 @@ PROG= pirtool SRCS= pirtool.c -NOMAN= defined +NOMAN= .include <bsd.prog.mk> diff --git a/tools/tools/raidtest/Makefile b/tools/tools/raidtest/Makefile index e629f82dc1c7..c46cc62a1172 100644 --- a/tools/tools/raidtest/Makefile +++ b/tools/tools/raidtest/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= raidtest -NOMAN= true +NOMAN= WARNS?= 6 .include <bsd.prog.mk> diff --git a/tools/tools/recoverdisk/Makefile b/tools/tools/recoverdisk/Makefile index f667aec9ea21..a3a578d061b5 100644 --- a/tools/tools/recoverdisk/Makefile +++ b/tools/tools/recoverdisk/Makefile @@ -2,7 +2,7 @@ PROG= recoverdisk -NOMAN=1 +NOMAN= WARNS?= 5 diff --git a/tools/tools/syscall_timing/Makefile b/tools/tools/syscall_timing/Makefile index 0ebdb0ea0bf3..4f8f66308c61 100644 --- a/tools/tools/syscall_timing/Makefile +++ b/tools/tools/syscall_timing/Makefile @@ -4,6 +4,6 @@ PROG= syscall_timing CFLAGS+= -static -O -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile index 15338fd920cc..b6a891182b11 100644 --- a/usr.bin/dirname/Makefile +++ b/usr.bin/dirname/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= dirname -NOMAN= noman +NOMAN= .include <bsd.prog.mk> diff --git a/usr.bin/elf2aout/Makefile b/usr.bin/elf2aout/Makefile index 24f73f8353e8..29478697da8e 100644 --- a/usr.bin/elf2aout/Makefile +++ b/usr.bin/elf2aout/Makefile @@ -2,7 +2,7 @@ PROG= elf2aout NOMAN= -NO_WERROR?= +NO_WERROR= WARNS?= 5 .include <bsd.prog.mk> diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index 0091cc2747bc..043d65f46fb4 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -2,7 +2,7 @@ LIB= ln SRCS= libmain.c libyywrap.c -NOPIC= yes +NOPIC= LINKS= ${LIBDIR}/libln.a ${LIBDIR}/libl.a LINKS+= ${LIBDIR}/libln.a ${LIBDIR}/libfl.a diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile index e0018d89b7fd..57e5bcfab85d 100644 --- a/usr.bin/locate/bigram/Makefile +++ b/usr.bin/locate/bigram/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= locate.bigram -NOMAN= noman +NOMAN= BINDIR= ${LIBEXECDIR} CFLAGS+= -I${.CURDIR}/../locate diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile index fb1fb510e59a..cc7033ba022d 100644 --- a/usr.bin/locate/code/Makefile +++ b/usr.bin/locate/code/Makefile @@ -3,7 +3,7 @@ PROG= locate.code CFLAGS+=-I${.CURDIR}/../locate -NOMAN= noman +NOMAN= BINDIR= ${LIBEXECDIR} .include <bsd.prog.mk> diff --git a/usr.bin/ministat/Makefile b/usr.bin/ministat/Makefile index 17e26c2b63e9..547e4bcbb553 100644 --- a/usr.bin/ministat/Makefile +++ b/usr.bin/ministat/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= ministat -NOMAN= yes +NOMAN= DPADD= ${LIBM} LDADD= -lm diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index a47f735e56ee..86a43d57e76a 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -7,7 +7,7 @@ SRCS= if.c inet.c inet6.c main.c mbuf.c mcast.c mroute.c ipx.c route.c \ CFLAGS+=-DIPSEC CFLAGS+=-DINET6 WARNS?= 2 -NO_WERROR?= +NO_WERROR= BINGRP= kmem BINMODE=2555 diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile index 828e71790f42..3fcc219ceb38 100644 --- a/usr.bin/truss/Makefile +++ b/usr.bin/truss/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ WARNS?= 2 -NO_WERROR= yes +NO_WERROR= PROG= truss SRCS= main.c setup.c syscalls.c syscalls.h ioctl.c ${MACHINE_ARCH}-fbsd.c .if ${MACHINE_ARCH} == "i386" diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile index 5a25126e0c06..bdd4a02aa9c0 100644 --- a/usr.bin/unexpand/Makefile +++ b/usr.bin/unexpand/Makefile @@ -2,6 +2,6 @@ # $FreeBSD$ PROG= unexpand -NOMAN= noman +NOMAN= .include <bsd.prog.mk> diff --git a/usr.bin/uudecode/Makefile b/usr.bin/uudecode/Makefile index e40f46c1acdf..b44773d1268e 100644 --- a/usr.bin/uudecode/Makefile +++ b/usr.bin/uudecode/Makefile @@ -4,6 +4,6 @@ PROG= uudecode WARNS?= 4 LINKS= ${BINDIR}/uudecode ${BINDIR}/b64decode -NOMAN= noman +NOMAN= .include <bsd.prog.mk> diff --git a/usr.bin/vgrind/RETEST/Makefile b/usr.bin/vgrind/RETEST/Makefile index 1e50c8179809..f5c5c82873d2 100644 --- a/usr.bin/vgrind/RETEST/Makefile +++ b/usr.bin/vgrind/RETEST/Makefile @@ -1,9 +1,10 @@ # @(#)Makefile 8.1 (Berkeley) 6/6/93 +# $FreeBSD$ PROG= retest SRCS= regexp.c retest.c .PATH: ${.CURDIR}/.. -NOMAN= noman +NOMAN= install: diff --git a/usr.sbin/amd/libamu/Makefile b/usr.sbin/amd/libamu/Makefile index 8a5de084210b..7bca934fb6ac 100644 --- a/usr.sbin/amd/libamu/Makefile +++ b/usr.sbin/amd/libamu/Makefile @@ -11,7 +11,7 @@ ${.CURDIR}/../../../contrib/amd/conf/umount LIB= amu -INTERNALLIB= YES +INTERNALLIB= SRCS= hasmntopt.c misc_rpc.c mount_fs.c mtab.c nfs_prot_xdr.c \ util.c wire.c xutil.c diff --git a/usr.sbin/bluetooth/bthidd/Makefile b/usr.sbin/bluetooth/bthidd/Makefile index c3bab372d48c..4bd7edc90b82 100644 --- a/usr.sbin/bluetooth/bthidd/Makefile +++ b/usr.sbin/bluetooth/bthidd/Makefile @@ -3,7 +3,7 @@ PROG= bthidd #MAN= bthidd.8 bthidd.conf.5 -NOMAN= 1 +NOMAN= SRCS= bthidd.c client.c hid.c lexer.l parser.y server.c session.c WARNS?= 1 CFLAGS+= -I${.CURDIR} diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index 8db69eab9529..d6afadec3b5d 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PROG= callbootd -NOMAN= #true +NOMAN= SRCS= callbootd.c ${GENSRCS} GENSRCS=bootparam_prot.h bootparam_prot_clnt.c bootparam_prot_xdr.c diff --git a/usr.sbin/bsnmpd/bsnmpd/Makefile b/usr.sbin/bsnmpd/bsnmpd/Makefile index 49faf87ce256..8fa1ee3b0be7 100644 --- a/usr.sbin/bsnmpd/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/bsnmpd/Makefile @@ -14,7 +14,7 @@ XSYM= snmpMIB begemotSnmpdModuleTable begemotSnmpd begemotTrapSinkTable \ CLEANFILES= oid.h tree.c tree.h MAN= bsnmpd.1 snmpmod.3 WARNS?= 6 -NO_WERROR=yes +NO_WERROR= FILESGROUPS= BMIBS DEFS diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile index ed14dfc32f7e..d11c511beec6 100644 --- a/usr.sbin/cron/lib/Makefile +++ b/usr.sbin/cron/lib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= cron -INTERNALLIB= YES +INTERNALLIB= SRCS= entry.c env.c misc.c CFLAGS+= -I${.CURDIR}/../cron diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile index 5ff5263e5593..282dbc7cd13c 100644 --- a/usr.sbin/crunch/examples/Makefile +++ b/usr.sbin/crunch/examples/Makefile @@ -11,7 +11,7 @@ CONF= $(CRUNCHED).conf OUTMK= $(CRUNCHED).mk OUTPUTS= $(OUTMK) $(CRUNCHED).c $(CRUNCHED).cache -NOMAN= #true +NOMAN= CLEANFILES+= $(CRUNCHED) *.o *.lo *.c *.mk *.cache CLEANDIRFILES+= $(OUTPUTS) diff --git a/usr.sbin/ctm/ctm_dequeue/Makefile b/usr.sbin/ctm/ctm_dequeue/Makefile index f12ecea39760..da88ca68599d 100644 --- a/usr.sbin/ctm/ctm_dequeue/Makefile +++ b/usr.sbin/ctm/ctm_dequeue/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ctm_rmail PROG= ctm_dequeue -NOMAN= #true +NOMAN= SRCS= ctm_dequeue.c error.c CFLAGS+= -I${.CURDIR}/../ctm_rmail diff --git a/usr.sbin/ctm/ctm_smail/Makefile b/usr.sbin/ctm/ctm_smail/Makefile index c2d0789bef1d..226799d6c9b2 100644 --- a/usr.sbin/ctm/ctm_smail/Makefile +++ b/usr.sbin/ctm/ctm_smail/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ctm_rmail PROG= ctm_smail -NOMAN= #true +NOMAN= SRCS= ctm_smail.c error.c CFLAGS+= -I${.CURDIR}/../ctm_rmail diff --git a/usr.sbin/ctm/mkCTM/Makefile b/usr.sbin/ctm/mkCTM/Makefile index 6bf5aebce90e..98c3c945f7e2 100644 --- a/usr.sbin/ctm/mkCTM/Makefile +++ b/usr.sbin/ctm/mkCTM/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= mkctm -NOMAN= 1 +NOMAN= SRCS= mkctm.c DPADD= ${LIBMD} diff --git a/usr.sbin/lpr/SMM.doc/Makefile b/usr.sbin/lpr/SMM.doc/Makefile index faeb266062d9..d80c8ce60d17 100644 --- a/usr.sbin/lpr/SMM.doc/Makefile +++ b/usr.sbin/lpr/SMM.doc/Makefile @@ -6,7 +6,7 @@ VOLUME= smm/07.lpd SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t MACROS= -ms -USE_TBL= yes +USE_TBL= SRCDIR= ${.CURDIR} .include <bsd.doc.mk> diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile index 352f79c9544c..14db0b77b798 100644 --- a/usr.sbin/lpr/common_source/Makefile +++ b/usr.sbin/lpr/common_source/Makefile @@ -6,7 +6,7 @@ # but the library makes it much easier to modularize them. # LIB= lpr -INTERNALLIB= YES +INTERNALLIB= SRCS= common.c ctlinfo.c displayq.c matchjobs.c net.c \ printcap.c request.c rmjob.c startdaemon.c diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index 6895b79517f1..768962814a3e 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= koi2855 -NOMAN= #true +NOMAN= CFLAGS+= -I${.CURDIR}/../../common_source diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index 1e4e30db1448..8aeff47aee35 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= koi2alt -NOMAN= #true +NOMAN= CFLAGS+= -I${.CURDIR}/../../common_source diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index 100022dfba5c..c4df5858590b 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -4,7 +4,7 @@ BINDIR= /usr/libexec/lpr PROG= lpf -NOMAN= noman +NOMAN= CFLAGS+= -I${.CURDIR}/../common_source diff --git a/usr.sbin/mrouted/common/Makefile b/usr.sbin/mrouted/common/Makefile index 4a286c6e67c7..903b50b2404b 100644 --- a/usr.sbin/mrouted/common/Makefile +++ b/usr.sbin/mrouted/common/Makefile @@ -4,7 +4,7 @@ S= ${.CURDIR}/.. .PATH: $S LIB= mrouted -INTERNALLIB= YES +INTERNALLIB= SRCS= igmp.c inet.c kern.c CFLAGS+= -I$S diff --git a/usr.sbin/mrouted/testrsrr/Makefile b/usr.sbin/mrouted/testrsrr/Makefile index 131346d6d356..87c80e28f216 100644 --- a/usr.sbin/mrouted/testrsrr/Makefile +++ b/usr.sbin/mrouted/testrsrr/Makefile @@ -4,7 +4,7 @@ S= ${.CURDIR}/.. .PATH: $S PROG= testrsrr -NOMAN= #true +NOMAN= SRCS= testrsrr.c CFLAGS+= -I$S diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index c6b451df8fbc..19039105bf2d 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -4,7 +4,7 @@ ${.CURDIR}/../../../contrib/ntp/libisc LIB= ntp -INTERNALLIB= true +INTERNALLIB= NTP_SRCS= a_md5encrypt.c adjtime.c atoint.c atolfp.c \ atouint.c audio.c authkeys.c \ diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index 10b97965792b..22d7ca38c4dc 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/libparse LIB= parse -INTERNALLIB= true +INTERNALLIB= 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 \ diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index ebb39339e365..953bf21eeef9 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -4,7 +4,7 @@ ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntp-keygen -NOMAN= yes +NOMAN= SRCS= ntp-keygen.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index d16dcc1cb061..98889b2f6519 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpd PROG= ntpd -NOMAN= yes +NOMAN= SRCS= cmd_args.c map_vme.c ntp_config.c \ ntp_control.c ntp_crypto.c ntp_filegen.c \ ntp_intres.c ntp_io.c ntp_loopfilter.c \ diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index eba0fdf7fcfc..19419391e67b 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdate PROG= ntpdate -NOMAN= yes +NOMAN= SRCS= ntpdate.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index 94947f5345f4..14366453e91a 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/ntpdc PROG= ntpdc -NOMAN= yes +NOMAN= SRCS= ntpdc.c ntpdc_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index a296bffa3fa9..2b3a14c5dd77 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -5,7 +5,7 @@ BINDIR= /usr/bin PROG= ntpq -NOMAN= yes +NOMAN= SRCS= ntpq.c ntpq_ops.c version.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index 9e14c38cb096..8132626f21fb 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/util PROG= ntptime -NOMAN= yes +NOMAN= SRCS= ntptime.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ diff --git a/usr.sbin/ntp/ntptrace/Makefile b/usr.sbin/ntp/ntptrace/Makefile index e570a97745b0..b0c26a8ad89b 100644 --- a/usr.sbin/ntp/ntptrace/Makefile +++ b/usr.sbin/ntp/ntptrace/Makefile @@ -5,6 +5,6 @@ SCRIPTS= ntptrace SCRIPTSNAME= ntptrace -NOMAN= yes +NOMAN= .include <bsd.prog.mk> diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile index ac8a4350b13a..33f98719a716 100644 --- a/usr.sbin/ntp/sntp/Makefile +++ b/usr.sbin/ntp/sntp/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../../../contrib/ntp/sntp PROG= sntp -NOMAN= yes +NOMAN= SRCS= internet.c main.c socket.c timing.c unix.c CFLAGS+= -I${.CURDIR}/../../../contrib/ntp/include -I${.CURDIR}/../ \ diff --git a/usr.sbin/pcvt/Misc/Doc/Makefile b/usr.sbin/pcvt/Misc/Doc/Makefile index a6d96604d977..2db21c74e5e2 100644 --- a/usr.sbin/pcvt/Misc/Doc/Makefile +++ b/usr.sbin/pcvt/Misc/Doc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= Acknowledgements Bibliography CharGen \ Charsets EscapeSequences Keyboard.HP Keyboard.VT \ NotesAndHints diff --git a/usr.sbin/pcvt/Misc/Etc/Makefile b/usr.sbin/pcvt/Misc/Etc/Makefile index 5e1aac5aa040..83b780dc3a5f 100644 --- a/usr.sbin/pcvt/Misc/Etc/Makefile +++ b/usr.sbin/pcvt/Misc/Etc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= Termcap Terminfo pcvt.el xmodmap-german pcvt.sh FILESDIR= ${BINDIR}/Etc diff --git a/usr.sbin/pcvt/Misc/Makefile b/usr.sbin/pcvt/Misc/Makefile index 6eff974ca3a0..96c87ab14849 100644 --- a/usr.sbin/pcvt/Misc/Makefile +++ b/usr.sbin/pcvt/Misc/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -NOOBJ= noobj +NOOBJ= FILES= README.FIRST SUBDIR= Doc Etc diff --git a/usr.sbin/pcvt/demo/Makefile b/usr.sbin/pcvt/demo/Makefile index ee2d1ef3378c..e5cf46837ea0 100644 --- a/usr.sbin/pcvt/demo/Makefile +++ b/usr.sbin/pcvt/demo/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= playvt -NOMAN= #true +NOMAN= SRCS= playvt.c DEMOS= chardemo.vt colors.vt sgr.vt diff --git a/usr.sbin/pcvt/kbdio/Makefile b/usr.sbin/pcvt/kbdio/Makefile index 1bbbdda8bbbe..1f8dd545d1a5 100644 --- a/usr.sbin/pcvt/kbdio/Makefile +++ b/usr.sbin/pcvt/kbdio/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PROG= kbdio -NOMAN= #true +NOMAN= SRCS= kbdio.y lex.l y.tab.h CFLAGS+= -I${.OBJDIR} -I${.CURDIR} #-g diff --git a/usr.sbin/pkg_install/lib/Makefile b/usr.sbin/pkg_install/lib/Makefile index b8683123f0de..84a41b8d7f15 100644 --- a/usr.sbin/pkg_install/lib/Makefile +++ b/usr.sbin/pkg_install/lib/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ LIB= install -INTERNALLIB= YES +INTERNALLIB= SRCS= file.c msg.c plist.c str.c exec.c global.c pen.c match.c \ deps.c version.c pkgwrap.c url.c diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index 4ed9d053ebf6..8e09aa0f9719 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -11,14 +11,14 @@ SRCS= acf.c arp.c async.c auth.c bundle.c cbcp.c ccp.c chap.c chat.c \ WARNS?= 3 .if defined(RELEASE_CRUNCH) CFLAGS+=-DRELEASE_CRUNCH -NOATM= true -NODES= true -NOI4B= true -NONAT= true -NOKLDLOAD= true -NOPAM= true -NORADIUS= true -NOSUID= true +NOATM= +NODES= +NOI4B= +NONAT= +NOKLDLOAD= +NOPAM= +NORADIUS= +NOSUID= .endif .if defined(NOSUID) || defined(PPP_NOSUID) diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index a5780613a3e4..fc7ea015c061 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/../ypserv ${.CURDIR}/../../libexec/ypxfr PROG= rpc.ypupdated -NOMAN= yes +NOMAN= 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 diff --git a/usr.sbin/vnconfig/Makefile b/usr.sbin/vnconfig/Makefile index c7aa34bfb706..7ba006e42288 100644 --- a/usr.sbin/vnconfig/Makefile +++ b/usr.sbin/vnconfig/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ PROG= vnconfig -NOMAN= "mdconfig supplies manpage" +NOMAN= # mdconfig supplies manpage .include <bsd.prog.mk> |