diff --git a/Makefile.libcompat b/Makefile.libcompat index a957c47598e..7054cf9ee0b 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -1,4 +1,3 @@ - .if !targets(__<${_this:T}>__) __<${_this:T}>__: diff --git a/bin/Makefile b/bin/Makefile index bf352b4d78d..3c37336b25e 100644 --- a/bin/Makefile +++ b/bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= cat \ diff --git a/bin/Makefile.inc b/bin/Makefile.inc index 8f9ef366e9a..f154d70ab9d 100644 --- a/bin/Makefile.inc +++ b/bin/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= /bin diff --git a/bin/cat/Makefile b/bin/cat/Makefile index 97b19e701e4..e8b5ac7c070 100644 --- a/bin/cat/Makefile +++ b/bin/cat/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/cat/tests/Makefile b/bin/cat/tests/Makefile index 83f93f5fc2d..2f48c7d4e0c 100644 --- a/bin/cat/tests/Makefile +++ b/bin/cat/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= cat_test diff --git a/bin/chflags/Makefile b/bin/chflags/Makefile index fd19a4e4f84..f0ced5d381d 100644 --- a/bin/chflags/Makefile +++ b/bin/chflags/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/chflags/tests/Makefile b/bin/chflags/tests/Makefile index eb2f870fd6a..cd83b67852a 100644 --- a/bin/chflags/tests/Makefile +++ b/bin/chflags/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= chflags_test .include diff --git a/bin/chio/Makefile b/bin/chio/Makefile index 0783e1d8372..817c200a1c8 100644 --- a/bin/chio/Makefile +++ b/bin/chio/Makefile @@ -1,4 +1,3 @@ - PACKAGE=utilities PROG= chio diff --git a/bin/chmod/Makefile b/bin/chmod/Makefile index e6de3a834c4..6ad01ed4b71 100644 --- a/bin/chmod/Makefile +++ b/bin/chmod/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/chmod/tests/Makefile b/bin/chmod/tests/Makefile index ebd96181cee..a27b7c3aec4 100644 --- a/bin/chmod/tests/Makefile +++ b/bin/chmod/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= chmod_test .include diff --git a/bin/cp/Makefile b/bin/cp/Makefile index 6da92d982f6..ae877015440 100644 --- a/bin/cp/Makefile +++ b/bin/cp/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/cp/tests/Makefile b/bin/cp/tests/Makefile index 36cf247ceae..3fa9ae8f068 100644 --- a/bin/cp/tests/Makefile +++ b/bin/cp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= cp_test diff --git a/bin/cpuset/Makefile b/bin/cpuset/Makefile index 6e88614a6a6..d6f58db6290 100644 --- a/bin/cpuset/Makefile +++ b/bin/cpuset/Makefile @@ -1,4 +1,3 @@ - PROG= cpuset LIBADD= jail diff --git a/bin/date/Makefile b/bin/date/Makefile index 85c269aa10b..6f2e7b7cf90 100644 --- a/bin/date/Makefile +++ b/bin/date/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/date/tests/Makefile b/bin/date/tests/Makefile index 02675a3dc8a..98625c4b1b3 100644 --- a/bin/date/tests/Makefile +++ b/bin/date/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= format_string_test .include diff --git a/bin/dd/Makefile b/bin/dd/Makefile index fde8e08db42..1f8462aef5f 100644 --- a/bin/dd/Makefile +++ b/bin/dd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/dd/tests/Makefile b/bin/dd/tests/Makefile index e0d924f6d13..70ce32336f9 100644 --- a/bin/dd/tests/Makefile +++ b/bin/dd/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= dd2_test NETBSD_ATF_TESTS_SH= dd_test diff --git a/bin/df/Makefile b/bin/df/Makefile index 6584f8901cf..d00b17c6df5 100644 --- a/bin/df/Makefile +++ b/bin/df/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= df diff --git a/bin/domainname/Makefile b/bin/domainname/Makefile index 7f68f14eccd..e0fdcfe8bbf 100644 --- a/bin/domainname/Makefile +++ b/bin/domainname/Makefile @@ -1,4 +1,3 @@ - PACKAGE=yp PROG= domainname diff --git a/bin/echo/Makefile b/bin/echo/Makefile index 385e459f81c..e730e0a44a6 100644 --- a/bin/echo/Makefile +++ b/bin/echo/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/echo/tests/Makefile b/bin/echo/tests/Makefile index 1725e32671a..18fa4681677 100644 --- a/bin/echo/tests/Makefile +++ b/bin/echo/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= echo_test .include diff --git a/bin/ed/Makefile b/bin/ed/Makefile index 776979f04e4..cad48082f18 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/ed/test/Makefile b/bin/ed/test/Makefile index 4a339d03029..bd89a3d1d7c 100644 --- a/bin/ed/test/Makefile +++ b/bin/ed/test/Makefile @@ -1,4 +1,3 @@ - SHELL= /bin/sh ED= ${.OBJDIR}/ed diff --git a/bin/expr/Makefile b/bin/expr/Makefile index 5386ec53868..7239e82631b 100644 --- a/bin/expr/Makefile +++ b/bin/expr/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/expr/tests/Makefile b/bin/expr/tests/Makefile index 8f32a5ea560..27f7438ba7d 100644 --- a/bin/expr/tests/Makefile +++ b/bin/expr/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= expr_test ATF_TESTS_SH_SED_expr_test+= -e 's/eval expr/eval expr --/g' diff --git a/bin/freebsd-version/Makefile b/bin/freebsd-version/Makefile index 6efe04a196c..2ce39610e09 100644 --- a/bin/freebsd-version/Makefile +++ b/bin/freebsd-version/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime SCRIPTS = freebsd-version MAN = freebsd-version.1 diff --git a/bin/getfacl/Makefile b/bin/getfacl/Makefile index 803c0cb2f07..6bc37f05b3f 100644 --- a/bin/getfacl/Makefile +++ b/bin/getfacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= getfacl diff --git a/bin/kenv/Makefile b/bin/kenv/Makefile index 5727aab93da..b5bc75c61e7 100644 --- a/bin/kenv/Makefile +++ b/bin/kenv/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= kenv diff --git a/bin/kill/Makefile b/bin/kill/Makefile index 4023586d2aa..44054b8a44a 100644 --- a/bin/kill/Makefile +++ b/bin/kill/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= kill diff --git a/bin/ln/Makefile b/bin/ln/Makefile index 141aa57aab5..0220ac3ba45 100644 --- a/bin/ln/Makefile +++ b/bin/ln/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/ln/tests/Makefile b/bin/ln/tests/Makefile index 5da5c54adfa..13ae71b7314 100644 --- a/bin/ln/tests/Makefile +++ b/bin/ln/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= ln_test .include diff --git a/bin/ls/Makefile b/bin/ls/Makefile index b9aa06775e7..574ab0d71a4 100644 --- a/bin/ls/Makefile +++ b/bin/ls/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/ls/tests/Makefile b/bin/ls/tests/Makefile index f7121982a7b..e750910cc91 100644 --- a/bin/ls/tests/Makefile +++ b/bin/ls/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= ls_tests # This seems like overkill, but the idea in mind is that all of the testcases # should be runnable as !root diff --git a/bin/mkdir/Makefile b/bin/mkdir/Makefile index 8bf3cfb0e08..0550f769e6f 100644 --- a/bin/mkdir/Makefile +++ b/bin/mkdir/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/mkdir/tests/Makefile b/bin/mkdir/tests/Makefile index 64ac0d72352..d6b025b660b 100644 --- a/bin/mkdir/tests/Makefile +++ b/bin/mkdir/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= mkdir_test .include diff --git a/bin/mv/Makefile b/bin/mv/Makefile index 2413f572874..6dbba5dba45 100644 --- a/bin/mv/Makefile +++ b/bin/mv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/mv/tests/Makefile b/bin/mv/tests/Makefile index 1785fa6c514..0e8da4c0981 100644 --- a/bin/mv/tests/Makefile +++ b/bin/mv/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_SH= legacy_test diff --git a/bin/pax/Makefile b/bin/pax/Makefile index 6b40986ce3a..abcfe61c7da 100644 --- a/bin/pax/Makefile +++ b/bin/pax/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/pax/tests/Makefile b/bin/pax/tests/Makefile index 622e59c57d1..1ebe2e3f7c9 100644 --- a/bin/pax/tests/Makefile +++ b/bin/pax/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_PERL= legacy_test diff --git a/bin/pkill/tests/Makefile b/bin/pkill/tests/Makefile index d92b0872456..aaf16552130 100644 --- a/bin/pkill/tests/Makefile +++ b/bin/pkill/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/bin/ps/Makefile b/bin/ps/Makefile index 23183e4e66b..a25b6a796ed 100644 --- a/bin/ps/Makefile +++ b/bin/ps/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= ps SRCS= fmt.c keyword.c nlist.c print.c ps.c diff --git a/bin/pwait/Makefile b/bin/pwait/Makefile index de3d5481fd4..99e6534034d 100644 --- a/bin/pwait/Makefile +++ b/bin/pwait/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/pwait/tests/Makefile b/bin/pwait/tests/Makefile index 8e916ae47b3..4e355ccfe78 100644 --- a/bin/pwait/tests/Makefile +++ b/bin/pwait/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= pwait_test .include diff --git a/bin/pwd/Makefile b/bin/pwd/Makefile index b46f7c19f6a..f6065e1d5b9 100644 --- a/bin/pwd/Makefile +++ b/bin/pwd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= pwd diff --git a/bin/realpath/Makefile b/bin/realpath/Makefile index bda6bff8a66..e5868f95f46 100644 --- a/bin/realpath/Makefile +++ b/bin/realpath/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= realpath diff --git a/bin/rm/Makefile b/bin/rm/Makefile index 777254eb548..dac3bee2247 100644 --- a/bin/rm/Makefile +++ b/bin/rm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/rm/tests/Makefile b/bin/rm/tests/Makefile index 7ff149da0ab..4145756fd3a 100644 --- a/bin/rm/tests/Makefile +++ b/bin/rm/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= rm_test .include diff --git a/bin/rmail/Makefile b/bin/rmail/Makefile index 1d0b26eb66d..c9cd44596df 100644 --- a/bin/rmail/Makefile +++ b/bin/rmail/Makefile @@ -1,4 +1,3 @@ - PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail diff --git a/bin/rmdir/Makefile b/bin/rmdir/Makefile index 319d89ff711..c51640af3b6 100644 --- a/bin/rmdir/Makefile +++ b/bin/rmdir/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/rmdir/tests/Makefile b/bin/rmdir/tests/Makefile index b8be667b83a..00c885b2949 100644 --- a/bin/rmdir/tests/Makefile +++ b/bin/rmdir/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= rmdir_test .include diff --git a/bin/setfacl/Makefile b/bin/setfacl/Makefile index 5b9d615caf8..128077aa16a 100644 --- a/bin/setfacl/Makefile +++ b/bin/setfacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= setfacl SRCS= file.c mask.c merge.c remove.c setfacl.c util.c diff --git a/bin/sh/Makefile b/bin/sh/Makefile index d2043ecad26..087dbf40c3b 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -1,4 +1,3 @@ - .include CONFGROUPS= ETC ROOT diff --git a/bin/sh/tests/Makefile b/bin/sh/tests/Makefile index ea28b9d39bd..c97779911e6 100644 --- a/bin/sh/tests/Makefile +++ b/bin/sh/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTS_SUBDIRS+= builtins diff --git a/bin/sh/tests/builtins/Makefile b/bin/sh/tests/builtins/Makefile index c3ed122791b..ac959b17c63 100644 --- a/bin/sh/tests/builtins/Makefile +++ b/bin/sh/tests/builtins/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/bin/sh/tests/errors/Makefile b/bin/sh/tests/errors/Makefile index 27e4f7143de..26b1ccbef4e 100644 --- a/bin/sh/tests/errors/Makefile +++ b/bin/sh/tests/errors/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/execution/Makefile b/bin/sh/tests/execution/Makefile index 2b4f88db989..53cb97db939 100644 --- a/bin/sh/tests/execution/Makefile +++ b/bin/sh/tests/execution/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/expansion/Makefile b/bin/sh/tests/expansion/Makefile index d38fd49e14e..af4b3699156 100644 --- a/bin/sh/tests/expansion/Makefile +++ b/bin/sh/tests/expansion/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/invocation/Makefile b/bin/sh/tests/invocation/Makefile index 6c892026ec7..e1d0601e57a 100644 --- a/bin/sh/tests/invocation/Makefile +++ b/bin/sh/tests/invocation/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/parameters/Makefile b/bin/sh/tests/parameters/Makefile index 0d6722b1d65..50352c91b6f 100644 --- a/bin/sh/tests/parameters/Makefile +++ b/bin/sh/tests/parameters/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/parser/Makefile b/bin/sh/tests/parser/Makefile index 812edafa7ca..afeb604710e 100644 --- a/bin/sh/tests/parser/Makefile +++ b/bin/sh/tests/parser/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sh/tests/set-e/Makefile b/bin/sh/tests/set-e/Makefile index 0d72e148da2..6b5b9a22802 100644 --- a/bin/sh/tests/set-e/Makefile +++ b/bin/sh/tests/set-e/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/bin/sh/${.CURDIR:T} diff --git a/bin/sleep/Makefile b/bin/sleep/Makefile index 8cece2dbc31..d0310fc4bea 100644 --- a/bin/sleep/Makefile +++ b/bin/sleep/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/sleep/tests/Makefile b/bin/sleep/tests/Makefile index 0f15dd5a4b9..1712dc1ecef 100644 --- a/bin/sleep/tests/Makefile +++ b/bin/sleep/tests/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_SH= sleep_test diff --git a/bin/stty/Makefile b/bin/stty/Makefile index d0fb28137ce..1b81c938f8b 100644 --- a/bin/stty/Makefile +++ b/bin/stty/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= stty SRCS= cchar.c gfmt.c key.c modes.c print.c stty.c util.c diff --git a/bin/sync/Makefile b/bin/sync/Makefile index 8da077108ae..dd3460afcbe 100644 --- a/bin/sync/Makefile +++ b/bin/sync/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= sync MAN= sync.8 diff --git a/bin/test/Makefile b/bin/test/Makefile index 4cdebcb5054..da1cccbb7f2 100644 --- a/bin/test/Makefile +++ b/bin/test/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/bin/test/tests/Makefile b/bin/test/tests/Makefile index 232ae04c0cb..3aaebb69301 100644 --- a/bin/test/tests/Makefile +++ b/bin/test/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_SH= legacy_test diff --git a/bin/tests/Makefile b/bin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/bin/tests/Makefile +++ b/bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/bin/timeout/Makefile b/bin/timeout/Makefile index fa6741afb1d..0b06ca57c84 100644 --- a/bin/timeout/Makefile +++ b/bin/timeout/Makefile @@ -1,4 +1,3 @@ - .include PROG= timeout diff --git a/bin/timeout/tests/Makefile b/bin/timeout/tests/Makefile index 7a2fd60db43..bf5dddd77ba 100644 --- a/bin/timeout/tests/Makefile +++ b/bin/timeout/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= timeout_test .include diff --git a/bin/uuidgen/Makefile b/bin/uuidgen/Makefile index 234ee20300e..8d389e7659a 100644 --- a/bin/uuidgen/Makefile +++ b/bin/uuidgen/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= uuidgen diff --git a/cddl/Makefile b/cddl/Makefile index c83acca4311..ab0d9896d2e 100644 --- a/cddl/Makefile +++ b/cddl/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= lib .WAIT \ diff --git a/cddl/Makefile.inc b/cddl/Makefile.inc index f07baf295b8..63768ae44a7 100644 --- a/cddl/Makefile.inc +++ b/cddl/Makefile.inc @@ -1,4 +1,3 @@ - OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../../../cddl/contrib/opensolaris OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris diff --git a/cddl/lib/Makefile b/cddl/lib/Makefile index e6a0763544f..892798be347 100644 --- a/cddl/lib/Makefile +++ b/cddl/lib/Makefile @@ -1,4 +1,3 @@ - .include .if ${MK_DTRACE} == yes || ${MK_ZFS} == yes diff --git a/cddl/lib/Makefile.inc b/cddl/lib/Makefile.inc index 3e83ba423f3..ebcc06f3e95 100644 --- a/cddl/lib/Makefile.inc +++ b/cddl/lib/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib SHLIB_MAJOR?= 2 diff --git a/cddl/lib/drti/Makefile b/cddl/lib/drti/Makefile index b9023202f0f..4a7a8350cac 100644 --- a/cddl/lib/drti/Makefile +++ b/cddl/lib/drti/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libdtrace/common PACKAGE= dtrace diff --git a/cddl/lib/libavl/Makefile b/cddl/lib/libavl/Makefile index 5b47d42d757..c816f07df22 100644 --- a/cddl/lib/libavl/Makefile +++ b/cddl/lib/libavl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/avl PACKAGE= zfs diff --git a/cddl/lib/libctf/Makefile b/cddl/lib/libctf/Makefile index 3b91a97bc3e..10854482cd2 100644 --- a/cddl/lib/libctf/Makefile +++ b/cddl/lib/libctf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/common/ctf .PATH: ${SRCTOP}/cddl/contrib/opensolaris/lib/libctf/common .PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/ctf diff --git a/cddl/lib/libdtrace/Makefile b/cddl/lib/libdtrace/Makefile index d5c857bc06a..d086fffb07b 100644 --- a/cddl/lib/libdtrace/Makefile +++ b/cddl/lib/libdtrace/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/cddl/lib/libicp/Makefile b/cddl/lib/libicp/Makefile index 1dbe4ace88e..b1d926d6536 100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp PACKAGE= zfs diff --git a/cddl/lib/libicp_rescue/Makefile b/cddl/lib/libicp_rescue/Makefile index 196f96b1fcf..c969b209a78 100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp PACKAGE= utilities diff --git a/cddl/lib/libnvpair/Makefile b/cddl/lib/libnvpair/Makefile index a93ffcbd00d..9ae081b7a96 100644 --- a/cddl/lib/libnvpair/Makefile +++ b/cddl/lib/libnvpair/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/nvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libnvpair .PATH: ${SRCTOP}/sys/contrib/openzfs/include diff --git a/cddl/lib/libspl/Makefile b/cddl/lib/libspl/Makefile index 6c43e1750c3..efeba68e4f0 100644 --- a/cddl/lib/libspl/Makefile +++ b/cddl/lib/libspl/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/cddl/lib/libtpool/Makefile b/cddl/lib/libtpool/Makefile index 6e85a8f82e9..94b29c9ae72 100644 --- a/cddl/lib/libtpool/Makefile +++ b/cddl/lib/libtpool/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libtpool .PATH: ${SRCTOP}/sys/contrib/openzfs/include diff --git a/cddl/lib/libumem/Makefile b/cddl/lib/libumem/Makefile index 1330ba0d94b..f955e306c62 100644 --- a/cddl/lib/libumem/Makefile +++ b/cddl/lib/libumem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/compat/opensolaris/lib/libumem PACKAGE= zfs diff --git a/cddl/lib/libuutil/Makefile b/cddl/lib/libuutil/Makefile index 333c581ccb9..54707850410 100644 --- a/cddl/lib/libuutil/Makefile +++ b/cddl/lib/libuutil/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libuutil PACKAGE= zfs diff --git a/cddl/lib/libzfs/Makefile b/cddl/lib/libzfs/Makefile index c05fe0c1c12..0b31fcb04b0 100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp .PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs diff --git a/cddl/lib/libzfs_core/Makefile b/cddl/lib/libzfs_core/Makefile index 9797f004d10..4cd978e99a7 100644 --- a/cddl/lib/libzfs_core/Makefile +++ b/cddl/lib/libzfs_core/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs_core .PATH: ${SRCTOP}/sys/contrib/openzfs/include .PATH: ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/zfs diff --git a/cddl/lib/libzfsbootenv/Makefile b/cddl/lib/libzfsbootenv/Makefile index 9579fb7dcf1..5f5dbfb6f10 100644 --- a/cddl/lib/libzfsbootenv/Makefile +++ b/cddl/lib/libzfsbootenv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfsbootenv .PATH: ${SRCTOP}/sys/contrib/openzfs/include diff --git a/cddl/lib/libzpool/Makefile b/cddl/lib/libzpool/Makefile index 149c1491902..95038f4e563 100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs # ZFS_COMMON_SRCS diff --git a/cddl/lib/libzutil/Makefile b/cddl/lib/libzutil/Makefile index 83f08960d53..4d9794c32dd 100644 --- a/cddl/lib/libzutil/Makefile +++ b/cddl/lib/libzutil/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil .PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzutil/os/freebsd .PATH: ${SRCTOP}/sys/contrib/openzfs/module/os/freebsd/zfs diff --git a/cddl/lib/tests/Makefile b/cddl/lib/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/cddl/lib/tests/Makefile +++ b/cddl/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/sbin/Makefile b/cddl/sbin/Makefile index b0e1448c645..80862bbf8e7 100644 --- a/cddl/sbin/Makefile +++ b/cddl/sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_TESTS}+= tests diff --git a/cddl/sbin/Makefile.inc b/cddl/sbin/Makefile.inc index 9f2b933fcf0..12d1247d4e9 100644 --- a/cddl/sbin/Makefile.inc +++ b/cddl/sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /sbin .include "../Makefile.inc" diff --git a/cddl/sbin/tests/Makefile b/cddl/sbin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/cddl/sbin/tests/Makefile +++ b/cddl/sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/sbin/zfs/Makefile b/cddl/sbin/zfs/Makefile index a47302c709d..b6ecfbe33ba 100644 --- a/cddl/sbin/zfs/Makefile +++ b/cddl/sbin/zfs/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zfs diff --git a/cddl/sbin/zpool/Makefile b/cddl/sbin/zpool/Makefile index 5a47890e58f..ffe180ae1f9 100644 --- a/cddl/sbin/zpool/Makefile +++ b/cddl/sbin/zpool/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/man/man4 diff --git a/cddl/share/Makefile b/cddl/share/Makefile index 2e291b9425e..4fdb0cba9ba 100644 --- a/cddl/share/Makefile +++ b/cddl/share/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_ZFS}+= zfs diff --git a/cddl/share/zfs/Makefile b/cddl/share/zfs/Makefile index a1fc04899b6..6e10ede77d0 100644 --- a/cddl/share/zfs/Makefile +++ b/cddl/share/zfs/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= compatibility.d diff --git a/cddl/share/zfs/compatibility.d/Makefile b/cddl/share/zfs/compatibility.d/Makefile index 13d88fef184..5b30adf4863 100644 --- a/cddl/share/zfs/compatibility.d/Makefile +++ b/cddl/share/zfs/compatibility.d/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool/compatibility.d diff --git a/cddl/tests/Makefile b/cddl/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/cddl/tests/Makefile +++ b/cddl/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/usr.bin/Makefile b/cddl/usr.bin/Makefile index ccf441cbabe..571d1c59a54 100644 --- a/cddl/usr.bin/Makefile +++ b/cddl/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_DTRACE}+= \ diff --git a/cddl/usr.bin/Makefile.inc b/cddl/usr.bin/Makefile.inc index 78a3af23f3c..b87015c546c 100644 --- a/cddl/usr.bin/Makefile.inc +++ b/cddl/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/cddl/usr.bin/ctfconvert/Makefile b/cddl/usr.bin/ctfconvert/Makefile index 5dd38fbb532..cd9f850f480 100644 --- a/cddl/usr.bin/ctfconvert/Makefile +++ b/cddl/usr.bin/ctfconvert/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common diff --git a/cddl/usr.bin/ctfconvert/tests/Makefile b/cddl/usr.bin/ctfconvert/tests/Makefile index 101282261dd..d86ddbcd635 100644 --- a/cddl/usr.bin/ctfconvert/tests/Makefile +++ b/cddl/usr.bin/ctfconvert/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= ctfconvert_test .include diff --git a/cddl/usr.bin/ctfdump/Makefile b/cddl/usr.bin/ctfdump/Makefile index 60ae9a0033b..23ded7458be 100644 --- a/cddl/usr.bin/ctfdump/Makefile +++ b/cddl/usr.bin/ctfdump/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/dump diff --git a/cddl/usr.bin/ctfmerge/Makefile b/cddl/usr.bin/ctfmerge/Makefile index e7ad35ab097..4cd9511f911 100644 --- a/cddl/usr.bin/ctfmerge/Makefile +++ b/cddl/usr.bin/ctfmerge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/common .PATH: ${SRCTOP}/cddl/contrib/opensolaris/tools/ctf/cvt diff --git a/cddl/usr.bin/tests/Makefile b/cddl/usr.bin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/cddl/usr.bin/tests/Makefile +++ b/cddl/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/usr.bin/zinject/Makefile b/cddl/usr.bin/zinject/Makefile index 71cd4776d33..395ba395a84 100644 --- a/cddl/usr.bin/zinject/Makefile +++ b/cddl/usr.bin/zinject/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zinject diff --git a/cddl/usr.bin/zstream/Makefile b/cddl/usr.bin/zstream/Makefile index 4444973b221..96a46cdf1cf 100644 --- a/cddl/usr.bin/zstream/Makefile +++ b/cddl/usr.bin/zstream/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zstream diff --git a/cddl/usr.bin/ztest/Makefile b/cddl/usr.bin/ztest/Makefile index 2913349eccc..dec4eb9ab39 100644 --- a/cddl/usr.bin/ztest/Makefile +++ b/cddl/usr.bin/ztest/Makefile @@ -1,4 +1,3 @@ - .include ZFSTOP= ${SRCTOP}/sys/contrib/openzfs diff --git a/cddl/usr.bin/ztest/tests/Makefile b/cddl/usr.bin/ztest/tests/Makefile index 824497940b2..88bcfc3ccf7 100644 --- a/cddl/usr.bin/ztest/tests/Makefile +++ b/cddl/usr.bin/ztest/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_SH+= ztest diff --git a/cddl/usr.libexec/Makefile b/cddl/usr.libexec/Makefile index 9eb4872b69d..ab4c4cb6741 100644 --- a/cddl/usr.libexec/Makefile +++ b/cddl/usr.libexec/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_ZFS}+= \ diff --git a/cddl/usr.libexec/zfs_prepare_disk/Makefile b/cddl/usr.libexec/zfs_prepare_disk/Makefile index e75484c6dc5..0d3f9b56b28 100644 --- a/cddl/usr.libexec/zfs_prepare_disk/Makefile +++ b/cddl/usr.libexec/zfs_prepare_disk/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/scripts diff --git a/cddl/usr.libexec/zpool_influxdb/Makefile b/cddl/usr.libexec/zpool_influxdb/Makefile index bd50df9e3c4..064ac9b23e4 100644 --- a/cddl/usr.libexec/zpool_influxdb/Makefile +++ b/cddl/usr.libexec/zpool_influxdb/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zpool_influxdb diff --git a/cddl/usr.sbin/Makefile b/cddl/usr.sbin/Makefile index b3bf139feae..b7f43ffd23b 100644 --- a/cddl/usr.sbin/Makefile +++ b/cddl/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_DTRACE}+= \ diff --git a/cddl/usr.sbin/Makefile.inc b/cddl/usr.sbin/Makefile.inc index 5c01baa093b..b660f1cc663 100644 --- a/cddl/usr.sbin/Makefile.inc +++ b/cddl/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin .include "../Makefile.inc" diff --git a/cddl/usr.sbin/dtrace/Makefile b/cddl/usr.sbin/dtrace/Makefile index 0a1ad0b81da..c72b55cc490 100644 --- a/cddl/usr.sbin/dtrace/Makefile +++ b/cddl/usr.sbin/dtrace/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/dtrace diff --git a/cddl/usr.sbin/dtrace/tests/Makefile b/cddl/usr.sbin/dtrace/tests/Makefile index c7391dec241..7aa8600bf70 100644 --- a/cddl/usr.sbin/dtrace/tests/Makefile +++ b/cddl/usr.sbin/dtrace/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTS_SUBDIRS+= common diff --git a/cddl/usr.sbin/dtrace/tests/amd64/Makefile b/cddl/usr.sbin/dtrace/tests/amd64/Makefile index 049692a46cd..100a66fa744 100644 --- a/cddl/usr.sbin/dtrace/tests/amd64/Makefile +++ b/cddl/usr.sbin/dtrace/tests/amd64/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/amd64 TESTS_SUBDIRS+= arrays diff --git a/cddl/usr.sbin/dtrace/tests/common/Makefile b/cddl/usr.sbin/dtrace/tests/common/Makefile index 9f694cabf99..a7c3aac9c6f 100644 --- a/cddl/usr.sbin/dtrace/tests/common/Makefile +++ b/cddl/usr.sbin/dtrace/tests/common/Makefile @@ -1,4 +1,3 @@ - # We exclude several subdirectories: nfs and sysevent do not compile on # FreeBSD, and docsExamples doesn't seem amenable to automated testing. diff --git a/cddl/usr.sbin/dtrace/tests/i386/Makefile b/cddl/usr.sbin/dtrace/tests/i386/Makefile index 9501fd7f3cc..4150a33adde 100644 --- a/cddl/usr.sbin/dtrace/tests/i386/Makefile +++ b/cddl/usr.sbin/dtrace/tests/i386/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace/i386 TESTS_SUBDIRS+= arrays \ funcs \ diff --git a/cddl/usr.sbin/dwatch/Makefile b/cddl/usr.sbin/dwatch/Makefile index e146e744e84..a50774d5603 100644 --- a/cddl/usr.sbin/dwatch/Makefile +++ b/cddl/usr.sbin/dwatch/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= dwatch diff --git a/cddl/usr.sbin/dwatch/examples/Makefile b/cddl/usr.sbin/dwatch/examples/Makefile index 185f57d8cfe..a0bfd3c5cd3 100644 --- a/cddl/usr.sbin/dwatch/examples/Makefile +++ b/cddl/usr.sbin/dwatch/examples/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dwatch FILESDIR= ${SHAREDIR}/examples/dwatch FILES= profile_template diff --git a/cddl/usr.sbin/dwatch/libexec/Makefile b/cddl/usr.sbin/dwatch/libexec/Makefile index e8df567eb20..72ea5be686f 100644 --- a/cddl/usr.sbin/dwatch/libexec/Makefile +++ b/cddl/usr.sbin/dwatch/libexec/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dwatch FILESDIR= ${LIBEXECDIR}/dwatch FILES= chmod \ diff --git a/cddl/usr.sbin/lockstat/Makefile b/cddl/usr.sbin/lockstat/Makefile index e0e3f40ccda..c87a37ef150 100644 --- a/cddl/usr.sbin/lockstat/Makefile +++ b/cddl/usr.sbin/lockstat/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/lockstat diff --git a/cddl/usr.sbin/plockstat/Makefile b/cddl/usr.sbin/plockstat/Makefile index e83fae8f305..3e35c5c5b8f 100644 --- a/cddl/usr.sbin/plockstat/Makefile +++ b/cddl/usr.sbin/plockstat/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/cddl/contrib/opensolaris/cmd/plockstat diff --git a/cddl/usr.sbin/tests/Makefile b/cddl/usr.sbin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/cddl/usr.sbin/tests/Makefile +++ b/cddl/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/cddl/usr.sbin/zdb/Makefile b/cddl/usr.sbin/zdb/Makefile index e41f4afce82..22ab4421b30 100644 --- a/cddl/usr.sbin/zdb/Makefile +++ b/cddl/usr.sbin/zdb/Makefile @@ -1,4 +1,3 @@ - ZFSTOP= ${SRCTOP}/sys/contrib/openzfs .PATH: ${ZFSTOP}/cmd/zdb diff --git a/cddl/usr.sbin/zfsd/Makefile b/cddl/usr.sbin/zfsd/Makefile index 93426c0320a..2f8134098b3 100644 --- a/cddl/usr.sbin/zfsd/Makefile +++ b/cddl/usr.sbin/zfsd/Makefile @@ -1,4 +1,3 @@ - .include .include "Makefile.common" diff --git a/cddl/usr.sbin/zfsd/Makefile.common b/cddl/usr.sbin/zfsd/Makefile.common index c1ed4bba928..72bda687c2d 100644 --- a/cddl/usr.sbin/zfsd/Makefile.common +++ b/cddl/usr.sbin/zfsd/Makefile.common @@ -1,4 +1,3 @@ - SRCS= callout.cc \ case_file.cc \ zfsd_event.cc \ diff --git a/cddl/usr.sbin/zfsd/tests/Makefile b/cddl/usr.sbin/zfsd/tests/Makefile index a4613e4cb1e..fdda8011b21 100644 --- a/cddl/usr.sbin/zfsd/tests/Makefile +++ b/cddl/usr.sbin/zfsd/tests/Makefile @@ -1,4 +1,3 @@ - .include "${.CURDIR}/../Makefile.common" .PATH: ${.CURDIR:H} diff --git a/cddl/usr.sbin/zhack/Makefile b/cddl/usr.sbin/zhack/Makefile index b2fa0e98b7e..a7c08fa818d 100644 --- a/cddl/usr.sbin/zhack/Makefile +++ b/cddl/usr.sbin/zhack/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/openzfs/cmd PACKAGE= zfs diff --git a/contrib/elftoolchain/nm/Makefile b/contrib/elftoolchain/nm/Makefile index 6177c61221e..e202668e0c3 100644 --- a/contrib/elftoolchain/nm/Makefile +++ b/contrib/elftoolchain/nm/Makefile @@ -1,4 +1,3 @@ - # $Id: Makefile 2076 2011-10-27 03:50:33Z jkoshy $ TOP= .. diff --git a/contrib/file/python/Makefile.am b/contrib/file/python/Makefile.am index 9588f085df0..fb7d40c21ee 100644 --- a/contrib/file/python/Makefile.am +++ b/contrib/file/python/Makefile.am @@ -1,4 +1,3 @@ - EXTRA_DIST = LICENSE CHANGELOG.md README.md example.py magic.py setup.py \ tests.py file_magic/__init__.py diff --git a/contrib/sqlite3/Makefile.am b/contrib/sqlite3/Makefile.am index 1eaa560ff88..09f83086b1e 100644 --- a/contrib/sqlite3/Makefile.am +++ b/contrib/sqlite3/Makefile.am @@ -1,4 +1,3 @@ - AM_CFLAGS = @BUILD_CFLAGS@ lib_LTLIBRARIES = libsqlite3.la libsqlite3_la_SOURCES = sqlite3.c diff --git a/crypto/heimdal/base/Makefile.am b/crypto/heimdal/base/Makefile.am index 639136f79c3..3d06e813f28 100644 --- a/crypto/heimdal/base/Makefile.am +++ b/crypto/heimdal/base/Makefile.am @@ -1,4 +1,3 @@ - include $(top_srcdir)/Makefile.am.common lib_LTLIBRARIES = libheimbase.la diff --git a/etc/Makefile b/etc/Makefile index f2b37fb0281..fdcad75911c 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/etc/gss/Makefile b/etc/gss/Makefile index d57a8b914b4..301a8e074e8 100644 --- a/etc/gss/Makefile +++ b/etc/gss/Makefile @@ -1,4 +1,3 @@ - FILES= mech qop NO_OBJ= FILESDIR= /etc/gss diff --git a/etc/sendmail/Makefile b/etc/sendmail/Makefile index 5135bf326e6..17e96519a49 100644 --- a/etc/sendmail/Makefile +++ b/etc/sendmail/Makefile @@ -1,4 +1,3 @@ - M4= m4 CHMOD= chmod ROMODE= 444 diff --git a/gnu/Makefile b/gnu/Makefile index 6a264d80e6a..301faa1c867 100644 --- a/gnu/Makefile +++ b/gnu/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= lib .WAIT \ diff --git a/gnu/Makefile.inc b/gnu/Makefile.inc index 0c24247f892..6ceebdef9d5 100644 --- a/gnu/Makefile.inc +++ b/gnu/Makefile.inc @@ -1,4 +1,3 @@ - # Do not lint the GNU stuff. It is all externally maintained and # lint output is wasteful noise here. diff --git a/gnu/lib/Makefile b/gnu/lib/Makefile index 0b5e328601f..1f92672b49b 100644 --- a/gnu/lib/Makefile +++ b/gnu/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/gnu/lib/Makefile.inc b/gnu/lib/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/gnu/lib/Makefile.inc +++ b/gnu/lib/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/gnu/lib/libdialog/Makefile b/gnu/lib/libdialog/Makefile index 4b18683e853..0b32a75e4a2 100644 --- a/gnu/lib/libdialog/Makefile +++ b/gnu/lib/libdialog/Makefile @@ -1,4 +1,3 @@ - DIALOG= ${SRCTOP}/contrib/dialog LIB= dialog diff --git a/gnu/lib/tests/Makefile b/gnu/lib/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/gnu/lib/tests/Makefile +++ b/gnu/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/gnu/tests/Makefile b/gnu/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/gnu/tests/Makefile +++ b/gnu/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/gnu/usr.bin/Makefile b/gnu/usr.bin/Makefile index 84fe2f2f3b8..e12fc0ccc40 100644 --- a/gnu/usr.bin/Makefile +++ b/gnu/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.${MK_DIALOG}+= dialog diff --git a/gnu/usr.bin/Makefile.inc b/gnu/usr.bin/Makefile.inc index 78a3af23f3c..b87015c546c 100644 --- a/gnu/usr.bin/Makefile.inc +++ b/gnu/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/gnu/usr.bin/dialog/Makefile b/gnu/usr.bin/dialog/Makefile index 8cf4976eee0..a4a109e112f 100644 --- a/gnu/usr.bin/dialog/Makefile +++ b/gnu/usr.bin/dialog/Makefile @@ -1,4 +1,3 @@ - DIALOG= ${SRCTOP}/contrib/dialog PROG= dialog diff --git a/gnu/usr.bin/diff3/Makefile b/gnu/usr.bin/diff3/Makefile index 9d325c4418c..4d7bb8a82e1 100644 --- a/gnu/usr.bin/diff3/Makefile +++ b/gnu/usr.bin/diff3/Makefile @@ -1,4 +1,3 @@ - DIFFSRC=${SRCTOP}/contrib/diff/src .PATH: ${DIFFSRC} \ ${SRCTOP}/contrib/diff/lib \ diff --git a/gnu/usr.bin/tests/Makefile b/gnu/usr.bin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/gnu/usr.bin/tests/Makefile +++ b/gnu/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/include/arpa/Makefile b/include/arpa/Makefile index 25bf8351684..ba589cc192f 100644 --- a/include/arpa/Makefile +++ b/include/arpa/Makefile @@ -1,4 +1,3 @@ - .include INCS= ftp.h inet.h nameser.h nameser_compat.h tftp.h diff --git a/include/gssapi/Makefile b/include/gssapi/Makefile index c0b18ae7a64..fb6cd7ee7da 100644 --- a/include/gssapi/Makefile +++ b/include/gssapi/Makefile @@ -1,4 +1,3 @@ - INCS= gssapi.h INCSDIR= ${INCLUDEDIR}/gssapi diff --git a/include/protocols/Makefile b/include/protocols/Makefile index bdcbbae48a3..9817add2e9f 100644 --- a/include/protocols/Makefile +++ b/include/protocols/Makefile @@ -1,4 +1,3 @@ - INCS= dumprestore.h routed.h rwhod.h talkd.h timed.h INCSDIR=${INCLUDEDIR}/protocols diff --git a/include/rpc/Makefile b/include/rpc/Makefile index 0c8434ee347..b6e3ab53adb 100644 --- a/include/rpc/Makefile +++ b/include/rpc/Makefile @@ -1,4 +1,3 @@ - .SUFFIXES: .x RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C diff --git a/include/rpcsvc/Makefile b/include/rpcsvc/Makefile index 8ede7636f50..bc2b7456142 100644 --- a/include/rpcsvc/Makefile +++ b/include/rpcsvc/Makefile @@ -1,4 +1,3 @@ - .SUFFIXES: .x RPCCOM= RPCGEN_CPP=${CPP:Q} rpcgen -C diff --git a/include/xlocale/Makefile b/include/xlocale/Makefile index d862483ef4e..fc2569c3650 100644 --- a/include/xlocale/Makefile +++ b/include/xlocale/Makefile @@ -1,4 +1,3 @@ - INCS= _ctype.h _inttypes.h _langinfo.h _locale.h _monetary.h _stdio.h\ _stdlib.h _string.h _strings.h _time.h _uchar.h _wchar.h INCSDIR=${INCLUDEDIR}/xlocale diff --git a/kerberos5/Makefile b/kerberos5/Makefile index 72707a36f94..39cd3307afd 100644 --- a/kerberos5/Makefile +++ b/kerberos5/Makefile @@ -1,4 +1,3 @@ - SUBDIR= lib .WAIT \ libexec tools usr.bin usr.sbin SUBDIR_PARALLEL= diff --git a/kerberos5/Makefile.inc b/kerberos5/Makefile.inc index 4cb7e6dca4e..71bd19c0b89 100644 --- a/kerberos5/Makefile.inc +++ b/kerberos5/Makefile.inc @@ -1,4 +1,3 @@ - .include NO_LINT= diff --git a/kerberos5/lib/Makefile b/kerberos5/lib/Makefile index 73395b86c81..7b63da16e36 100644 --- a/kerberos5/lib/Makefile +++ b/kerberos5/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= libasn1 libhdb \ diff --git a/kerberos5/lib/Makefile.inc b/kerberos5/lib/Makefile.inc index 6d0bed2058e..7c74af1e974 100644 --- a/kerberos5/lib/Makefile.inc +++ b/kerberos5/lib/Makefile.inc @@ -1,4 +1,3 @@ - SHLIB_MAJOR?= 11 .include "../Makefile.inc" diff --git a/kerberos5/lib/libasn1/Makefile b/kerberos5/lib/libasn1/Makefile index 095c7089dc8..58fde4ded38 100644 --- a/kerberos5/lib/libasn1/Makefile +++ b/kerberos5/lib/libasn1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= asn1 diff --git a/kerberos5/lib/libgssapi_krb5/Makefile b/kerberos5/lib/libgssapi_krb5/Makefile index 2a47f35a12d..630cb11ad6c 100644 --- a/kerberos5/lib/libgssapi_krb5/Makefile +++ b/kerberos5/lib/libgssapi_krb5/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= gssapi_krb5 diff --git a/kerberos5/lib/libgssapi_ntlm/Makefile b/kerberos5/lib/libgssapi_ntlm/Makefile index 591efcaff1d..8698c5c2e3e 100644 --- a/kerberos5/lib/libgssapi_ntlm/Makefile +++ b/kerberos5/lib/libgssapi_ntlm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= gssapi_ntlm diff --git a/kerberos5/lib/libgssapi_spnego/Makefile b/kerberos5/lib/libgssapi_spnego/Makefile index c6d92389db2..421c3fecce7 100644 --- a/kerberos5/lib/libgssapi_spnego/Makefile +++ b/kerberos5/lib/libgssapi_spnego/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= gssapi_spnego diff --git a/kerberos5/lib/libhdb/Makefile b/kerberos5/lib/libhdb/Makefile index 27e246e1bee..be18779a047 100644 --- a/kerberos5/lib/libhdb/Makefile +++ b/kerberos5/lib/libhdb/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= hdb diff --git a/kerberos5/lib/libheimbase/Makefile b/kerberos5/lib/libheimbase/Makefile index 99c637ee3c3..e3cb2fc6c77 100644 --- a/kerberos5/lib/libheimbase/Makefile +++ b/kerberos5/lib/libheimbase/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimbase diff --git a/kerberos5/lib/libheimipcc/Makefile b/kerberos5/lib/libheimipcc/Makefile index a8b5846128f..8eb2b2b3756 100644 --- a/kerberos5/lib/libheimipcc/Makefile +++ b/kerberos5/lib/libheimipcc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimipcc diff --git a/kerberos5/lib/libheimipcs/Makefile b/kerberos5/lib/libheimipcs/Makefile index 582298b0e77..e689ac06a60 100644 --- a/kerberos5/lib/libheimipcs/Makefile +++ b/kerberos5/lib/libheimipcs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimipcs diff --git a/kerberos5/lib/libheimntlm/Makefile b/kerberos5/lib/libheimntlm/Makefile index f669be55b1c..f68a3d498d2 100644 --- a/kerberos5/lib/libheimntlm/Makefile +++ b/kerberos5/lib/libheimntlm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= heimntlm diff --git a/kerberos5/lib/libhx509/Makefile b/kerberos5/lib/libhx509/Makefile index e74e442b636..0e82a79d9a8 100644 --- a/kerberos5/lib/libhx509/Makefile +++ b/kerberos5/lib/libhx509/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= hx509 diff --git a/kerberos5/lib/libkadm5clnt/Makefile b/kerberos5/lib/libkadm5clnt/Makefile index 76e93499147..dee95b0c8b4 100644 --- a/kerberos5/lib/libkadm5clnt/Makefile +++ b/kerberos5/lib/libkadm5clnt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kadm5clnt diff --git a/kerberos5/lib/libkadm5srv/Makefile b/kerberos5/lib/libkadm5srv/Makefile index df5c9b99f1a..9905668c529 100644 --- a/kerberos5/lib/libkadm5srv/Makefile +++ b/kerberos5/lib/libkadm5srv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kadm5srv diff --git a/kerberos5/lib/libkafs5/Makefile b/kerberos5/lib/libkafs5/Makefile index 28d9ca50822..ba83533bd84 100644 --- a/kerberos5/lib/libkafs5/Makefile +++ b/kerberos5/lib/libkafs5/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kafs5 diff --git a/kerberos5/lib/libkdc/Makefile b/kerberos5/lib/libkdc/Makefile index 19c508c9c4f..58355fd6d81 100644 --- a/kerberos5/lib/libkdc/Makefile +++ b/kerberos5/lib/libkdc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= kdc diff --git a/kerberos5/lib/libkrb5/Makefile b/kerberos5/lib/libkrb5/Makefile index 160643e36b2..edc14556dc5 100644 --- a/kerberos5/lib/libkrb5/Makefile +++ b/kerberos5/lib/libkrb5/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= krb5 diff --git a/kerberos5/lib/libroken/Makefile b/kerberos5/lib/libroken/Makefile index ca6d090e64f..2299beed67a 100644 --- a/kerberos5/lib/libroken/Makefile +++ b/kerberos5/lib/libroken/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= roken diff --git a/kerberos5/lib/libsl/Makefile b/kerberos5/lib/libsl/Makefile index 771a7c70d06..159e1608929 100644 --- a/kerberos5/lib/libsl/Makefile +++ b/kerberos5/lib/libsl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= sl diff --git a/kerberos5/lib/libvers/Makefile b/kerberos5/lib/libvers/Makefile index 52f025bc50a..d7fe0a00165 100644 --- a/kerberos5/lib/libvers/Makefile +++ b/kerberos5/lib/libvers/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= vers diff --git a/kerberos5/lib/libwind/Makefile b/kerberos5/lib/libwind/Makefile index 542ea662515..2ce6947dce7 100644 --- a/kerberos5/lib/libwind/Makefile +++ b/kerberos5/lib/libwind/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= wind diff --git a/kerberos5/libexec/Makefile b/kerberos5/libexec/Makefile index 0d3c4875a7f..543331d5029 100644 --- a/kerberos5/libexec/Makefile +++ b/kerberos5/libexec/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= digest-service ipropd-master ipropd-slave hprop hpropd kdc \ diff --git a/kerberos5/libexec/Makefile.inc b/kerberos5/libexec/Makefile.inc index 7f4404e6b98..068f9e01f1f 100644 --- a/kerberos5/libexec/Makefile.inc +++ b/kerberos5/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/libexec .include "../Makefile.inc" diff --git a/kerberos5/libexec/digest-service/Makefile b/kerberos5/libexec/digest-service/Makefile index d7d5d76352b..521e3b29470 100644 --- a/kerberos5/libexec/digest-service/Makefile +++ b/kerberos5/libexec/digest-service/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= digest-service diff --git a/kerberos5/libexec/hprop/Makefile b/kerberos5/libexec/hprop/Makefile index ff46512216f..96ac9205d04 100644 --- a/kerberos5/libexec/hprop/Makefile +++ b/kerberos5/libexec/hprop/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= hprop diff --git a/kerberos5/libexec/hpropd/Makefile b/kerberos5/libexec/hpropd/Makefile index 2811e2d9363..20619c070aa 100644 --- a/kerberos5/libexec/hpropd/Makefile +++ b/kerberos5/libexec/hpropd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= hpropd diff --git a/kerberos5/libexec/ipropd-master/Makefile b/kerberos5/libexec/ipropd-master/Makefile index c4bddbd07c9..640de69120a 100644 --- a/kerberos5/libexec/ipropd-master/Makefile +++ b/kerberos5/libexec/ipropd-master/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ipropd-master diff --git a/kerberos5/libexec/ipropd-slave/Makefile b/kerberos5/libexec/ipropd-slave/Makefile index a927d82d37c..748183eb09b 100644 --- a/kerberos5/libexec/ipropd-slave/Makefile +++ b/kerberos5/libexec/ipropd-slave/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ipropd-slave diff --git a/kerberos5/libexec/kadmind/Makefile b/kerberos5/libexec/kadmind/Makefile index 4578266fe78..b228b653b02 100644 --- a/kerberos5/libexec/kadmind/Makefile +++ b/kerberos5/libexec/kadmind/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kadmind diff --git a/kerberos5/libexec/kcm/Makefile b/kerberos5/libexec/kcm/Makefile index 2b3267a09c1..f62e39a920f 100644 --- a/kerberos5/libexec/kcm/Makefile +++ b/kerberos5/libexec/kcm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kcm diff --git a/kerberos5/libexec/kdc/Makefile b/kerberos5/libexec/kdc/Makefile index 41fde9115c0..587f850d595 100644 --- a/kerberos5/libexec/kdc/Makefile +++ b/kerberos5/libexec/kdc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kdc diff --git a/kerberos5/libexec/kdigest/Makefile b/kerberos5/libexec/kdigest/Makefile index 85b2e7a4f46..81d3a878064 100644 --- a/kerberos5/libexec/kdigest/Makefile +++ b/kerberos5/libexec/kdigest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kdigest diff --git a/kerberos5/libexec/kfd/Makefile b/kerberos5/libexec/kfd/Makefile index edd2a5ad431..29ddabb8126 100644 --- a/kerberos5/libexec/kfd/Makefile +++ b/kerberos5/libexec/kfd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kfd diff --git a/kerberos5/libexec/kimpersonate/Makefile b/kerberos5/libexec/kimpersonate/Makefile index c7ba44e7bf7..ceb79bc7949 100644 --- a/kerberos5/libexec/kimpersonate/Makefile +++ b/kerberos5/libexec/kimpersonate/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kimpersonate diff --git a/kerberos5/libexec/kpasswdd/Makefile b/kerberos5/libexec/kpasswdd/Makefile index 17a8fa731ae..8b09c0eea5c 100644 --- a/kerberos5/libexec/kpasswdd/Makefile +++ b/kerberos5/libexec/kpasswdd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kpasswdd diff --git a/kerberos5/tools/Makefile b/kerberos5/tools/Makefile index f4f908e3d6d..95c6103d2f7 100644 --- a/kerberos5/tools/Makefile +++ b/kerberos5/tools/Makefile @@ -1,4 +1,3 @@ - SUBDIR= make-roken asn1_compile slc SUBDIR_PARALLEL= diff --git a/kerberos5/tools/Makefile.inc b/kerberos5/tools/Makefile.inc index 78a3af23f3c..b87015c546c 100644 --- a/kerberos5/tools/Makefile.inc +++ b/kerberos5/tools/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/kerberos5/tools/asn1_compile/Makefile b/kerberos5/tools/asn1_compile/Makefile index 39ba5a43f9d..cdeed7da2f6 100644 --- a/kerberos5/tools/asn1_compile/Makefile +++ b/kerberos5/tools/asn1_compile/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= asn1_compile diff --git a/kerberos5/tools/make-roken/Makefile b/kerberos5/tools/make-roken/Makefile index 19957373e6a..a6c6cd9104a 100644 --- a/kerberos5/tools/make-roken/Makefile +++ b/kerberos5/tools/make-roken/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= make-roken diff --git a/kerberos5/tools/slc/Makefile b/kerberos5/tools/slc/Makefile index 82fe68d50be..749e20c8cc2 100644 --- a/kerberos5/tools/slc/Makefile +++ b/kerberos5/tools/slc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= slc diff --git a/kerberos5/usr.bin/Makefile b/kerberos5/usr.bin/Makefile index be3ff31455a..e7292e7cd72 100644 --- a/kerberos5/usr.bin/Makefile +++ b/kerberos5/usr.bin/Makefile @@ -1,4 +1,3 @@ - SUBDIR= hxtool kadmin kcc kdestroy kgetcred kf kinit kpasswd krb5-config ksu \ string2key verify_krb5_conf SUBDIR_PARALLEL= diff --git a/kerberos5/usr.bin/Makefile.inc b/kerberos5/usr.bin/Makefile.inc index 6ce10a5357a..18e54db392b 100644 --- a/kerberos5/usr.bin/Makefile.inc +++ b/kerberos5/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/bin .include "../Makefile.inc" diff --git a/kerberos5/usr.bin/hxtool/Makefile b/kerberos5/usr.bin/hxtool/Makefile index e03dc848ef4..98db4f6a77d 100644 --- a/kerberos5/usr.bin/hxtool/Makefile +++ b/kerberos5/usr.bin/hxtool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= hxtool diff --git a/kerberos5/usr.bin/kadmin/Makefile b/kerberos5/usr.bin/kadmin/Makefile index 73ec415aa53..3ff90ff1e1d 100644 --- a/kerberos5/usr.bin/kadmin/Makefile +++ b/kerberos5/usr.bin/kadmin/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kadmin diff --git a/kerberos5/usr.bin/kcc/Makefile b/kerberos5/usr.bin/kcc/Makefile index 8dbd733aa90..b305f442f78 100644 --- a/kerberos5/usr.bin/kcc/Makefile +++ b/kerberos5/usr.bin/kcc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kcc diff --git a/kerberos5/usr.bin/kdestroy/Makefile b/kerberos5/usr.bin/kdestroy/Makefile index 4e231e33b9b..dde1366dfcd 100644 --- a/kerberos5/usr.bin/kdestroy/Makefile +++ b/kerberos5/usr.bin/kdestroy/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kdestroy diff --git a/kerberos5/usr.bin/kf/Makefile b/kerberos5/usr.bin/kf/Makefile index cdb4c7b3424..5f9d46502b8 100644 --- a/kerberos5/usr.bin/kf/Makefile +++ b/kerberos5/usr.bin/kf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kf diff --git a/kerberos5/usr.bin/kgetcred/Makefile b/kerberos5/usr.bin/kgetcred/Makefile index 80be56620d8..d3d6a485f46 100644 --- a/kerberos5/usr.bin/kgetcred/Makefile +++ b/kerberos5/usr.bin/kgetcred/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kgetcred diff --git a/kerberos5/usr.bin/kinit/Makefile b/kerberos5/usr.bin/kinit/Makefile index 5481ba169c5..46729aec0f1 100644 --- a/kerberos5/usr.bin/kinit/Makefile +++ b/kerberos5/usr.bin/kinit/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kinit diff --git a/kerberos5/usr.bin/kpasswd/Makefile b/kerberos5/usr.bin/kpasswd/Makefile index b0d20ac1146..d8da1baadf3 100644 --- a/kerberos5/usr.bin/kpasswd/Makefile +++ b/kerberos5/usr.bin/kpasswd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kpasswd diff --git a/kerberos5/usr.bin/krb5-config/Makefile b/kerberos5/usr.bin/krb5-config/Makefile index a6ad2cc5857..45166de3e48 100644 --- a/kerberos5/usr.bin/krb5-config/Makefile +++ b/kerberos5/usr.bin/krb5-config/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos SCRIPTS=krb5-config diff --git a/kerberos5/usr.bin/ksu/Makefile b/kerberos5/usr.bin/ksu/Makefile index a6d9043c1b9..55f42db74e8 100644 --- a/kerberos5/usr.bin/ksu/Makefile +++ b/kerberos5/usr.bin/ksu/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ksu diff --git a/kerberos5/usr.bin/string2key/Makefile b/kerberos5/usr.bin/string2key/Makefile index e8cb00c77ee..2e470cb5d7f 100644 --- a/kerberos5/usr.bin/string2key/Makefile +++ b/kerberos5/usr.bin/string2key/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= string2key diff --git a/kerberos5/usr.bin/verify_krb5_conf/Makefile b/kerberos5/usr.bin/verify_krb5_conf/Makefile index c93093eeb24..26d8961e6b0 100644 --- a/kerberos5/usr.bin/verify_krb5_conf/Makefile +++ b/kerberos5/usr.bin/verify_krb5_conf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= verify_krb5_conf diff --git a/kerberos5/usr.sbin/Makefile b/kerberos5/usr.sbin/Makefile index 46fe55b4913..3a3e719751c 100644 --- a/kerberos5/usr.sbin/Makefile +++ b/kerberos5/usr.sbin/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iprop-log kstash ktutil SUBDIR_PARALLEL= diff --git a/kerberos5/usr.sbin/Makefile.inc b/kerberos5/usr.sbin/Makefile.inc index d2495e22de2..d19ea22b6db 100644 --- a/kerberos5/usr.sbin/Makefile.inc +++ b/kerberos5/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/sbin .include "../Makefile.inc" diff --git a/kerberos5/usr.sbin/iprop-log/Makefile b/kerberos5/usr.sbin/iprop-log/Makefile index dc6a605e017..e4e7964cd00 100644 --- a/kerberos5/usr.sbin/iprop-log/Makefile +++ b/kerberos5/usr.sbin/iprop-log/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= iprop-log diff --git a/kerberos5/usr.sbin/kstash/Makefile b/kerberos5/usr.sbin/kstash/Makefile index 0f4d1be2a7b..f2e2ce691ca 100644 --- a/kerberos5/usr.sbin/kstash/Makefile +++ b/kerberos5/usr.sbin/kstash/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= kstash diff --git a/kerberos5/usr.sbin/ktutil/Makefile b/kerberos5/usr.sbin/ktutil/Makefile index a3a0bf2929d..a79222791c4 100644 --- a/kerberos5/usr.sbin/ktutil/Makefile +++ b/kerberos5/usr.sbin/ktutil/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos PROG= ktutil diff --git a/lib/Makefile b/lib/Makefile index 5696fa4aa59..ee5419ae0f9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,3 @@ - .include # The SUBDIR_BOOTSTRAP list is a small set of libraries which are used by many diff --git a/lib/atf/libatf-c++/Makefile.inc b/lib/atf/libatf-c++/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/lib/atf/libatf-c++/Makefile.inc +++ b/lib/atf/libatf-c++/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/atf/libatf-c++/tests/Makefile b/lib/atf/libatf-c++/tests/Makefile index 570e9845a14..dc052c19df6 100644 --- a/lib/atf/libatf-c++/tests/Makefile +++ b/lib/atf/libatf-c++/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/lib/atf/libatf-c++/tests/Makefile.inc b/lib/atf/libatf-c++/tests/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/lib/atf/libatf-c++/tests/Makefile.inc +++ b/lib/atf/libatf-c++/tests/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/atf/libatf-c++/tests/detail/Makefile b/lib/atf/libatf-c++/tests/detail/Makefile index 63e7489e572..4b95f8dbd66 100644 --- a/lib/atf/libatf-c++/tests/detail/Makefile +++ b/lib/atf/libatf-c++/tests/detail/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c++/detail diff --git a/lib/atf/libatf-c/Makefile.inc b/lib/atf/libatf-c/Makefile.inc index 692761e886b..bb4b9697d84 100644 --- a/lib/atf/libatf-c/Makefile.inc +++ b/lib/atf/libatf-c/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" CFLAGS+= -DATF_BUILD_CC='"cc"' diff --git a/lib/atf/libatf-c/tests/Makefile b/lib/atf/libatf-c/tests/Makefile index 4cba59485f3..c81c18a91f0 100644 --- a/lib/atf/libatf-c/tests/Makefile +++ b/lib/atf/libatf-c/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/lib/atf/libatf-c/tests/Makefile.inc b/lib/atf/libatf-c/tests/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/lib/atf/libatf-c/tests/Makefile.inc +++ b/lib/atf/libatf-c/tests/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/atf/libatf-c/tests/detail/Makefile b/lib/atf/libatf-c/tests/detail/Makefile index fb014b3497a..5123f6f4d79 100644 --- a/lib/atf/libatf-c/tests/detail/Makefile +++ b/lib/atf/libatf-c/tests/detail/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/lib/atf/libatf-c/detail diff --git a/lib/atf/tests/Makefile b/lib/atf/tests/Makefile index 3c4e525aa46..500ff0f20c3 100644 --- a/lib/atf/tests/Makefile +++ b/lib/atf/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/atf/tests/test-programs/Makefile b/lib/atf/tests/test-programs/Makefile index a1999e236ce..b0b04f5fe98 100644 --- a/lib/atf/tests/test-programs/Makefile +++ b/lib/atf/tests/test-programs/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/lib/atf/test-programs diff --git a/lib/clang/Makefile b/lib/clang/Makefile index adbf15828f8..52093dd7cb2 100644 --- a/lib/clang/Makefile +++ b/lib/clang/Makefile @@ -1,4 +1,3 @@ - .include # These have to be built in order. diff --git a/lib/clang/Makefile.inc b/lib/clang/Makefile.inc index 37da7ac759b..3678060fdec 100644 --- a/lib/clang/Makefile.inc +++ b/lib/clang/Makefile.inc @@ -1,4 +1,3 @@ - .include PACKAGE= clang diff --git a/lib/clang/headers/Makefile b/lib/clang/headers/Makefile index 16683a039b2..e3197c7822a 100644 --- a/lib/clang/headers/Makefile +++ b/lib/clang/headers/Makefile @@ -1,4 +1,3 @@ - .include .include "../clang.pre.mk" diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 3dc82612089..3c92e4599ec 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -1,4 +1,3 @@ - .include .include "../clang.pre.mk" diff --git a/lib/clang/libclangminimal/Makefile b/lib/clang/libclangminimal/Makefile index 22faa7b98ae..c55dae8896a 100644 --- a/lib/clang/libclangminimal/Makefile +++ b/lib/clang/libclangminimal/Makefile @@ -1,4 +1,3 @@ - .include .include "../clang.pre.mk" diff --git a/lib/clang/liblldb/Makefile b/lib/clang/liblldb/Makefile index fdf30bfba12..68740883f7f 100644 --- a/lib/clang/liblldb/Makefile +++ b/lib/clang/liblldb/Makefile @@ -1,4 +1,3 @@ - .include .include "../lldb.pre.mk" diff --git a/lib/clang/libllvm/Makefile b/lib/clang/libllvm/Makefile index 528551aab85..6c9becbd4b6 100644 --- a/lib/clang/libllvm/Makefile +++ b/lib/clang/libllvm/Makefile @@ -1,4 +1,3 @@ - .include .include "../llvm.pre.mk" diff --git a/lib/clang/libllvmminimal/Makefile b/lib/clang/libllvmminimal/Makefile index aeae260bf18..ae40dc75d89 100644 --- a/lib/clang/libllvmminimal/Makefile +++ b/lib/clang/libllvmminimal/Makefile @@ -1,4 +1,3 @@ - .include .include "../llvm.pre.mk" diff --git a/lib/csu/Makefile b/lib/csu/Makefile index 1f8a403eb2c..1e7a17bd35e 100644 --- a/lib/csu/Makefile +++ b/lib/csu/Makefile @@ -1,4 +1,3 @@ - .include .if exists(${.CURDIR}/${MACHINE_ARCH:S/powerpc64le/powerpc64/}) diff --git a/lib/csu/aarch64/Makefile b/lib/csu/aarch64/Makefile index 0ea681ced6b..24abd0b4758 100644 --- a/lib/csu/aarch64/Makefile +++ b/lib/csu/aarch64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CFLAGS+= -I${.CURDIR} diff --git a/lib/csu/amd64/Makefile b/lib/csu/amd64/Makefile index 8dd4084f863..80ae5484d66 100644 --- a/lib/csu/amd64/Makefile +++ b/lib/csu/amd64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CFLAGS+= -I${.CURDIR} diff --git a/lib/csu/arm/Makefile b/lib/csu/arm/Makefile index 96b361b0656..5f5de9f9c61 100644 --- a/lib/csu/arm/Makefile +++ b/lib/csu/arm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CRT1OBJS+= crt1_s.o diff --git a/lib/csu/i386/Makefile b/lib/csu/i386/Makefile index 0ea681ced6b..24abd0b4758 100644 --- a/lib/csu/i386/Makefile +++ b/lib/csu/i386/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CFLAGS+= -I${.CURDIR} diff --git a/lib/csu/powerpc/Makefile b/lib/csu/powerpc/Makefile index 5e0cc7ff6ed..b6928446d00 100644 --- a/lib/csu/powerpc/Makefile +++ b/lib/csu/powerpc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common OBJS+= crtsavres.o diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile index 763cebbaa48..97df3f38911 100644 --- a/lib/csu/powerpc64/Makefile +++ b/lib/csu/powerpc64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common OBJS+= crtsavres.o diff --git a/lib/csu/riscv/Makefile b/lib/csu/riscv/Makefile index 96b361b0656..5f5de9f9c61 100644 --- a/lib/csu/riscv/Makefile +++ b/lib/csu/riscv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common CRT1OBJS+= crt1_s.o diff --git a/lib/csu/tests/Makefile b/lib/csu/tests/Makefile index 3f95193420e..946d293973d 100644 --- a/lib/csu/tests/Makefile +++ b/lib/csu/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR= dso TESTS_SUBDIRS= dynamic TESTS_SUBDIRS+= dynamiclib diff --git a/lib/csu/tests/Makefile.inc b/lib/csu/tests/Makefile.inc index 9904a82f1ba..2cb85b8d5d4 100644 --- a/lib/csu/tests/Makefile.inc +++ b/lib/csu/tests/Makefile.inc @@ -1,2 +1 @@ - TESTSDIR:= ${TESTSBASE}/${RELDIR:C/csu\/tests/csu/} diff --git a/lib/csu/tests/Makefile.tests b/lib/csu/tests/Makefile.tests index 12926d5e38a..52179057b2a 100644 --- a/lib/csu/tests/Makefile.tests +++ b/lib/csu/tests/Makefile.tests @@ -1,4 +1,3 @@ - ATF_TESTS_C+= init_test ATF_TESTS_C+= fini_test ATF_TESTS_CXX+= cxx_constructors diff --git a/lib/csu/tests/dso/Makefile b/lib/csu/tests/dso/Makefile index 6975e64c5df..2f2b8c90ac2 100644 --- a/lib/csu/tests/dso/Makefile +++ b/lib/csu/tests/dso/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} SHLIB= h_csu SHLIB_NAME= libh_csu.so diff --git a/lib/csu/tests/dynamic/Makefile b/lib/csu/tests/dynamic/Makefile index 1ceeb385b5e..e9e57201cb9 100644 --- a/lib/csu/tests/dynamic/Makefile +++ b/lib/csu/tests/dynamic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} .include diff --git a/lib/csu/tests/dynamiclib/Makefile b/lib/csu/tests/dynamiclib/Makefile index ced5bbb4e93..13a9b837684 100644 --- a/lib/csu/tests/dynamiclib/Makefile +++ b/lib/csu/tests/dynamiclib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} CFLAGS+= -DDSO_BASE DPADD+= ${.OBJDIR:H}/dso/libh_csu.so diff --git a/lib/csu/tests/dynamicpie/Makefile b/lib/csu/tests/dynamicpie/Makefile index b5c0356001d..204bef0c7d1 100644 --- a/lib/csu/tests/dynamicpie/Makefile +++ b/lib/csu/tests/dynamicpie/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} .include diff --git a/lib/csu/tests/static/Makefile b/lib/csu/tests/static/Makefile index c3f87641c8e..e76c49c93a1 100644 --- a/lib/csu/tests/static/Makefile +++ b/lib/csu/tests/static/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} NO_SHARED= diff --git a/lib/flua/libjail/Makefile b/lib/flua/libjail/Makefile index c7649c724c0..2b9b6c777cb 100644 --- a/lib/flua/libjail/Makefile +++ b/lib/flua/libjail/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= jail.so SHLIBDIR= ${LIBDIR}/flua diff --git a/lib/geom/Makefile b/lib/geom/Makefile index 8352b4f2c5a..a6274d43e7e 100644 --- a/lib/geom/Makefile +++ b/lib/geom/Makefile @@ -1,4 +1,3 @@ - SUBDIR=${GEOM_CLASSES} .include "Makefile.inc" diff --git a/lib/geom/Makefile.classes b/lib/geom/Makefile.classes index a924bf71c29..1852e35be15 100644 --- a/lib/geom/Makefile.classes +++ b/lib/geom/Makefile.classes @@ -1,4 +1,3 @@ - .if !defined(COMPAT_libcompat) GEOM_CLASS_DIR?=/lib/geom .else diff --git a/lib/geom/Makefile.inc b/lib/geom/Makefile.inc index 3f2e2b54105..35163127538 100644 --- a/lib/geom/Makefile.inc +++ b/lib/geom/Makefile.inc @@ -1,4 +1,3 @@ - .include SHLIBDIR=${GEOM_CLASS_DIR} diff --git a/lib/geom/cache/Makefile b/lib/geom/cache/Makefile index db3f667a097..850a237d682 100644 --- a/lib/geom/cache/Makefile +++ b/lib/geom/cache/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/concat/Makefile b/lib/geom/concat/Makefile index f8801db9c61..e30eeb24756 100644 --- a/lib/geom/concat/Makefile +++ b/lib/geom/concat/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/eli/Makefile b/lib/geom/eli/Makefile index 1bc31a5f66b..f4a0e6f5ad9 100644 --- a/lib/geom/eli/Makefile +++ b/lib/geom/eli/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 diff --git a/lib/geom/journal/Makefile b/lib/geom/journal/Makefile index b3e23df9176..7d5282ff762 100644 --- a/lib/geom/journal/Makefile +++ b/lib/geom/journal/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/label/Makefile b/lib/geom/label/Makefile index d281b3c40e7..ed35777cf47 100644 --- a/lib/geom/label/Makefile +++ b/lib/geom/label/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/mirror/Makefile b/lib/geom/mirror/Makefile index fd7608accc9..2e86b099fea 100644 --- a/lib/geom/mirror/Makefile +++ b/lib/geom/mirror/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/mountver/Makefile b/lib/geom/mountver/Makefile index 24caa75636e..b60e355bed6 100644 --- a/lib/geom/mountver/Makefile +++ b/lib/geom/mountver/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/multipath/Makefile b/lib/geom/multipath/Makefile index 550d1969ee4..805ac93dfcb 100644 --- a/lib/geom/multipath/Makefile +++ b/lib/geom/multipath/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/nop/Makefile b/lib/geom/nop/Makefile index 939f56e9567..d7d1329697b 100644 --- a/lib/geom/nop/Makefile +++ b/lib/geom/nop/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/part/Makefile b/lib/geom/part/Makefile index 00840df1da2..a8f0c6ac5f7 100644 --- a/lib/geom/part/Makefile +++ b/lib/geom/part/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/raid/Makefile b/lib/geom/raid/Makefile index 9d804fd437a..338a305b7ab 100644 --- a/lib/geom/raid/Makefile +++ b/lib/geom/raid/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/raid3/Makefile b/lib/geom/raid3/Makefile index b4843bd5034..f6e5e5ef92f 100644 --- a/lib/geom/raid3/Makefile +++ b/lib/geom/raid3/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/shsec/Makefile b/lib/geom/shsec/Makefile index b67b9c8b6b6..47981da7df9 100644 --- a/lib/geom/shsec/Makefile +++ b/lib/geom/shsec/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/stripe/Makefile b/lib/geom/stripe/Makefile index 9168ecf3046..a63568ae35e 100644 --- a/lib/geom/stripe/Makefile +++ b/lib/geom/stripe/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/union/Makefile b/lib/geom/union/Makefile index 9f2deca840e..7dfe3be205a 100644 --- a/lib/geom/union/Makefile +++ b/lib/geom/union/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc diff --git a/lib/geom/virstor/Makefile b/lib/geom/virstor/Makefile index c8f728904f2..e596e83ec18 100644 --- a/lib/geom/virstor/Makefile +++ b/lib/geom/virstor/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom .PATH: ${.CURDIR:H:H}/misc ${SRCTOP}/sys/geom/virstor diff --git a/lib/googletest/Makefile b/lib/googletest/Makefile index 7b56a6c216d..2cbc40829d1 100644 --- a/lib/googletest/Makefile +++ b/lib/googletest/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR+= gtest diff --git a/lib/googletest/Makefile.inc b/lib/googletest/Makefile.inc index f40428f7754..231d7545f36 100644 --- a/lib/googletest/Makefile.inc +++ b/lib/googletest/Makefile.inc @@ -1,4 +1,3 @@ - .include GTEST_DIR= ${SRCTOP}/contrib/googletest diff --git a/lib/googletest/gmock/Makefile b/lib/googletest/gmock/Makefile index b896c789a8b..b6f8b69e356 100644 --- a/lib/googletest/gmock/Makefile +++ b/lib/googletest/gmock/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src diff --git a/lib/googletest/gmock/Makefile.inc b/lib/googletest/gmock/Makefile.inc index 22f1f738401..f77e46b3451 100644 --- a/lib/googletest/gmock/Makefile.inc +++ b/lib/googletest/gmock/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/gmock_main/Makefile b/lib/googletest/gmock_main/Makefile index 4978aa7af4a..34b87a05426 100644 --- a/lib/googletest/gmock_main/Makefile +++ b/lib/googletest/gmock_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/include ${GOOGLEMOCK_SRCROOT}/src diff --git a/lib/googletest/gmock_main/Makefile.inc b/lib/googletest/gmock_main/Makefile.inc index 22f1f738401..f77e46b3451 100644 --- a/lib/googletest/gmock_main/Makefile.inc +++ b/lib/googletest/gmock_main/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/gtest/Makefile b/lib/googletest/gtest/Makefile index fbfcfb5e1b3..6475fd2e043 100644 --- a/lib/googletest/gtest/Makefile +++ b/lib/googletest/gtest/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src diff --git a/lib/googletest/gtest/Makefile.inc b/lib/googletest/gtest/Makefile.inc index 22f1f738401..f77e46b3451 100644 --- a/lib/googletest/gtest/Makefile.inc +++ b/lib/googletest/gtest/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/gtest_main/Makefile b/lib/googletest/gtest_main/Makefile index 0aea71a41b7..1a4eb5d7139 100644 --- a/lib/googletest/gtest_main/Makefile +++ b/lib/googletest/gtest_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/include ${GOOGLETEST_SRCROOT}/src diff --git a/lib/googletest/gtest_main/Makefile.inc b/lib/googletest/gtest_main/Makefile.inc index 22f1f738401..f77e46b3451 100644 --- a/lib/googletest/gtest_main/Makefile.inc +++ b/lib/googletest/gtest_main/Makefile.inc @@ -1,2 +1 @@ - include ../Makefile.inc diff --git a/lib/googletest/tests/Makefile b/lib/googletest/tests/Makefile index 8e3299029da..886b1a2fe49 100644 --- a/lib/googletest/tests/Makefile +++ b/lib/googletest/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/googletest/tests/Makefile.inc b/lib/googletest/tests/Makefile.inc index 03ee799eb61..9691aaa93de 100644 --- a/lib/googletest/tests/Makefile.inc +++ b/lib/googletest/tests/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" # Keep the existing tests directory structure (with subdirs per component) # rather than installing all of them to /usr/tests/lib/googletest diff --git a/lib/googletest/tests/gmock/Makefile b/lib/googletest/tests/gmock/Makefile index 5df1f48c0e4..49356710063 100644 --- a/lib/googletest/tests/gmock/Makefile +++ b/lib/googletest/tests/gmock/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test diff --git a/lib/googletest/tests/gmock_main/Makefile b/lib/googletest/tests/gmock_main/Makefile index 7523b585ac2..1b191924fb9 100644 --- a/lib/googletest/tests/gmock_main/Makefile +++ b/lib/googletest/tests/gmock_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLEMOCK_SRCROOT}/src ${GOOGLEMOCK_SRCROOT}/test diff --git a/lib/googletest/tests/gtest/Makefile b/lib/googletest/tests/gtest/Makefile index 0000167dfe7..5834ca78898 100644 --- a/lib/googletest/tests/gtest/Makefile +++ b/lib/googletest/tests/gtest/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test diff --git a/lib/googletest/tests/gtest_main/Makefile b/lib/googletest/tests/gtest_main/Makefile index 3124042f8b9..de9bc2f4a78 100644 --- a/lib/googletest/tests/gtest_main/Makefile +++ b/lib/googletest/tests/gtest_main/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${GOOGLETEST_SRCROOT}/src ${GOOGLETEST_SRCROOT}/test diff --git a/lib/lib80211/Makefile b/lib/lib80211/Makefile index 0d3cd3619c6..78819cb9cfa 100644 --- a/lib/lib80211/Makefile +++ b/lib/lib80211/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime CONFS= regdomain.xml LIB= 80211 diff --git a/lib/lib9p/Makefile b/lib/lib9p/Makefile index 349900a9c53..a8e0c74301e 100644 --- a/lib/lib9p/Makefile +++ b/lib/lib9p/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/../../contrib/lib9p diff --git a/lib/libalias/Makefile b/lib/libalias/Makefile index 02fd37c62a1..c847f55e8e0 100644 --- a/lib/libalias/Makefile +++ b/lib/libalias/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libalias modules .include diff --git a/lib/libalias/Makefile.inc b/lib/libalias/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/lib/libalias/Makefile.inc +++ b/lib/libalias/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libalias/libalias/Makefile b/lib/libalias/libalias/Makefile index 7a2004ed43f..e6fed2355d8 100644 --- a/lib/libalias/libalias/Makefile +++ b/lib/libalias/libalias/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias PACKAGE= natd diff --git a/lib/libalias/modules/Makefile b/lib/libalias/modules/Makefile index f7d4c3e8e8b..cf2ce73397c 100644 --- a/lib/libalias/modules/Makefile +++ b/lib/libalias/modules/Makefile @@ -1,4 +1,3 @@ - .include "${SRCTOP}/sys/modules/libalias/modules/modules.inc" SUBDIR= ${MODULES} diff --git a/lib/libalias/modules/Makefile.inc b/lib/libalias/modules/Makefile.inc index 4be1feb6e74..9d1c9bac3ff 100644 --- a/lib/libalias/modules/Makefile.inc +++ b/lib/libalias/modules/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias SHLIBDIR?= /lib diff --git a/lib/libalias/modules/dummy/Makefile b/lib/libalias/modules/dummy/Makefile index 8795962cc42..4762582b944 100644 --- a/lib/libalias/modules/dummy/Makefile +++ b/lib/libalias/modules/dummy/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= dummy SRCS= alias_dummy.c diff --git a/lib/libalias/modules/ftp/Makefile b/lib/libalias/modules/ftp/Makefile index 84dac1758aa..4e90d1aeea0 100644 --- a/lib/libalias/modules/ftp/Makefile +++ b/lib/libalias/modules/ftp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= ftp SRCS= alias_ftp.c diff --git a/lib/libalias/modules/irc/Makefile b/lib/libalias/modules/irc/Makefile index e954208c256..0400cbeb53a 100644 --- a/lib/libalias/modules/irc/Makefile +++ b/lib/libalias/modules/irc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= irc SRCS= alias_irc.c diff --git a/lib/libalias/modules/nbt/Makefile b/lib/libalias/modules/nbt/Makefile index 5176d49b7af..7c8b0487530 100644 --- a/lib/libalias/modules/nbt/Makefile +++ b/lib/libalias/modules/nbt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= nbt SRCS= alias_nbt.c diff --git a/lib/libalias/modules/pptp/Makefile b/lib/libalias/modules/pptp/Makefile index 7db0d859760..ad32569d0c0 100644 --- a/lib/libalias/modules/pptp/Makefile +++ b/lib/libalias/modules/pptp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= pptp SRCS= alias_pptp.c diff --git a/lib/libalias/modules/skinny/Makefile b/lib/libalias/modules/skinny/Makefile index a120ac2f1c7..5d914c6f79a 100644 --- a/lib/libalias/modules/skinny/Makefile +++ b/lib/libalias/modules/skinny/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= skinny SRCS= alias_skinny.c diff --git a/lib/libalias/modules/smedia/Makefile b/lib/libalias/modules/smedia/Makefile index 0fbda73b395..9fa766b7d7d 100644 --- a/lib/libalias/modules/smedia/Makefile +++ b/lib/libalias/modules/smedia/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd NAME= smedia SRCS= alias_smedia.c diff --git a/lib/libbe/Makefile b/lib/libbe/Makefile index 099efed52d9..10bcabea732 100644 --- a/lib/libbe/Makefile +++ b/lib/libbe/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libbe/tests/Makefile b/lib/libbe/tests/Makefile index 7a16bc486d7..20a4e1ddfeb 100644 --- a/lib/libbe/tests/Makefile +++ b/lib/libbe/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= be_create diff --git a/lib/libbearssl/Makefile b/lib/libbearssl/Makefile index 1fa57f37259..2c649bb80e9 100644 --- a/lib/libbearssl/Makefile +++ b/lib/libbearssl/Makefile @@ -1,4 +1,3 @@ - # This is a reach over build of BearSSL (www.BearSSL.org) .include diff --git a/lib/libbearssl/Makefile.inc b/lib/libbearssl/Makefile.inc index 453630d038c..75365bb98be 100644 --- a/lib/libbearssl/Makefile.inc +++ b/lib/libbearssl/Makefile.inc @@ -1,4 +1,3 @@ - BEARSSL?= ${SRCTOP}/contrib/bearssl BEARSSL_SRC= ${BEARSSL}/src BEARSSL_TOOLS= ${BEARSSL}/tools diff --git a/lib/libbearssl/Makefile.libsa.inc b/lib/libbearssl/Makefile.libsa.inc index c171e141f0d..827ce82d130 100644 --- a/lib/libbearssl/Makefile.libsa.inc +++ b/lib/libbearssl/Makefile.libsa.inc @@ -1,4 +1,3 @@ - # This file is included by libsa # It contains SRCS needed for loader diff --git a/lib/libbegemot/Makefile b/lib/libbegemot/Makefile index a58881ff2ac..99f61c67f08 100644 --- a/lib/libbegemot/Makefile +++ b/lib/libbegemot/Makefile @@ -1,4 +1,3 @@ - LIBBEGEMOT_DIR=${SRCTOP}/contrib/libbegemot PACKAGE=lib${LIB} diff --git a/lib/libblacklist/Makefile b/lib/libblacklist/Makefile index 9d85d1eff82..bfd9edb9614 100644 --- a/lib/libblacklist/Makefile +++ b/lib/libblacklist/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist .PATH: ${BLOCKLIST_DIR}/lib ${BLOCKLIST_DIR}/include diff --git a/lib/libblocksruntime/Makefile b/lib/libblocksruntime/Makefile index 6c7bb3c5514..baadcfd0f95 100644 --- a/lib/libblocksruntime/Makefile +++ b/lib/libblocksruntime/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB:tl} LIB= BlocksRuntime SHLIB_MAJOR=0 diff --git a/lib/libbsdstat/Makefile b/lib/libbsdstat/Makefile index 46fa76adb28..403c11cce58 100644 --- a/lib/libbsdstat/Makefile +++ b/lib/libbsdstat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} LIB= bsdstat SHLIB_MAJOR= 1 diff --git a/lib/libbsnmp/Makefile b/lib/libbsnmp/Makefile index 5dc4e084dd0..7b25928ba61 100644 --- a/lib/libbsnmp/Makefile +++ b/lib/libbsnmp/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= libbsnmp diff --git a/lib/libbsnmp/Makefile.inc b/lib/libbsnmp/Makefile.inc index 80478f39241..ea77a5f420d 100644 --- a/lib/libbsnmp/Makefile.inc +++ b/lib/libbsnmp/Makefile.inc @@ -1,4 +1,3 @@ - INCSDIR= ${INCLUDEDIR}/bsnmp PACKAGE= bsnmp diff --git a/lib/libbsnmp/tests/Makefile b/lib/libbsnmp/tests/Makefile index 52962210444..fdd5484ec07 100644 --- a/lib/libbsnmp/tests/Makefile +++ b/lib/libbsnmp/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= bsnmpd_test diff --git a/lib/libbz2/Makefile b/lib/libbz2/Makefile index 832ec15487b..f7ea21b1a08 100644 --- a/lib/libbz2/Makefile +++ b/lib/libbz2/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/lib/libc++/Makefile b/lib/libc++/Makefile index ea93913e358..aec8ebc5a97 100644 --- a/lib/libc++/Makefile +++ b/lib/libc++/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libc++experimental/Makefile b/lib/libc++experimental/Makefile index ddc34e8756c..733bb894690 100644 --- a/lib/libc++experimental/Makefile +++ b/lib/libc++experimental/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= clibs diff --git a/lib/libc/Makefile b/lib/libc/Makefile index c70e5749877..ae059e53144 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/libc/aarch64/gen/Makefile.inc b/lib/libc/aarch64/gen/Makefile.inc index 4f4fb3d199b..1efdb0e9f8b 100644 --- a/lib/libc/aarch64/gen/Makefile.inc +++ b/lib/libc/aarch64/gen/Makefile.inc @@ -1,4 +1,3 @@ - CFLAGS+= -DNO_COMPAT7 SRCS+= _ctx_start.S \ diff --git a/lib/libc/amd64/gen/Makefile.inc b/lib/libc/amd64/gen/Makefile.inc index 583418c4620..aaffcb0481f 100644 --- a/lib/libc/amd64/gen/Makefile.inc +++ b/lib/libc/amd64/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _setjmp.S setjmp.S sigsetjmp.S \ fabs.S \ infinity.c ldexp.c makecontext.c signalcontext.c \ diff --git a/lib/libc/amd64/stdlib/Makefile.inc b/lib/libc/amd64/stdlib/Makefile.inc index f0abf7ce825..568f8eb4afa 100644 --- a/lib/libc/amd64/stdlib/Makefile.inc +++ b/lib/libc/amd64/stdlib/Makefile.inc @@ -1,2 +1 @@ - MDSRCS+=div.S ldiv.S lldiv.S diff --git a/lib/libc/arm/aeabi/Makefile.inc b/lib/libc/arm/aeabi/Makefile.inc index 08158f1d8e6..ef9ff746060 100644 --- a/lib/libc/arm/aeabi/Makefile.inc +++ b/lib/libc/arm/aeabi/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/arm/aeabi SRCS+= aeabi_atexit.c \ diff --git a/lib/libc/arm/gen/Makefile.inc b/lib/libc/arm/gen/Makefile.inc index 3a76c1de4e7..dfb83da20a1 100644 --- a/lib/libc/arm/gen/Makefile.inc +++ b/lib/libc/arm/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= \ __aeabi_read_tp.S \ _ctx_start.S \ diff --git a/lib/libc/arm/string/Makefile.inc b/lib/libc/arm/string/Makefile.inc index 9f0d10f70c9..fc886645b0c 100644 --- a/lib/libc/arm/string/Makefile.inc +++ b/lib/libc/arm/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ bcopy.S \ bzero.S \ diff --git a/lib/libc/capability/Makefile.inc b/lib/libc/capability/Makefile.inc index cf214d7f562..e4c2350a731 100644 --- a/lib/libc/capability/Makefile.inc +++ b/lib/libc/capability/Makefile.inc @@ -1,4 +1,3 @@ - # capability sources .PATH: ${SRCTOP}/sys/kern ${LIBC_SRCTOP}/capability diff --git a/lib/libc/compat-43/Makefile.inc b/lib/libc/compat-43/Makefile.inc index b0fcd0d4af8..288fb04e592 100644 --- a/lib/libc/compat-43/Makefile.inc +++ b/lib/libc/compat-43/Makefile.inc @@ -1,4 +1,3 @@ - # compat-43 sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/compat-43 ${LIBC_SRCTOP}/compat-43 diff --git a/lib/libc/db/btree/Makefile.inc b/lib/libc/db/btree/Makefile.inc index 44c4d16275e..fb1cf231467 100644 --- a/lib/libc/db/btree/Makefile.inc +++ b/lib/libc/db/btree/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/btree SRCS+= bt_close.c bt_conv.c bt_debug.c bt_delete.c bt_get.c bt_open.c \ diff --git a/lib/libc/db/db/Makefile.inc b/lib/libc/db/db/Makefile.inc index 0597b4e6029..7447ec41ca8 100644 --- a/lib/libc/db/db/Makefile.inc +++ b/lib/libc/db/db/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/db SRCS+= db.c diff --git a/lib/libc/db/hash/Makefile.inc b/lib/libc/db/hash/Makefile.inc index 369985d55ed..0d58e60796a 100644 --- a/lib/libc/db/hash/Makefile.inc +++ b/lib/libc/db/hash/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/hash SRCS+= hash.c hash_bigkey.c hash_buf.c hash_func.c hash_log2.c \ diff --git a/lib/libc/db/man/Makefile.inc b/lib/libc/db/man/Makefile.inc index c3045ca980b..312fd046707 100644 --- a/lib/libc/db/man/Makefile.inc +++ b/lib/libc/db/man/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/man MAN+= btree.3 dbm.3 dbopen.3 hash.3 mpool.3 recno.3 diff --git a/lib/libc/db/mpool/Makefile.inc b/lib/libc/db/mpool/Makefile.inc index 526d70cc236..e9c9795add3 100644 --- a/lib/libc/db/mpool/Makefile.inc +++ b/lib/libc/db/mpool/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/mpool SRCS+= mpool.c \ diff --git a/lib/libc/db/recno/Makefile.inc b/lib/libc/db/recno/Makefile.inc index 0a4da32314b..b3cb3c412f1 100644 --- a/lib/libc/db/recno/Makefile.inc +++ b/lib/libc/db/recno/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/db/recno SRCS+= rec_close.c rec_delete.c rec_get.c rec_open.c rec_put.c rec_search.c \ diff --git a/lib/libc/db/test/Makefile b/lib/libc/db/test/Makefile index 0e1c295a61a..b8930e951e1 100644 --- a/lib/libc/db/test/Makefile +++ b/lib/libc/db/test/Makefile @@ -1,4 +1,3 @@ - PROG= dbtest OBJS= dbtest.o strerror.o diff --git a/lib/libc/gdtoa/Makefile.inc b/lib/libc/gdtoa/Makefile.inc index 5a7bc9fab15..ce0ddfc4616 100644 --- a/lib/libc/gdtoa/Makefile.inc +++ b/lib/libc/gdtoa/Makefile.inc @@ -1,4 +1,3 @@ - # netlib gdtoa sources .PATH: ${LIBC_SRCTOP}/gdtoa diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index 2f034e7d476..8111b0d2434 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,4 +1,3 @@ - # machine-independent gen sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen ${SRCTOP}/etc diff --git a/lib/libc/gmon/Makefile.inc b/lib/libc/gmon/Makefile.inc index 92db74d4888..f70dc5692f8 100644 --- a/lib/libc/gmon/Makefile.inc +++ b/lib/libc/gmon/Makefile.inc @@ -1,4 +1,3 @@ - # gmon sources .PATH: ${LIBC_SRCTOP}/gmon diff --git a/lib/libc/i386/Makefile.inc b/lib/libc/i386/Makefile.inc index 79ecb759754..5268afe685f 100644 --- a/lib/libc/i386/Makefile.inc +++ b/lib/libc/i386/Makefile.inc @@ -1,4 +1,3 @@ - # Long double is 80 bits GDTOASRCS+=strtorx.c SRCS+=machdep_ldisx.c diff --git a/lib/libc/i386/gen/Makefile.inc b/lib/libc/i386/gen/Makefile.inc index 1c4eb2a9981..e3d36c0a1ad 100644 --- a/lib/libc/i386/gen/Makefile.inc +++ b/lib/libc/i386/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _ctx_start.S _setjmp.S fabs.S \ flt_rounds.c infinity.c ldexp.c makecontext.c \ setjmp.S signalcontext.c sigsetjmp.S diff --git a/lib/libc/i386/stdlib/Makefile.inc b/lib/libc/i386/stdlib/Makefile.inc index 072bcb2ace0..21e1af04fd8 100644 --- a/lib/libc/i386/stdlib/Makefile.inc +++ b/lib/libc/i386/stdlib/Makefile.inc @@ -1,2 +1 @@ - MDSRCS+=div.S ldiv.S diff --git a/lib/libc/i386/string/Makefile.inc b/lib/libc/i386/string/Makefile.inc index 391b81be4d6..bbb4320a5b0 100644 --- a/lib/libc/i386/string/Makefile.inc +++ b/lib/libc/i386/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ bcmp.S \ bcopy.S \ diff --git a/lib/libc/iconv/Makefile.inc b/lib/libc/iconv/Makefile.inc index 1e23f1a6fc9..08c2763c8f0 100644 --- a/lib/libc/iconv/Makefile.inc +++ b/lib/libc/iconv/Makefile.inc @@ -1,4 +1,3 @@ - # iconv sources .PATH: ${LIBC_SRCTOP}/iconv diff --git a/lib/libc/inet/Makefile.inc b/lib/libc/inet/Makefile.inc index 9cc1b654726..8175bfef677 100644 --- a/lib/libc/inet/Makefile.inc +++ b/lib/libc/inet/Makefile.inc @@ -1,4 +1,3 @@ - # inet sources .PATH: ${LIBC_SRCTOP}/inet diff --git a/lib/libc/isc/Makefile.inc b/lib/libc/isc/Makefile.inc index 11b3da0a1b4..30729e96ef1 100644 --- a/lib/libc/isc/Makefile.inc +++ b/lib/libc/isc/Makefile.inc @@ -1,4 +1,3 @@ - # isc sources .PATH: ${LIBC_SRCTOP}/isc diff --git a/lib/libc/locale/Makefile.inc b/lib/libc/locale/Makefile.inc index ad00b38a1ba..33caafc5c10 100644 --- a/lib/libc/locale/Makefile.inc +++ b/lib/libc/locale/Makefile.inc @@ -1,4 +1,3 @@ - # locale sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/locale ${LIBC_SRCTOP}/locale diff --git a/lib/libc/md/Makefile.inc b/lib/libc/md/Makefile.inc index e7bf932c1ff..346fb93017a 100644 --- a/lib/libc/md/Makefile.inc +++ b/lib/libc/md/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libmd SRCS+= md5c.c diff --git a/lib/libc/nameser/Makefile.inc b/lib/libc/nameser/Makefile.inc index f91cccbc171..c60371e2ca9 100644 --- a/lib/libc/nameser/Makefile.inc +++ b/lib/libc/nameser/Makefile.inc @@ -1,4 +1,3 @@ - # nameser sources .PATH: ${LIBC_SRCTOP}/nameser diff --git a/lib/libc/net/Makefile.inc b/lib/libc/net/Makefile.inc index cd4ccaefac9..558cf7be577 100644 --- a/lib/libc/net/Makefile.inc +++ b/lib/libc/net/Makefile.inc @@ -1,4 +1,3 @@ - # machine-independent net sources .PATH: ${LIBC_SRCTOP}/net diff --git a/lib/libc/posix1e/Makefile.inc b/lib/libc/posix1e/Makefile.inc index 0b738ef7e23..934998cdd09 100644 --- a/lib/libc/posix1e/Makefile.inc +++ b/lib/libc/posix1e/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/posix1e CFLAGS+=-D_ACL_PRIVATE diff --git a/lib/libc/powerpc/Makefile.inc b/lib/libc/powerpc/Makefile.inc index 80ac23a9947..1d1fadd2133 100644 --- a/lib/libc/powerpc/Makefile.inc +++ b/lib/libc/powerpc/Makefile.inc @@ -1,4 +1,3 @@ - # Long double is 64-bits SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc/Symbol.map diff --git a/lib/libc/powerpc/gen/Makefile.common b/lib/libc/powerpc/gen/Makefile.common index d0d78197ca6..70aa9ea5d9c 100644 --- a/lib/libc/powerpc/gen/Makefile.common +++ b/lib/libc/powerpc/gen/Makefile.common @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/powerpc/gen SRCS += _ctx_start.S eabi.S infinity.c ldexp.c makecontext.c \ diff --git a/lib/libc/powerpc/gen/Makefile.inc b/lib/libc/powerpc/gen/Makefile.inc index efdc778e899..502f3dc231b 100644 --- a/lib/libc/powerpc/gen/Makefile.inc +++ b/lib/libc/powerpc/gen/Makefile.inc @@ -1,4 +1,3 @@ - .include "${LIBC_SRCTOP}/powerpc/gen/Makefile.common" SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ diff --git a/lib/libc/powerpc64/Makefile.inc b/lib/libc/powerpc64/Makefile.inc index 4aac4e3a6e6..734afe95f24 100644 --- a/lib/libc/powerpc64/Makefile.inc +++ b/lib/libc/powerpc64/Makefile.inc @@ -1,4 +1,3 @@ - # Long double is 64-bits SRCS+=machdep_ldisd.c SYM_MAPS+=${LIBC_SRCTOP}/powerpc64/Symbol.map diff --git a/lib/libc/powerpc64/gen/Makefile.inc b/lib/libc/powerpc64/gen/Makefile.inc index 26265df5fbd..c48ff05ae55 100644 --- a/lib/libc/powerpc64/gen/Makefile.inc +++ b/lib/libc/powerpc64/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS += _ctx_start.S fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ fpgetsticky.c fpsetmask.c fpsetround.c \ infinity.c ldexp.c makecontext.c _setjmp.S \ diff --git a/lib/libc/powerpc64/string/Makefile.inc b/lib/libc/powerpc64/string/Makefile.inc index d1918ff027c..c9d7c9d7167 100644 --- a/lib/libc/powerpc64/string/Makefile.inc +++ b/lib/libc/powerpc64/string/Makefile.inc @@ -1,4 +1,3 @@ - MDSRCS+= \ bcopy.S \ bcopy_vsx.S \ diff --git a/lib/libc/powerpcspe/Makefile.inc b/lib/libc/powerpcspe/Makefile.inc index 6962e107ed4..0b587957448 100644 --- a/lib/libc/powerpcspe/Makefile.inc +++ b/lib/libc/powerpcspe/Makefile.inc @@ -1,4 +1,3 @@ - CFLAGS+= -I${LIBC_SRCTOP}/powerpc # Long double is 64-bits diff --git a/lib/libc/powerpcspe/gen/Makefile.inc b/lib/libc/powerpcspe/gen/Makefile.inc index efdc778e899..502f3dc231b 100644 --- a/lib/libc/powerpcspe/gen/Makefile.inc +++ b/lib/libc/powerpcspe/gen/Makefile.inc @@ -1,4 +1,3 @@ - .include "${LIBC_SRCTOP}/powerpc/gen/Makefile.common" SRCS += fabs.S flt_rounds.c fpgetmask.c fpgetround.c \ diff --git a/lib/libc/quad/Makefile.inc b/lib/libc/quad/Makefile.inc index d70c2596f3f..680b58ab222 100644 --- a/lib/libc/quad/Makefile.inc +++ b/lib/libc/quad/Makefile.inc @@ -1,4 +1,3 @@ - # Quad support, if needed .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/quad ${LIBC_SRCTOP}/quad diff --git a/lib/libc/quad/TESTS/Makefile b/lib/libc/quad/TESTS/Makefile index 7bcbe465505..9cb44015802 100644 --- a/lib/libc/quad/TESTS/Makefile +++ b/lib/libc/quad/TESTS/Makefile @@ -1,4 +1,3 @@ - all: mul divrem MUL= mul.c ../muldi3.c diff --git a/lib/libc/regex/Makefile.inc b/lib/libc/regex/Makefile.inc index 9fa541ab4cd..89468f1317f 100644 --- a/lib/libc/regex/Makefile.inc +++ b/lib/libc/regex/Makefile.inc @@ -1,4 +1,3 @@ - # regex sources .PATH: ${LIBC_SRCTOP}/regex diff --git a/lib/libc/resolv/Makefile.inc b/lib/libc/resolv/Makefile.inc index ea5e1927a9c..be900e94243 100644 --- a/lib/libc/resolv/Makefile.inc +++ b/lib/libc/resolv/Makefile.inc @@ -1,4 +1,3 @@ - # resolv sources .PATH: ${LIBC_SRCTOP}/resolv diff --git a/lib/libc/riscv/gen/Makefile.inc b/lib/libc/riscv/gen/Makefile.inc index 71bb6a42bbd..443e029946b 100644 --- a/lib/libc/riscv/gen/Makefile.inc +++ b/lib/libc/riscv/gen/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= _ctx_start.S \ fabs.S \ flt_rounds.c \ diff --git a/lib/libc/rpc/Makefile.inc b/lib/libc/rpc/Makefile.inc index 274f780755a..021b7390ca5 100644 --- a/lib/libc/rpc/Makefile.inc +++ b/lib/libc/rpc/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/. CONFS+= rpc/netconfig rpc/rpc SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \ diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc index 52497254ac8..a3d76c0ea79 100644 --- a/lib/libc/stdio/Makefile.inc +++ b/lib/libc/stdio/Makefile.inc @@ -1,4 +1,3 @@ - # stdio sources .PATH: ${LIBC_SRCTOP}/stdio diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index 5e273d5d5a2..bea82445304 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -1,4 +1,3 @@ - # machine-independent stdlib sources .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib ${LIBC_SRCTOP}/stdlib diff --git a/lib/libc/string/Makefile.inc b/lib/libc/string/Makefile.inc index f32bcde5ba5..c5ded194c78 100644 --- a/lib/libc/string/Makefile.inc +++ b/lib/libc/string/Makefile.inc @@ -1,4 +1,3 @@ - .if ${MK_MACHDEP_OPTIMIZATIONS} != "no" .PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/string .endif diff --git a/lib/libc/tests/Makefile b/lib/libc/tests/Makefile index 7f72fb61900..76a79a9f578 100644 --- a/lib/libc/tests/Makefile +++ b/lib/libc/tests/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= tls_dso diff --git a/lib/libc/tests/Makefile.netbsd-tests b/lib/libc/tests/Makefile.netbsd-tests index 98ff48bde5c..43710d39aca 100644 --- a/lib/libc/tests/Makefile.netbsd-tests +++ b/lib/libc/tests/Makefile.netbsd-tests @@ -1,4 +1,3 @@ - TESTSRC:= ${SRCTOP}/contrib/netbsd-tests/${RELDIR:C/libc\/tests/libc/} TESTSDIR:= ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/} diff --git a/lib/libc/tests/c063/Makefile b/lib/libc/tests/c063/Makefile index d71ddad1f5f..c1d8b01c1ab 100644 --- a/lib/libc/tests/c063/Makefile +++ b/lib/libc/tests/c063/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_C= faccessat_test NETBSD_ATF_TESTS_C+= fchmodat_test NETBSD_ATF_TESTS_C+= fchownat_test diff --git a/lib/libc/tests/db/Makefile b/lib/libc/tests/db/Makefile index 617295b8b14..f1f33bd2baf 100644 --- a/lib/libc/tests/db/Makefile +++ b/lib/libc/tests/db/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests BINDIR= ${TESTSDIR} diff --git a/lib/libc/tests/gen/Makefile b/lib/libc/tests/gen/Makefile index edffdc98b35..87f2b8320d2 100644 --- a/lib/libc/tests/gen/Makefile +++ b/lib/libc/tests/gen/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= arc4random_test diff --git a/lib/libc/tests/gen/execve/Makefile b/lib/libc/tests/gen/execve/Makefile index 5f563dc8e3c..7bf911d1cb4 100644 --- a/lib/libc/tests/gen/execve/Makefile +++ b/lib/libc/tests/gen/execve/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C= execve_test diff --git a/lib/libc/tests/gen/posix_spawn/Makefile b/lib/libc/tests/gen/posix_spawn/Makefile index 7a13fdf501c..df428876708 100644 --- a/lib/libc/tests/gen/posix_spawn/Makefile +++ b/lib/libc/tests/gen/posix_spawn/Makefile @@ -1,4 +1,3 @@ - .include BINDIR= ${TESTSDIR} diff --git a/lib/libc/tests/hash/Makefile b/lib/libc/tests/hash/Makefile index 009b7d1c523..d09d87b7cd8 100644 --- a/lib/libc/tests/hash/Makefile +++ b/lib/libc/tests/hash/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/lib/libc/tests/iconv/Makefile b/lib/libc/tests/iconv/Makefile index fd4ab284ebe..dc2dc5a925b 100644 --- a/lib/libc/tests/iconv/Makefile +++ b/lib/libc/tests/iconv/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/lib/libc/iconv ATF_TESTS_C+= iconvctl_test diff --git a/lib/libc/tests/inet/Makefile b/lib/libc/tests/inet/Makefile index 0c5a1674237..3ceadfb8868 100644 --- a/lib/libc/tests/inet/Makefile +++ b/lib/libc/tests/inet/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C+= inet_addr_test diff --git a/lib/libc/tests/locale/Makefile b/lib/libc/tests/locale/Makefile index 03e89571aac..70905cc58d2 100644 --- a/lib/libc/tests/locale/Makefile +++ b/lib/libc/tests/locale/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= btowc_test diff --git a/lib/libc/tests/net/Makefile b/lib/libc/tests/net/Makefile index 6e90f22b98f..0a49683ea3d 100644 --- a/lib/libc/tests/net/Makefile +++ b/lib/libc/tests/net/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_C+= ether_test diff --git a/lib/libc/tests/net/getaddrinfo/Makefile b/lib/libc/tests/net/getaddrinfo/Makefile index c9c9fba7d53..5d98aa31a86 100644 --- a/lib/libc/tests/net/getaddrinfo/Makefile +++ b/lib/libc/tests/net/getaddrinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T} diff --git a/lib/libc/tests/nss/Makefile b/lib/libc/tests/nss/Makefile index df85dd46393..790af8c6312 100644 --- a/lib/libc/tests/nss/Makefile +++ b/lib/libc/tests/nss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/resolv PACKAGE= tests diff --git a/lib/libc/tests/regex/Makefile b/lib/libc/tests/regex/Makefile index 00f681c0751..65675d94c59 100644 --- a/lib/libc/tests/regex/Makefile +++ b/lib/libc/tests/regex/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests # local test cases diff --git a/lib/libc/tests/regex/Makefile.inc b/lib/libc/tests/regex/Makefile.inc index 1af987faa15..aca7ae47be1 100644 --- a/lib/libc/tests/regex/Makefile.inc +++ b/lib/libc/tests/regex/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= ${TESTSDIR} diff --git a/lib/libc/tests/resolv/Makefile b/lib/libc/tests/resolv/Makefile index f1c00f7ea5c..25c659d5668 100644 --- a/lib/libc/tests/resolv/Makefile +++ b/lib/libc/tests/resolv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/lib/libc/resolv diff --git a/lib/libc/tests/rpc/Makefile b/lib/libc/tests/rpc/Makefile index 8c908ce40c6..621af96eb95 100644 --- a/lib/libc/tests/rpc/Makefile +++ b/lib/libc/tests/rpc/Makefile @@ -1,4 +1,3 @@ - SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \ h_testbits.h diff --git a/lib/libc/tests/setjmp/Makefile b/lib/libc/tests/setjmp/Makefile index 309a5c82c46..8ea8550dfba 100644 --- a/lib/libc/tests/setjmp/Makefile +++ b/lib/libc/tests/setjmp/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_C= setjmp_test NETBSD_ATF_TESTS_C+= threadjmp_test diff --git a/lib/libc/tests/ssp/Makefile b/lib/libc/tests/ssp/Makefile index 0f5b5650513..644d5a6d64a 100644 --- a/lib/libc/tests/ssp/Makefile +++ b/lib/libc/tests/ssp/Makefile @@ -1,4 +1,3 @@ - .include MK_WERROR= no diff --git a/lib/libc/tests/stdio/Makefile b/lib/libc/tests/stdio/Makefile index f0822601e34..6dca927c4fb 100644 --- a/lib/libc/tests/stdio/Makefile +++ b/lib/libc/tests/stdio/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= eintr_test diff --git a/lib/libc/tests/stdlib/Makefile b/lib/libc/tests/stdlib/Makefile index 860e530389d..cf1a204cfb4 100644 --- a/lib/libc/tests/stdlib/Makefile +++ b/lib/libc/tests/stdlib/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= clearenv_test diff --git a/lib/libc/tests/stdlib/dynthr_mod/Makefile b/lib/libc/tests/stdlib/dynthr_mod/Makefile index 1db3a3c9d57..3602e81e5be 100644 --- a/lib/libc/tests/stdlib/dynthr_mod/Makefile +++ b/lib/libc/tests/stdlib/dynthr_mod/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= dynthr_mod.so SHLIBDIR= ${TESTSDIR} SRCS= dynthr_mod.c diff --git a/lib/libc/tests/string/Makefile b/lib/libc/tests/string/Makefile index c71a83eede6..f4607661935 100644 --- a/lib/libc/tests/string/Makefile +++ b/lib/libc/tests/string/Makefile @@ -1,4 +1,3 @@ - # ensure libc functions are tested, not clang's builtins CFLAGS+= -fno-builtin diff --git a/lib/libc/tests/sys/Makefile b/lib/libc/tests/sys/Makefile index 380b3b51104..89d341ff400 100644 --- a/lib/libc/tests/sys/Makefile +++ b/lib/libc/tests/sys/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/lib/libc/tests/termios/Makefile b/lib/libc/tests/termios/Makefile index 4900f0067ce..76879b80503 100644 --- a/lib/libc/tests/termios/Makefile +++ b/lib/libc/tests/termios/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C= tcsetpgrp_test diff --git a/lib/libc/tests/time/Makefile b/lib/libc/tests/time/Makefile index ac6d3bc55be..9e0230a70f5 100644 --- a/lib/libc/tests/time/Makefile +++ b/lib/libc/tests/time/Makefile @@ -1,4 +1,3 @@ - .include NETBSD_ATF_TESTS_C= mktime_test diff --git a/lib/libc/tests/tls/Makefile b/lib/libc/tests/tls/Makefile index dc0fbb4c90a..6d53493f56f 100644 --- a/lib/libc/tests/tls/Makefile +++ b/lib/libc/tests/tls/Makefile @@ -1,4 +1,3 @@ - .include .if !defined(NO_PIC) diff --git a/lib/libc/tests/tls/dso/Makefile b/lib/libc/tests/tls/dso/Makefile index 2e08d6899d6..5efd8b29a6b 100644 --- a/lib/libc/tests/tls/dso/Makefile +++ b/lib/libc/tests/tls/dso/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T} LIB= h_tls_dlopen diff --git a/lib/libc/tests/tls_dso/Makefile b/lib/libc/tests/tls_dso/Makefile index bae78739708..89296c64369 100644 --- a/lib/libc/tests/tls_dso/Makefile +++ b/lib/libc/tests/tls_dso/Makefile @@ -1,4 +1,3 @@ - .include LIB= h_tls_dynamic diff --git a/lib/libc/tests/ttyio/Makefile b/lib/libc/tests/ttyio/Makefile index 79ec9a4039e..2d2dda2f854 100644 --- a/lib/libc/tests/ttyio/Makefile +++ b/lib/libc/tests/ttyio/Makefile @@ -1,4 +1,3 @@ - .include # TODO: ptm_test diff --git a/lib/libc/uuid/Makefile.inc b/lib/libc/uuid/Makefile.inc index d9c8b0a6083..d887bf81626 100644 --- a/lib/libc/uuid/Makefile.inc +++ b/lib/libc/uuid/Makefile.inc @@ -1,4 +1,3 @@ - # DCE 1.1 UUID implementation sources .PATH: ${LIBC_SRCTOP}/uuid diff --git a/lib/libc/x86/gen/Makefile.inc b/lib/libc/x86/gen/Makefile.inc index 7449ef52fa6..c2ff1ffb001 100644 --- a/lib/libc/x86/gen/Makefile.inc +++ b/lib/libc/x86/gen/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/x86/gen SRCS+= \ diff --git a/lib/libc/xdr/Makefile.inc b/lib/libc/xdr/Makefile.inc index bbbd09d1e26..559ed5ed044 100644 --- a/lib/libc/xdr/Makefile.inc +++ b/lib/libc/xdr/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${LIBC_SRCTOP}/xdr ${LIBC_SRCTOP}/. SRCS+= xdr.c xdr_array.c xdr_float.c xdr_mem.c \ xdr_rec.c xdr_reference.c xdr_sizeof.c \ diff --git a/lib/libc/yp/Makefile.inc b/lib/libc/yp/Makefile.inc index 887a29d51f0..7aeac84090e 100644 --- a/lib/libc/yp/Makefile.inc +++ b/lib/libc/yp/Makefile.inc @@ -1,4 +1,3 @@ - # yp sources .PATH: ${LIBC_SRCTOP}/yp diff --git a/lib/libc_nonshared/Makefile b/lib/libc_nonshared/Makefile index 0f6cf561a7c..840dc3b8c29 100644 --- a/lib/libc_nonshared/Makefile +++ b/lib/libc_nonshared/Makefile @@ -1,4 +1,3 @@ - # We're actually creating a libc_noshared.a that is PIC along side libc.so.* # It is used exclusively with libc.so.* - there is no need for any other # compile modes. diff --git a/lib/libc_nonshared/Makefile.iconv b/lib/libc_nonshared/Makefile.iconv index 3fbd06f1b6a..a17d3436f99 100644 --- a/lib/libc_nonshared/Makefile.iconv +++ b/lib/libc_nonshared/Makefile.iconv @@ -1,4 +1,3 @@ - .if ${MK_ICONV} == "yes" LIBC_NONSHARED_SRCS+= \ __iconv.c __iconv_free_list.c __iconv_get_list.c \ diff --git a/lib/libcalendar/Makefile b/lib/libcalendar/Makefile index aac15461b84..e28e7ef08ea 100644 --- a/lib/libcalendar/Makefile +++ b/lib/libcalendar/Makefile @@ -1,4 +1,3 @@ - LIB= calendar SRCS= calendar.c easter.c diff --git a/lib/libcam/Makefile b/lib/libcam/Makefile index f3f43a90d4b..c2f7b75bc87 100644 --- a/lib/libcam/Makefile +++ b/lib/libcam/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= cam diff --git a/lib/libcam/tests/Makefile b/lib/libcam/tests/Makefile index f762332b0c7..a1726638fdc 100644 --- a/lib/libcam/tests/Makefile +++ b/lib/libcam/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= libcam_test ATF_TESTS_C+= cam_test diff --git a/lib/libcapsicum/Makefile b/lib/libcapsicum/Makefile index 48577bb7fb5..3cb476e67e2 100644 --- a/lib/libcapsicum/Makefile +++ b/lib/libcapsicum/Makefile @@ -1,4 +1,3 @@ - INCS= capsicum_helpers.h MAN+= capsicum_helpers.3 diff --git a/lib/libcasper/Makefile b/lib/libcasper/Makefile index ce6bfb94116..0a1074d4613 100644 --- a/lib/libcasper/Makefile +++ b/lib/libcasper/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= libcasper diff --git a/lib/libcasper/Makefile.inc b/lib/libcasper/Makefile.inc index ca5f4a2b360..00bd221feb2 100644 --- a/lib/libcasper/Makefile.inc +++ b/lib/libcasper/Makefile.inc @@ -1,4 +1,3 @@ - .include .if ${MK_CASPER} != "no" diff --git a/lib/libcasper/libcasper/Makefile b/lib/libcasper/libcasper/Makefile index 8d7e49bf94a..4db26f665f1 100644 --- a/lib/libcasper/libcasper/Makefile +++ b/lib/libcasper/libcasper/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime SHLIBDIR?= /lib diff --git a/lib/libcasper/services/Makefile b/lib/libcasper/services/Makefile index f51531d12b2..c86b199f879 100644 --- a/lib/libcasper/services/Makefile +++ b/lib/libcasper/services/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= cap_dns diff --git a/lib/libcasper/services/Makefile.inc b/lib/libcasper/services/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/lib/libcasper/services/Makefile.inc +++ b/lib/libcasper/services/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libcasper/services/cap_dns/Makefile b/lib/libcasper/services/cap_dns/Makefile index eec1ac9d7d7..4b11c97d29e 100644 --- a/lib/libcasper/services/cap_dns/Makefile +++ b/lib/libcasper/services/cap_dns/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_dns/tests/Makefile b/lib/libcasper/services/cap_dns/tests/Makefile index b11586df6a8..c7306581a80 100644 --- a/lib/libcasper/services/cap_dns/tests/Makefile +++ b/lib/libcasper/services/cap_dns/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= dns_test diff --git a/lib/libcasper/services/cap_fileargs/Makefile b/lib/libcasper/services/cap_fileargs/Makefile index 31febd08096..2c52d0887a4 100644 --- a/lib/libcasper/services/cap_fileargs/Makefile +++ b/lib/libcasper/services/cap_fileargs/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_fileargs/tests/Makefile b/lib/libcasper/services/cap_fileargs/tests/Makefile index 46059698aa0..02f02cceab8 100644 --- a/lib/libcasper/services/cap_fileargs/tests/Makefile +++ b/lib/libcasper/services/cap_fileargs/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= fileargs_test diff --git a/lib/libcasper/services/cap_grp/Makefile b/lib/libcasper/services/cap_grp/Makefile index 0f722e3979f..a921dfa87e7 100644 --- a/lib/libcasper/services/cap_grp/Makefile +++ b/lib/libcasper/services/cap_grp/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_grp/tests/Makefile b/lib/libcasper/services/cap_grp/tests/Makefile index 18074380b7f..f57d58972c5 100644 --- a/lib/libcasper/services/cap_grp/tests/Makefile +++ b/lib/libcasper/services/cap_grp/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_C= grp_test diff --git a/lib/libcasper/services/cap_net/Makefile b/lib/libcasper/services/cap_net/Makefile index 365d5bb63e9..1ba35a674a0 100644 --- a/lib/libcasper/services/cap_net/Makefile +++ b/lib/libcasper/services/cap_net/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_net/tests/Makefile b/lib/libcasper/services/cap_net/tests/Makefile index 7b0b98f869b..5798d738544 100644 --- a/lib/libcasper/services/cap_net/tests/Makefile +++ b/lib/libcasper/services/cap_net/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= net_test diff --git a/lib/libcasper/services/cap_netdb/Makefile b/lib/libcasper/services/cap_netdb/Makefile index 653aa21c9b3..853052e78d0 100644 --- a/lib/libcasper/services/cap_netdb/Makefile +++ b/lib/libcasper/services/cap_netdb/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_netdb/tests/Makefile b/lib/libcasper/services/cap_netdb/tests/Makefile index a2f90206488..bc5e0457832 100644 --- a/lib/libcasper/services/cap_netdb/tests/Makefile +++ b/lib/libcasper/services/cap_netdb/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= netdb_test diff --git a/lib/libcasper/services/cap_pwd/Makefile b/lib/libcasper/services/cap_pwd/Makefile index 4e0e6db6f86..a1e97845c73 100644 --- a/lib/libcasper/services/cap_pwd/Makefile +++ b/lib/libcasper/services/cap_pwd/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_pwd/tests/Makefile b/lib/libcasper/services/cap_pwd/tests/Makefile index dcda3ad9482..79df81416d4 100644 --- a/lib/libcasper/services/cap_pwd/tests/Makefile +++ b/lib/libcasper/services/cap_pwd/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_C= pwd_test diff --git a/lib/libcasper/services/cap_sysctl/Makefile b/lib/libcasper/services/cap_sysctl/Makefile index 73da70acaeb..522313df4ff 100644 --- a/lib/libcasper/services/cap_sysctl/Makefile +++ b/lib/libcasper/services/cap_sysctl/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/cap_sysctl/tests/Makefile b/lib/libcasper/services/cap_sysctl/tests/Makefile index 82001851362..85bb0d28c38 100644 --- a/lib/libcasper/services/cap_sysctl/tests/Makefile +++ b/lib/libcasper/services/cap_sysctl/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= sysctl_test diff --git a/lib/libcasper/services/cap_syslog/Makefile b/lib/libcasper/services/cap_syslog/Makefile index 4c20f697019..88979d8bed2 100644 --- a/lib/libcasper/services/cap_syslog/Makefile +++ b/lib/libcasper/services/cap_syslog/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libcasper/services/tests/Makefile b/lib/libcasper/services/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/lib/libcasper/services/tests/Makefile +++ b/lib/libcasper/services/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/libcasper/tests/Makefile b/lib/libcasper/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/lib/libcasper/tests/Makefile +++ b/lib/libcasper/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/lib/libcbor/Makefile b/lib/libcbor/Makefile index c9d86c0b95a..ddc064562fc 100644 --- a/lib/libcbor/Makefile +++ b/lib/libcbor/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ssh LIB= cbor PRIVATELIB= diff --git a/lib/libclang_rt/Makefile b/lib/libclang_rt/Makefile index 79ccd288a84..7d9ad9191b7 100644 --- a/lib/libclang_rt/Makefile +++ b/lib/libclang_rt/Makefile @@ -1,4 +1,3 @@ - SD_ASAN+= asan SD_ASAN+= asan-preinit SD_ASAN+= asan_cxx diff --git a/lib/libclang_rt/Makefile.inc b/lib/libclang_rt/Makefile.inc index 4be3c667462..e351d6ebef9 100644 --- a/lib/libclang_rt/Makefile.inc +++ b/lib/libclang_rt/Makefile.inc @@ -1,4 +1,3 @@ - .include PACKAGE= clang diff --git a/lib/libclang_rt/asan-preinit/Makefile b/lib/libclang_rt/asan-preinit/Makefile index ce99dfa2d50..1f2fade866a 100644 --- a/lib/libclang_rt/asan-preinit/Makefile +++ b/lib/libclang_rt/asan-preinit/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan-preinit-${CRTARCH} diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile index 630b2d4ea06..b87d7a0bb1a 100644 --- a/lib/libclang_rt/asan/Makefile +++ b/lib/libclang_rt/asan/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan-${CRTARCH} diff --git a/lib/libclang_rt/asan_cxx/Makefile b/lib/libclang_rt/asan_cxx/Makefile index c26690aedfb..804e6ffd43d 100644 --- a/lib/libclang_rt/asan_cxx/Makefile +++ b/lib/libclang_rt/asan_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan_cxx-${CRTARCH} diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile index ed70c7c3dc3..198a61bfbb6 100644 --- a/lib/libclang_rt/asan_dynamic/Makefile +++ b/lib/libclang_rt/asan_dynamic/Makefile @@ -1,4 +1,3 @@ - .include SHLIB_NAME= libclang_rt.asan-${CRTARCH}.so diff --git a/lib/libclang_rt/asan_static/Makefile b/lib/libclang_rt/asan_static/Makefile index 099ef64b37e..158228051d9 100644 --- a/lib/libclang_rt/asan_static/Makefile +++ b/lib/libclang_rt/asan_static/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.asan_static-${CRTARCH} diff --git a/lib/libclang_rt/cfi/Makefile b/lib/libclang_rt/cfi/Makefile index 5fdbb9fd6cc..d101ff0296c 100644 --- a/lib/libclang_rt/cfi/Makefile +++ b/lib/libclang_rt/cfi/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.cfi-${CRTARCH} diff --git a/lib/libclang_rt/cfi_diag/Makefile b/lib/libclang_rt/cfi_diag/Makefile index 66a5d2c88e8..0ac9a46c7a9 100644 --- a/lib/libclang_rt/cfi_diag/Makefile +++ b/lib/libclang_rt/cfi_diag/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.cfi_diag-${CRTARCH} diff --git a/lib/libclang_rt/dd/Makefile b/lib/libclang_rt/dd/Makefile index 558d7cfb698..c0f0b3d3694 100644 --- a/lib/libclang_rt/dd/Makefile +++ b/lib/libclang_rt/dd/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.dd-${CRTARCH} diff --git a/lib/libclang_rt/fuzzer/Makefile b/lib/libclang_rt/fuzzer/Makefile index 73e69616d8a..00287482f3f 100644 --- a/lib/libclang_rt/fuzzer/Makefile +++ b/lib/libclang_rt/fuzzer/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.fuzzer-${CRTARCH} diff --git a/lib/libclang_rt/fuzzer_interceptors/Makefile b/lib/libclang_rt/fuzzer_interceptors/Makefile index 52f8425e429..bb58f71bf68 100644 --- a/lib/libclang_rt/fuzzer_interceptors/Makefile +++ b/lib/libclang_rt/fuzzer_interceptors/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.fuzzer_interceptors-${CRTARCH} diff --git a/lib/libclang_rt/fuzzer_no_main/Makefile b/lib/libclang_rt/fuzzer_no_main/Makefile index 088f0f2e79a..7f88a585dea 100644 --- a/lib/libclang_rt/fuzzer_no_main/Makefile +++ b/lib/libclang_rt/fuzzer_no_main/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.fuzzer_no_main-${CRTARCH} diff --git a/lib/libclang_rt/include/Makefile b/lib/libclang_rt/include/Makefile index ab881db3da7..7fe850fca57 100644 --- a/lib/libclang_rt/include/Makefile +++ b/lib/libclang_rt/include/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${CRTSRC}/include/sanitizer diff --git a/lib/libclang_rt/msan/Makefile b/lib/libclang_rt/msan/Makefile index 18afe7e474f..1c1911f2236 100644 --- a/lib/libclang_rt/msan/Makefile +++ b/lib/libclang_rt/msan/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.msan-${CRTARCH} diff --git a/lib/libclang_rt/msan_cxx/Makefile b/lib/libclang_rt/msan_cxx/Makefile index 59ad2120111..3e024e7c6c7 100644 --- a/lib/libclang_rt/msan_cxx/Makefile +++ b/lib/libclang_rt/msan_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.msan_cxx-${CRTARCH} diff --git a/lib/libclang_rt/profile/Makefile b/lib/libclang_rt/profile/Makefile index ac4e9d66d33..d03b640b025 100644 --- a/lib/libclang_rt/profile/Makefile +++ b/lib/libclang_rt/profile/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.profile-${CRTARCH} diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile index bbf4a665c37..8c99724ec3d 100644 --- a/lib/libclang_rt/safestack/Makefile +++ b/lib/libclang_rt/safestack/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.safestack-${CRTARCH} diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile index 63ed5eb22c5..7124ab7c968 100644 --- a/lib/libclang_rt/stats/Makefile +++ b/lib/libclang_rt/stats/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.stats-${CRTARCH} diff --git a/lib/libclang_rt/stats_client/Makefile b/lib/libclang_rt/stats_client/Makefile index 010763a9e25..775152fc77a 100644 --- a/lib/libclang_rt/stats_client/Makefile +++ b/lib/libclang_rt/stats_client/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.stats_client-${CRTARCH} diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile index 906156a4820..573688dfac1 100644 --- a/lib/libclang_rt/tsan/Makefile +++ b/lib/libclang_rt/tsan/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.tsan-${CRTARCH} diff --git a/lib/libclang_rt/tsan_cxx/Makefile b/lib/libclang_rt/tsan_cxx/Makefile index b556699c911..a95ee30701d 100644 --- a/lib/libclang_rt/tsan_cxx/Makefile +++ b/lib/libclang_rt/tsan_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.tsan_cxx-${CRTARCH} diff --git a/lib/libclang_rt/ubsan_minimal/Makefile b/lib/libclang_rt/ubsan_minimal/Makefile index 5edbad5df89..9a56a189688 100644 --- a/lib/libclang_rt/ubsan_minimal/Makefile +++ b/lib/libclang_rt/ubsan_minimal/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.ubsan_minimal-${CRTARCH} diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile index 6b4964715b5..935c03d2005 100644 --- a/lib/libclang_rt/ubsan_standalone/Makefile +++ b/lib/libclang_rt/ubsan_standalone/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.ubsan_standalone-${CRTARCH} diff --git a/lib/libclang_rt/ubsan_standalone_cxx/Makefile b/lib/libclang_rt/ubsan_standalone_cxx/Makefile index bfca7e1bd69..f533df169ab 100644 --- a/lib/libclang_rt/ubsan_standalone_cxx/Makefile +++ b/lib/libclang_rt/ubsan_standalone_cxx/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.ubsan_standalone_cxx-${CRTARCH} diff --git a/lib/libclang_rt/xray-basic/Makefile b/lib/libclang_rt/xray-basic/Makefile index f5421f59679..8e4d97497b8 100644 --- a/lib/libclang_rt/xray-basic/Makefile +++ b/lib/libclang_rt/xray-basic/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-basic-${CRTARCH} diff --git a/lib/libclang_rt/xray-fdr/Makefile b/lib/libclang_rt/xray-fdr/Makefile index 43bfd97b0de..50822c79d15 100644 --- a/lib/libclang_rt/xray-fdr/Makefile +++ b/lib/libclang_rt/xray-fdr/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-fdr-${CRTARCH} diff --git a/lib/libclang_rt/xray-profiling/Makefile b/lib/libclang_rt/xray-profiling/Makefile index 4e609b77779..0aa0dbb602e 100644 --- a/lib/libclang_rt/xray-profiling/Makefile +++ b/lib/libclang_rt/xray-profiling/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-profiling-${CRTARCH} diff --git a/lib/libclang_rt/xray/Makefile b/lib/libclang_rt/xray/Makefile index 91abbb74366..a2a0afb5895 100644 --- a/lib/libclang_rt/xray/Makefile +++ b/lib/libclang_rt/xray/Makefile @@ -1,4 +1,3 @@ - .include LIB= clang_rt.xray-${CRTARCH} diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index 72b715bbf83..2bfd26bae96 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,4 +1,3 @@ - PACKAGE= kerberos-lib LIB= com_err diff --git a/lib/libcompat/Makefile b/lib/libcompat/Makefile index 884941b3a13..2612568a9da 100644 --- a/lib/libcompat/Makefile +++ b/lib/libcompat/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= compat CFLAGS+=-I${SRCTOP}/lib/libc/locale diff --git a/lib/libcompiler_rt/Makefile b/lib/libcompiler_rt/Makefile index f894d68e647..3543ce5728d 100644 --- a/lib/libcompiler_rt/Makefile +++ b/lib/libcompiler_rt/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= lib${LIB} diff --git a/lib/libcrypt/tests/Makefile b/lib/libcrypt/tests/Makefile index 8e97c95f95f..f64fafe3c8c 100644 --- a/lib/libcrypt/tests/Makefile +++ b/lib/libcrypt/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= crypt_tests NETBSD_ATF_TESTS_C+= crypt_test diff --git a/lib/libdevctl/Makefile b/lib/libdevctl/Makefile index 4e1993428d8..6e32151aeb1 100644 --- a/lib/libdevctl/Makefile +++ b/lib/libdevctl/Makefile @@ -1,4 +1,3 @@ - LIB= devctl SRCS= devctl.c INCS= devctl.h diff --git a/lib/libdevdctl/Makefile b/lib/libdevdctl/Makefile index 619c15a9285..32cede96df4 100644 --- a/lib/libdevdctl/Makefile +++ b/lib/libdevdctl/Makefile @@ -1,4 +1,3 @@ - LIB_CXX= devdctl INCS= consumer.h \ event.h \ diff --git a/lib/libdevdctl/tests/Makefile b/lib/libdevdctl/tests/Makefile index a8019b46828..a77fff5c610 100644 --- a/lib/libdevdctl/tests/Makefile +++ b/lib/libdevdctl/tests/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/lib/libdevdctl .PATH: ${.CURDIR:H} diff --git a/lib/libdevinfo/Makefile b/lib/libdevinfo/Makefile index e11e7a61af2..41e17f7de0b 100644 --- a/lib/libdevinfo/Makefile +++ b/lib/libdevinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= devmatch LIB= devinfo SRCS= devinfo.c diff --git a/lib/libdevstat/Makefile b/lib/libdevstat/Makefile index 0f3caef96b8..1531717d2fe 100644 --- a/lib/libdevstat/Makefile +++ b/lib/libdevstat/Makefile @@ -1,4 +1,3 @@ - LIB= devstat SHLIBDIR?= /lib # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented. diff --git a/lib/libdl/Makefile b/lib/libdl/Makefile index 3432e244a5d..d958dec8599 100644 --- a/lib/libdl/Makefile +++ b/lib/libdl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=clibs LIB=dl SHLIB_MAJOR=1 diff --git a/lib/libdpv/Makefile b/lib/libdpv/Makefile index 80b3e862004..31f1186fa31 100644 --- a/lib/libdpv/Makefile +++ b/lib/libdpv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dpv LIB= dpv SHLIB_MAJOR= 3 diff --git a/lib/libedit/readline/Makefile b/lib/libedit/readline/Makefile index 0f771e64745..b717846de0a 100644 --- a/lib/libedit/readline/Makefile +++ b/lib/libedit/readline/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/libedit/readline INCS= readline.h history.h tilde.h diff --git a/lib/libelf/Makefile b/lib/libelf/Makefile index 9704405a8a3..c15ce2798a9 100644 --- a/lib/libelf/Makefile +++ b/lib/libelf/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libevent1/Makefile b/lib/libevent1/Makefile index 6ca16cc03c1..9e48707bc44 100644 --- a/lib/libevent1/Makefile +++ b/lib/libevent1/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} .PATH: ${SRCTOP}/contrib/pf/libevent diff --git a/lib/libexecinfo/Makefile b/lib/libexecinfo/Makefile index 3b44ca15bc3..3010a5be589 100644 --- a/lib/libexecinfo/Makefile +++ b/lib/libexecinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} .include diff --git a/lib/libexecinfo/tests/Makefile b/lib/libexecinfo/tests/Makefile index 5dbf25cf4e1..281074e34a6 100644 --- a/lib/libexecinfo/tests/Makefile +++ b/lib/libexecinfo/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libexecinfo diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile index 08c8604e74c..92ba6b67148 100644 --- a/lib/libexpat/Makefile +++ b/lib/libexpat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime EXPAT= ${SRCTOP}/contrib/expat diff --git a/lib/libfetch/Makefile b/lib/libfetch/Makefile index 44234db1b19..37767cb5ec8 100644 --- a/lib/libfetch/Makefile +++ b/lib/libfetch/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= fetch diff --git a/lib/libfigpar/Makefile b/lib/libfigpar/Makefile index 350abdf7dfd..66a1d61c701 100644 --- a/lib/libfigpar/Makefile +++ b/lib/libfigpar/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dpv LIB= figpar SHLIB_MAJOR= 0 diff --git a/lib/libgcc_eh/Makefile b/lib/libgcc_eh/Makefile index ceac35b518d..ace27ce69b8 100644 --- a/lib/libgcc_eh/Makefile +++ b/lib/libgcc_eh/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= clibs diff --git a/lib/libgcc_eh/Makefile.inc b/lib/libgcc_eh/Makefile.inc index 75e7d743a72..af59ee7aaa6 100644 --- a/lib/libgcc_eh/Makefile.inc +++ b/lib/libgcc_eh/Makefile.inc @@ -1,4 +1,3 @@ - COMPILERRTDIR= ${SRCTOP}/contrib/llvm-project/compiler-rt UNWINDINCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/include UNWINDSRCDIR= ${SRCTOP}/contrib/llvm-project/libunwind/src diff --git a/lib/libgcc_s/Makefile b/lib/libgcc_s/Makefile index fdf5a67d804..992fc930ee9 100644 --- a/lib/libgcc_s/Makefile +++ b/lib/libgcc_s/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIB_NAME= libgcc_s.so.1 SHLIBDIR?= /lib diff --git a/lib/libgeom/Makefile b/lib/libgeom/Makefile index e75261fffa8..ac8a056d25b 100644 --- a/lib/libgeom/Makefile +++ b/lib/libgeom/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= geom diff --git a/lib/libgpio/Makefile b/lib/libgpio/Makefile index f19ec87572d..42f822e97ba 100644 --- a/lib/libgpio/Makefile +++ b/lib/libgpio/Makefile @@ -1,4 +1,3 @@ - LIB= gpio SHLIB_MAJOR= 0 diff --git a/lib/libgssapi/Makefile b/lib/libgssapi/Makefile index 87ae164faff..000abc4f5ee 100644 --- a/lib/libgssapi/Makefile +++ b/lib/libgssapi/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= gssapi SHLIB_MAJOR= 10 diff --git a/lib/libiconv_modules/BIG5/Makefile b/lib/libiconv_modules/BIG5/Makefile index f236c203678..ebc0f9d0333 100644 --- a/lib/libiconv_modules/BIG5/Makefile +++ b/lib/libiconv_modules/BIG5/Makefile @@ -1,4 +1,3 @@ - SHLIB= BIG5 SRCS+= citrus_big5.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/DECHanyu/Makefile b/lib/libiconv_modules/DECHanyu/Makefile index fd09592edda..ace1b5ca73f 100644 --- a/lib/libiconv_modules/DECHanyu/Makefile +++ b/lib/libiconv_modules/DECHanyu/Makefile @@ -1,4 +1,3 @@ - SHLIB= DECHanyu SRCS+= citrus_dechanyu.c diff --git a/lib/libiconv_modules/EUC/Makefile b/lib/libiconv_modules/EUC/Makefile index 5e9401f4a8d..b0f54fe2c88 100644 --- a/lib/libiconv_modules/EUC/Makefile +++ b/lib/libiconv_modules/EUC/Makefile @@ -1,4 +1,3 @@ - SHLIB= EUC SRCS+= citrus_euc.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/EUCTW/Makefile b/lib/libiconv_modules/EUCTW/Makefile index a7fecc8acbd..a357d00b5d8 100644 --- a/lib/libiconv_modules/EUCTW/Makefile +++ b/lib/libiconv_modules/EUCTW/Makefile @@ -1,4 +1,3 @@ - SHLIB= EUCTW SRCS+= citrus_euctw.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/GBK2K/Makefile b/lib/libiconv_modules/GBK2K/Makefile index 7c821c9aaf5..2173f6de00e 100644 --- a/lib/libiconv_modules/GBK2K/Makefile +++ b/lib/libiconv_modules/GBK2K/Makefile @@ -1,4 +1,3 @@ - SHLIB= GBK2K SRCS+= citrus_gbk2k.c CFLAGS.gcc+= --param max-inline-insns-single=16 diff --git a/lib/libiconv_modules/HZ/Makefile b/lib/libiconv_modules/HZ/Makefile index f998f3db26c..109aa9f9010 100644 --- a/lib/libiconv_modules/HZ/Makefile +++ b/lib/libiconv_modules/HZ/Makefile @@ -1,4 +1,3 @@ - SHLIB= HZ SRCS+= citrus_hz.c diff --git a/lib/libiconv_modules/ISO2022/Makefile b/lib/libiconv_modules/ISO2022/Makefile index 422e6c98621..f666cb7bbac 100644 --- a/lib/libiconv_modules/ISO2022/Makefile +++ b/lib/libiconv_modules/ISO2022/Makefile @@ -1,4 +1,3 @@ - SHLIB= ISO2022 SRCS+= citrus_iso2022.c CFLAGS.gcc+= --param max-inline-insns-single=128 diff --git a/lib/libiconv_modules/JOHAB/Makefile b/lib/libiconv_modules/JOHAB/Makefile index 8f7bb07fa8f..e700f8b7ef4 100644 --- a/lib/libiconv_modules/JOHAB/Makefile +++ b/lib/libiconv_modules/JOHAB/Makefile @@ -1,4 +1,3 @@ - SHLIB= JOHAB SRCS+= citrus_johab.c CFLAGS.gcc+= --param max-inline-insns-single=16 diff --git a/lib/libiconv_modules/MSKanji/Makefile b/lib/libiconv_modules/MSKanji/Makefile index 4294d4dbffb..11ae1809bb3 100644 --- a/lib/libiconv_modules/MSKanji/Makefile +++ b/lib/libiconv_modules/MSKanji/Makefile @@ -1,4 +1,3 @@ - SHLIB= MSKanji SRCS+= citrus_mskanji.c diff --git a/lib/libiconv_modules/Makefile b/lib/libiconv_modules/Makefile index 9811e59761e..52344d5a837 100644 --- a/lib/libiconv_modules/Makefile +++ b/lib/libiconv_modules/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= BIG5 DECHanyu EUC EUCTW GBK2K HZ ISO2022 JOHAB MSKanji UES UTF1632 \ diff --git a/lib/libiconv_modules/Makefile.inc b/lib/libiconv_modules/Makefile.inc index 729c973a0d6..ba2ccb0dd27 100644 --- a/lib/libiconv_modules/Makefile.inc +++ b/lib/libiconv_modules/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv SHLIB_MAJOR= 5 diff --git a/lib/libiconv_modules/UES/Makefile b/lib/libiconv_modules/UES/Makefile index 65e4be5f71e..bcdae77adbd 100644 --- a/lib/libiconv_modules/UES/Makefile +++ b/lib/libiconv_modules/UES/Makefile @@ -1,4 +1,3 @@ - SHLIB= UES SRCS+= citrus_ues.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/UTF1632/Makefile b/lib/libiconv_modules/UTF1632/Makefile index 7033fb22a1e..88fe285d97a 100644 --- a/lib/libiconv_modules/UTF1632/Makefile +++ b/lib/libiconv_modules/UTF1632/Makefile @@ -1,4 +1,3 @@ - SHLIB= UTF1632 SRCS+= citrus_utf1632.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/UTF7/Makefile b/lib/libiconv_modules/UTF7/Makefile index 19aa59181fe..969e001fc2e 100644 --- a/lib/libiconv_modules/UTF7/Makefile +++ b/lib/libiconv_modules/UTF7/Makefile @@ -1,4 +1,3 @@ - SHLIB= UTF7 SRCS+= citrus_utf7.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/UTF8/Makefile b/lib/libiconv_modules/UTF8/Makefile index cb7c4c66926..ec9c85cce4d 100644 --- a/lib/libiconv_modules/UTF8/Makefile +++ b/lib/libiconv_modules/UTF8/Makefile @@ -1,4 +1,3 @@ - SHLIB= UTF8 SRCS+= citrus_utf8.c diff --git a/lib/libiconv_modules/VIQR/Makefile b/lib/libiconv_modules/VIQR/Makefile index 7300f6fb1c3..67fc707ab30 100644 --- a/lib/libiconv_modules/VIQR/Makefile +++ b/lib/libiconv_modules/VIQR/Makefile @@ -1,4 +1,3 @@ - SHLIB= VIQR SRCS+= citrus_viqr.c diff --git a/lib/libiconv_modules/ZW/Makefile b/lib/libiconv_modules/ZW/Makefile index d7e24bd24ca..ca2bd7cc89c 100644 --- a/lib/libiconv_modules/ZW/Makefile +++ b/lib/libiconv_modules/ZW/Makefile @@ -1,4 +1,3 @@ - SHLIB= ZW SRCS+= citrus_zw.c diff --git a/lib/libiconv_modules/iconv_none/Makefile b/lib/libiconv_modules/iconv_none/Makefile index bb5b5a790ea..c0b3b7a776f 100644 --- a/lib/libiconv_modules/iconv_none/Makefile +++ b/lib/libiconv_modules/iconv_none/Makefile @@ -1,4 +1,3 @@ - SHLIB= iconv_none SRCS+= citrus_iconv_none.c diff --git a/lib/libiconv_modules/iconv_std/Makefile b/lib/libiconv_modules/iconv_std/Makefile index 49c63f14f41..1ab46cf162c 100644 --- a/lib/libiconv_modules/iconv_std/Makefile +++ b/lib/libiconv_modules/iconv_std/Makefile @@ -1,4 +1,3 @@ - SHLIB= iconv_std SRCS+= citrus_iconv_std.c CFLAGS.gcc+= --param max-inline-insns-single=64 diff --git a/lib/libiconv_modules/mapper_646/Makefile b/lib/libiconv_modules/mapper_646/Makefile index 3740eff8b75..6695d1c1c96 100644 --- a/lib/libiconv_modules/mapper_646/Makefile +++ b/lib/libiconv_modules/mapper_646/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_646 SRCS= citrus_mapper_646.c diff --git a/lib/libiconv_modules/mapper_none/Makefile b/lib/libiconv_modules/mapper_none/Makefile index fd7c22617ef..e0891e957af 100644 --- a/lib/libiconv_modules/mapper_none/Makefile +++ b/lib/libiconv_modules/mapper_none/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_none SRCS+= citrus_mapper_none.c diff --git a/lib/libiconv_modules/mapper_parallel/Makefile b/lib/libiconv_modules/mapper_parallel/Makefile index 36390b58066..823260aca5b 100644 --- a/lib/libiconv_modules/mapper_parallel/Makefile +++ b/lib/libiconv_modules/mapper_parallel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/mapper_serial SHLIB= mapper_parallel diff --git a/lib/libiconv_modules/mapper_serial/Makefile b/lib/libiconv_modules/mapper_serial/Makefile index bc64c58d160..931d7c0943e 100644 --- a/lib/libiconv_modules/mapper_serial/Makefile +++ b/lib/libiconv_modules/mapper_serial/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_serial SRCS+= citrus_mapper_serial.c CFLAGS.gcc+= --param max-inline-insns-single=32 diff --git a/lib/libiconv_modules/mapper_std/Makefile b/lib/libiconv_modules/mapper_std/Makefile index 8ffd114fe86..2765525f4ce 100644 --- a/lib/libiconv_modules/mapper_std/Makefile +++ b/lib/libiconv_modules/mapper_std/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_std SRCS+= citrus_mapper_std.c CFLAGS.gcc+= --param max-inline-insns-single=8 diff --git a/lib/libiconv_modules/mapper_zone/Makefile b/lib/libiconv_modules/mapper_zone/Makefile index e33dea95e67..55e17d3b2fb 100644 --- a/lib/libiconv_modules/mapper_zone/Makefile +++ b/lib/libiconv_modules/mapper_zone/Makefile @@ -1,4 +1,3 @@ - SHLIB= mapper_zone SRCS+= citrus_mapper_zone.c CFLAGS.gcc+= --param max-inline-insns-single=8 diff --git a/lib/libifconfig/Makefile b/lib/libifconfig/Makefile index 6bdb202bec1..e8e0651dc0d 100644 --- a/lib/libifconfig/Makefile +++ b/lib/libifconfig/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} LIB= ifconfig INTERNALLIB= true diff --git a/lib/libipt/Makefile b/lib/libipt/Makefile index 07cdfd0417d..68809f32da0 100644 --- a/lib/libipt/Makefile +++ b/lib/libipt/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} SHLIBDIR?= /lib diff --git a/lib/libjail/Makefile b/lib/libjail/Makefile index eef14e89e16..2c7bc157c82 100644 --- a/lib/libjail/Makefile +++ b/lib/libjail/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= jail SHLIBDIR?= /lib diff --git a/lib/libkiconv/Makefile b/lib/libkiconv/Makefile index 687e3586b8b..f359f9215a2 100644 --- a/lib/libkiconv/Makefile +++ b/lib/libkiconv/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libkvm/Makefile b/lib/libkvm/Makefile index 775896c1fcd..94a1173010a 100644 --- a/lib/libkvm/Makefile +++ b/lib/libkvm/Makefile @@ -1,4 +1,3 @@ - LIB= kvm PACKAGE= runtime diff --git a/lib/libkvm/tests/Makefile b/lib/libkvm/tests/Makefile index c3c94c69056..5b422032767 100644 --- a/lib/libkvm/tests/Makefile +++ b/lib/libkvm/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C+= kvm_close_test diff --git a/lib/libldns/Makefile b/lib/libldns/Makefile index 68ee26076f6..71519aa7f70 100644 --- a/lib/libldns/Makefile +++ b/lib/libldns/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR = ${SRCTOP}/contrib/ldns diff --git a/lib/liblua/Makefile b/lib/liblua/Makefile index c15174b3972..1fb4a9b85e7 100644 --- a/lib/liblua/Makefile +++ b/lib/liblua/Makefile @@ -1,4 +1,3 @@ - LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} diff --git a/lib/liblutok/Makefile b/lib/liblutok/Makefile index 656cf7850f2..abb6ecd13ad 100644 --- a/lib/liblutok/Makefile +++ b/lib/liblutok/Makefile @@ -1,4 +1,3 @@ - LIB_CXX= lutok INTERNALLIB= diff --git a/lib/liblzma/Makefile b/lib/liblzma/Makefile index e656ddd9bb4..9f8ac443a8f 100644 --- a/lib/liblzma/Makefile +++ b/lib/liblzma/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= lzma LZMADIR= ${SRCTOP}/contrib/xz/src/liblzma diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index bafcd5b46c1..4c2ed2f7f9c 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libmemstat/Makefile b/lib/libmemstat/Makefile index e60b322e222..4deeaf3a952 100644 --- a/lib/libmemstat/Makefile +++ b/lib/libmemstat/Makefile @@ -1,4 +1,3 @@ - WARNS?= 3 LIB= memstat SHLIB_MAJOR= 3 diff --git a/lib/libmilter/Makefile b/lib/libmilter/Makefile index 0b0896fad43..dd6a481d1a1 100644 --- a/lib/libmilter/Makefile +++ b/lib/libmilter/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=sendmail diff --git a/lib/libmixer/Makefile b/lib/libmixer/Makefile index 3f8a4dad4a6..a0bb37a85fb 100644 --- a/lib/libmixer/Makefile +++ b/lib/libmixer/Makefile @@ -1,4 +1,3 @@ - LIB= mixer SRCS= ${LIB}.c INCS= ${LIB}.h diff --git a/lib/libmp/Makefile b/lib/libmp/Makefile index 532d4bd64bb..3ef85cee79c 100644 --- a/lib/libmp/Makefile +++ b/lib/libmp/Makefile @@ -1,4 +1,3 @@ - .include LIB= mp diff --git a/lib/libmp/tests/Makefile b/lib/libmp/tests/Makefile index bb7ad32f42e..4d66ca65937 100644 --- a/lib/libmp/tests/Makefile +++ b/lib/libmp/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_C+= legacy_test WARNS?= 3 diff --git a/lib/libmt/Makefile b/lib/libmt/Makefile index 92c5469a2c8..44382a92340 100644 --- a/lib/libmt/Makefile +++ b/lib/libmt/Makefile @@ -1,4 +1,3 @@ - LIB= mt SHLIBDIR?= /lib SRCS= mtlib.c diff --git a/lib/libnetbsd/Makefile b/lib/libnetbsd/Makefile index c89b74b1228..1639caf20d6 100644 --- a/lib/libnetbsd/Makefile +++ b/lib/libnetbsd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libnv/Makefile b/lib/libnv/Makefile index c9bf45e0205..f4225df297d 100644 --- a/lib/libnv/Makefile +++ b/lib/libnv/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libnv/tests/Makefile b/lib/libnv/tests/Makefile index fc377e38ce8..2e6563a8307 100644 --- a/lib/libnv/tests/Makefile +++ b/lib/libnv/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C= \ nvlist_send_recv_test diff --git a/lib/libomp/Makefile b/lib/libomp/Makefile index 2be8a207a21..6c14c7d2107 100644 --- a/lib/libomp/Makefile +++ b/lib/libomp/Makefile @@ -1,4 +1,3 @@ - # z_Linux_asm.S is missing BTI support MK_BRANCH_PROTECTION=no diff --git a/lib/libopenbsd/Makefile b/lib/libopenbsd/Makefile index 24fd62e5887..675ed476c51 100644 --- a/lib/libopenbsd/Makefile +++ b/lib/libopenbsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= openbsd SRCS= imsg-buffer.c \ diff --git a/lib/libopencsd/Makefile b/lib/libopencsd/Makefile index d6d648ef1e3..aae0b795c21 100644 --- a/lib/libopencsd/Makefile +++ b/lib/libopencsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} SHLIBDIR?= /lib diff --git a/lib/libpam/modules/Makefile.inc b/lib/libpam/modules/Makefile.inc index 955ee522419..dc701f92107 100644 --- a/lib/libpam/modules/Makefile.inc +++ b/lib/libpam/modules/Makefile.inc @@ -1,4 +1,3 @@ - PAMDIR= ${SRCTOP}/contrib/openpam MK_INSTALLLIB= no diff --git a/lib/libpam/modules/pam_chroot/Makefile b/lib/libpam/modules/pam_chroot/Makefile index ca4f3cc1744..206f8fa40a0 100644 --- a/lib/libpam/modules/pam_chroot/Makefile +++ b/lib/libpam/modules/pam_chroot/Makefile @@ -1,4 +1,3 @@ - LIB= pam_chroot SRCS= pam_chroot.c MAN= pam_chroot.8 diff --git a/lib/libpam/modules/pam_echo/Makefile b/lib/libpam/modules/pam_echo/Makefile index 58aae0053be..532d0a51b58 100644 --- a/lib/libpam/modules/pam_echo/Makefile +++ b/lib/libpam/modules/pam_echo/Makefile @@ -1,4 +1,3 @@ - LIB= pam_echo SRCS= pam_echo.c MAN= pam_echo.8 diff --git a/lib/libpam/modules/pam_exec/Makefile b/lib/libpam/modules/pam_exec/Makefile index 1902d10789b..c2327a2860c 100644 --- a/lib/libpam/modules/pam_exec/Makefile +++ b/lib/libpam/modules/pam_exec/Makefile @@ -1,4 +1,3 @@ - LIB= pam_exec SRCS= pam_exec.c MAN= pam_exec.8 diff --git a/lib/libpam/modules/pam_ftpusers/Makefile b/lib/libpam/modules/pam_ftpusers/Makefile index e92b752309b..07d37c8b17a 100644 --- a/lib/libpam/modules/pam_ftpusers/Makefile +++ b/lib/libpam/modules/pam_ftpusers/Makefile @@ -1,4 +1,3 @@ - LIB= pam_ftpusers SRCS= pam_ftpusers.c MAN= pam_ftpusers.8 diff --git a/lib/libpam/modules/pam_group/Makefile b/lib/libpam/modules/pam_group/Makefile index dca72374817..0395b3a8f35 100644 --- a/lib/libpam/modules/pam_group/Makefile +++ b/lib/libpam/modules/pam_group/Makefile @@ -1,4 +1,3 @@ - LIB= pam_group SRCS= pam_group.c MAN= pam_group.8 diff --git a/lib/libpam/modules/pam_guest/Makefile b/lib/libpam/modules/pam_guest/Makefile index c168513b98e..7128b513afb 100644 --- a/lib/libpam/modules/pam_guest/Makefile +++ b/lib/libpam/modules/pam_guest/Makefile @@ -1,4 +1,3 @@ - LIB= pam_guest SRCS= pam_guest.c MAN= pam_guest.8 diff --git a/lib/libpam/modules/pam_passwdqc/Makefile b/lib/libpam/modules/pam_passwdqc/Makefile index 60d27529dd1..91ce72928a6 100644 --- a/lib/libpam/modules/pam_passwdqc/Makefile +++ b/lib/libpam/modules/pam_passwdqc/Makefile @@ -1,4 +1,3 @@ - SRCDIR= ${SRCTOP}/contrib/pam_modules/pam_passwdqc .PATH: ${SRCDIR} diff --git a/lib/libpam/modules/pam_rhosts/Makefile b/lib/libpam/modules/pam_rhosts/Makefile index af94a24599a..4cd25fe5dfa 100644 --- a/lib/libpam/modules/pam_rhosts/Makefile +++ b/lib/libpam/modules/pam_rhosts/Makefile @@ -1,4 +1,3 @@ - LIB= pam_rhosts SRCS= pam_rhosts.c MAN= pam_rhosts.8 diff --git a/lib/libpam/modules/pam_xdg/Makefile b/lib/libpam/modules/pam_xdg/Makefile index 2a470e0850b..df3948987da 100644 --- a/lib/libpam/modules/pam_xdg/Makefile +++ b/lib/libpam/modules/pam_xdg/Makefile @@ -1,4 +1,3 @@ - LIB= pam_xdg SRCS= pam_xdg.c MAN= pam_xdg.8 diff --git a/lib/libpam/pam.d/Makefile b/lib/libpam/pam.d/Makefile index d2cc192f359..5dccf590ee4 100644 --- a/lib/libpam/pam.d/Makefile +++ b/lib/libpam/pam.d/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/lib/libpathconv/Makefile b/lib/libpathconv/Makefile index 5d39b84a11c..2d6d5b47b0b 100644 --- a/lib/libpathconv/Makefile +++ b/lib/libpathconv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libpathconv/tests/Makefile b/lib/libpathconv/tests/Makefile index 1289999a62f..92b4bffdfec 100644 --- a/lib/libpathconv/tests/Makefile +++ b/lib/libpathconv/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_C+= abs2rel TAP_TESTS_C+= rel2abs diff --git a/lib/libpfctl/Makefile b/lib/libpfctl/Makefile index 24684b91943..d301d7850b4 100644 --- a/lib/libpfctl/Makefile +++ b/lib/libpfctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} LIB= pfctl INTERNALLIB= true diff --git a/lib/libpmc/Makefile b/lib/libpmc/Makefile index 34993a428fb..8728b0c1c76 100644 --- a/lib/libpmc/Makefile +++ b/lib/libpmc/Makefile @@ -1,4 +1,3 @@ - LIB_CXX= pmc SRCS= libpmc.c pmclog.c libpmc_pmu_util.c libpmc_json.cc diff --git a/lib/libpmc/Makefile.inc b/lib/libpmc/Makefile.inc index 04846e84746..35f9588b608 100644 --- a/lib/libpmc/Makefile.inc +++ b/lib/libpmc/Makefile.inc @@ -1,2 +1 @@ - WARNS?= 3 diff --git a/lib/libpmc/pmu-events/Makefile b/lib/libpmc/pmu-events/Makefile index c21a8dfba2a..3f7fc7e1e54 100644 --- a/lib/libpmc/pmu-events/Makefile +++ b/lib/libpmc/pmu-events/Makefile @@ -1,4 +1,3 @@ - PROG= jevents SRCS= jevents.c jsmn.c json.c CFLAGS+= -Wno-cast-qual diff --git a/lib/libproc/Makefile b/lib/libproc/Makefile index ae00bdc4ba9..78500718825 100644 --- a/lib/libproc/Makefile +++ b/lib/libproc/Makefile @@ -1,4 +1,3 @@ - .include LIB= proc diff --git a/lib/libproc/Makefile.inc b/lib/libproc/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/lib/libproc/Makefile.inc +++ b/lib/libproc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/lib/libproc/tests/Makefile b/lib/libproc/tests/Makefile index 8e1d7c4d91c..9467cc63488 100644 --- a/lib/libproc/tests/Makefile +++ b/lib/libproc/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= proc_test PROGS= target_prog diff --git a/lib/libprocstat/Makefile b/lib/libprocstat/Makefile index 0c8d1b63488..d1b15b47eb8 100644 --- a/lib/libprocstat/Makefile +++ b/lib/libprocstat/Makefile @@ -1,4 +1,3 @@ - .include LIB= procstat diff --git a/lib/libprocstat/zfs/Makefile b/lib/libprocstat/zfs/Makefile index 3fa6f985c69..9efe8918492 100644 --- a/lib/libprocstat/zfs/Makefile +++ b/lib/libprocstat/zfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} SRCS= zfs_defs.c diff --git a/lib/libregex/Makefile b/lib/libregex/Makefile index 555559b9db5..beffa476ca9 100644 --- a/lib/libregex/Makefile +++ b/lib/libregex/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/lib/libregex/tests/Makefile b/lib/libregex/tests/Makefile index 9c4a1aac89e..7c6820f70a4 100644 --- a/lib/libregex/tests/Makefile +++ b/lib/libregex/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libc/regex diff --git a/lib/librpcsec_gss/Makefile b/lib/librpcsec_gss/Makefile index eca805e7dae..9b04340c8eb 100644 --- a/lib/librpcsec_gss/Makefile +++ b/lib/librpcsec_gss/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= rpcsec_gss SHLIB_MAJOR= 1 diff --git a/lib/librpcsvc/Makefile b/lib/librpcsvc/Makefile index 94c933af64c..bdd01c91ada 100644 --- a/lib/librpcsvc/Makefile +++ b/lib/librpcsvc/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/include/rpcsvc diff --git a/lib/librss/Makefile b/lib/librss/Makefile index 57caa2bb81a..b851485a923 100644 --- a/lib/librss/Makefile +++ b/lib/librss/Makefile @@ -1,4 +1,3 @@ - PACKAGE= lib${LIB} SHLIBDIR?= /lib diff --git a/lib/librt/tests/Makefile b/lib/librt/tests/Makefile index 1be361d603c..abbd439fb9e 100644 --- a/lib/librt/tests/Makefile +++ b/lib/librt/tests/Makefile @@ -1,4 +1,3 @@ - LIBADD= rt NETBSD_ATF_TESTS_C= sched_test diff --git a/lib/librtld_db/Makefile b/lib/librtld_db/Makefile index 7a30d55bec7..a79a32f5715 100644 --- a/lib/librtld_db/Makefile +++ b/lib/librtld_db/Makefile @@ -1,4 +1,3 @@ - .include LIB= rtld_db diff --git a/lib/libsbuf/Makefile b/lib/libsbuf/Makefile index bf800265031..cc0fef31be4 100644 --- a/lib/libsbuf/Makefile +++ b/lib/libsbuf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= sbuf diff --git a/lib/libsbuf/tests/Makefile b/lib/libsbuf/tests/Makefile index 07b93f67fed..512ca678cac 100644 --- a/lib/libsbuf/tests/Makefile +++ b/lib/libsbuf/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= sbuf_core_test ATF_TESTS_C+= sbuf_stdio_test ATF_TESTS_C+= sbuf_string_test diff --git a/lib/libsecureboot/Makefile b/lib/libsecureboot/Makefile index 3ae4d5e69a5..85167e57abf 100644 --- a/lib/libsecureboot/Makefile +++ b/lib/libsecureboot/Makefile @@ -1,4 +1,3 @@ - .include LIB= secureboot diff --git a/lib/libsecureboot/Makefile.inc b/lib/libsecureboot/Makefile.inc index b09e44edc1b..b9d986cdc6b 100644 --- a/lib/libsecureboot/Makefile.inc +++ b/lib/libsecureboot/Makefile.inc @@ -1,4 +1,3 @@ - .if empty(BEARSSL) .include "../libbearssl/Makefile.inc" .endif diff --git a/lib/libsecureboot/Makefile.libsa.inc b/lib/libsecureboot/Makefile.libsa.inc index 907c8e8f753..7397d0fc114 100644 --- a/lib/libsecureboot/Makefile.libsa.inc +++ b/lib/libsecureboot/Makefile.libsa.inc @@ -1,4 +1,3 @@ - BRSSL_CFLAGS+= -DNO_STDIO .include "Makefile.inc" diff --git a/lib/libsecureboot/openpgp/Makefile.inc b/lib/libsecureboot/openpgp/Makefile.inc index 0d9a01a8036..3a216d205fe 100644 --- a/lib/libsecureboot/openpgp/Makefile.inc +++ b/lib/libsecureboot/openpgp/Makefile.inc @@ -1,4 +1,3 @@ - # decode OpenPGP signatures per rfc4880 .PATH: ${.PARSEDIR} diff --git a/lib/libsecureboot/tests/Makefile b/lib/libsecureboot/tests/Makefile index 70e10bb4f98..b3de2b6ce5b 100644 --- a/lib/libsecureboot/tests/Makefile +++ b/lib/libsecureboot/tests/Makefile @@ -1,4 +1,3 @@ - .include PROG= tvo diff --git a/lib/libsm/Makefile b/lib/libsm/Makefile index b6485bbc2b0..448abad5919 100644 --- a/lib/libsm/Makefile +++ b/lib/libsm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=sendmail diff --git a/lib/libsmb/Makefile b/lib/libsmb/Makefile index f8fa30e3960..777f2a65e67 100644 --- a/lib/libsmb/Makefile +++ b/lib/libsmb/Makefile @@ -1,4 +1,3 @@ - .include CONFS= nsmb.conf diff --git a/lib/libsmdb/Makefile b/lib/libsmdb/Makefile index fef1466299e..898af78d610 100644 --- a/lib/libsmdb/Makefile +++ b/lib/libsmdb/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/libsmdb diff --git a/lib/libsmutil/Makefile b/lib/libsmutil/Makefile index 5ef7959c1d4..ef526ff8656 100644 --- a/lib/libsmutil/Makefile +++ b/lib/libsmutil/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libsqlite3/Makefile b/lib/libsqlite3/Makefile index bb2c939c5cf..73ba8951a79 100644 --- a/lib/libsqlite3/Makefile +++ b/lib/libsqlite3/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} PRIVATELIB= yes LIB= sqlite3 diff --git a/lib/libssp/Makefile b/lib/libssp/Makefile index 1a95c4b4984..c481839ee32 100644 --- a/lib/libssp/Makefile +++ b/lib/libssp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib SHLIB= ssp diff --git a/lib/libssp_nonshared/Makefile b/lib/libssp_nonshared/Makefile index 209f969b6c3..8bad8722a5b 100644 --- a/lib/libssp_nonshared/Makefile +++ b/lib/libssp_nonshared/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs LIB= ssp_nonshared NO_PIC= diff --git a/lib/libstats/Makefile b/lib/libstats/Makefile index d25745b57f7..77a4770ff2f 100644 --- a/lib/libstats/Makefile +++ b/lib/libstats/Makefile @@ -1,4 +1,3 @@ - LIB= stats SHLIBDIR?= /lib SHLIB_MAJOR= 0 diff --git a/lib/libstdbuf/Makefile b/lib/libstdbuf/Makefile index aa0ed7b4e18..102c6745c59 100644 --- a/lib/libstdbuf/Makefile +++ b/lib/libstdbuf/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libstdthreads/Makefile b/lib/libstdthreads/Makefile index 72ebd988df1..49d02405242 100644 --- a/lib/libstdthreads/Makefile +++ b/lib/libstdthreads/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= stdthreads SHLIB_MAJOR= 0 diff --git a/lib/libsysdecode/Makefile b/lib/libsysdecode/Makefile index ccff95af741..b01877bb8bb 100644 --- a/lib/libsysdecode/Makefile +++ b/lib/libsysdecode/Makefile @@ -1,4 +1,3 @@ - .include LIB= sysdecode diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile index e87ea8ac25d..69e63af4e27 100644 --- a/lib/libtelnet/Makefile +++ b/lib/libtelnet/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=lib${LIB} diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile index d3c69a7dc8b..88ccecdeba2 100644 --- a/lib/libthr/Makefile +++ b/lib/libthr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/libthr/arch/aarch64/Makefile.inc b/lib/libthr/arch/aarch64/Makefile.inc index 8b137891791..e69de29bb2d 100644 --- a/lib/libthr/arch/aarch64/Makefile.inc +++ b/lib/libthr/arch/aarch64/Makefile.inc @@ -1 +0,0 @@ - diff --git a/lib/libthr/sys/Makefile.inc b/lib/libthr/sys/Makefile.inc index 7043b2e7c62..98d7b2ac7bd 100644 --- a/lib/libthr/sys/Makefile.inc +++ b/lib/libthr/sys/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/sys SRCS+= thr_error.c diff --git a/lib/libthr/tests/Makefile b/lib/libthr/tests/Makefile index d882ccfd877..aadf0a4d80c 100644 --- a/lib/libthr/tests/Makefile +++ b/lib/libthr/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 3 diff --git a/lib/libthr/tests/dlopen/Makefile b/lib/libthr/tests/dlopen/Makefile index acc565056f4..3427f67025b 100644 --- a/lib/libthr/tests/dlopen/Makefile +++ b/lib/libthr/tests/dlopen/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen WARNS?= 2 diff --git a/lib/libthr/tests/dlopen/dso/Makefile b/lib/libthr/tests/dlopen/dso/Makefile index c2052e82c0e..0dac101f718 100644 --- a/lib/libthr/tests/dlopen/dso/Makefile +++ b/lib/libthr/tests/dlopen/dso/Makefile @@ -1,4 +1,3 @@ - TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso WARNS?= 3 diff --git a/lib/libthr/thread/Makefile.inc b/lib/libthr/thread/Makefile.inc index c75322d6be9..c7442284bd5 100644 --- a/lib/libthr/thread/Makefile.inc +++ b/lib/libthr/thread/Makefile.inc @@ -1,4 +1,3 @@ - # thr sources .PATH: ${.CURDIR}/thread diff --git a/lib/libthread_db/Makefile b/lib/libthread_db/Makefile index 8b2d835531d..faef7051f46 100644 --- a/lib/libthread_db/Makefile +++ b/lib/libthread_db/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH} PACKAGE=lib${LIB} diff --git a/lib/libucl/Makefile b/lib/libucl/Makefile index 98ec1f6993b..d4ee3e599df 100644 --- a/lib/libucl/Makefile +++ b/lib/libucl/Makefile @@ -1,4 +1,3 @@ - LIBUCL_DIR= ${SRCTOP}/contrib/libucl PACKAGE=lib${LIB} diff --git a/lib/libufs/Makefile b/lib/libufs/Makefile index 42d76c6061d..12c742e6b87 100644 --- a/lib/libufs/Makefile +++ b/lib/libufs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ufs LIB= ufs SHLIBDIR?= /lib diff --git a/lib/libugidfw/Makefile b/lib/libugidfw/Makefile index e5a0b2e6cb2..bf3ecd04699 100644 --- a/lib/libugidfw/Makefile +++ b/lib/libugidfw/Makefile @@ -1,4 +1,3 @@ - LIB= ugidfw SHLIB_MAJOR= 5 SRCS= ugidfw.c diff --git a/lib/libulog/Makefile b/lib/libulog/Makefile index 5c073ef1d6a..22138a09a9f 100644 --- a/lib/libulog/Makefile +++ b/lib/libulog/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?=/lib .include diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile index 5031470a4ef..cdc965c2076 100644 --- a/lib/libunbound/Makefile +++ b/lib/libunbound/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile index eb5907ac183..8178d33b7ba 100644 --- a/lib/libutil/Makefile +++ b/lib/libutil/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile index d29045d78a1..cdcf3466aec 100644 --- a/lib/libutil/tests/Makefile +++ b/lib/libutil/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_C+= flopen_test TAP_TESTS_C+= grp_test TAP_TESTS_C+= humanize_number_test diff --git a/lib/libveriexec/Makefile b/lib/libveriexec/Makefile index 15460514207..9cef42a7cf5 100644 --- a/lib/libveriexec/Makefile +++ b/lib/libveriexec/Makefile @@ -1,4 +1,3 @@ - .include LIB= veriexec diff --git a/lib/libxo/Makefile b/lib/libxo/Makefile index 051dce64628..97172d0e863 100644 --- a/lib/libxo/Makefile +++ b/lib/libxo/Makefile @@ -1,4 +1,3 @@ - .include HAS_TESTS= diff --git a/lib/libxo/encoder/Makefile b/lib/libxo/encoder/Makefile index 8b70fbed97b..1b479d065d9 100644 --- a/lib/libxo/encoder/Makefile +++ b/lib/libxo/encoder/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libxo/encoder/csv/Makefile b/lib/libxo/encoder/csv/Makefile index b828e64c814..442883a6199 100644 --- a/lib/libxo/encoder/csv/Makefile +++ b/lib/libxo/encoder/csv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/lib/libxo/libxo/Makefile b/lib/libxo/libxo/Makefile index f51ec506da4..5b40d1e2688 100644 --- a/lib/libxo/libxo/Makefile +++ b/lib/libxo/libxo/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .include diff --git a/lib/libxo/tests/Makefile b/lib/libxo/tests/Makefile index 74af945b724..a53dbea685a 100644 --- a/lib/libxo/tests/Makefile +++ b/lib/libxo/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/lib/libxo/tests/encoder/Makefile b/lib/libxo/tests/encoder/Makefile index 81d6e0a051d..7522328b081 100644 --- a/lib/libxo/tests/encoder/Makefile +++ b/lib/libxo/tests/encoder/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/lib/liby/Makefile b/lib/liby/Makefile index bb53c79cd05..93f72ee440f 100644 --- a/lib/liby/Makefile +++ b/lib/liby/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lib${LIB} LIB= y SRCS= main.c yyerror.c diff --git a/lib/libypclnt/Makefile b/lib/libypclnt/Makefile index 74d18d4b77e..899e301f460 100644 --- a/lib/libypclnt/Makefile +++ b/lib/libypclnt/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime LIB= ypclnt SHLIB_MAJOR= 4 diff --git a/lib/libzstd/Makefile b/lib/libzstd/Makefile index 080b6247fee..0e25f01d488 100644 --- a/lib/libzstd/Makefile +++ b/lib/libzstd/Makefile @@ -1,4 +1,3 @@ - LIB= zstd SRCS= entropy_common.c \ error_private.c \ diff --git a/lib/msun/aarch64/Makefile.inc b/lib/msun/aarch64/Makefile.inc index 82463110f1b..fcc74487822 100644 --- a/lib/msun/aarch64/Makefile.inc +++ b/lib/msun/aarch64/Makefile.inc @@ -1,4 +1,3 @@ - LDBL_PREC = 113 # Use a builtin when it generates the needed instruction diff --git a/lib/msun/amd64/Makefile.inc b/lib/msun/amd64/Makefile.inc index 6a99005f670..dcdc2495d69 100644 --- a/lib/msun/amd64/Makefile.inc +++ b/lib/msun/amd64/Makefile.inc @@ -1,4 +1,3 @@ - ARCH_SRCS = e_fmod.S e_fmodf.S e_fmodl.S \ e_remainder.S e_remainderf.S e_remainderl.S \ e_sqrt.S e_sqrtf.S e_sqrtl.S \ diff --git a/lib/msun/arm/Makefile.inc b/lib/msun/arm/Makefile.inc index a52552766e3..6e3ddb351dd 100644 --- a/lib/msun/arm/Makefile.inc +++ b/lib/msun/arm/Makefile.inc @@ -1,4 +1,3 @@ - LDBL_PREC = 53 SYM_MAPS += ${.CURDIR}/arm/Symbol.map diff --git a/lib/msun/i387/Makefile.inc b/lib/msun/i387/Makefile.inc index d0f22572b36..73feb52de6a 100644 --- a/lib/msun/i387/Makefile.inc +++ b/lib/msun/i387/Makefile.inc @@ -1,4 +1,3 @@ - ARCH_SRCS = e_exp.S e_fmod.S e_log.S e_log10.S \ e_remainder.S e_sqrt.S s_ceil.S s_copysign.S \ s_finite.S s_floor.S s_llrint.S s_logb.S s_lrint.S \ diff --git a/lib/msun/powerpc/Makefile.inc b/lib/msun/powerpc/Makefile.inc index c1088659f2b..35747abb708 100644 --- a/lib/msun/powerpc/Makefile.inc +++ b/lib/msun/powerpc/Makefile.inc @@ -1,3 +1,2 @@ - LDBL_PREC = 53 SYM_MAPS += ${.CURDIR}/powerpc/Symbol.map diff --git a/lib/msun/riscv/Makefile.inc b/lib/msun/riscv/Makefile.inc index e83e57a743a..6262cfd6981 100644 --- a/lib/msun/riscv/Makefile.inc +++ b/lib/msun/riscv/Makefile.inc @@ -1,3 +1,2 @@ - LDBL_PREC = 113 SYM_MAPS += ${.CURDIR}/riscv/Symbol.map diff --git a/lib/msun/tests/Makefile b/lib/msun/tests/Makefile index ccea2ad82fc..d2a3ebffadb 100644 --- a/lib/msun/tests/Makefile +++ b/lib/msun/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libm diff --git a/lib/ncurses/Makefile b/lib/ncurses/Makefile index b6b416138a1..862a6aba0bb 100644 --- a/lib/ncurses/Makefile +++ b/lib/ncurses/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tinfo ncurses form menu panel SUBDIR_PARALLEL= diff --git a/lib/ncurses/Makefile.inc b/lib/ncurses/Makefile.inc index 666f8a74396..f2ed84e2e38 100644 --- a/lib/ncurses/Makefile.inc +++ b/lib/ncurses/Makefile.inc @@ -1,4 +1,3 @@ - # This is to include src/lib/Makefile.inc WARNS?= 3 diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile index 0c163e05e07..aaa3be9f3c0 100644 --- a/lib/ncurses/form/Makefile +++ b/lib/ncurses/form/Makefile @@ -1,4 +1,3 @@ - .include .include "${.CURDIR:H}/config.mk" diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile index 840a41e8022..0864da644bd 100644 --- a/lib/ncurses/menu/Makefile +++ b/lib/ncurses/menu/Makefile @@ -1,4 +1,3 @@ - .include .include "${.CURDIR:H}/config.mk" diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile index e1a3dbf61e4..ad3f20f5f72 100644 --- a/lib/ncurses/ncurses/Makefile +++ b/lib/ncurses/ncurses/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile index 808b3110597..93b07bf9b7d 100644 --- a/lib/ncurses/panel/Makefile +++ b/lib/ncurses/panel/Makefile @@ -1,4 +1,3 @@ - .include .include "${.CURDIR:H}/config.mk" diff --git a/lib/ncurses/tinfo/Makefile b/lib/ncurses/tinfo/Makefile index 54044119a90..55b24cd3bc9 100644 --- a/lib/ncurses/tinfo/Makefile +++ b/lib/ncurses/tinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= clibs SHLIBDIR?= /lib diff --git a/lib/ofed/Makefile b/lib/ofed/Makefile index ea3ecabf95b..a16e93adc14 100644 --- a/lib/ofed/Makefile +++ b/lib/ofed/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ include \ libibverbs \ diff --git a/lib/ofed/Makefile.inc b/lib/ofed/Makefile.inc index 069272ab810..1b911c451c0 100644 --- a/lib/ofed/Makefile.inc +++ b/lib/ofed/Makefile.inc @@ -1,2 +1 @@ - WARNS?= 0 diff --git a/lib/ofed/complib/Makefile b/lib/ofed/complib/Makefile index c0e333afc5d..e900bc2b9a3 100644 --- a/lib/ofed/complib/Makefile +++ b/lib/ofed/complib/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/complib .PATH: ${_spath} diff --git a/lib/ofed/include/Makefile b/lib/ofed/include/Makefile index a7ed635a488..dc6271de734 100644 --- a/lib/ofed/include/Makefile +++ b/lib/ofed/include/Makefile @@ -1,4 +1,3 @@ - OFEDINCS= ${SRCTOP}/contrib/ofed/include IBVERBS= ${SRCTOP}/contrib/ofed/libibverbs IBMAD= ${SRCTOP}/contrib/ofed/libibmad diff --git a/lib/ofed/libcxgb4/Makefile b/lib/ofed/libcxgb4/Makefile index 7d184308fea..da831be6ebb 100644 --- a/lib/ofed/libcxgb4/Makefile +++ b/lib/ofed/libcxgb4/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libcxgb4 .PATH: ${_spath} diff --git a/lib/ofed/libibcm/Makefile b/lib/ofed/libibcm/Makefile index d684811a311..ba8c2e8adf1 100644 --- a/lib/ofed/libibcm/Makefile +++ b/lib/ofed/libibcm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibcm .PATH: ${_spath} diff --git a/lib/ofed/libibmad/Makefile b/lib/ofed/libibmad/Makefile index 0a1e40096d9..985efda634f 100644 --- a/lib/ofed/libibmad/Makefile +++ b/lib/ofed/libibmad/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibmad .PATH: ${_spath} diff --git a/lib/ofed/libibnetdisc/Makefile b/lib/ofed/libibnetdisc/Makefile index 47470132a2b..d471189cb7c 100644 --- a/lib/ofed/libibnetdisc/Makefile +++ b/lib/ofed/libibnetdisc/Makefile @@ -1,4 +1,3 @@ - .include _spath= ${SRCTOP}/contrib/ofed/libibnetdisc diff --git a/lib/ofed/libibumad/Makefile b/lib/ofed/libibumad/Makefile index 3097ac846c4..7d12e5cfa38 100644 --- a/lib/ofed/libibumad/Makefile +++ b/lib/ofed/libibumad/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibumad .PATH: ${_spath} diff --git a/lib/ofed/libibverbs/Makefile b/lib/ofed/libibverbs/Makefile index 6a5f6a50bbb..d336c40363d 100644 --- a/lib/ofed/libibverbs/Makefile +++ b/lib/ofed/libibverbs/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libibverbs .PATH: ${_spath} ${_spath}/man diff --git a/lib/ofed/libmlx4/Makefile b/lib/ofed/libmlx4/Makefile index 09571f159dc..cd4dccb9916 100644 --- a/lib/ofed/libmlx4/Makefile +++ b/lib/ofed/libmlx4/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libmlx4 .PATH: ${_spath} diff --git a/lib/ofed/libmlx5/Makefile b/lib/ofed/libmlx5/Makefile index 57959a1cd02..38700bb7b9e 100644 --- a/lib/ofed/libmlx5/Makefile +++ b/lib/ofed/libmlx5/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/libmlx5 .PATH: ${_spath} diff --git a/lib/ofed/libopensm/Makefile b/lib/ofed/libopensm/Makefile index 8ba51f034aa..11179a75860 100644 --- a/lib/ofed/libopensm/Makefile +++ b/lib/ofed/libopensm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/opensm .PATH: ${_spath} diff --git a/lib/ofed/librdmacm/Makefile b/lib/ofed/librdmacm/Makefile index cb37008f585..37b79d56513 100644 --- a/lib/ofed/librdmacm/Makefile +++ b/lib/ofed/librdmacm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/librdmacm .PATH: ${_spath} ${_spath}/man diff --git a/lib/ofed/libvendor/Makefile b/lib/ofed/libvendor/Makefile index baa50ff8cab..8082a866e9f 100644 --- a/lib/ofed/libvendor/Makefile +++ b/lib/ofed/libvendor/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/libvendor .PATH: ${_spath} diff --git a/lib/tests/Makefile b/lib/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/libexec/Makefile.inc b/libexec/Makefile.inc index ee76f0719df..8cf92479878 100644 --- a/libexec/Makefile.inc +++ b/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/libexec WFORMAT?= 1 diff --git a/libexec/atf/atf-check/Makefile.inc b/libexec/atf/atf-check/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/libexec/atf/atf-check/Makefile.inc +++ b/libexec/atf/atf-check/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile index 90d3fce7ea4..e98f82d941c 100644 --- a/libexec/atf/atf-check/tests/Makefile +++ b/libexec/atf/atf-check/tests/Makefile @@ -1,4 +1,3 @@ - ATF= ${SRCTOP}/contrib/atf .PATH: ${ATF}/atf-sh diff --git a/libexec/atf/atf-sh/tests/Makefile b/libexec/atf/atf-sh/tests/Makefile index b3c336b7c56..d358ed403a4 100644 --- a/libexec/atf/atf-sh/tests/Makefile +++ b/libexec/atf/atf-sh/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF= ${SRCTOP}/contrib/atf diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/libexec/atf/tests/Makefile +++ b/libexec/atf/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/libexec/atrun/Makefile b/libexec/atrun/Makefile index ce3e1eeb2f4..7c44a8ae3d8 100644 --- a/libexec/atrun/Makefile +++ b/libexec/atrun/Makefile @@ -1,4 +1,3 @@ - PACKAGE=at MAINSRC=${SRCTOP}/usr.bin/at diff --git a/libexec/blacklistd-helper/Makefile b/libexec/blacklistd-helper/Makefile index c0eb2548905..50fd3b5c982 100644 --- a/libexec/blacklistd-helper/Makefile +++ b/libexec/blacklistd-helper/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist SCRIPTS= ${BLOCKLIST_DIR}/libexec/blacklistd-helper diff --git a/libexec/bootpd/Makefile.inc b/libexec/bootpd/Makefile.inc index 88e1d3cf4e2..338eb907e37 100644 --- a/libexec/bootpd/Makefile.inc +++ b/libexec/bootpd/Makefile.inc @@ -1,4 +1,3 @@ - WARNS?= 1 .include "../Makefile.inc" diff --git a/libexec/comsat/Makefile b/libexec/comsat/Makefile index 848577f178b..3f349abbde2 100644 --- a/libexec/comsat/Makefile +++ b/libexec/comsat/Makefile @@ -1,4 +1,3 @@ - PROG= comsat MAN= comsat.8 diff --git a/libexec/dma/Makefile b/libexec/dma/Makefile index 5c9281f41d5..6150359b2c0 100644 --- a/libexec/dma/Makefile +++ b/libexec/dma/Makefile @@ -1,4 +1,3 @@ - SUBDIR= dmagent \ dma-mbox-create diff --git a/libexec/dma/Makefile.inc b/libexec/dma/Makefile.inc index 2a24ef6b787..e4eb86c4b03 100644 --- a/libexec/dma/Makefile.inc +++ b/libexec/dma/Makefile.inc @@ -1,4 +1,3 @@ - .sinclude "${.CURDIR:H:H}/Makefile.inc" DMA_SOURCES= ${SRCTOP}/contrib/dma .PATH: ${DMA_SOURCES} diff --git a/libexec/dma/dma-mbox-create/Makefile b/libexec/dma/dma-mbox-create/Makefile index 0b74fcb42e2..26f669e2e0b 100644 --- a/libexec/dma/dma-mbox-create/Makefile +++ b/libexec/dma/dma-mbox-create/Makefile @@ -1,4 +1,3 @@ - MAN= WARNS?= 2 diff --git a/libexec/dma/dmagent/Makefile b/libexec/dma/dmagent/Makefile index 0b38c5dca6b..5f7deeea0b0 100644 --- a/libexec/dma/dmagent/Makefile +++ b/libexec/dma/dmagent/Makefile @@ -1,4 +1,3 @@ - .include LIBADD= ssl crypto diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile index 5a170379e32..296cb504bab 100644 --- a/libexec/fingerd/Makefile +++ b/libexec/fingerd/Makefile @@ -1,4 +1,3 @@ - .include PROG= fingerd diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 7a58b2265a5..e324ca99371 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -1,4 +1,3 @@ - .include LUASRC?= ${SRCTOP}/contrib/lua/src diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile index 2cbd1491200..a040fa57f7d 100644 --- a/libexec/ftpd/Makefile +++ b/libexec/ftpd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ftpd diff --git a/libexec/getty/Makefile b/libexec/getty/Makefile index 1661a3a1512..18668bee6aa 100644 --- a/libexec/getty/Makefile +++ b/libexec/getty/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime CONFS= gettytab diff --git a/libexec/hyperv/Makefile b/libexec/hyperv/Makefile index eacb74582d0..ed0f91c7942 100644 --- a/libexec/hyperv/Makefile +++ b/libexec/hyperv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/hyperv/tools/scripts BINDIR= ${LIBEXECDIR}/hyperv diff --git a/libexec/mail.local/Makefile b/libexec/mail.local/Makefile index 8a2b211cf7c..d41469068c3 100644 --- a/libexec/mail.local/Makefile +++ b/libexec/mail.local/Makefile @@ -1,4 +1,3 @@ - PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mail.local diff --git a/libexec/makewhatis.local/Makefile b/libexec/makewhatis.local/Makefile index 14d7b80b78e..765036623d4 100644 --- a/libexec/makewhatis.local/Makefile +++ b/libexec/makewhatis.local/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= makewhatis.local.sh MAN= makewhatis.local.8 SCRIPTSDIR= ${LIBEXECDIR} diff --git a/libexec/mknetid/Makefile b/libexec/mknetid/Makefile index e9ff69a2783..c872abd74b9 100644 --- a/libexec/mknetid/Makefile +++ b/libexec/mknetid/Makefile @@ -1,4 +1,3 @@ - PROG= mknetid SRCS= mknetid.c hash.c parse_group.c diff --git a/libexec/phttpget/Makefile b/libexec/phttpget/Makefile index e16288dabbc..ef231fa634d 100644 --- a/libexec/phttpget/Makefile +++ b/libexec/phttpget/Makefile @@ -1,4 +1,3 @@ - PROG= phttpget MAN= phttpget.8 diff --git a/libexec/pppoed/Makefile b/libexec/pppoed/Makefile index b9127fba779..b1b88c4c1b6 100644 --- a/libexec/pppoed/Makefile +++ b/libexec/pppoed/Makefile @@ -1,4 +1,3 @@ - PROG= pppoed LIBADD= netgraph MAN= pppoed.8 diff --git a/libexec/rbootd/Makefile b/libexec/rbootd/Makefile index f204de7397d..7df1ecee327 100644 --- a/libexec/rbootd/Makefile +++ b/libexec/rbootd/Makefile @@ -1,4 +1,3 @@ - PROG= rbootd SRCS= bpf.c conf.c parseconf.c rbootd.c rmpproto.c utils.c MAN= rbootd.8 diff --git a/libexec/rc/Makefile b/libexec/rc/Makefile index 48115d873fe..9a5aa11424a 100644 --- a/libexec/rc/Makefile +++ b/libexec/rc/Makefile @@ -1,4 +1,3 @@ - .include CONFGROUPS= CONFETC CONFETCEXEC CONFETCDEFAULTS diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 331f0edf44b..69a643a248e 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -1,4 +1,3 @@ - .include CONFDIR= /etc/rc.d diff --git a/libexec/revnetgroup/Makefile b/libexec/revnetgroup/Makefile index 2b3978416e5..d764028e576 100644 --- a/libexec/revnetgroup/Makefile +++ b/libexec/revnetgroup/Makefile @@ -1,4 +1,3 @@ - PROG= revnetgroup SRCS= revnetgroup.c hash.c parse_netgroup.c diff --git a/libexec/rpc.rquotad/Makefile b/libexec/rpc.rquotad/Makefile index df3d003aaf5..f232a73b8b8 100644 --- a/libexec/rpc.rquotad/Makefile +++ b/libexec/rpc.rquotad/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG = rpc.rquotad diff --git a/libexec/rpc.rstatd/Makefile b/libexec/rpc.rstatd/Makefile index 49eade455d3..1be4bd27c2c 100644 --- a/libexec/rpc.rstatd/Makefile +++ b/libexec/rpc.rstatd/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.rstatd SRCS = rstatd.c rstat_proc.c MAN = rpc.rstatd.8 diff --git a/libexec/rpc.rusersd/Makefile b/libexec/rpc.rusersd/Makefile index 586d971ae40..49d155c969b 100644 --- a/libexec/rpc.rusersd/Makefile +++ b/libexec/rpc.rusersd/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.rusersd SRCS = rusersd.c rusers_proc.c extern.h MAN = rpc.rusersd.8 diff --git a/libexec/rpc.rwalld/Makefile b/libexec/rpc.rwalld/Makefile index ff011754764..38a9646166d 100644 --- a/libexec/rpc.rwalld/Makefile +++ b/libexec/rpc.rwalld/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.rwalld SRCS = rwalld.c MAN = rpc.rwalld.8 diff --git a/libexec/rpc.sprayd/Makefile b/libexec/rpc.sprayd/Makefile index 8d0269b74a1..ed4b25615b0 100644 --- a/libexec/rpc.sprayd/Makefile +++ b/libexec/rpc.sprayd/Makefile @@ -1,4 +1,3 @@ - PROG = rpc.sprayd SRCS = sprayd.c MAN = rpc.sprayd.8 diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 864448ad782..0dbd2b8aa93 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -1,4 +1,3 @@ - # Use the following command to build local debug version of dynamic # linker: # make DEBUG_FLAGS=-g WITHOUT_TESTS=yes all diff --git a/libexec/rtld-elf/amd64/Makefile.inc b/libexec/rtld-elf/amd64/Makefile.inc index 9bc8509b37e..c1036df29a0 100644 --- a/libexec/rtld-elf/amd64/Makefile.inc +++ b/libexec/rtld-elf/amd64/Makefile.inc @@ -1,2 +1 @@ - CFLAGS+= ${CFLAGS_NO_SIMD} -msoft-float -fvisibility=hidden diff --git a/libexec/rtld-elf/arm/Makefile.inc b/libexec/rtld-elf/arm/Makefile.inc index 9710db49889..b92dedb0285 100644 --- a/libexec/rtld-elf/arm/Makefile.inc +++ b/libexec/rtld-elf/arm/Makefile.inc @@ -1,2 +1 @@ - CFLAGS+= -mfpu=none diff --git a/libexec/rtld-elf/i386/Makefile.inc b/libexec/rtld-elf/i386/Makefile.inc index 9bc8509b37e..c1036df29a0 100644 --- a/libexec/rtld-elf/i386/Makefile.inc +++ b/libexec/rtld-elf/i386/Makefile.inc @@ -1,2 +1 @@ - CFLAGS+= ${CFLAGS_NO_SIMD} -msoft-float -fvisibility=hidden diff --git a/libexec/rtld-elf/powerpc64/Makefile.inc b/libexec/rtld-elf/powerpc64/Makefile.inc index 592bac9ef4d..64133672489 100644 --- a/libexec/rtld-elf/powerpc64/Makefile.inc +++ b/libexec/rtld-elf/powerpc64/Makefile.inc @@ -1,2 +1 @@ - RTLD_ENTRY= _rtld_start diff --git a/libexec/rtld-elf/tests/Makefile b/libexec/rtld-elf/tests/Makefile index e380e9850fc..c4b3baab4cb 100644 --- a/libexec/rtld-elf/tests/Makefile +++ b/libexec/rtld-elf/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR+= libpythagoras libdeep libval libval2 target TESTS_SUBDIRS+= rtld_deepbind diff --git a/libexec/rtld-elf/tests/Makefile.inc b/libexec/rtld-elf/tests/Makefile.inc index dfba72a51ce..01cf8363423 100644 --- a/libexec/rtld-elf/tests/Makefile.inc +++ b/libexec/rtld-elf/tests/Makefile.inc @@ -1,3 +1,2 @@ - PACKAGE?= tests TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf diff --git a/libexec/rtld-elf/tests/libdeep/Makefile b/libexec/rtld-elf/tests/libdeep/Makefile index 9324b6f25ef..5b8e47e1229 100644 --- a/libexec/rtld-elf/tests/libdeep/Makefile +++ b/libexec/rtld-elf/tests/libdeep/Makefile @@ -1,4 +1,3 @@ - SHLIB?= deep SHLIB_MAJOR= 0 diff --git a/libexec/rtld-elf/tests/libpythagoras/Makefile b/libexec/rtld-elf/tests/libpythagoras/Makefile index 0b000d1b836..0e3fa37acf8 100644 --- a/libexec/rtld-elf/tests/libpythagoras/Makefile +++ b/libexec/rtld-elf/tests/libpythagoras/Makefile @@ -1,4 +1,3 @@ - .include LIB= pythagoras diff --git a/libexec/rtld-elf/tests/libval/Makefile b/libexec/rtld-elf/tests/libval/Makefile index 66728c01dc9..913564e9ad0 100644 --- a/libexec/rtld-elf/tests/libval/Makefile +++ b/libexec/rtld-elf/tests/libval/Makefile @@ -1,4 +1,3 @@ - SHLIB?= val SHLIB_MAJOR= 0 diff --git a/libexec/rtld-elf/tests/libval2/Makefile b/libexec/rtld-elf/tests/libval2/Makefile index 2b5cf534209..f353a248b1b 100644 --- a/libexec/rtld-elf/tests/libval2/Makefile +++ b/libexec/rtld-elf/tests/libval2/Makefile @@ -1,4 +1,3 @@ - LIBVAL= ${.CURDIR}/../libval # Just rebuild libval diff --git a/libexec/rtld-elf/tests/rtld_deepbind/Makefile b/libexec/rtld-elf/tests/rtld_deepbind/Makefile index bcc55d945c7..7054a846449 100644 --- a/libexec/rtld-elf/tests/rtld_deepbind/Makefile +++ b/libexec/rtld-elf/tests/rtld_deepbind/Makefile @@ -1,4 +1,3 @@ - TESTSDIR?= ${TESTSBASE}/libexec/rtld-elf/rtld_deepbind ATF_TESTS_C= rtld_deepbind diff --git a/libexec/rtld-elf/tests/target/Makefile b/libexec/rtld-elf/tests/target/Makefile index aa4875b6748..8069229dedd 100644 --- a/libexec/rtld-elf/tests/target/Makefile +++ b/libexec/rtld-elf/tests/target/Makefile @@ -1,4 +1,3 @@ - .include PROG= target diff --git a/libexec/rtld-elf32/Makefile b/libexec/rtld-elf32/Makefile index 16659993dd4..9854223d6f7 100644 --- a/libexec/rtld-elf32/Makefile +++ b/libexec/rtld-elf32/Makefile @@ -1,4 +1,3 @@ - NEED_COMPAT= 32 .include diff --git a/libexec/save-entropy/Makefile b/libexec/save-entropy/Makefile index 0c541606411..5d7e9726b78 100644 --- a/libexec/save-entropy/Makefile +++ b/libexec/save-entropy/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= save-entropy.sh MAN= save-entropy.8 diff --git a/libexec/smrsh/Makefile b/libexec/smrsh/Makefile index 2f4f62131d7..345937df2df 100644 --- a/libexec/smrsh/Makefile +++ b/libexec/smrsh/Makefile @@ -1,4 +1,3 @@ - PACKAGE=sendmail SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/smrsh diff --git a/libexec/talkd/Makefile b/libexec/talkd/Makefile index f39a0b2ca57..2cdafd5216e 100644 --- a/libexec/talkd/Makefile +++ b/libexec/talkd/Makefile @@ -1,4 +1,3 @@ - PROG= ntalkd SRCS= talkd.c announce.c process.c table.c print.c ttymsg.c .PATH: ${SRCTOP}/usr.bin/wall diff --git a/libexec/tcpd/Makefile b/libexec/tcpd/Makefile index 408db9c3974..bb8f09ca13a 100644 --- a/libexec/tcpd/Makefile +++ b/libexec/tcpd/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/libexec/tests/Makefile +++ b/libexec/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/libexec/tftp-proxy/Makefile b/libexec/tftp-proxy/Makefile index 88029fae413..9b28b2d8aa4 100644 --- a/libexec/tftp-proxy/Makefile +++ b/libexec/tftp-proxy/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/tftp-proxy PROG= tftp-proxy diff --git a/libexec/tftpd/Makefile b/libexec/tftpd/Makefile index e804ff4d0f3..1cea8178ae0 100644 --- a/libexec/tftpd/Makefile +++ b/libexec/tftpd/Makefile @@ -1,4 +1,3 @@ - .include PROG= tftpd diff --git a/libexec/tftpd/tests/Makefile b/libexec/tftpd/tests/Makefile index 938d2129d98..661120335ac 100644 --- a/libexec/tftpd/tests/Makefile +++ b/libexec/tftpd/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_C= functional diff --git a/libexec/ulog-helper/Makefile b/libexec/ulog-helper/Makefile index 12d49853734..61a88fb6269 100644 --- a/libexec/ulog-helper/Makefile +++ b/libexec/ulog-helper/Makefile @@ -1,4 +1,3 @@ - PROG= ulog-helper BINOWN= root BINMODE=4555 diff --git a/libexec/ypxfr/Makefile b/libexec/ypxfr/Makefile index e0feee7a80f..e93df9a8b5e 100644 --- a/libexec/ypxfr/Makefile +++ b/libexec/ypxfr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypxfr SRCS= yp_dblookup.c yp_dbwrite.c yp_error.c \ diff --git a/rescue/Makefile b/rescue/Makefile index e16f74080ab..cdd545a12a4 100644 --- a/rescue/Makefile +++ b/rescue/Makefile @@ -1,4 +1,3 @@ - SUBDIR= librescue \ rescue diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index c3604c6e22a..4474a0af050 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/sbin/Makefile b/sbin/Makefile index 303e29e9e12..790112b05f6 100644 --- a/sbin/Makefile +++ b/sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR=adjkerntz \ diff --git a/sbin/Makefile.amd64 b/sbin/Makefile.amd64 index 4904b2ebfe8..a7cb3997632 100644 --- a/sbin/Makefile.amd64 +++ b/sbin/Makefile.amd64 @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/Makefile.arm b/sbin/Makefile.arm index 4904b2ebfe8..a7cb3997632 100644 --- a/sbin/Makefile.arm +++ b/sbin/Makefile.arm @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/Makefile.i386 b/sbin/Makefile.i386 index 4904b2ebfe8..a7cb3997632 100644 --- a/sbin/Makefile.i386 +++ b/sbin/Makefile.i386 @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/Makefile.inc b/sbin/Makefile.inc index a9e857c046d..7034747d22e 100644 --- a/sbin/Makefile.inc +++ b/sbin/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= /sbin diff --git a/sbin/Makefile.powerpc64 b/sbin/Makefile.powerpc64 index 4904b2ebfe8..a7cb3997632 100644 --- a/sbin/Makefile.powerpc64 +++ b/sbin/Makefile.powerpc64 @@ -1,3 +1,2 @@ - SUBDIR += bsdlabel SUBDIR += fdisk diff --git a/sbin/adjkerntz/Makefile b/sbin/adjkerntz/Makefile index 1fa9b74b90b..54980c3a57f 100644 --- a/sbin/adjkerntz/Makefile +++ b/sbin/adjkerntz/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= adjkerntz MAN= adjkerntz.8 diff --git a/sbin/bectl/Makefile b/sbin/bectl/Makefile index 531f54cca18..c11426c57e4 100644 --- a/sbin/bectl/Makefile +++ b/sbin/bectl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=zfs diff --git a/sbin/bectl/tests/Makefile b/sbin/bectl/tests/Makefile index 5da29657bea..3a35a5263a6 100644 --- a/sbin/bectl/tests/Makefile +++ b/sbin/bectl/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= bectl_test diff --git a/sbin/bsdlabel/Makefile b/sbin/bsdlabel/Makefile index 9bfa0fad657..d2be16efa54 100644 --- a/sbin/bsdlabel/Makefile +++ b/sbin/bsdlabel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom CONFS= disktab diff --git a/sbin/camcontrol/Makefile b/sbin/camcontrol/Makefile index 64703f656a8..2b0c2c9dbc1 100644 --- a/sbin/camcontrol/Makefile +++ b/sbin/camcontrol/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/ccdconfig/Makefile b/sbin/ccdconfig/Makefile index 6a27bb7e7cf..8972945ed07 100644 --- a/sbin/ccdconfig/Makefile +++ b/sbin/ccdconfig/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ccdconfig PROG= ccdconfig MAN= ccdconfig.8 diff --git a/sbin/clri/Makefile b/sbin/clri/Makefile index ac3eda4cd59..51f4e9a914d 100644 --- a/sbin/clri/Makefile +++ b/sbin/clri/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= clri MAN= clri.8 diff --git a/sbin/comcontrol/Makefile b/sbin/comcontrol/Makefile index 809f1060d18..6c868dcfb1a 100644 --- a/sbin/comcontrol/Makefile +++ b/sbin/comcontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= comcontrol MAN= comcontrol.8 diff --git a/sbin/conscontrol/Makefile b/sbin/conscontrol/Makefile index 072edf04a5c..33665536167 100644 --- a/sbin/conscontrol/Makefile +++ b/sbin/conscontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= conscontrol MAN= conscontrol.8 diff --git a/sbin/ddb/Makefile b/sbin/ddb/Makefile index d8d67602c3e..8d527ad5259 100644 --- a/sbin/ddb/Makefile +++ b/sbin/ddb/Makefile @@ -1,4 +1,3 @@ - CONFS= ddb.conf PACKAGE=runtime PROG= ddb diff --git a/sbin/decryptcore/Makefile b/sbin/decryptcore/Makefile index 885766f5cfc..97421fe5cd3 100644 --- a/sbin/decryptcore/Makefile +++ b/sbin/decryptcore/Makefile @@ -1,4 +1,3 @@ - PROG= decryptcore CFLAGS+=-DOPENSSL_API_COMPAT=0x10100000L diff --git a/sbin/devd/Makefile b/sbin/devd/Makefile index 09a8ed5898e..4ff0187a5a2 100644 --- a/sbin/devd/Makefile +++ b/sbin/devd/Makefile @@ -1,4 +1,3 @@ - .include WARNS?= 6 diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile index 7a51f488ac6..fba7176d5ae 100644 --- a/sbin/devd/tests/Makefile +++ b/sbin/devd/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C= client_test TEST_METADATA.client_test= required_files="/var/run/devd.pid" TEST_METADATA.client_test+= required_programs="devd" diff --git a/sbin/devfs/Makefile b/sbin/devfs/Makefile index dc823abcaf1..0a20cee8241 100644 --- a/sbin/devfs/Makefile +++ b/sbin/devfs/Makefile @@ -1,4 +1,3 @@ - CONFS= devfs.conf devfs.rules CONFSDIR_devfs.rules= /etc/defaults CONFSMODE_devfs.rules= 600 diff --git a/sbin/devmatch/Makefile b/sbin/devmatch/Makefile index bc0b2a7cba5..20da7231206 100644 --- a/sbin/devmatch/Makefile +++ b/sbin/devmatch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= devmatch PROG= devmatch MAN= devmatch.8 diff --git a/sbin/dhclient/tests/Makefile b/sbin/dhclient/tests/Makefile index 7d4359d4b76..2cca8635fa1 100644 --- a/sbin/dhclient/tests/Makefile +++ b/sbin/dhclient/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H} ATF_TESTS_SH= pcp diff --git a/sbin/dmesg/Makefile b/sbin/dmesg/Makefile index d1863f2b448..b0bd864fd09 100644 --- a/sbin/dmesg/Makefile +++ b/sbin/dmesg/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= dmesg MAN= dmesg.8 diff --git a/sbin/dump/Makefile b/sbin/dump/Makefile index d982e5bc033..6f0dbf3f478 100644 --- a/sbin/dump/Makefile +++ b/sbin/dump/Makefile @@ -1,4 +1,3 @@ - # dump.h header file # itime.c reads /etc/dumpdates # main.c driver diff --git a/sbin/dumpfs/Makefile b/sbin/dumpfs/Makefile index b416eb1cd58..1e7fa4f150d 100644 --- a/sbin/dumpfs/Makefile +++ b/sbin/dumpfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= dumpfs WARNS?= 2 diff --git a/sbin/dumpon/Makefile b/sbin/dumpon/Makefile index 346951f12b3..03a72bcba41 100644 --- a/sbin/dumpon/Makefile +++ b/sbin/dumpon/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/etherswitchcfg/Makefile b/sbin/etherswitchcfg/Makefile index 6312f07b09d..00f9c308932 100644 --- a/sbin/etherswitchcfg/Makefile +++ b/sbin/etherswitchcfg/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= etherswitchcfg MAN= etherswitchcfg.8 diff --git a/sbin/fdisk/Makefile b/sbin/fdisk/Makefile index 322dfa33043..85cea684a88 100644 --- a/sbin/fdisk/Makefile +++ b/sbin/fdisk/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= fdisk SRCS= fdisk.c fdisk_mbr_enc.c diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile index 59805dbbf3d..7b0f0ed822b 100644 --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= fsck_ffs LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_ufs diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile index b311a9e8e8f..078503d3ae6 100644 --- a/sbin/geom/Makefile +++ b/sbin/geom/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/core ${.CURDIR}/misc diff --git a/sbin/ggate/Makefile b/sbin/ggate/Makefile index 9aa1d511550..753e0bd0ddb 100644 --- a/sbin/ggate/Makefile +++ b/sbin/ggate/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= ggatec \ diff --git a/sbin/ggate/Makefile.inc b/sbin/ggate/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sbin/ggate/Makefile.inc +++ b/sbin/ggate/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sbin/ggate/ggatec/Makefile b/sbin/ggate/ggatec/Makefile index 5591b2a3a8b..9ea38ceb87d 100644 --- a/sbin/ggate/ggatec/Makefile +++ b/sbin/ggate/ggatec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/shared PROG= ggatec diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile index 2939e4de49e..629d6aded30 100644 --- a/sbin/ggate/ggated/Makefile +++ b/sbin/ggate/ggated/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/shared PROG= ggated diff --git a/sbin/ggate/ggatel/Makefile b/sbin/ggate/ggatel/Makefile index ec1302bf9cd..eb9ff9a675c 100644 --- a/sbin/ggate/ggatel/Makefile +++ b/sbin/ggate/ggatel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/shared PROG= ggatel diff --git a/sbin/growfs/tests/Makefile b/sbin/growfs/tests/Makefile index 270eb46ce95..a23b430f58f 100644 --- a/sbin/growfs/tests/Makefile +++ b/sbin/growfs/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_PERL= legacy_test .include diff --git a/sbin/gvinum/Makefile b/sbin/gvinum/Makefile index 8ffabc694c3..7e706696451 100644 --- a/sbin/gvinum/Makefile +++ b/sbin/gvinum/Makefile @@ -1,4 +1,3 @@ - PACKAGE=geom PROG= gvinum SRCS= gvinum.c gvinum.h geom_vinum_share.c diff --git a/sbin/hastctl/Makefile b/sbin/hastctl/Makefile index 3f42f6ecdda..36152dc835a 100644 --- a/sbin/hastctl/Makefile +++ b/sbin/hastctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=hast diff --git a/sbin/hastd/Makefile b/sbin/hastd/Makefile index 64f35483c5d..8a79320fb66 100644 --- a/sbin/hastd/Makefile +++ b/sbin/hastd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=hast diff --git a/sbin/ifconfig/Makefile b/sbin/ifconfig/Makefile index e5701fbcdbb..2553e61b5e9 100644 --- a/sbin/ifconfig/Makefile +++ b/sbin/ifconfig/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/ifconfig/tests/Makefile b/sbin/ifconfig/tests/Makefile index 9b29983afc7..ff545f60308 100644 --- a/sbin/ifconfig/tests/Makefile +++ b/sbin/ifconfig/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= nonexistent_test .include diff --git a/sbin/init/Makefile b/sbin/init/Makefile index 96560806529..124a9f77ded 100644 --- a/sbin/init/Makefile +++ b/sbin/init/Makefile @@ -1,4 +1,3 @@ - CONFGROUPS= CONFTTYS PACKAGE=runtime PROG= init diff --git a/sbin/ipf/Makefile b/sbin/ipf/Makefile index 32cead444f7..1b0a18d3d9c 100644 --- a/sbin/ipf/Makefile +++ b/sbin/ipf/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libipf .WAIT SUBDIR+= ipf ipfs ipfstat ipmon ipnat ippool # XXX Temporarily disconnected. diff --git a/sbin/ipf/Makefile.inc b/sbin/ipf/Makefile.inc index 39bdc3674b2..cb3a3df50e0 100644 --- a/sbin/ipf/Makefile.inc +++ b/sbin/ipf/Makefile.inc @@ -1,4 +1,3 @@ - .include WARNS?= 2 diff --git a/sbin/ipf/ipf/Makefile b/sbin/ipf/ipf/Makefile index 981be4acd99..00cabf50cd8 100644 --- a/sbin/ipf/ipf/Makefile +++ b/sbin/ipf/ipf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipf SRCS= ${GENHDRS} ipf.c ipfcomp.c ipf_y.c ipf_l.c bpf_filter.c diff --git a/sbin/ipf/ipfs/Makefile b/sbin/ipf/ipfs/Makefile index 56eb92edec0..09bf881deca 100644 --- a/sbin/ipf/ipfs/Makefile +++ b/sbin/ipf/ipfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ipf PROG= ipfs MAN= ipfs.8 diff --git a/sbin/ipf/ipfstat/Makefile b/sbin/ipf/ipfstat/Makefile index 7d03f282f67..795e89e0a14 100644 --- a/sbin/ipf/ipfstat/Makefile +++ b/sbin/ipf/ipfstat/Makefile @@ -1,4 +1,3 @@ - NOGCCERROR= # defined PACKAGE= ipf diff --git a/sbin/ipf/ipftest/Makefile b/sbin/ipf/ipftest/Makefile index 3ff410e8f22..d446ab9d22b 100644 --- a/sbin/ipf/ipftest/Makefile +++ b/sbin/ipf/ipftest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipftest SRCS= ${GENHDRS} ipftest.c fil.c ip_frag.c ip_state.c ip_nat.c \ diff --git a/sbin/ipf/ipmon/Makefile b/sbin/ipf/ipmon/Makefile index 11506d8a85e..257e3b99977 100644 --- a/sbin/ipf/ipmon/Makefile +++ b/sbin/ipf/ipmon/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipmon SRCS= ${GENHDRS} ipmon.c ipmon_y.c ipmon_l.c diff --git a/sbin/ipf/ipnat/Makefile b/sbin/ipf/ipnat/Makefile index e4015e34c4e..869a399bd44 100644 --- a/sbin/ipf/ipnat/Makefile +++ b/sbin/ipf/ipnat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipnat SRCS= ${GENHDRS} ipnat.c ipnat_y.c ipnat_l.c diff --git a/sbin/ipf/ippool/Makefile b/sbin/ipf/ippool/Makefile index d9b267a5858..8ed864ee926 100644 --- a/sbin/ipf/ippool/Makefile +++ b/sbin/ipf/ippool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ippool SRCS= ${GENHDRS} ippool_y.c ippool_l.c ippool.c diff --git a/sbin/ipf/ipresend/Makefile b/sbin/ipf/ipresend/Makefile index fc655c5423d..f866891c4c9 100644 --- a/sbin/ipf/ipresend/Makefile +++ b/sbin/ipf/ipresend/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipresend SRCS= ipresend.c ip.c resend.c sbpf.c sock.c 44arp.c diff --git a/sbin/ipf/ipscan/Makefile b/sbin/ipf/ipscan/Makefile index 1169e7dcade..1f62d796076 100644 --- a/sbin/ipf/ipscan/Makefile +++ b/sbin/ipf/ipscan/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf PROG= ipscan SRCS= ${GENHDRS} ipscan_y.c diff --git a/sbin/ipf/libipf/Makefile b/sbin/ipf/libipf/Makefile index 8971e014fae..bdd56876dad 100644 --- a/sbin/ipf/libipf/Makefile +++ b/sbin/ipf/libipf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ipf LIB= ipf INTERNALLIB= diff --git a/sbin/ipfw/Makefile b/sbin/ipfw/Makefile index a800ec86b0c..bfbe70130de 100644 --- a/sbin/ipfw/Makefile +++ b/sbin/ipfw/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=ipfw diff --git a/sbin/ldconfig/Makefile b/sbin/ldconfig/Makefile index 2ed58431fc0..621be3937ec 100644 --- a/sbin/ldconfig/Makefile +++ b/sbin/ldconfig/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= ldconfig SRCS= elfhints.c ldconfig.c diff --git a/sbin/md5/Makefile b/sbin/md5/Makefile index f91e84323b0..ed87ff84876 100644 --- a/sbin/md5/Makefile +++ b/sbin/md5/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= md5 diff --git a/sbin/md5/tests/Makefile b/sbin/md5/tests/Makefile index 236e8433fd4..03c4da684eb 100644 --- a/sbin/md5/tests/Makefile +++ b/sbin/md5/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/sbin/mdconfig/Makefile b/sbin/mdconfig/Makefile index 5e102d635e9..bd835df0dae 100644 --- a/sbin/mdconfig/Makefile +++ b/sbin/mdconfig/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/mdconfig/tests/Makefile b/sbin/mdconfig/tests/Makefile index 674536a33d7..a3841f8f0dd 100644 --- a/sbin/mdconfig/tests/Makefile +++ b/sbin/mdconfig/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= mdconfig_test TEST_METADATA.mdconfig_test+= required_user="root" diff --git a/sbin/mdmfs/Makefile b/sbin/mdmfs/Makefile index 592ceaa152c..0665dfcc20a 100644 --- a/sbin/mdmfs/Makefile +++ b/sbin/mdmfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mdmfs LINKS= ${BINDIR}/${PROG} ${BINDIR}/mount_mfs diff --git a/sbin/mknod/Makefile b/sbin/mknod/Makefile index ce2c8d0cd97..2182f31ca24 100644 --- a/sbin/mknod/Makefile +++ b/sbin/mknod/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mknod MAN= mknod.8 diff --git a/sbin/mksnap_ffs/Makefile b/sbin/mksnap_ffs/Makefile index b11bf0a25fa..591fd6adcc2 100644 --- a/sbin/mksnap_ffs/Makefile +++ b/sbin/mksnap_ffs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/mount PACKAGE=ufs diff --git a/sbin/mount/Makefile b/sbin/mount/Makefile index ad5a27f7d76..9b5c9b9e593 100644 --- a/sbin/mount/Makefile +++ b/sbin/mount/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount SRCS= mount.c mount_fs.c getmntopts.c vfslist.c diff --git a/sbin/mount_cd9660/Makefile b/sbin/mount_cd9660/Makefile index ae9cde8080a..3a8f9cd45cb 100644 --- a/sbin/mount_cd9660/Makefile +++ b/sbin/mount_cd9660/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_cd9660 SRCS= mount_cd9660.c getmntopts.c diff --git a/sbin/mount_fusefs/Makefile b/sbin/mount_fusefs/Makefile index 741cbed1dd5..0c173bf1b68 100644 --- a/sbin/mount_fusefs/Makefile +++ b/sbin/mount_fusefs/Makefile @@ -1,4 +1,3 @@ - .if defined(DEBUG) DEBUG_FLAGS+= -D_DEBUG -g .endif diff --git a/sbin/mount_nfs/Makefile b/sbin/mount_nfs/Makefile index 2af94bff3a9..3e61a9f680e 100644 --- a/sbin/mount_nfs/Makefile +++ b/sbin/mount_nfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=nfs PROG= mount_nfs SRCS= mount_nfs.c getmntopts.c mounttab.c diff --git a/sbin/mount_nullfs/Makefile b/sbin/mount_nullfs/Makefile index 591ee9a9e24..12e87308ed1 100644 --- a/sbin/mount_nullfs/Makefile +++ b/sbin/mount_nullfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_nullfs SRCS= mount_nullfs.c getmntopts.c diff --git a/sbin/mount_udf/Makefile b/sbin/mount_udf/Makefile index bf165eb28ff..c41c051fc31 100644 --- a/sbin/mount_udf/Makefile +++ b/sbin/mount_udf/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_udf SRCS= mount_udf.c getmntopts.c diff --git a/sbin/mount_unionfs/Makefile b/sbin/mount_unionfs/Makefile index a548429b03c..2096386a378 100644 --- a/sbin/mount_unionfs/Makefile +++ b/sbin/mount_unionfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= mount_unionfs SRCS= mount_unionfs.c getmntopts.c diff --git a/sbin/natd/Makefile b/sbin/natd/Makefile index 39e3fd708bc..b8d54c780bf 100644 --- a/sbin/natd/Makefile +++ b/sbin/natd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= natd PROG = natd SRCS = natd.c icmp.c diff --git a/sbin/newfs/Makefile b/sbin/newfs/Makefile index b8070d90257..1138e819055 100644 --- a/sbin/newfs/Makefile +++ b/sbin/newfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom PACKAGE= ufs diff --git a/sbin/newfs_msdos/Makefile b/sbin/newfs_msdos/Makefile index f4efc649067..a3ea6a6a675 100644 --- a/sbin/newfs_msdos/Makefile +++ b/sbin/newfs_msdos/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/nfsiod/Makefile b/sbin/nfsiod/Makefile index c75b1075c4e..974c7de3362 100644 --- a/sbin/nfsiod/Makefile +++ b/sbin/nfsiod/Makefile @@ -1,4 +1,3 @@ - PROG= nfsiod MAN= nfsiod.8 diff --git a/sbin/nos-tun/Makefile b/sbin/nos-tun/Makefile index 8934e138b49..bef6878b7f2 100644 --- a/sbin/nos-tun/Makefile +++ b/sbin/nos-tun/Makefile @@ -1,4 +1,3 @@ - PROG= nos-tun MAN= nos-tun.8 WARNS?= 3 diff --git a/sbin/nvmecontrol/modules/Makefile b/sbin/nvmecontrol/modules/Makefile index f89b8dc84ab..70d1ba40a1e 100644 --- a/sbin/nvmecontrol/modules/Makefile +++ b/sbin/nvmecontrol/modules/Makefile @@ -1,4 +1,3 @@ - SUBDIR= intel wdc samsung .include diff --git a/sbin/nvmecontrol/modules/Makefile.inc b/sbin/nvmecontrol/modules/Makefile.inc index f949af97945..d8892750143 100644 --- a/sbin/nvmecontrol/modules/Makefile.inc +++ b/sbin/nvmecontrol/modules/Makefile.inc @@ -1,4 +1,3 @@ - PACKAGE=nvme-tools NVMECONTROLDIR= ${SRCTOP}/sbin/nvmecontrol diff --git a/sbin/nvmecontrol/modules/intel/Makefile b/sbin/nvmecontrol/modules/intel/Makefile index 3191980c562..9e4eafa0fee 100644 --- a/sbin/nvmecontrol/modules/intel/Makefile +++ b/sbin/nvmecontrol/modules/intel/Makefile @@ -1,4 +1,3 @@ - LIB= intel SRCS= intel.c diff --git a/sbin/nvmecontrol/modules/samsung/Makefile b/sbin/nvmecontrol/modules/samsung/Makefile index 353a2d14150..750dd07cbeb 100644 --- a/sbin/nvmecontrol/modules/samsung/Makefile +++ b/sbin/nvmecontrol/modules/samsung/Makefile @@ -1,4 +1,3 @@ - LIB= samsung SRCS= samsung.c diff --git a/sbin/nvmecontrol/modules/wdc/Makefile b/sbin/nvmecontrol/modules/wdc/Makefile index 9a71b2b2a80..8f8185d5f7a 100644 --- a/sbin/nvmecontrol/modules/wdc/Makefile +++ b/sbin/nvmecontrol/modules/wdc/Makefile @@ -1,4 +1,3 @@ - LIB= wdc SRCS= wdc.c diff --git a/sbin/nvmecontrol/tests/Makefile b/sbin/nvmecontrol/tests/Makefile index eebe8819339..5754dbd743b 100644 --- a/sbin/nvmecontrol/tests/Makefile +++ b/sbin/nvmecontrol/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= basic diff --git a/sbin/pfctl/Makefile b/sbin/pfctl/Makefile index c9108f702f2..08ca9a7af81 100644 --- a/sbin/pfctl/Makefile +++ b/sbin/pfctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=pf diff --git a/sbin/pfctl/tests/Makefile b/sbin/pfctl/tests/Makefile index db41a445903..ed5f5275814 100644 --- a/sbin/pfctl/tests/Makefile +++ b/sbin/pfctl/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_C= pfctl_test diff --git a/sbin/pfctl/tests/files/Makefile b/sbin/pfctl/tests/files/Makefile index c676a42f62b..27cf512d81c 100644 --- a/sbin/pfctl/tests/files/Makefile +++ b/sbin/pfctl/tests/files/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sbin/pfctl/files diff --git a/sbin/pfilctl/Makefile b/sbin/pfilctl/Makefile index fb67b5ea649..d5efad642bf 100644 --- a/sbin/pfilctl/Makefile +++ b/sbin/pfilctl/Makefile @@ -1,4 +1,3 @@ - PROG= pfilctl SRCS= pfilctl.c diff --git a/sbin/pflogd/Makefile b/sbin/pflogd/Makefile index 17077a4f825..7b4a636843e 100644 --- a/sbin/pflogd/Makefile +++ b/sbin/pflogd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/pflogd PACKAGE=pf diff --git a/sbin/pflowctl/Makefile b/sbin/pflowctl/Makefile index 35cf8cc020f..dd20f7b7a37 100644 --- a/sbin/pflowctl/Makefile +++ b/sbin/pflowctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=pf diff --git a/sbin/ping/Makefile b/sbin/ping/Makefile index a710629cb24..b4e3f115b24 100644 --- a/sbin/ping/Makefile +++ b/sbin/ping/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile index 3bdf53c15a7..0520b1d634c 100644 --- a/sbin/ping/tests/Makefile +++ b/sbin/ping/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_C+= in_cksum_test SRCS.in_cksum_test= in_cksum_test.c ../utils.c diff --git a/sbin/quotacheck/Makefile b/sbin/quotacheck/Makefile index d737e4f0472..edaac867945 100644 --- a/sbin/quotacheck/Makefile +++ b/sbin/quotacheck/Makefile @@ -1,4 +1,3 @@ - PACKAGE=quotacheck PROG= quotacheck SRCS= quotacheck.c preen.c fsutil.c utilities.c diff --git a/sbin/reboot/Makefile b/sbin/reboot/Makefile index 5e7a2fea15b..27805d30779 100644 --- a/sbin/reboot/Makefile +++ b/sbin/reboot/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= reboot MAN= reboot.8 nextboot.8 diff --git a/sbin/recoverdisk/Makefile b/sbin/recoverdisk/Makefile index e0a8d118656..41bc736ecc6 100644 --- a/sbin/recoverdisk/Makefile +++ b/sbin/recoverdisk/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= recoverdisk diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index e381ee4118a..328153a2b0b 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -1,4 +1,3 @@ - PACKAGE=resolvconf DIST= ${SRCTOP}/contrib/openresolv .PATH: ${DIST} diff --git a/sbin/restore/Makefile b/sbin/restore/Makefile index 915ad0d1ad6..99fc7e190bf 100644 --- a/sbin/restore/Makefile +++ b/sbin/restore/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/dump PACKAGE=ufs diff --git a/sbin/route/Makefile b/sbin/route/Makefile index b0a0670e462..43b9c0d8d82 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/route/tests/Makefile b/sbin/route/tests/Makefile index 23e5ecb7914..9d634d7c48b 100644 --- a/sbin/route/tests/Makefile +++ b/sbin/route/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= basic diff --git a/sbin/routed/Makefile.inc b/sbin/routed/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sbin/routed/Makefile.inc +++ b/sbin/routed/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile index fe10df45930..8d22ab21b6d 100644 --- a/sbin/savecore/Makefile +++ b/sbin/savecore/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime CONFS= minfree VAR_CRASH= /var/crash diff --git a/sbin/shutdown/Makefile b/sbin/shutdown/Makefile index 3271570b352..6c5d6e4487e 100644 --- a/sbin/shutdown/Makefile +++ b/sbin/shutdown/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= shutdown MAN= shutdown.8 diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile index 27808aed585..ef87c9668dd 100644 --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= swapon MAN= swapon.8 diff --git a/sbin/sysctl/Makefile b/sbin/sysctl/Makefile index e1e590307c6..cd47d8b2829 100644 --- a/sbin/sysctl/Makefile +++ b/sbin/sysctl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=runtime diff --git a/sbin/sysctl/tests/Makefile b/sbin/sysctl/tests/Makefile index c3f117dcff1..b209b244824 100644 --- a/sbin/sysctl/tests/Makefile +++ b/sbin/sysctl/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= sysctl_test .include diff --git a/sbin/tests/Makefile b/sbin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/sbin/tests/Makefile +++ b/sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/sbin/tunefs/Makefile b/sbin/tunefs/Makefile index 2a1f7888531..e236525557e 100644 --- a/sbin/tunefs/Makefile +++ b/sbin/tunefs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ufs PROG= tunefs SRCS= tunefs.c getmntopts.c diff --git a/sbin/umount/Makefile b/sbin/umount/Makefile index 7b440db82af..d97283d70c2 100644 --- a/sbin/umount/Makefile +++ b/sbin/umount/Makefile @@ -1,4 +1,3 @@ - PACKAGE=runtime PROG= umount SRCS= umount.c vfslist.c mounttab.c diff --git a/sbin/veriexec/Makefile b/sbin/veriexec/Makefile index 78f7059109f..6b6007c4bb3 100644 --- a/sbin/veriexec/Makefile +++ b/sbin/veriexec/Makefile @@ -1,4 +1,3 @@ - PROG= veriexec MAN= veriexec.8 SRCS= \ diff --git a/secure/Makefile b/secure/Makefile index f23953bb71a..268ece6847f 100644 --- a/secure/Makefile +++ b/secure/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= lib .WAIT \ diff --git a/secure/Makefile.inc b/secure/Makefile.inc index c951f3d3524..a0f42faa062 100644 --- a/secure/Makefile.inc +++ b/secure/Makefile.inc @@ -1,4 +1,3 @@ - .if exists(${.CURDIR:H:H}/lib/libcrypt/obj) CRYPTOBJDIR= ${.CURDIR:H:H}/lib/libcrypt/obj .else diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile index 4390d4890b9..cd337a74a75 100644 --- a/secure/caroot/Makefile +++ b/secure/caroot/Makefile @@ -1,4 +1,3 @@ - CLEANFILES+= certdata.txt SUBDIR+= trusted diff --git a/secure/caroot/Makefile.inc b/secure/caroot/Makefile.inc index 700e6ff3048..88e28778968 100644 --- a/secure/caroot/Makefile.inc +++ b/secure/caroot/Makefile.inc @@ -1,2 +1 @@ - PACKAGE= caroot diff --git a/secure/caroot/trusted/Makefile b/secure/caroot/trusted/Makefile index 20d0ccfcbe2..b2fe43fcb80 100644 --- a/secure/caroot/trusted/Makefile +++ b/secure/caroot/trusted/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/share/certs/trusted TRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true diff --git a/secure/caroot/untrusted/Makefile b/secure/caroot/untrusted/Makefile index e5341c97800..19d7359ddcb 100644 --- a/secure/caroot/untrusted/Makefile +++ b/secure/caroot/untrusted/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/share/certs/untrusted UNTRUSTED_CERTS!= echo ${.CURDIR}/*.pem 2> /dev/null || true diff --git a/secure/lib/Makefile b/secure/lib/Makefile index b4b586fa658..195fef28501 100644 --- a/secure/lib/Makefile +++ b/secure/lib/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/lib/Makefile.inc b/secure/lib/Makefile.inc index 9f5c8f24396..ac01b9fd682 100644 --- a/secure/lib/Makefile.inc +++ b/secure/lib/Makefile.inc @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .if exists(${.CURDIR:H:H:H}/lib/Makefile.inc) .include "${.CURDIR:H:H:H}/lib/Makefile.inc" diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index dc701d90451..a6ca46ecd37 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -1,4 +1,3 @@ - SHLIBDIR?= /lib .if !defined(LIBCRYPTO_WITHOUT_SUBDIRS) SUBDIR= engines modules diff --git a/secure/lib/libcrypto/Makefile.common b/secure/lib/libcrypto/Makefile.common index b109fd7f7f4..afcc2a48660 100644 --- a/secure/lib/libcrypto/Makefile.common +++ b/secure/lib/libcrypto/Makefile.common @@ -1,4 +1,3 @@ - .include .if ${TARGET_ENDIANNESS} == 1234 diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index d95f08e2725..16a2c15bc96 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,4 +1,3 @@ - .include # OpenSSL version used for manual page generation diff --git a/secure/lib/libcrypto/engines/Makefile b/secure/lib/libcrypto/engines/Makefile index 80587f47c48..945d93599f0 100644 --- a/secure/lib/libcrypto/engines/Makefile +++ b/secure/lib/libcrypto/engines/Makefile @@ -1,4 +1,3 @@ - SUBDIR= capi devcrypto loader_attic .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" SUBDIR+= padlock diff --git a/secure/lib/libcrypto/engines/Makefile.inc b/secure/lib/libcrypto/engines/Makefile.inc index 13d5f4849cb..3da129023c7 100644 --- a/secure/lib/libcrypto/engines/Makefile.inc +++ b/secure/lib/libcrypto/engines/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR= ${LIBDIR}/engines-3 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/engines/capi/Makefile b/secure/lib/libcrypto/engines/capi/Makefile index 184b6aaef2f..2162dbf94b6 100644 --- a/secure/lib/libcrypto/engines/capi/Makefile +++ b/secure/lib/libcrypto/engines/capi/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= capi.so SRCS= e_capi.c diff --git a/secure/lib/libcrypto/engines/devcrypto/Makefile b/secure/lib/libcrypto/engines/devcrypto/Makefile index a8b6f84a70b..a69e6074cc2 100644 --- a/secure/lib/libcrypto/engines/devcrypto/Makefile +++ b/secure/lib/libcrypto/engines/devcrypto/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= devcrypto.so SRCS= e_devcrypto.c diff --git a/secure/lib/libcrypto/engines/loader_attic/Makefile b/secure/lib/libcrypto/engines/loader_attic/Makefile index bd837dbb559..cee699eaccf 100644 --- a/secure/lib/libcrypto/engines/loader_attic/Makefile +++ b/secure/lib/libcrypto/engines/loader_attic/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= loader_attic.so SRCS= e_loader_attic.c pvkfmt.c diff --git a/secure/lib/libcrypto/engines/padlock/Makefile b/secure/lib/libcrypto/engines/padlock/Makefile index 9dc8cd4eafe..60dfa9c77c2 100644 --- a/secure/lib/libcrypto/engines/padlock/Makefile +++ b/secure/lib/libcrypto/engines/padlock/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= padlock.so SRCS= e_padlock.c diff --git a/secure/lib/libcrypto/modules/Makefile b/secure/lib/libcrypto/modules/Makefile index 2f9e5b40fe3..0e01eb3b8ef 100644 --- a/secure/lib/libcrypto/modules/Makefile +++ b/secure/lib/libcrypto/modules/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fips legacy SUBDIR_PARALLEL= diff --git a/secure/lib/libcrypto/modules/Makefile.inc b/secure/lib/libcrypto/modules/Makefile.inc index 0c7027bff89..92bc102c06e 100644 --- a/secure/lib/libcrypto/modules/Makefile.inc +++ b/secure/lib/libcrypto/modules/Makefile.inc @@ -1,4 +1,3 @@ - SHLIBDIR= ${LIBDIR}/ossl-modules LCRYPTO_SRC= ${SRCTOP}/crypto/openssl diff --git a/secure/lib/libcrypto/modules/fips/Makefile b/secure/lib/libcrypto/modules/fips/Makefile index 8843cb9717c..0f4889f3ff8 100644 --- a/secure/lib/libcrypto/modules/fips/Makefile +++ b/secure/lib/libcrypto/modules/fips/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= fips.so CFLAGS+= -DFIPS_MODULE diff --git a/secure/lib/libcrypto/modules/legacy/Makefile b/secure/lib/libcrypto/modules/legacy/Makefile index a285d0b1148..f90c873072e 100644 --- a/secure/lib/libcrypto/modules/legacy/Makefile +++ b/secure/lib/libcrypto/modules/legacy/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME?= legacy.so LIBADD= crypto diff --git a/secure/lib/libssh/Makefile b/secure/lib/libssh/Makefile index e6738be94f6..aca21d31881 100644 --- a/secure/lib/libssh/Makefile +++ b/secure/lib/libssh/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/lib/libssl/Makefile b/secure/lib/libssl/Makefile index 21a57f6b368..9d8a64ee0ab 100644 --- a/secure/lib/libssl/Makefile +++ b/secure/lib/libssl/Makefile @@ -1,4 +1,3 @@ - .include LIB= ssl diff --git a/secure/lib/tests/Makefile b/secure/lib/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/secure/lib/tests/Makefile +++ b/secure/lib/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/libexec/Makefile b/secure/libexec/Makefile index 6d0be7b50df..cf265c72bdd 100644 --- a/secure/libexec/Makefile +++ b/secure/libexec/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/libexec/Makefile.inc b/secure/libexec/Makefile.inc index e5beeed87ca..8998b613dda 100644 --- a/secure/libexec/Makefile.inc +++ b/secure/libexec/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/libexec PACKAGE= ssh diff --git a/secure/libexec/sftp-server/Makefile b/secure/libexec/sftp-server/Makefile index 852055bfe62..40d86926d1b 100644 --- a/secure/libexec/sftp-server/Makefile +++ b/secure/libexec/sftp-server/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/ssh-keysign/Makefile b/secure/libexec/ssh-keysign/Makefile index e5aa05f40f1..6027b164a35 100644 --- a/secure/libexec/ssh-keysign/Makefile +++ b/secure/libexec/ssh-keysign/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/ssh-pkcs11-helper/Makefile b/secure/libexec/ssh-pkcs11-helper/Makefile index 2e04a0ed1fc..4bc3a814ab8 100644 --- a/secure/libexec/ssh-pkcs11-helper/Makefile +++ b/secure/libexec/ssh-pkcs11-helper/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/libexec/tests/Makefile b/secure/libexec/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/secure/libexec/tests/Makefile +++ b/secure/libexec/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/tests/Makefile b/secure/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/secure/tests/Makefile +++ b/secure/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/usr.bin/Makefile b/secure/usr.bin/Makefile index 55abbdb5c3e..30f8767aa4e 100644 --- a/secure/usr.bin/Makefile +++ b/secure/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/usr.bin/Makefile.inc b/secure/usr.bin/Makefile.inc index 78a3af23f3c..b87015c546c 100644 --- a/secure/usr.bin/Makefile.inc +++ b/secure/usr.bin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin .include "../Makefile.inc" diff --git a/secure/usr.bin/openssl/Makefile b/secure/usr.bin/openssl/Makefile index 464189e7982..0653e687518 100644 --- a/secure/usr.bin/openssl/Makefile +++ b/secure/usr.bin/openssl/Makefile @@ -1,4 +1,3 @@ - CONFS= openssl.cnf CONFSDIR= /etc/ssl PROG= openssl diff --git a/secure/usr.bin/scp/Makefile b/secure/usr.bin/scp/Makefile index bb262306233..dbc896286dd 100644 --- a/secure/usr.bin/scp/Makefile +++ b/secure/usr.bin/scp/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/sftp/Makefile b/secure/usr.bin/sftp/Makefile index 72229d100c4..841c89b71c6 100644 --- a/secure/usr.bin/sftp/Makefile +++ b/secure/usr.bin/sftp/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-add/Makefile b/secure/usr.bin/ssh-add/Makefile index 43ee63c567e..ec709c72108 100644 --- a/secure/usr.bin/ssh-add/Makefile +++ b/secure/usr.bin/ssh-add/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-agent/Makefile b/secure/usr.bin/ssh-agent/Makefile index 83813452e69..bc5985a7325 100644 --- a/secure/usr.bin/ssh-agent/Makefile +++ b/secure/usr.bin/ssh-agent/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-keygen/Makefile b/secure/usr.bin/ssh-keygen/Makefile index 6595ad3db13..149dc693665 100644 --- a/secure/usr.bin/ssh-keygen/Makefile +++ b/secure/usr.bin/ssh-keygen/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh-keyscan/Makefile b/secure/usr.bin/ssh-keyscan/Makefile index b71c07a91b9..b842841f765 100644 --- a/secure/usr.bin/ssh-keyscan/Makefile +++ b/secure/usr.bin/ssh-keyscan/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/ssh/Makefile b/secure/usr.bin/ssh/Makefile index 1d1f5e5e872..7c3eb68ea08 100644 --- a/secure/usr.bin/ssh/Makefile +++ b/secure/usr.bin/ssh/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.bin/tests/Makefile b/secure/usr.bin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/secure/usr.bin/tests/Makefile +++ b/secure/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/secure/usr.sbin/Makefile b/secure/usr.sbin/Makefile index c0521b95cdb..50b86309613 100644 --- a/secure/usr.sbin/Makefile +++ b/secure/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= diff --git a/secure/usr.sbin/Makefile.inc b/secure/usr.sbin/Makefile.inc index 5c01baa093b..b660f1cc663 100644 --- a/secure/usr.sbin/Makefile.inc +++ b/secure/usr.sbin/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin .include "../Makefile.inc" diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index c15bd773c77..323fe4b8c99 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -1,4 +1,3 @@ - .include .include "${SRCTOP}/secure/ssh.mk" diff --git a/secure/usr.sbin/tests/Makefile b/secure/usr.sbin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/secure/usr.sbin/tests/Makefile +++ b/secure/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/share/Makefile b/share/Makefile index 5546f3e90c1..a94fe633470 100644 --- a/share/Makefile +++ b/share/Makefile @@ -1,4 +1,3 @@ - .include # Do not include `info' in the SUBDIR list, it is handled separately. diff --git a/share/Makefile.inc b/share/Makefile.inc index 121787f4b10..31d47bde05d 100644 --- a/share/Makefile.inc +++ b/share/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= ${SHAREDIR} BINOWN= ${SHAREOWN} BINGRP= ${SHAREGRP} diff --git a/share/colldef/Makefile b/share/colldef/Makefile index dd310b699dd..5d608056f73 100644 --- a/share/colldef/Makefile +++ b/share/colldef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_COLLATE diff --git a/share/ctypedef/Makefile b/share/ctypedef/Makefile index 62b3a719fe5..cf333526744 100644 --- a/share/ctypedef/Makefile +++ b/share/ctypedef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales FILESGROUPS= FILES ALWAYS ALWAYSPACKAGE= runtime diff --git a/share/dict/Makefile b/share/dict/Makefile index 7e8c830d194..3fb23e269ae 100644 --- a/share/dict/Makefile +++ b/share/dict/Makefile @@ -1,4 +1,3 @@ - # XXX MISSING: connectives words FILES= README propernames web2 web2a freebsd FILESDIR= ${BINDIR}/dict diff --git a/share/doc/IPv6/Makefile b/share/doc/IPv6/Makefile index 29a321f55c3..c2b04c972bf 100644 --- a/share/doc/IPv6/Makefile +++ b/share/doc/IPv6/Makefile @@ -1,4 +1,3 @@ - FILES= IMPLEMENTATION FILESDIR= ${SHAREDIR}/doc/IPv6 diff --git a/share/doc/Makefile b/share/doc/Makefile index 75c12e2ba0e..6324dd59ef7 100644 --- a/share/doc/Makefile +++ b/share/doc/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= ${_IPv6} \ diff --git a/share/doc/legal/Makefile b/share/doc/legal/Makefile index 8e674019e9a..9467a4ece9a 100644 --- a/share/doc/legal/Makefile +++ b/share/doc/legal/Makefile @@ -1,4 +1,3 @@ - SUBDIR= intel_ipw \ intel_iwi \ intel_iwlwififw \ diff --git a/share/doc/legal/Makefile.armv7 b/share/doc/legal/Makefile.armv7 index 245d40118ac..3064611d04b 100644 --- a/share/doc/legal/Makefile.armv7 +++ b/share/doc/legal/Makefile.armv7 @@ -1,2 +1 @@ - SUBDIR += imx diff --git a/share/doc/legal/imx/Makefile b/share/doc/legal/imx/Makefile index bd0e97a04a8..866af4017e4 100644 --- a/share/doc/legal/imx/Makefile +++ b/share/doc/legal/imx/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/imx/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= sdma-imx6q.LICENSE diff --git a/share/doc/legal/intel_ipw/Makefile b/share/doc/legal/intel_ipw/Makefile index fccf2bda0c0..9f842cb8b24 100644 --- a/share/doc/legal/intel_ipw/Makefile +++ b/share/doc/legal/intel_ipw/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/ipw/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_ipw.LICENSE diff --git a/share/doc/legal/intel_iwi/Makefile b/share/doc/legal/intel_iwi/Makefile index 93c0ddf0556..8c3a73fd88c 100644 --- a/share/doc/legal/intel_iwi/Makefile +++ b/share/doc/legal/intel_iwi/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/iwi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwi.LICENSE diff --git a/share/doc/legal/intel_iwlwififw/Makefile b/share/doc/legal/intel_iwlwififw/Makefile index 631d3465434..87956f8e7a3 100644 --- a/share/doc/legal/intel_iwlwififw/Makefile +++ b/share/doc/legal/intel_iwlwififw/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/iwlwififw/LICENCE.iwlwifi_firmware FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwlwifi_firmware.LICENCE diff --git a/share/doc/legal/intel_iwn/Makefile b/share/doc/legal/intel_iwn/Makefile index d706f3a3b88..7542e0d6356 100644 --- a/share/doc/legal/intel_iwn/Makefile +++ b/share/doc/legal/intel_iwn/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/iwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_iwn.LICENSE diff --git a/share/doc/legal/intel_wpi/Makefile b/share/doc/legal/intel_wpi/Makefile index 29baf84d1d4..b23d3ab9260 100644 --- a/share/doc/legal/intel_wpi/Makefile +++ b/share/doc/legal/intel_wpi/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/wpi/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= intel_wpi.LICENSE diff --git a/share/doc/legal/realtek/Makefile b/share/doc/legal/realtek/Makefile index 2a6fd6ae619..14aa123011c 100644 --- a/share/doc/legal/realtek/Makefile +++ b/share/doc/legal/realtek/Makefile @@ -1,4 +1,3 @@ - FILES= ${SRCTOP}/sys/contrib/dev/rtwn/LICENSE FILESDIR= ${SHAREDIR}/doc/legal FILESNAME= realtek.LICENSE diff --git a/share/doc/llvm/Makefile b/share/doc/llvm/Makefile index 829b77a117a..8fde27acf11 100644 --- a/share/doc/llvm/Makefile +++ b/share/doc/llvm/Makefile @@ -1,4 +1,3 @@ - SUBDIR= clang SRCDIR= ${SRCTOP}/contrib/llvm-project/llvm diff --git a/share/doc/llvm/clang/Makefile b/share/doc/llvm/clang/Makefile index 9cd2f210cd9..ba789f4afd9 100644 --- a/share/doc/llvm/clang/Makefile +++ b/share/doc/llvm/clang/Makefile @@ -1,4 +1,3 @@ - SRCDIR= ${SRCTOP}/contrib/llvm-project/clang .PATH: ${SRCDIR} diff --git a/share/doc/papers/Makefile b/share/doc/papers/Makefile index 271180abb82..3c702b2aeaa 100644 --- a/share/doc/papers/Makefile +++ b/share/doc/papers/Makefile @@ -1,4 +1,3 @@ - SUBDIR= beyond4.3 \ bufbio \ contents \ diff --git a/share/doc/papers/beyond4.3/Makefile b/share/doc/papers/beyond4.3/Makefile index 9f25cb6db89..acc2048503f 100644 --- a/share/doc/papers/beyond4.3/Makefile +++ b/share/doc/papers/beyond4.3/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= beyond43 SRCS= beyond43.ms diff --git a/share/doc/papers/bufbio/Makefile b/share/doc/papers/bufbio/Makefile index 8cffb984f88..a486124fac5 100644 --- a/share/doc/papers/bufbio/Makefile +++ b/share/doc/papers/bufbio/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= bio SRCS= bio.ms-patched diff --git a/share/doc/papers/contents/Makefile b/share/doc/papers/contents/Makefile index c4075606b26..454fff5ee5a 100644 --- a/share/doc/papers/contents/Makefile +++ b/share/doc/papers/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= contents SRCS= contents.ms diff --git a/share/doc/papers/devfs/Makefile b/share/doc/papers/devfs/Makefile index 114134a5958..656e3cd89c2 100644 --- a/share/doc/papers/devfs/Makefile +++ b/share/doc/papers/devfs/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= devfs SRCS= paper.me diff --git a/share/doc/papers/diskperf/Makefile b/share/doc/papers/diskperf/Makefile index dd6c009d47e..0c909ea9584 100644 --- a/share/doc/papers/diskperf/Makefile +++ b/share/doc/papers/diskperf/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= diskperf SRCS= abs.ms motivation.ms equip.ms methodology.ms tests.ms \ diff --git a/share/doc/papers/fsinterface/Makefile b/share/doc/papers/fsinterface/Makefile index 4226f134917..3c45b04b08d 100644 --- a/share/doc/papers/fsinterface/Makefile +++ b/share/doc/papers/fsinterface/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= fsinterface SRCS= fsinterface.ms diff --git a/share/doc/papers/jail/Makefile b/share/doc/papers/jail/Makefile index 3476ab194d5..d2505992990 100644 --- a/share/doc/papers/jail/Makefile +++ b/share/doc/papers/jail/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= jail SRCS= paper.ms-patched diff --git a/share/doc/papers/kernmalloc/Makefile b/share/doc/papers/kernmalloc/Makefile index d91fd40baaa..f353016251b 100644 --- a/share/doc/papers/kernmalloc/Makefile +++ b/share/doc/papers/kernmalloc/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= kernmalloc SRCS= kernmalloc.t appendix.ms diff --git a/share/doc/papers/kerntune/Makefile b/share/doc/papers/kerntune/Makefile index a4f9954d6ab..6dbc8c67ab2 100644 --- a/share/doc/papers/kerntune/Makefile +++ b/share/doc/papers/kerntune/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= kerntune SRCS= 0.t 1.t 2.t 3.t 4.t diff --git a/share/doc/papers/malloc/Makefile b/share/doc/papers/malloc/Makefile index 8925f01cb45..755264466aa 100644 --- a/share/doc/papers/malloc/Makefile +++ b/share/doc/papers/malloc/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= malloc SRCS= abs.ms intro.ms kernel.ms malloc.ms problems.ms alternatives.ms \ diff --git a/share/doc/papers/newvm/Makefile b/share/doc/papers/newvm/Makefile index 531de11faf3..6a4d1342162 100644 --- a/share/doc/papers/newvm/Makefile +++ b/share/doc/papers/newvm/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= newvm SRCS= 0.t 1.t a.t diff --git a/share/doc/papers/relengr/Makefile b/share/doc/papers/relengr/Makefile index 902c3d1855e..a2a2b355ef6 100644 --- a/share/doc/papers/relengr/Makefile +++ b/share/doc/papers/relengr/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= releng SRCS= stubs 0.t 1.t 2.t 3.t diff --git a/share/doc/papers/sysperf/Makefile b/share/doc/papers/sysperf/Makefile index 8eaf0ec1008..d38189a350d 100644 --- a/share/doc/papers/sysperf/Makefile +++ b/share/doc/papers/sysperf/Makefile @@ -1,4 +1,3 @@ - VOLUME= papers DOC= sysperf SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t appendix.ms diff --git a/share/doc/papers/timecounter/Makefile b/share/doc/papers/timecounter/Makefile index 02833db4692..a2e7479bbd2 100644 --- a/share/doc/papers/timecounter/Makefile +++ b/share/doc/papers/timecounter/Makefile @@ -1,4 +1,3 @@ - # You really want: # PRINTERDEVICE=ps # or you will not get the illustration. diff --git a/share/doc/pjdfstest/Makefile b/share/doc/pjdfstest/Makefile index a4463fa6567..d7bfd45ae36 100644 --- a/share/doc/pjdfstest/Makefile +++ b/share/doc/pjdfstest/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/doc/pjdfstest FILES= README diff --git a/share/doc/psd/01.cacm/Makefile b/share/doc/psd/01.cacm/Makefile index b7770a4c1fb..1e5d3c677db 100644 --- a/share/doc/psd/01.cacm/Makefile +++ b/share/doc/psd/01.cacm/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/01.cacm SRCS= stubs p.mac p1 p2 p3 p4 p5 p6 EXTRA= ref.bib diff --git a/share/doc/psd/02.implement/Makefile b/share/doc/psd/02.implement/Makefile index c6c881ab8f6..4aa334a84a9 100644 --- a/share/doc/psd/02.implement/Makefile +++ b/share/doc/psd/02.implement/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/02.implement SRCS= stubs implement EXTRA= ref.bib diff --git a/share/doc/psd/03.iosys/Makefile b/share/doc/psd/03.iosys/Makefile index 69b12e8d31f..297c2e63a5e 100644 --- a/share/doc/psd/03.iosys/Makefile +++ b/share/doc/psd/03.iosys/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/03.iosys SRCS= iosys MACROS= -ms diff --git a/share/doc/psd/04.uprog/Makefile b/share/doc/psd/04.uprog/Makefile index 9039377ea8f..aeb736aedb0 100644 --- a/share/doc/psd/04.uprog/Makefile +++ b/share/doc/psd/04.uprog/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/04.uprog SRCS= p.mac p0 p1 p2 p3 p4 p5 p6 p8 p9 MACROS= -ms diff --git a/share/doc/psd/05.sysman/Makefile b/share/doc/psd/05.sysman/Makefile index a9115a09028..eea45d30497 100644 --- a/share/doc/psd/05.sysman/Makefile +++ b/share/doc/psd/05.sysman/Makefile @@ -1,4 +1,3 @@ - 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 diff --git a/share/doc/psd/06.Clang/Makefile b/share/doc/psd/06.Clang/Makefile index 4a1f10394d7..966bed693ba 100644 --- a/share/doc/psd/06.Clang/Makefile +++ b/share/doc/psd/06.Clang/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/06.Clang SRCS= Clang.ms MACROS= -ms diff --git a/share/doc/psd/12.make/Makefile b/share/doc/psd/12.make/Makefile index d72bde8b35f..ea4ba64282f 100644 --- a/share/doc/psd/12.make/Makefile +++ b/share/doc/psd/12.make/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/12.make SRCS= stubs tutorial.ms MACROS= -ms diff --git a/share/doc/psd/15.yacc/Makefile b/share/doc/psd/15.yacc/Makefile index 462b3178587..781cbb0c6ce 100644 --- a/share/doc/psd/15.yacc/Makefile +++ b/share/doc/psd/15.yacc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/15.yacc SRCS= stubs ss_ ss0 ss1 ss2 ss3 ss4 ss5 ss6 ss7 ss8 ss9 \ ss10 ss11 ssa ssb ssc ssd diff --git a/share/doc/psd/16.lex/Makefile b/share/doc/psd/16.lex/Makefile index 23698f35b65..ff7f26e1374 100644 --- a/share/doc/psd/16.lex/Makefile +++ b/share/doc/psd/16.lex/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/16.lex SRCS= lex.ms MACROS= -ms diff --git a/share/doc/psd/17.m4/Makefile b/share/doc/psd/17.m4/Makefile index 1f248858c05..d47473ba0a3 100644 --- a/share/doc/psd/17.m4/Makefile +++ b/share/doc/psd/17.m4/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/17.m4 SRCS= m4.ms MACROS= -ms diff --git a/share/doc/psd/18.gprof/Makefile b/share/doc/psd/18.gprof/Makefile index 05d283217bd..066a930a2ea 100644 --- a/share/doc/psd/18.gprof/Makefile +++ b/share/doc/psd/18.gprof/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/18.gprof SRCS= header.me abstract.me intro.me profiling.me gathering.me \ postp.me present.me refs.me diff --git a/share/doc/psd/20.ipctut/Makefile b/share/doc/psd/20.ipctut/Makefile index f26c47c6d6d..c752d8279c9 100644 --- a/share/doc/psd/20.ipctut/Makefile +++ b/share/doc/psd/20.ipctut/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/20.ipctut SRCS= tutor.me MACROS= -me diff --git a/share/doc/psd/21.ipc/Makefile b/share/doc/psd/21.ipc/Makefile index 4ba3bf5d44b..baf34752ea1 100644 --- a/share/doc/psd/21.ipc/Makefile +++ b/share/doc/psd/21.ipc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/21.ipc SRCS= 0.t 1.t 2.t 3.t 4.t 5.t MACROS= -ms diff --git a/share/doc/psd/22.rpcgen/Makefile b/share/doc/psd/22.rpcgen/Makefile index 653a382ebba..067b258a1a9 100644 --- a/share/doc/psd/22.rpcgen/Makefile +++ b/share/doc/psd/22.rpcgen/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/22.rpcgen SRCS= stubs rpcgen.ms MACROS= -ms diff --git a/share/doc/psd/23.rpc/Makefile b/share/doc/psd/23.rpc/Makefile index f1a004c4a57..5a893108c02 100644 --- a/share/doc/psd/23.rpc/Makefile +++ b/share/doc/psd/23.rpc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/23.rpc SRCS= stubs rpc.prog.ms MACROS= -ms diff --git a/share/doc/psd/24.xdr/Makefile b/share/doc/psd/24.xdr/Makefile index 49a9239dbef..b4525b58c7b 100644 --- a/share/doc/psd/24.xdr/Makefile +++ b/share/doc/psd/24.xdr/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/24.xdr SRCS= stubs xdr.nts.ms MACROS= -ms diff --git a/share/doc/psd/25.xdrrfc/Makefile b/share/doc/psd/25.xdrrfc/Makefile index e2deaa0edd4..5edb44e847c 100644 --- a/share/doc/psd/25.xdrrfc/Makefile +++ b/share/doc/psd/25.xdrrfc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/25.xdrrfc SRCS= stubs xdr.rfc.ms MACROS= -ms diff --git a/share/doc/psd/26.rpcrfc/Makefile b/share/doc/psd/26.rpcrfc/Makefile index 6334e077f2f..cdfbe9d4a4d 100644 --- a/share/doc/psd/26.rpcrfc/Makefile +++ b/share/doc/psd/26.rpcrfc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/26.rpcrfc SRCS= stubs rpc.rfc.ms MACROS= -ms diff --git a/share/doc/psd/27.nfsrpc/Makefile b/share/doc/psd/27.nfsrpc/Makefile index aa06a588d2c..c1c1720b74e 100644 --- a/share/doc/psd/27.nfsrpc/Makefile +++ b/share/doc/psd/27.nfsrpc/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd/27.nfsrfc SRCS= stubs nfs.rfc.ms MACROS= -ms diff --git a/share/doc/psd/Makefile b/share/doc/psd/Makefile index 93fa759ed34..15ff1bb0222 100644 --- a/share/doc/psd/Makefile +++ b/share/doc/psd/Makefile @@ -1,4 +1,3 @@ - # The following modules do not build/install: # 10.gdb diff --git a/share/doc/psd/contents/Makefile b/share/doc/psd/contents/Makefile index 778650d1f4c..b1ca61764f9 100644 --- a/share/doc/psd/contents/Makefile +++ b/share/doc/psd/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd DOC= contents SRCS= contents.ms diff --git a/share/doc/psd/title/Makefile b/share/doc/psd/title/Makefile index 06f1a060713..c13d7261852 100644 --- a/share/doc/psd/title/Makefile +++ b/share/doc/psd/title/Makefile @@ -1,4 +1,3 @@ - VOLUME= psd DOC= Title SRCS= Title diff --git a/share/doc/smm/01.setup/Makefile b/share/doc/smm/01.setup/Makefile index be4ea12d943..60351b562bb 100644 --- a/share/doc/smm/01.setup/Makefile +++ b/share/doc/smm/01.setup/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/01.setup SRCS= stubs 0.t 1.t 2.t 3.t 4.t 5.t 6.t MACROS= -ms diff --git a/share/doc/smm/02.config/Makefile b/share/doc/smm/02.config/Makefile index da2ec7424c8..7c8eb7f5077 100644 --- a/share/doc/smm/02.config/Makefile +++ b/share/doc/smm/02.config/Makefile @@ -1,4 +1,3 @@ - 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 diff --git a/share/doc/smm/03.fsck/Makefile b/share/doc/smm/03.fsck/Makefile index a946ad81be7..59cf82cd2cf 100644 --- a/share/doc/smm/03.fsck/Makefile +++ b/share/doc/smm/03.fsck/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/03.fsck SRCS= 0.t 1.t 2.t 3.t 4.t MACROS= -ms diff --git a/share/doc/smm/04.quotas/Makefile b/share/doc/smm/04.quotas/Makefile index ade471b8d65..e9f7ac58710 100644 --- a/share/doc/smm/04.quotas/Makefile +++ b/share/doc/smm/04.quotas/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/04.quotas SRCS= quotas.ms MACROS= -ms diff --git a/share/doc/smm/05.fastfs/Makefile b/share/doc/smm/05.fastfs/Makefile index 18b13a175c9..fa7cf0f830d 100644 --- a/share/doc/smm/05.fastfs/Makefile +++ b/share/doc/smm/05.fastfs/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/05.fastfs SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t MACROS= -ms diff --git a/share/doc/smm/06.nfs/Makefile b/share/doc/smm/06.nfs/Makefile index d5375598b98..a15d81d5b86 100644 --- a/share/doc/smm/06.nfs/Makefile +++ b/share/doc/smm/06.nfs/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/06.nfs SRCS= 0.t 1.t 2.t ref.t MACROS= -me diff --git a/share/doc/smm/07.lpd/Makefile b/share/doc/smm/07.lpd/Makefile index 1d2ffa32134..a92ce0bd3bb 100644 --- a/share/doc/smm/07.lpd/Makefile +++ b/share/doc/smm/07.lpd/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/07.lpd SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t MACROS= -ms diff --git a/share/doc/smm/08.sendmailop/Makefile b/share/doc/smm/08.sendmailop/Makefile index 53eedc4058c..ba0eb96de95 100644 --- a/share/doc/smm/08.sendmailop/Makefile +++ b/share/doc/smm/08.sendmailop/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/08.sendmailop SRCS= op.me MACROS= -me diff --git a/share/doc/smm/11.timedop/Makefile b/share/doc/smm/11.timedop/Makefile index 1f7ff654b50..a78b1204ca4 100644 --- a/share/doc/smm/11.timedop/Makefile +++ b/share/doc/smm/11.timedop/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/11.timedop SRCS= timed.ms MACROS= -ms diff --git a/share/doc/smm/12.timed/Makefile b/share/doc/smm/12.timed/Makefile index eee720bac9a..e8498e8ccc9 100644 --- a/share/doc/smm/12.timed/Makefile +++ b/share/doc/smm/12.timed/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/12.timed SRCS= timed.ms EXTRA= date loop time unused diff --git a/share/doc/smm/18.net/Makefile b/share/doc/smm/18.net/Makefile index 05972254c5d..beb0b147771 100644 --- a/share/doc/smm/18.net/Makefile +++ b/share/doc/smm/18.net/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm/18.net SRCS= 0.t 1.t 2.t 3.t 4.t 5.t 6.t 7.t 8.t 9.t a.t b.t c.t d.t e.t f.t MACROS= -ms diff --git a/share/doc/smm/Makefile b/share/doc/smm/Makefile index 60c4f72ee92..14a57395090 100644 --- a/share/doc/smm/Makefile +++ b/share/doc/smm/Makefile @@ -1,4 +1,3 @@ - .include # The following modules do not describe FreeBSD: diff --git a/share/doc/smm/contents/Makefile b/share/doc/smm/contents/Makefile index 800331f7eb1..c529682d6f3 100644 --- a/share/doc/smm/contents/Makefile +++ b/share/doc/smm/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm DOC= contents SRCS= contents.ms diff --git a/share/doc/smm/title/Makefile b/share/doc/smm/title/Makefile index bd8c1e1e343..294e3766611 100644 --- a/share/doc/smm/title/Makefile +++ b/share/doc/smm/title/Makefile @@ -1,4 +1,3 @@ - VOLUME= smm DOC= Title SRCS= Title diff --git a/share/doc/usd/04.csh/Makefile b/share/doc/usd/04.csh/Makefile index f9845389a6c..95aafe8851f 100644 --- a/share/doc/usd/04.csh/Makefile +++ b/share/doc/usd/04.csh/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/04.csh SRCS= tabs csh.1 csh.2 csh.3 csh.4 csh.a csh.g MACROS= -ms diff --git a/share/doc/usd/05.dc/Makefile b/share/doc/usd/05.dc/Makefile index 73ac03c794e..4a850d9f21a 100644 --- a/share/doc/usd/05.dc/Makefile +++ b/share/doc/usd/05.dc/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/05.dc SRCS= dc MACROS= -ms diff --git a/share/doc/usd/06.bc/Makefile b/share/doc/usd/06.bc/Makefile index ddb52f6f701..15e6aaca953 100644 --- a/share/doc/usd/06.bc/Makefile +++ b/share/doc/usd/06.bc/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/06.bc SRCS= bc MACROS= -ms diff --git a/share/doc/usd/07.mail/Makefile b/share/doc/usd/07.mail/Makefile index 5009150bc84..a8592b1e77e 100644 --- a/share/doc/usd/07.mail/Makefile +++ b/share/doc/usd/07.mail/Makefile @@ -1,4 +1,3 @@ - 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 diff --git a/share/doc/usd/10.exref/Makefile b/share/doc/usd/10.exref/Makefile index f41e46a8b60..b5732c65513 100644 --- a/share/doc/usd/10.exref/Makefile +++ b/share/doc/usd/10.exref/Makefile @@ -1,4 +1,3 @@ - SUBDIR= exref summary .include diff --git a/share/doc/usd/10.exref/Makefile.inc b/share/doc/usd/10.exref/Makefile.inc index 5a64f267bb4..c5dd0a9aac6 100644 --- a/share/doc/usd/10.exref/Makefile.inc +++ b/share/doc/usd/10.exref/Makefile.inc @@ -1,3 +1,2 @@ - VOLUME= usd/10.exref MACROS= -ms diff --git a/share/doc/usd/10.exref/exref/Makefile b/share/doc/usd/10.exref/exref/Makefile index 8e5d815dbe3..23d10e55316 100644 --- a/share/doc/usd/10.exref/exref/Makefile +++ b/share/doc/usd/10.exref/exref/Makefile @@ -1,4 +1,3 @@ - SRCS= ex.rm .include diff --git a/share/doc/usd/10.exref/summary/Makefile b/share/doc/usd/10.exref/summary/Makefile index 1d05d7c0f8c..fe2d338a961 100644 --- a/share/doc/usd/10.exref/summary/Makefile +++ b/share/doc/usd/10.exref/summary/Makefile @@ -1,4 +1,3 @@ - DOC= summary SRCS= ex.summary USE_TBL= diff --git a/share/doc/usd/11.vitut/Makefile b/share/doc/usd/11.vitut/Makefile index 9a18829d24c..e6aa1e72e54 100644 --- a/share/doc/usd/11.vitut/Makefile +++ b/share/doc/usd/11.vitut/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/11.edit SRCS= edittut.ms MACROS= -ms diff --git a/share/doc/usd/12.vi/Makefile b/share/doc/usd/12.vi/Makefile index ba422c8442e..9896d75fb41 100644 --- a/share/doc/usd/12.vi/Makefile +++ b/share/doc/usd/12.vi/Makefile @@ -1,4 +1,3 @@ - SUBDIR= vi viapwh summary .include diff --git a/share/doc/usd/12.vi/Makefile.inc b/share/doc/usd/12.vi/Makefile.inc index 1c1b09d2add..0fa6960311d 100644 --- a/share/doc/usd/12.vi/Makefile.inc +++ b/share/doc/usd/12.vi/Makefile.inc @@ -1,3 +1,2 @@ - VOLUME= usd/12.vi MACROS= -ms diff --git a/share/doc/usd/12.vi/summary/Makefile b/share/doc/usd/12.vi/summary/Makefile index e2a12e50fed..16482e203b7 100644 --- a/share/doc/usd/12.vi/summary/Makefile +++ b/share/doc/usd/12.vi/summary/Makefile @@ -1,4 +1,3 @@ - DOC= summary SRCS= vi.summary USE_TBL= diff --git a/share/doc/usd/12.vi/vi/Makefile b/share/doc/usd/12.vi/vi/Makefile index 72be559f210..b7281ebcdc8 100644 --- a/share/doc/usd/12.vi/vi/Makefile +++ b/share/doc/usd/12.vi/vi/Makefile @@ -1,4 +1,3 @@ - SRCS= vi.in vi.chars USE_TBL= diff --git a/share/doc/usd/12.vi/viapwh/Makefile b/share/doc/usd/12.vi/viapwh/Makefile index 3746784bbdb..a8de9a151e0 100644 --- a/share/doc/usd/12.vi/viapwh/Makefile +++ b/share/doc/usd/12.vi/viapwh/Makefile @@ -1,4 +1,3 @@ - DOC= viapwh SRCS= vi.apwh.ms diff --git a/share/doc/usd/13.viref/Makefile b/share/doc/usd/13.viref/Makefile index 5bea230c3ce..c7a03af2c7a 100644 --- a/share/doc/usd/13.viref/Makefile +++ b/share/doc/usd/13.viref/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/13.viref EXTRA= ex.cmd.roff ref.so set.opt.roff vi.cmd.roff MACROS= -me diff --git a/share/doc/usd/18.msdiffs/Makefile b/share/doc/usd/18.msdiffs/Makefile index a50b225f66b..1945542dc28 100644 --- a/share/doc/usd/18.msdiffs/Makefile +++ b/share/doc/usd/18.msdiffs/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/18.msdiffs SRCS= ms.diffs MACROS= -ms diff --git a/share/doc/usd/19.memacros/Makefile b/share/doc/usd/19.memacros/Makefile index e3a00289cd6..547eb25bd81 100644 --- a/share/doc/usd/19.memacros/Makefile +++ b/share/doc/usd/19.memacros/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/19.memacros SRCS= meintro.me-sed MACROS= -me diff --git a/share/doc/usd/20.meref/Makefile b/share/doc/usd/20.meref/Makefile index 0481c80e38f..a0d7fe6cb2e 100644 --- a/share/doc/usd/20.meref/Makefile +++ b/share/doc/usd/20.meref/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/20.meref SRCS= meref.me-sed MACROS= -me diff --git a/share/doc/usd/21.troff/Makefile b/share/doc/usd/21.troff/Makefile index 5360967a700..d2b140dc44b 100644 --- a/share/doc/usd/21.troff/Makefile +++ b/share/doc/usd/21.troff/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd/21.troff SRCS= m.mac m0 m0a m1 m2 m3 m4 m5 table1 table2 USE_TBL= diff --git a/share/doc/usd/Makefile b/share/doc/usd/Makefile index 7f298c60a65..16d98b85506 100644 --- a/share/doc/usd/Makefile +++ b/share/doc/usd/Makefile @@ -1,4 +1,3 @@ - # The following modules are not provided: # 14.jove diff --git a/share/doc/usd/contents/Makefile b/share/doc/usd/contents/Makefile index d2052ccce94..860f1199707 100644 --- a/share/doc/usd/contents/Makefile +++ b/share/doc/usd/contents/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd DOC= contents SRCS= contents.ms diff --git a/share/doc/usd/title/Makefile b/share/doc/usd/title/Makefile index 8d1adca5b9f..3a0b41aee33 100644 --- a/share/doc/usd/title/Makefile +++ b/share/doc/usd/title/Makefile @@ -1,4 +1,3 @@ - VOLUME= usd DOC= Title SRCS= Title diff --git a/share/examples/FreeBSD_version/Makefile b/share/examples/FreeBSD_version/Makefile index 13d60978e86..9c74916dd6b 100644 --- a/share/examples/FreeBSD_version/Makefile +++ b/share/examples/FreeBSD_version/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= FreeBSD_version diff --git a/share/examples/find_interface/Makefile b/share/examples/find_interface/Makefile index 91ce0eb8807..23d02a2002d 100644 --- a/share/examples/find_interface/Makefile +++ b/share/examples/find_interface/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= find_interface diff --git a/share/examples/hwpmc/Makefile b/share/examples/hwpmc/Makefile index fcbb6160bb0..c7d1c54b1d1 100644 --- a/share/examples/hwpmc/Makefile +++ b/share/examples/hwpmc/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/hwpmc PROG= overhead diff --git a/share/examples/ipfilter/Makefile b/share/examples/ipfilter/Makefile index b1b8b57449f..ec4d4be3dd2 100644 --- a/share/examples/ipfilter/Makefile +++ b/share/examples/ipfilter/Makefile @@ -1,4 +1,3 @@ - PACKAGE=ipf FILES= README diff --git a/share/examples/kld/cdev/Makefile b/share/examples/kld/cdev/Makefile index 706cb2dcbae..8c7662243b3 100644 --- a/share/examples/kld/cdev/Makefile +++ b/share/examples/kld/cdev/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/cdev SUBDIR= module test diff --git a/share/examples/kld/dyn_sysctl/Makefile b/share/examples/kld/dyn_sysctl/Makefile index 0dffd9c8e7b..e47eb3f339b 100644 --- a/share/examples/kld/dyn_sysctl/Makefile +++ b/share/examples/kld/dyn_sysctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/${KMOD} SRCS = dyn_sysctl.c diff --git a/share/examples/kld/firmware/Makefile b/share/examples/kld/firmware/Makefile index b4b144a7669..5e31deaa17e 100644 --- a/share/examples/kld/firmware/Makefile +++ b/share/examples/kld/firmware/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/firmware SUBDIR= fwimage fwconsumer diff --git a/share/examples/kld/firmware/fwconsumer/Makefile b/share/examples/kld/firmware/fwconsumer/Makefile index b2968499912..ce4f77d41d8 100644 --- a/share/examples/kld/firmware/fwconsumer/Makefile +++ b/share/examples/kld/firmware/fwconsumer/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/fwconsumer KMOD= fw_consumer diff --git a/share/examples/kld/firmware/fwimage/Makefile b/share/examples/kld/firmware/fwimage/Makefile index 1e0e3ff3ca9..b57d2bf326b 100644 --- a/share/examples/kld/firmware/fwimage/Makefile +++ b/share/examples/kld/firmware/fwimage/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/fwimage KMOD= beastie diff --git a/share/examples/kld/khelp/Makefile b/share/examples/kld/khelp/Makefile index 7cbaa79ceda..dfdf602a468 100644 --- a/share/examples/kld/khelp/Makefile +++ b/share/examples/kld/khelp/Makefile @@ -1,4 +1,3 @@ - .include # Change if the src tree you are compiling for is not in /usr/src diff --git a/share/examples/kld/random_adaptor/Makefile b/share/examples/kld/random_adaptor/Makefile index c391da795e8..c9011bb2dba 100644 --- a/share/examples/kld/random_adaptor/Makefile +++ b/share/examples/kld/random_adaptor/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/${KMOD} KMOD= random_adaptor_example diff --git a/share/examples/kld/syscall/Makefile b/share/examples/kld/syscall/Makefile index efae887771e..4270f388bd1 100644 --- a/share/examples/kld/syscall/Makefile +++ b/share/examples/kld/syscall/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/kld/syscall SUBDIR= module test diff --git a/share/examples/libusb20/Makefile b/share/examples/libusb20/Makefile index 262f1ac3825..9c0524c00b2 100644 --- a/share/examples/libusb20/Makefile +++ b/share/examples/libusb20/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/libusb20 TARGETS= bulk control diff --git a/share/examples/libvgl/Makefile b/share/examples/libvgl/Makefile index ebfa7eaa47e..8bb99eb795b 100644 --- a/share/examples/libvgl/Makefile +++ b/share/examples/libvgl/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/libvgl PROG= demo diff --git a/share/examples/perfmon/Makefile b/share/examples/perfmon/Makefile index a687980e780..96712dee88e 100644 --- a/share/examples/perfmon/Makefile +++ b/share/examples/perfmon/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= perfmon diff --git a/share/examples/pf/Makefile b/share/examples/pf/Makefile index 4ea4f9c79bb..3107fa346c6 100644 --- a/share/examples/pf/Makefile +++ b/share/examples/pf/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILES= faq-example1 faq-example2 faq-example3 \ ackpri queue1 queue2 queue3 queue4 \ diff --git a/share/examples/scsi_target/Makefile b/share/examples/scsi_target/Makefile index 1e2c076591b..42dd2ca5851 100644 --- a/share/examples/scsi_target/Makefile +++ b/share/examples/scsi_target/Makefile @@ -1,4 +1,3 @@ - PACKAGE=examples FILESDIR=${SHAREDIR}/examples/${PROG} PROG= scsi_target diff --git a/share/examples/smbfs/Makefile b/share/examples/smbfs/Makefile index e3830514800..cd235434db7 100644 --- a/share/examples/smbfs/Makefile +++ b/share/examples/smbfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE=utilities FILESDIR= ${SHAREDIR}/examples/smbfs FILES= dot.nsmbrc diff --git a/share/examples/smbfs/print/Makefile b/share/examples/smbfs/print/Makefile index 0a0fd500724..a8a6e12e701 100644 --- a/share/examples/smbfs/print/Makefile +++ b/share/examples/smbfs/print/Makefile @@ -1,4 +1,3 @@ - PACKAGE=utilities FILESDIR= ${SHAREDIR}/examples/smbfs/print FILES= lj6l ljspool printcap.sample tolj diff --git a/share/examples/tests/Makefile b/share/examples/tests/Makefile index 8f257929d60..6aea074e254 100644 --- a/share/examples/tests/Makefile +++ b/share/examples/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tests .PATH: ${SRCTOP}/tests diff --git a/share/examples/tests/tests/Makefile b/share/examples/tests/tests/Makefile index ecaa1b5b903..4530e341aa3 100644 --- a/share/examples/tests/tests/Makefile +++ b/share/examples/tests/tests/Makefile @@ -1,4 +1,3 @@ - .include # Directory into which the Kyuafile provided by this directory will be diff --git a/share/examples/tests/tests/atf/Makefile b/share/examples/tests/tests/atf/Makefile index 7614767b6e0..72c2e546d3f 100644 --- a/share/examples/tests/tests/atf/Makefile +++ b/share/examples/tests/tests/atf/Makefile @@ -1,4 +1,3 @@ - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support diff --git a/share/examples/tests/tests/plain/Makefile b/share/examples/tests/tests/plain/Makefile index 462324309f6..40f4e7041b1 100644 --- a/share/examples/tests/tests/plain/Makefile +++ b/share/examples/tests/tests/plain/Makefile @@ -1,4 +1,3 @@ - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support diff --git a/share/examples/tests/tests/tap/Makefile b/share/examples/tests/tests/tap/Makefile index 86d3f680504..af906b30935 100644 --- a/share/examples/tests/tests/tap/Makefile +++ b/share/examples/tests/tests/tap/Makefile @@ -1,4 +1,3 @@ - # The release package to use for the tests contained within the directory # # This applies to components which rely on ^/projects/release-pkg support diff --git a/share/i18n/csmapper/Makefile.inc b/share/i18n/csmapper/Makefile.inc index 798a0ab4f50..9bbbbed5020 100644 --- a/share/i18n/csmapper/Makefile.inc +++ b/share/i18n/csmapper/Makefile.inc @@ -1,4 +1,3 @@ - .include CSMAPPERDIR?= /usr/share/i18n/csmapper diff --git a/share/i18n/esdb/Makefile.inc b/share/i18n/esdb/Makefile.inc index 8db77ae0711..e072ef592aa 100644 --- a/share/i18n/esdb/Makefile.inc +++ b/share/i18n/esdb/Makefile.inc @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR} diff --git a/share/keys/Makefile b/share/keys/Makefile index b51ccc17626..f4bab152d8c 100644 --- a/share/keys/Makefile +++ b/share/keys/Makefile @@ -1,4 +1,3 @@ - SUBDIR= pkg .include diff --git a/share/keys/pkg/Makefile b/share/keys/pkg/Makefile index 2fd00019107..665bcf389da 100644 --- a/share/keys/pkg/Makefile +++ b/share/keys/pkg/Makefile @@ -1,4 +1,3 @@ - SUBDIR= trusted .include diff --git a/share/keys/pkg/trusted/Makefile b/share/keys/pkg/trusted/Makefile index 15044f1c9a4..cb550d1d71f 100644 --- a/share/keys/pkg/trusted/Makefile +++ b/share/keys/pkg/trusted/Makefile @@ -1,4 +1,3 @@ - PACKAGE= pkg-bootstrap FILES= pkg.freebsd.org.2013102301 diff --git a/share/man/Makefile b/share/man/Makefile index cf91101a27f..51e560e199a 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,4 +1,3 @@ - .include # XXX MISSING: man3f diff --git a/share/man/man1/Makefile b/share/man/man1/Makefile index 04f05920c9a..e5ab6597ead 100644 --- a/share/man/man1/Makefile +++ b/share/man/man1/Makefile @@ -1,4 +1,3 @@ - .include MAN= builtin.1 intro.1 diff --git a/share/man/man3/Makefile b/share/man/man3/Makefile index 5c8dced7174..1d8586e48f9 100644 --- a/share/man/man3/Makefile +++ b/share/man/man3/Makefile @@ -1,4 +1,3 @@ - .include MAN= arb.3 \ diff --git a/share/man/man3lua/Makefile b/share/man/man3lua/Makefile index 35555988b6a..6f95a27ac30 100644 --- a/share/man/man3lua/Makefile +++ b/share/man/man3lua/Makefile @@ -1,4 +1,3 @@ - .include MAN= intro.3lua diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 69424a4be27..36d945d64a6 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -1,4 +1,3 @@ - .include MAN= aac.4 \ diff --git a/share/man/man4/man4.aarch64/Makefile b/share/man/man4/man4.aarch64/Makefile index a0161f8f490..aca11eeb583 100644 --- a/share/man/man4/man4.aarch64/Makefile +++ b/share/man/man4/man4.aarch64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../man4.arm # Some manpages are common to arm and aarch64 MAN= \ diff --git a/share/man/man4/man4.arm/Makefile b/share/man/man4/man4.arm/Makefile index e2a41559410..b5d49d0dffb 100644 --- a/share/man/man4/man4.arm/Makefile +++ b/share/man/man4/man4.arm/Makefile @@ -1,4 +1,3 @@ - MAN= \ aw_gpio.4 \ aw_mmc.4 \ diff --git a/share/man/man4/man4.i386/Makefile b/share/man/man4/man4.i386/Makefile index f84f0797a62..ad9b3a01828 100644 --- a/share/man/man4/man4.i386/Makefile +++ b/share/man/man4/man4.i386/Makefile @@ -1,4 +1,3 @@ - MAN= apm.4 \ CPU_ELAN.4 \ glxiic.4 \ diff --git a/share/man/man4/man4.powerpc/Makefile b/share/man/man4/man4.powerpc/Makefile index dbc133cc985..1762bf17b50 100644 --- a/share/man/man4/man4.powerpc/Makefile +++ b/share/man/man4/man4.powerpc/Makefile @@ -1,4 +1,3 @@ - MAN= adb.4 \ akbd.4 \ abtn.4 \ diff --git a/share/man/man5/Makefile b/share/man/man5/Makefile index 465cc85a3fe..553bedddeea 100644 --- a/share/man/man5/Makefile +++ b/share/man/man5/Makefile @@ -1,4 +1,3 @@ - .include #MISSING: dump.5 plot.5 diff --git a/share/man/man6/Makefile b/share/man/man6/Makefile index b97fae54a03..9c94781169f 100644 --- a/share/man/man6/Makefile +++ b/share/man/man6/Makefile @@ -1,4 +1,3 @@ - MAN= intro.6 .include diff --git a/share/man/man7/Makefile b/share/man/man7/Makefile index b83399b2917..67cca438a46 100644 --- a/share/man/man7/Makefile +++ b/share/man/man7/Makefile @@ -1,4 +1,3 @@ - .include #MISSING: eqnchar.7 ms.7 term.7 diff --git a/share/man/man8/Makefile b/share/man/man8/Makefile index 1e2c22e97d8..bd6bdfe4ba0 100644 --- a/share/man/man8/Makefile +++ b/share/man/man8/Makefile @@ -1,4 +1,3 @@ - .include MAN= \ diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 35eec7b2c6c..9880b7b2f5e 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -1,4 +1,3 @@ - .include MAN= accept_filter.9 \ diff --git a/share/misc/Makefile b/share/misc/Makefile index bd560db25c7..d92a359ec36 100644 --- a/share/misc/Makefile +++ b/share/misc/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/../../sys/dev/usb diff --git a/share/mk/Makefile b/share/mk/Makefile index 096dc2ede00..85b39a9c72e 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,3 @@ - # Only parse this if executing make in this directory, not in other places # in src that lack a Makefile, such as sys/dev/*. Otherwise the MAKESYSPATH # will read this Makefile since it auto includes it into -I. diff --git a/share/numericdef/Makefile b/share/numericdef/Makefile index 4835486036a..95469fd68dd 100644 --- a/share/numericdef/Makefile +++ b/share/numericdef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_NUMERIC diff --git a/share/security/Makefile b/share/security/Makefile index 31de6284f91..44d116aa472 100644 --- a/share/security/Makefile +++ b/share/security/Makefile @@ -1,4 +1,3 @@ - FILES= lomac-policy.contexts FILESDIR= ${BINDIR}/security diff --git a/share/skel/Makefile b/share/skel/Makefile index fa0c97066dd..0cd718b6ad2 100644 --- a/share/skel/Makefile +++ b/share/skel/Makefile @@ -1,4 +1,3 @@ - FILES= dot.cshrc dot.login dot.login_conf dot.mailrc dot.profile \ dot.shrc dot.mail_aliases FILESDIR= ${SHAREDIR}/skel diff --git a/share/snmp/Makefile b/share/snmp/Makefile index 6e1e93019ca..95efeec23a7 100644 --- a/share/snmp/Makefile +++ b/share/snmp/Makefile @@ -1,4 +1,3 @@ - SUBDIR= mibs .include diff --git a/share/snmp/mibs/Makefile b/share/snmp/mibs/Makefile index 023cbf26e01..29be45a8daf 100644 --- a/share/snmp/mibs/Makefile +++ b/share/snmp/mibs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bsnmp FILES= FREEBSD-MIB.txt diff --git a/share/syscons/Makefile b/share/syscons/Makefile index 2bff5fcb639..aa192093782 100644 --- a/share/syscons/Makefile +++ b/share/syscons/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fonts keymaps scrnmaps SUBDIR_PARALLEL= diff --git a/share/syscons/Makefile.inc b/share/syscons/Makefile.inc index 0b22547cec2..07cde30e3d5 100644 --- a/share/syscons/Makefile.inc +++ b/share/syscons/Makefile.inc @@ -1,2 +1 @@ - FILESPACKAGE= syscons diff --git a/share/syscons/fonts/Makefile b/share/syscons/fonts/Makefile index 8dfd012c910..e1b6614b568 100644 --- a/share/syscons/fonts/Makefile +++ b/share/syscons/fonts/Makefile @@ -1,4 +1,3 @@ - PACKAGE= syscons-data FILES= armscii8-8x8.fnt armscii8-8x14.fnt armscii8-8x16.fnt \ diff --git a/share/syscons/keymaps/Makefile b/share/syscons/keymaps/Makefile index a8aaa08c47d..139834abcd2 100644 --- a/share/syscons/keymaps/Makefile +++ b/share/syscons/keymaps/Makefile @@ -1,4 +1,3 @@ - PACKAGE= syscons-data FILES= INDEX.keymaps \ diff --git a/share/syscons/scrnmaps/Makefile b/share/syscons/scrnmaps/Makefile index b7e94fd1629..8da31ed32be 100644 --- a/share/syscons/scrnmaps/Makefile +++ b/share/syscons/scrnmaps/Makefile @@ -1,4 +1,3 @@ - PACKAGE= syscons-data SCRMAPS = armscii8-2haik8.scm \ diff --git a/share/tabset/Makefile b/share/tabset/Makefile index a2339005212..fe751908471 100644 --- a/share/tabset/Makefile +++ b/share/tabset/Makefile @@ -1,4 +1,3 @@ - FILES= 3101 9837 aa aed512 beehive diablo dtc382 hp700-wy ibm3101 std \ stdcrt tandem653 teleray vt100 vt100-w wyse-adds xerox1720 xerox1730 \ xerox1730-lm zenith29 diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 3bddf790b80..34ad41fd520 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,4 +1,3 @@ - # reorder gives an editor command for most common terminals # (in reverse order from n'th to 1'st most commonly used) # to move them to the front of termcap diff --git a/share/tests/Makefile b/share/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/share/tests/Makefile +++ b/share/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/share/timedef/Makefile b/share/timedef/Makefile index f8cb183c032..d09a7d33db3 100644 --- a/share/timedef/Makefile +++ b/share/timedef/Makefile @@ -1,4 +1,3 @@ - PACKAGE= locales LOCALEDIR= ${SHAREDIR}/locale FILESNAME= LC_TIME diff --git a/share/vt/Makefile b/share/vt/Makefile index 91465c65776..51c237e7ac8 100644 --- a/share/vt/Makefile +++ b/share/vt/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fonts keymaps .include diff --git a/share/vt/fonts/Makefile b/share/vt/fonts/Makefile index a5a1ef981a9..01f56a235e5 100644 --- a/share/vt/fonts/Makefile +++ b/share/vt/fonts/Makefile @@ -1,4 +1,3 @@ - PACKAGE= vt-data .PATH: ${SRCTOP}/contrib/spleen diff --git a/share/vt/keymaps/Makefile b/share/vt/keymaps/Makefile index bcfd6abaa4e..52b7c616c8b 100644 --- a/share/vt/keymaps/Makefile +++ b/share/vt/keymaps/Makefile @@ -1,4 +1,3 @@ - PACKAGE= vt-data FILES= INDEX.keymaps \ diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index d4b37ce991a..824dda827e4 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -1,4 +1,3 @@ - # # HOW TO UPDATE THE ZONEINFO DATA # diff --git a/share/zoneinfo/tests/Makefile b/share/zoneinfo/tests/Makefile index 97d47d3a150..7e8c05a3bc7 100644 --- a/share/zoneinfo/tests/Makefile +++ b/share/zoneinfo/tests/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tzdata diff --git a/stand/Makefile b/stand/Makefile index 6d0d7a09672..225113384b1 100644 --- a/stand/Makefile +++ b/stand/Makefile @@ -1,4 +1,3 @@ - .include # For amd64 we have to build 32 and 64 bit versions of things. For diff --git a/stand/Makefile.amd64 b/stand/Makefile.amd64 index 82b3f0def22..48e5136ec33 100644 --- a/stand/Makefile.amd64 +++ b/stand/Makefile.amd64 @@ -1,4 +1,3 @@ - S.yes+= userboot S.yes+= i386 diff --git a/stand/Makefile.inc b/stand/Makefile.inc index 391de6abc6d..5d55c4e4a16 100644 --- a/stand/Makefile.inc +++ b/stand/Makefile.inc @@ -1,4 +1,3 @@ - SUBDIR_PARALLEL= yes # Firmware may not be able to handle branch protection failures diff --git a/stand/arm64/Makefile b/stand/arm64/Makefile index c378e5b10df..eb7a92885d7 100644 --- a/stand/arm64/Makefile +++ b/stand/arm64/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/defaults/Makefile b/stand/defaults/Makefile index ae382b9af69..f3ee630a9c1 100644 --- a/stand/defaults/Makefile +++ b/stand/defaults/Makefile @@ -1,4 +1,3 @@ - .include FILES+= loader.conf diff --git a/stand/efi/Makefile b/stand/efi/Makefile index 5177ea688ed..c6ef92b2683 100644 --- a/stand/efi/Makefile +++ b/stand/efi/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/efi/Makefile.inc b/stand/efi/Makefile.inc index a27eb5d9748..3a13ca24f36 100644 --- a/stand/efi/Makefile.inc +++ b/stand/efi/Makefile.inc @@ -1,4 +1,3 @@ - # Options used when building app-specific efi components # See conf/kern.mk for the correct set of these CFLAGS+= -Wformat diff --git a/stand/efi/boot1/Makefile b/stand/efi/boot1/Makefile index 607c30f10cf..8641ecf457a 100644 --- a/stand/efi/boot1/Makefile +++ b/stand/efi/boot1/Makefile @@ -1,4 +1,3 @@ - .include BOOT1?= boot1 diff --git a/stand/efi/fdt/Makefile b/stand/efi/fdt/Makefile index 518d7a75dc6..bbb380f5218 100644 --- a/stand/efi/fdt/Makefile +++ b/stand/efi/fdt/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${LDRSRC} diff --git a/stand/efi/libefi/Makefile b/stand/efi/libefi/Makefile index 7bc0184e206..8ce57280d61 100644 --- a/stand/efi/libefi/Makefile +++ b/stand/efi/libefi/Makefile @@ -1,4 +1,3 @@ - .include LIB= efi diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 946ea0937de..057cb15fb7f 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -1,4 +1,3 @@ - LOADER_NET_SUPPORT?= yes LOADER_MSDOS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes diff --git a/stand/efi/loader/arch/amd64/Makefile.inc b/stand/efi/loader/arch/amd64/Makefile.inc index 00658b3b863..25ff8fa9ce5 100644 --- a/stand/efi/loader/arch/amd64/Makefile.inc +++ b/stand/efi/loader/arch/amd64/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= amd64_tramp.S \ start.S \ elf64_freebsd.c \ diff --git a/stand/efi/loader/arch/arm/Makefile.inc b/stand/efi/loader/arch/arm/Makefile.inc index 5761c806211..3d07122530e 100644 --- a/stand/efi/loader/arch/arm/Makefile.inc +++ b/stand/efi/loader/arch/arm/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= exec.c \ start.S diff --git a/stand/efi/loader/arch/arm64/Makefile.inc b/stand/efi/loader/arch/arm64/Makefile.inc index d19a23af0e9..9474767cf2f 100644 --- a/stand/efi/loader/arch/arm64/Makefile.inc +++ b/stand/efi/loader/arch/arm64/Makefile.inc @@ -1,4 +1,3 @@ - HAVE_FDT=yes SRCS+= exec.c \ diff --git a/stand/efi/loader/arch/riscv/Makefile.inc b/stand/efi/loader/arch/riscv/Makefile.inc index c25f63c0b3b..e7f7fd8b7f4 100644 --- a/stand/efi/loader/arch/riscv/Makefile.inc +++ b/stand/efi/loader/arch/riscv/Makefile.inc @@ -1,4 +1,3 @@ - HAVE_FDT=yes SRCS+= exec.c \ diff --git a/stand/efi/loader_4th/Makefile b/stand/efi/loader_4th/Makefile index 3ca07866843..2361952ccc5 100644 --- a/stand/efi/loader_4th/Makefile +++ b/stand/efi/loader_4th/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=4th INSTALL_LOADER_HELP_FILE=no diff --git a/stand/efi/loader_lua/Makefile b/stand/efi/loader_lua/Makefile index 6866e742290..628aab34c0b 100644 --- a/stand/efi/loader_lua/Makefile +++ b/stand/efi/loader_lua/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=lua INSTALL_LOADER_HELP_FILE=no diff --git a/stand/efi/loader_simp/Makefile b/stand/efi/loader_simp/Makefile index ac873c1a303..2e10a6595ed 100644 --- a/stand/efi/loader_simp/Makefile +++ b/stand/efi/loader_simp/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=simp .include "../loader/Makefile" diff --git a/stand/fdt/Makefile b/stand/fdt/Makefile index b0090be108a..f585d8a2098 100644 --- a/stand/fdt/Makefile +++ b/stand/fdt/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SYSDIR}/contrib/libfdt/ diff --git a/stand/ficl32/Makefile b/stand/ficl32/Makefile index c231b51cac8..4851e0b8f97 100644 --- a/stand/ficl32/Makefile +++ b/stand/ficl32/Makefile @@ -1,4 +1,3 @@ - DO32=1 .include "${.CURDIR}/../ficl/Makefile" diff --git a/stand/fonts/Makefile b/stand/fonts/Makefile index 88e7d0f9104..3ac1b0bac95 100644 --- a/stand/fonts/Makefile +++ b/stand/fonts/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/terminus diff --git a/stand/forth/Makefile b/stand/forth/Makefile index 0fcee14fcdf..d362863a097 100644 --- a/stand/forth/Makefile +++ b/stand/forth/Makefile @@ -1,4 +1,3 @@ - .include MAN+= beastie.4th.8 \ diff --git a/stand/i386/Makefile b/stand/i386/Makefile index e323a2cef9c..a08e956ef4f 100644 --- a/stand/i386/Makefile +++ b/stand/i386/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/i386/boot0/Makefile b/stand/i386/boot0/Makefile index bfd566dfa45..e9c6b2281e3 100644 --- a/stand/i386/boot0/Makefile +++ b/stand/i386/boot0/Makefile @@ -1,4 +1,3 @@ - PROG?= boot0 STRIP= BINMODE=${NOBINMODE} diff --git a/stand/i386/boot0sio/Makefile b/stand/i386/boot0sio/Makefile index 1725a11ec32..3c883a7d93d 100644 --- a/stand/i386/boot0sio/Makefile +++ b/stand/i386/boot0sio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../boot0 PROGNAME= boot0sio diff --git a/stand/i386/boot2/Makefile b/stand/i386/boot2/Makefile index 6d6a05cf228..313bb8030f3 100644 --- a/stand/i386/boot2/Makefile +++ b/stand/i386/boot2/Makefile @@ -1,4 +1,3 @@ - .include FILES= boot boot1 boot2 diff --git a/stand/i386/btx/Makefile b/stand/i386/btx/Makefile index 8ab9e72c548..c055927ae59 100644 --- a/stand/i386/btx/Makefile +++ b/stand/i386/btx/Makefile @@ -1,4 +1,3 @@ - SUBDIR= btx btxldr lib .include diff --git a/stand/i386/btx/Makefile.inc b/stand/i386/btx/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/stand/i386/btx/Makefile.inc +++ b/stand/i386/btx/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/stand/i386/btx/btx/Makefile b/stand/i386/btx/btx/Makefile index bfb9edcd1d3..6812115213d 100644 --- a/stand/i386/btx/btx/Makefile +++ b/stand/i386/btx/btx/Makefile @@ -1,4 +1,3 @@ - .include PROG= btx diff --git a/stand/i386/btx/btxldr/Makefile b/stand/i386/btx/btxldr/Makefile index 83eaf7d2beb..ef3a04bf12f 100644 --- a/stand/i386/btx/btxldr/Makefile +++ b/stand/i386/btx/btxldr/Makefile @@ -1,4 +1,3 @@ - .include PROG= btxldr diff --git a/stand/i386/btx/lib/Makefile b/stand/i386/btx/lib/Makefile index 11d8e05b7f6..ae7ebc33118 100644 --- a/stand/i386/btx/lib/Makefile +++ b/stand/i386/btx/lib/Makefile @@ -1,4 +1,3 @@ - .include PROG= crt0.o diff --git a/stand/i386/cdboot/Makefile b/stand/i386/cdboot/Makefile index 7923e258fb6..c66ff68105c 100644 --- a/stand/i386/cdboot/Makefile +++ b/stand/i386/cdboot/Makefile @@ -1,4 +1,3 @@ - .include PROG= cdboot diff --git a/stand/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile index cce5e2e88d5..b91875d242f 100644 --- a/stand/i386/gptboot/Makefile +++ b/stand/i386/gptboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common ${SASRC} diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile index 03f89191288..0d9fa8b043d 100644 --- a/stand/i386/gptzfsboot/Makefile +++ b/stand/i386/gptzfsboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \ diff --git a/stand/i386/isoboot/Makefile b/stand/i386/isoboot/Makefile index 12be31b52bc..7973f8029aa 100644 --- a/stand/i386/isoboot/Makefile +++ b/stand/i386/isoboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/gptboot \ diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile index 8608c369a11..038557c6a82 100644 --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -1,4 +1,3 @@ - .include LIB= i386 diff --git a/stand/i386/loader_4th/Makefile b/stand/i386/loader_4th/Makefile index 3ca07866843..2361952ccc5 100644 --- a/stand/i386/loader_4th/Makefile +++ b/stand/i386/loader_4th/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=4th INSTALL_LOADER_HELP_FILE=no diff --git a/stand/i386/loader_lua/Makefile b/stand/i386/loader_lua/Makefile index 6866e742290..628aab34c0b 100644 --- a/stand/i386/loader_lua/Makefile +++ b/stand/i386/loader_lua/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=lua INSTALL_LOADER_HELP_FILE=no diff --git a/stand/i386/loader_simp/Makefile b/stand/i386/loader_simp/Makefile index ac873c1a303..2e10a6595ed 100644 --- a/stand/i386/loader_simp/Makefile +++ b/stand/i386/loader_simp/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=simp .include "../loader/Makefile" diff --git a/stand/i386/mbr/Makefile b/stand/i386/mbr/Makefile index ce38590bf85..f9dd023ea9b 100644 --- a/stand/i386/mbr/Makefile +++ b/stand/i386/mbr/Makefile @@ -1,4 +1,3 @@ - PROG= mbr STRIP= BINMODE=${NOBINMODE} diff --git a/stand/i386/pmbr/Makefile b/stand/i386/pmbr/Makefile index 30a5e37b0e4..80b79f7b8c8 100644 --- a/stand/i386/pmbr/Makefile +++ b/stand/i386/pmbr/Makefile @@ -1,4 +1,3 @@ - PROG= pmbr STRIP= BINMODE=${NOBINMODE} diff --git a/stand/i386/pxeldr/Makefile b/stand/i386/pxeldr/Makefile index b2ecedd4594..a303aff413a 100644 --- a/stand/i386/pxeldr/Makefile +++ b/stand/i386/pxeldr/Makefile @@ -1,4 +1,3 @@ - .include PROG= ${LDR} diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile index dcfac140231..b619b84c368 100644 --- a/stand/i386/zfsboot/Makefile +++ b/stand/i386/zfsboot/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${BOOTSRC}/i386/boot2 ${BOOTSRC}/i386/common ${BOOTSRC}/common diff --git a/stand/images/Makefile b/stand/images/Makefile index 44d2faf36e5..d1e7d124dfa 100644 --- a/stand/images/Makefile +++ b/stand/images/Makefile @@ -1,4 +1,3 @@ - .include FILES+= freebsd-brand-rev.png freebsd-brand.png freebsd-logo-rev.png diff --git a/stand/kboot/kboot/Makefile b/stand/kboot/kboot/Makefile index c6cb47fbbba..d354e1bc7e6 100644 --- a/stand/kboot/kboot/Makefile +++ b/stand/kboot/kboot/Makefile @@ -1,4 +1,3 @@ - LOADER_DISK_SUPPORT?= yes LOADER_CD9660_SUPPORT?= yes LOADER_MSDOS_SUPPORT?= no diff --git a/stand/liblua/Makefile b/stand/liblua/Makefile index b0d89bec4f0..ce7eb89fe49 100644 --- a/stand/liblua/Makefile +++ b/stand/liblua/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${LUASRC} diff --git a/stand/liblua32/Makefile b/stand/liblua32/Makefile index 1093e454385..292fff71a95 100644 --- a/stand/liblua32/Makefile +++ b/stand/liblua32/Makefile @@ -1,4 +1,3 @@ - DO32=1 .include "${.CURDIR}/../liblua/Makefile" diff --git a/stand/libofw/Makefile b/stand/libofw/Makefile index 79d52023d63..3d4c70dcfc1 100644 --- a/stand/libofw/Makefile +++ b/stand/libofw/Makefile @@ -1,4 +1,3 @@ - .include LIB= ofw diff --git a/stand/libsa/zfs/Makefile.inc b/stand/libsa/zfs/Makefile.inc index 15ec82626b8..7c94c2184eb 100644 --- a/stand/libsa/zfs/Makefile.inc +++ b/stand/libsa/zfs/Makefile.inc @@ -1,4 +1,3 @@ - .PATH: ${ZFSSRC} .PATH: ${SYSDIR}/crypto/skein .PATH: ${ZFSOSSRC}/spl diff --git a/stand/libsa32/Makefile b/stand/libsa32/Makefile index 4c62c79e01f..7dea1efd005 100644 --- a/stand/libsa32/Makefile +++ b/stand/libsa32/Makefile @@ -1,4 +1,3 @@ - DO32=1 .include diff --git a/stand/lua/Makefile b/stand/lua/Makefile index 4462a803bee..3cec7ae3b05 100644 --- a/stand/lua/Makefile +++ b/stand/lua/Makefile @@ -1,4 +1,3 @@ - .include MAN= loader.conf.lua.5 \ diff --git a/stand/man/Makefile b/stand/man/Makefile index 2f58c1ee617..1075c2e831c 100644 --- a/stand/man/Makefile +++ b/stand/man/Makefile @@ -1,4 +1,3 @@ - .include M.${MK_EFI}+= boot1.efi.8 diff --git a/stand/powerpc/Makefile b/stand/powerpc/Makefile index 4ac319c6f9e..c6403f324ba 100644 --- a/stand/powerpc/Makefile +++ b/stand/powerpc/Makefile @@ -1,4 +1,3 @@ - NO_OBJ=t .include diff --git a/stand/powerpc/Makefile.inc b/stand/powerpc/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/stand/powerpc/Makefile.inc +++ b/stand/powerpc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/stand/powerpc/boot1.chrp/Makefile b/stand/powerpc/boot1.chrp/Makefile index 11b9e356219..e67414584bc 100644 --- a/stand/powerpc/boot1.chrp/Makefile +++ b/stand/powerpc/boot1.chrp/Makefile @@ -1,4 +1,3 @@ - .include PROG= boot1.elf diff --git a/stand/powerpc/ofw/Makefile b/stand/powerpc/ofw/Makefile index 80ebaf48629..552e828b761 100644 --- a/stand/powerpc/ofw/Makefile +++ b/stand/powerpc/ofw/Makefile @@ -1,4 +1,3 @@ - LOADER_CD9660_SUPPORT?= yes LOADER_EXT2FS_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile index 791cfcb47bf..becca47944d 100644 --- a/stand/uboot/Makefile +++ b/stand/uboot/Makefile @@ -1,4 +1,3 @@ - LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_MSDOS_SUPPORT?= no diff --git a/stand/uboot/arch/powerpc/Makefile.inc b/stand/uboot/arch/powerpc/Makefile.inc index 226cfc2f736..555eef94f1c 100644 --- a/stand/uboot/arch/powerpc/Makefile.inc +++ b/stand/uboot/arch/powerpc/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= start.S conf.c ppc64_elf_freebsd.c .PATH: ${SYSDIR}/libkern SRCS+= ucmpdi2.c diff --git a/stand/usb/tools/Makefile b/stand/usb/tools/Makefile index 8b851e5788b..30144ea5fc2 100644 --- a/stand/usb/tools/Makefile +++ b/stand/usb/tools/Makefile @@ -1,4 +1,3 @@ - PROG= sysinit MAN= diff --git a/stand/userboot/Makefile b/stand/userboot/Makefile index dd71908f857..f783c93eede 100644 --- a/stand/userboot/Makefile +++ b/stand/userboot/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR.yes= test diff --git a/stand/userboot/Makefile.inc b/stand/userboot/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/stand/userboot/Makefile.inc +++ b/stand/userboot/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/stand/userboot/test/Makefile b/stand/userboot/test/Makefile index 0ccec7e8f93..9e097ac6426 100644 --- a/stand/userboot/test/Makefile +++ b/stand/userboot/test/Makefile @@ -1,4 +1,3 @@ - .include PROG= test diff --git a/stand/userboot/userboot/Makefile b/stand/userboot/userboot/Makefile index 4674672bbec..a1ba1b4d700 100644 --- a/stand/userboot/userboot/Makefile +++ b/stand/userboot/userboot/Makefile @@ -1,4 +1,3 @@ - LOADER_MSDOS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no diff --git a/stand/userboot/userboot_4th/Makefile b/stand/userboot/userboot_4th/Makefile index a1b91b4d075..1f8b1df64cb 100644 --- a/stand/userboot/userboot_4th/Makefile +++ b/stand/userboot/userboot_4th/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=4th INSTALL_LOADER_HELP_FILE=no diff --git a/stand/userboot/userboot_lua/Makefile b/stand/userboot/userboot_lua/Makefile index 4027a9a1539..ae8fc762c86 100644 --- a/stand/userboot/userboot_lua/Makefile +++ b/stand/userboot/userboot_lua/Makefile @@ -1,4 +1,3 @@ - LOADER_INTERP=lua .include "../userboot/Makefile" diff --git a/sys/Makefile b/sys/Makefile index f3702606fc6..e62c085b4a5 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -1,4 +1,3 @@ - # Directories to include in cscope name file and TAGS. CSCOPEDIRS= bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ geom gnu isa kern libkern modules net net80211 \ diff --git a/sys/amd64/Makefile b/sys/amd64/Makefile index 759b12977d1..98d95eaf9b7 100644 --- a/sys/amd64/Makefile +++ b/sys/amd64/Makefile @@ -1,4 +1,3 @@ - # Makefile for amd64 links, tags file # SYS is normally set in Make.tags.inc diff --git a/sys/contrib/device-tree/Makefile b/sys/contrib/device-tree/Makefile index fb51acef7c6..af6871622ca 100644 --- a/sys/contrib/device-tree/Makefile +++ b/sys/contrib/device-tree/Makefile @@ -1,4 +1,3 @@ - DTC ?= dtc CPP ?= cpp diff --git a/sys/contrib/libsodium/contrib/Makefile.am b/sys/contrib/libsodium/contrib/Makefile.am index 2cfe5224884..79228b435ca 100644 --- a/sys/contrib/libsodium/contrib/Makefile.am +++ b/sys/contrib/libsodium/contrib/Makefile.am @@ -1,3 +1,2 @@ - EXTRA_DIST = \ Findsodium.cmake diff --git a/sys/contrib/libsodium/dist-build/Makefile.am b/sys/contrib/libsodium/dist-build/Makefile.am index 3d0a0e637f2..c4c1421b0e5 100644 --- a/sys/contrib/libsodium/dist-build/Makefile.am +++ b/sys/contrib/libsodium/dist-build/Makefile.am @@ -1,4 +1,3 @@ - EXTRA_DIST = \ android-build.sh \ android-arm.sh \ diff --git a/sys/contrib/libsodium/src/Makefile.am b/sys/contrib/libsodium/src/Makefile.am index 64445045e6a..cd132cd3ebd 100644 --- a/sys/contrib/libsodium/src/Makefile.am +++ b/sys/contrib/libsodium/src/Makefile.am @@ -1,3 +1,2 @@ - SUBDIRS = \ libsodium diff --git a/sys/contrib/libsodium/src/libsodium/include/Makefile.am b/sys/contrib/libsodium/src/libsodium/include/Makefile.am index b70c22b39b8..126d346a0ba 100644 --- a/sys/contrib/libsodium/src/libsodium/include/Makefile.am +++ b/sys/contrib/libsodium/src/libsodium/include/Makefile.am @@ -1,4 +1,3 @@ - SODIUM_EXPORT = \ sodium.h \ sodium/core.h \ diff --git a/sys/contrib/libsodium/test/default/Makefile.am b/sys/contrib/libsodium/test/default/Makefile.am index 88d6e2aa921..324943623a2 100644 --- a/sys/contrib/libsodium/test/default/Makefile.am +++ b/sys/contrib/libsodium/test/default/Makefile.am @@ -1,4 +1,3 @@ - EXTRA_DIST = \ cmptest.h \ wintest.bat \ diff --git a/sys/crypto/rijndael/Makefile b/sys/crypto/rijndael/Makefile index 44d91532b47..a2cd780f750 100644 --- a/sys/crypto/rijndael/Makefile +++ b/sys/crypto/rijndael/Makefile @@ -1,4 +1,3 @@ - PROG=test00 MAN= SRCS= ${PROG}.c rijndael-alg-fst.c rijndael-api-fst.c diff --git a/sys/dts/Makefile b/sys/dts/Makefile index 6f771855ea5..99eb23c033c 100644 --- a/sys/dts/Makefile +++ b/sys/dts/Makefile @@ -1,4 +1,3 @@ - SUBDIR=arm powerpc .include diff --git a/sys/dts/Makefile.inc b/sys/dts/Makefile.inc index 9aa907fd12d..7f51725400c 100644 --- a/sys/dts/Makefile.inc +++ b/sys/dts/Makefile.inc @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys test-dts: diff --git a/sys/dts/arm/Makefile b/sys/dts/arm/Makefile index fd046873943..a0cb93ec26d 100644 --- a/sys/dts/arm/Makefile +++ b/sys/dts/arm/Makefile @@ -1,4 +1,3 @@ - DTS!=ls ${.CURDIR}/*.dts all: test-dts diff --git a/sys/dts/arm/Makefile.inc b/sys/dts/arm/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/dts/arm/Makefile.inc +++ b/sys/dts/arm/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/dts/arm/overlays/Makefile b/sys/dts/arm/overlays/Makefile index f3d08520a27..c234bead7d1 100644 --- a/sys/dts/arm/overlays/Makefile +++ b/sys/dts/arm/overlays/Makefile @@ -1,4 +1,3 @@ - DTSO!=ls ${.CURDIR}/*.dtso all: test-dtso diff --git a/sys/dts/arm64/Makefile b/sys/dts/arm64/Makefile index fd046873943..a0cb93ec26d 100644 --- a/sys/dts/arm64/Makefile +++ b/sys/dts/arm64/Makefile @@ -1,4 +1,3 @@ - DTS!=ls ${.CURDIR}/*.dts all: test-dts diff --git a/sys/dts/arm64/Makefile.inc b/sys/dts/arm64/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/dts/arm64/Makefile.inc +++ b/sys/dts/arm64/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/dts/arm64/overlays/Makefile b/sys/dts/arm64/overlays/Makefile index f3d08520a27..c234bead7d1 100644 --- a/sys/dts/arm64/overlays/Makefile +++ b/sys/dts/arm64/overlays/Makefile @@ -1,4 +1,3 @@ - DTSO!=ls ${.CURDIR}/*.dtso all: test-dtso diff --git a/sys/dts/powerpc/Makefile b/sys/dts/powerpc/Makefile index fd046873943..a0cb93ec26d 100644 --- a/sys/dts/powerpc/Makefile +++ b/sys/dts/powerpc/Makefile @@ -1,4 +1,3 @@ - DTS!=ls ${.CURDIR}/*.dts all: test-dts diff --git a/sys/i386/Makefile b/sys/i386/Makefile index 8a174422047..9b9a0004666 100644 --- a/sys/i386/Makefile +++ b/sys/i386/Makefile @@ -1,4 +1,3 @@ - # Makefile for i386 links, tags file # SYS is normally set in Make.tags.inc diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile index 8d553b25c65..f5ff7c61e0e 100644 --- a/sys/modules/3dfx/Makefile +++ b/sys/modules/3dfx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx diff --git a/sys/modules/3dfx_linux/Makefile b/sys/modules/3dfx_linux/Makefile index b6da59fd35c..841faf19f9e 100644 --- a/sys/modules/3dfx_linux/Makefile +++ b/sys/modules/3dfx_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/tdfx KMOD= 3dfx_linux diff --git a/sys/modules/Makefile b/sys/modules/Makefile index be7539e9eae..19c34f81851 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/Makefile.inc b/sys/modules/Makefile.inc index d6f8b49f655..9491a25bfa1 100644 --- a/sys/modules/Makefile.inc +++ b/sys/modules/Makefile.inc @@ -1,2 +1 @@ - SUBDIR_PARALLEL= yes diff --git a/sys/modules/aac/Makefile b/sys/modules/aac/Makefile index 549619098e7..5d5f00ae029 100644 --- a/sys/modules/aac/Makefile +++ b/sys/modules/aac/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aac .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/aac/Makefile.inc b/sys/modules/aac/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/aac/Makefile.inc +++ b/sys/modules/aac/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aac/aac_linux/Makefile b/sys/modules/aac/aac_linux/Makefile index b6ff8221130..96cc7cb0ec7 100644 --- a/sys/modules/aac/aac_linux/Makefile +++ b/sys/modules/aac/aac_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aac KMOD= aac_linux diff --git a/sys/modules/aacraid/Makefile b/sys/modules/aacraid/Makefile index 22815f9b4e5..1d174573e7b 100644 --- a/sys/modules/aacraid/Makefile +++ b/sys/modules/aacraid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aacraid .if ${MACHINE_CPUARCH} == "i386" diff --git a/sys/modules/aacraid/Makefile.inc b/sys/modules/aacraid/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/aacraid/Makefile.inc +++ b/sys/modules/aacraid/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aacraid/aacraid_linux/Makefile b/sys/modules/aacraid/aacraid_linux/Makefile index cf661c61d5a..c0046292cac 100644 --- a/sys/modules/aacraid/aacraid_linux/Makefile +++ b/sys/modules/aacraid/aacraid_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aacraid KMOD= aacraid_linux diff --git a/sys/modules/accf_data/Makefile b/sys/modules/accf_data/Makefile index 10e7e6fa850..6c0d216c136 100644 --- a/sys/modules/accf_data/Makefile +++ b/sys/modules/accf_data/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_data diff --git a/sys/modules/accf_dns/Makefile b/sys/modules/accf_dns/Makefile index c7c780843fe..7fcefcc6956 100644 --- a/sys/modules/accf_dns/Makefile +++ b/sys/modules/accf_dns/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_dns diff --git a/sys/modules/accf_http/Makefile b/sys/modules/accf_http/Makefile index dc491a81974..2c5988b585a 100644 --- a/sys/modules/accf_http/Makefile +++ b/sys/modules/accf_http/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_http diff --git a/sys/modules/accf_tls/Makefile b/sys/modules/accf_tls/Makefile index f45b2f057f0..07fa15319b6 100644 --- a/sys/modules/accf_tls/Makefile +++ b/sys/modules/accf_tls/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= accf_tls diff --git a/sys/modules/acl_nfs4/Makefile b/sys/modules/acl_nfs4/Makefile index ae12090d11a..1ddb8c1558f 100644 --- a/sys/modules/acl_nfs4/Makefile +++ b/sys/modules/acl_nfs4/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= acl_nfs4 SRCS= vnode_if.h subr_acl_nfs4.c diff --git a/sys/modules/acl_posix1e/Makefile b/sys/modules/acl_posix1e/Makefile index f9333de3737..397832f9b89 100644 --- a/sys/modules/acl_posix1e/Makefile +++ b/sys/modules/acl_posix1e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= acl_posix1e SRCS= vnode_if.h subr_acl_posix1e.c diff --git a/sys/modules/acpi/Makefile b/sys/modules/acpi/Makefile index ee921a23aeb..918f5128e5c 100644 --- a/sys/modules/acpi/Makefile +++ b/sys/modules/acpi/Makefile @@ -1,4 +1,3 @@ - SUBDIR= acpi_asus acpi_asus_wmi acpi_dock acpi_fujitsu acpi_hp \ acpi_ged acpi_ibm acpi_panasonic acpi_sony acpi_toshiba \ acpi_video acpi_wmi aibs diff --git a/sys/modules/acpi/Makefile.inc b/sys/modules/acpi/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/acpi/Makefile.inc +++ b/sys/modules/acpi/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/acpi/acpi_asus/Makefile b/sys/modules/acpi/acpi_asus/Makefile index 234fc11c335..15a560c36d1 100644 --- a/sys/modules/acpi/acpi_asus/Makefile +++ b/sys/modules/acpi/acpi_asus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus diff --git a/sys/modules/acpi/acpi_asus_wmi/Makefile b/sys/modules/acpi/acpi_asus_wmi/Makefile index 0e831bf05e4..c202ef8f070 100644 --- a/sys/modules/acpi/acpi_asus_wmi/Makefile +++ b/sys/modules/acpi/acpi_asus_wmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_asus_wmi diff --git a/sys/modules/acpi/acpi_dock/Makefile b/sys/modules/acpi/acpi_dock/Makefile index f9856e1295d..81ab3b98bd0 100644 --- a/sys/modules/acpi/acpi_dock/Makefile +++ b/sys/modules/acpi/acpi_dock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_dock SRCS= acpi_dock.c opt_acpi.h device_if.h bus_if.h acpi_if.h diff --git a/sys/modules/acpi/acpi_fujitsu/Makefile b/sys/modules/acpi/acpi_fujitsu/Makefile index 8053f9891e6..e154efb69d1 100644 --- a/sys/modules/acpi/acpi_fujitsu/Makefile +++ b/sys/modules/acpi/acpi_fujitsu/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_fujitsu diff --git a/sys/modules/acpi/acpi_ged/Makefile b/sys/modules/acpi/acpi_ged/Makefile index 3cfc3b51a21..c435fab4a17 100644 --- a/sys/modules/acpi/acpi_ged/Makefile +++ b/sys/modules/acpi/acpi_ged/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_ged SRCS= acpi_ged.c diff --git a/sys/modules/acpi/acpi_hp/Makefile b/sys/modules/acpi/acpi_hp/Makefile index 0d1a03c30b6..9ab3dadf24a 100644 --- a/sys/modules/acpi/acpi_hp/Makefile +++ b/sys/modules/acpi/acpi_hp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_hp diff --git a/sys/modules/acpi/acpi_ibm/Makefile b/sys/modules/acpi/acpi_ibm/Makefile index 9e815ccc9e8..ac7428ac452 100644 --- a/sys/modules/acpi/acpi_ibm/Makefile +++ b/sys/modules/acpi/acpi_ibm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_ibm SRCS= acpi_ibm.c opt_acpi.h device_if.h bus_if.h acpi_if.h diff --git a/sys/modules/acpi/acpi_panasonic/Makefile b/sys/modules/acpi/acpi_panasonic/Makefile index 60a04cecb57..9062374b25f 100644 --- a/sys/modules/acpi/acpi_panasonic/Makefile +++ b/sys/modules/acpi/acpi_panasonic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_panasonic diff --git a/sys/modules/acpi/acpi_rapidstart/Makefile b/sys/modules/acpi/acpi_rapidstart/Makefile index 109fc30ba1d..088b265d784 100644 --- a/sys/modules/acpi/acpi_rapidstart/Makefile +++ b/sys/modules/acpi/acpi_rapidstart/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_rapidstart diff --git a/sys/modules/acpi/acpi_sony/Makefile b/sys/modules/acpi/acpi_sony/Makefile index b1c93c3d4be..b30738cb0ca 100644 --- a/sys/modules/acpi/acpi_sony/Makefile +++ b/sys/modules/acpi/acpi_sony/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_sony diff --git a/sys/modules/acpi/acpi_toshiba/Makefile b/sys/modules/acpi/acpi_toshiba/Makefile index 2f6190e1524..f60ff2e55d6 100644 --- a/sys/modules/acpi/acpi_toshiba/Makefile +++ b/sys/modules/acpi/acpi_toshiba/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_toshiba diff --git a/sys/modules/acpi/acpi_video/Makefile b/sys/modules/acpi/acpi_video/Makefile index 78c20b705cb..a553612c245 100644 --- a/sys/modules/acpi/acpi_video/Makefile +++ b/sys/modules/acpi/acpi_video/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpica KMOD= acpi_video diff --git a/sys/modules/acpi/acpi_wmi/Makefile b/sys/modules/acpi/acpi_wmi/Makefile index 850be463e07..55ba2f844b4 100644 --- a/sys/modules/acpi/acpi_wmi/Makefile +++ b/sys/modules/acpi/acpi_wmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= acpi_wmi diff --git a/sys/modules/acpi/aibs/Makefile b/sys/modules/acpi/aibs/Makefile index b3af05552f8..346fb491adc 100644 --- a/sys/modules/acpi/aibs/Makefile +++ b/sys/modules/acpi/aibs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/acpi_support KMOD= aibs diff --git a/sys/modules/adlink/Makefile b/sys/modules/adlink/Makefile index 1d5931cfcc9..94e9393279e 100644 --- a/sys/modules/adlink/Makefile +++ b/sys/modules/adlink/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/adlink KMOD= adlink diff --git a/sys/modules/ae/Makefile b/sys/modules/ae/Makefile index b9e1e6bf16b..49024ff58e6 100644 --- a/sys/modules/ae/Makefile +++ b/sys/modules/ae/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ae KMOD= if_ae diff --git a/sys/modules/aesni/Makefile b/sys/modules/aesni/Makefile index 2ae256e40e8..4219182f03f 100644 --- a/sys/modules/aesni/Makefile +++ b/sys/modules/aesni/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/aesni .PATH: ${SRCTOP}/contrib/llvm-project/clang/lib/Headers diff --git a/sys/modules/age/Makefile b/sys/modules/age/Makefile index e1e895222b2..7a78e5de92f 100644 --- a/sys/modules/age/Makefile +++ b/sys/modules/age/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/age KMOD= if_age diff --git a/sys/modules/agp/Makefile b/sys/modules/agp/Makefile index c5ce53d2ef1..d27a78b7e43 100644 --- a/sys/modules/agp/Makefile +++ b/sys/modules/agp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/agp KMOD= agp diff --git a/sys/modules/ahci/Makefile b/sys/modules/ahci/Makefile index b7d8aadc4fc..d79c18397dc 100644 --- a/sys/modules/ahci/Makefile +++ b/sys/modules/ahci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ahci KMOD= ahci diff --git a/sys/modules/aic7xxx/Makefile b/sys/modules/aic7xxx/Makefile index 720a7709a31..6e69a6db223 100644 --- a/sys/modules/aic7xxx/Makefile +++ b/sys/modules/aic7xxx/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ahc ahd firmware: aicasm/aicasm ahdfirmware ahcfirmware diff --git a/sys/modules/aic7xxx/Makefile.inc b/sys/modules/aic7xxx/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/aic7xxx/Makefile.inc +++ b/sys/modules/aic7xxx/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aic7xxx/ahc/Makefile b/sys/modules/aic7xxx/ahc/Makefile index 1ced6c05039..3741d4fb666 100644 --- a/sys/modules/aic7xxx/ahc/Makefile +++ b/sys/modules/aic7xxx/ahc/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/aic7xxx/ahc/Makefile.inc b/sys/modules/aic7xxx/ahc/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/aic7xxx/ahc/Makefile.inc +++ b/sys/modules/aic7xxx/ahc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile index 0d33d08e6e1..875d2687851 100644 --- a/sys/modules/aic7xxx/ahc/ahc_isa/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_isa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_isa diff --git a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile index 5b4059f2cef..dd5da761dd6 100644 --- a/sys/modules/aic7xxx/ahc/ahc_pci/Makefile +++ b/sys/modules/aic7xxx/ahc/ahc_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahc_pci diff --git a/sys/modules/aic7xxx/ahd/Makefile b/sys/modules/aic7xxx/ahd/Makefile index cf68651e792..c62b69eff9c 100644 --- a/sys/modules/aic7xxx/ahd/Makefile +++ b/sys/modules/aic7xxx/ahd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/aic7xxx KMOD= ahd diff --git a/sys/modules/aic7xxx/aicasm/Makefile b/sys/modules/aic7xxx/aicasm/Makefile index d1e744e3583..77b815421e1 100644 --- a/sys/modules/aic7xxx/aicasm/Makefile +++ b/sys/modules/aic7xxx/aicasm/Makefile @@ -1,4 +1,3 @@ - MAKESRCPATH= ${SRCTOP}/sys/dev/aic7xxx/aicasm install: diff --git a/sys/modules/alc/Makefile b/sys/modules/alc/Makefile index 49aa0247cd4..d89d3ea4d30 100644 --- a/sys/modules/alc/Makefile +++ b/sys/modules/alc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/alc KMOD= if_alc diff --git a/sys/modules/ale/Makefile b/sys/modules/ale/Makefile index beed313e495..0a9853ec704 100644 --- a/sys/modules/ale/Makefile +++ b/sys/modules/ale/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ale KMOD= if_ale diff --git a/sys/modules/allwinner/aw_mmc/Makefile b/sys/modules/allwinner/aw_mmc/Makefile index 450ba717829..25a2a69cfac 100644 --- a/sys/modules/allwinner/aw_mmc/Makefile +++ b/sys/modules/allwinner/aw_mmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_mmc diff --git a/sys/modules/allwinner/aw_pwm/Makefile b/sys/modules/allwinner/aw_pwm/Makefile index 8aac8f5ebe8..dca08d5d7c6 100644 --- a/sys/modules/allwinner/aw_pwm/Makefile +++ b/sys/modules/allwinner/aw_pwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm/controller/allwinner KMOD= aw_pwm diff --git a/sys/modules/allwinner/aw_rsb/Makefile b/sys/modules/allwinner/aw_rsb/Makefile index 89f5ec68717..325dc839dce 100644 --- a/sys/modules/allwinner/aw_rsb/Makefile +++ b/sys/modules/allwinner/aw_rsb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_rsb diff --git a/sys/modules/allwinner/aw_rtc/Makefile b/sys/modules/allwinner/aw_rtc/Makefile index 0eaa9befd88..ea41747339e 100644 --- a/sys/modules/allwinner/aw_rtc/Makefile +++ b/sys/modules/allwinner/aw_rtc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_rtc diff --git a/sys/modules/allwinner/aw_sid/Makefile b/sys/modules/allwinner/aw_sid/Makefile index edbaf33f1a0..7d3dad68acb 100644 --- a/sys/modules/allwinner/aw_sid/Makefile +++ b/sys/modules/allwinner/aw_sid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_sid diff --git a/sys/modules/allwinner/aw_spi/Makefile b/sys/modules/allwinner/aw_spi/Makefile index 3bab8c70e41..412880ce4b6 100644 --- a/sys/modules/allwinner/aw_spi/Makefile +++ b/sys/modules/allwinner/aw_spi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/spibus/controller/allwinner/ KMOD= aw_spi diff --git a/sys/modules/allwinner/aw_thermal/Makefile b/sys/modules/allwinner/aw_thermal/Makefile index 1552d420af8..911e6406d94 100644 --- a/sys/modules/allwinner/aw_thermal/Makefile +++ b/sys/modules/allwinner/aw_thermal/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= aw_thermal diff --git a/sys/modules/allwinner/axp81x/Makefile b/sys/modules/allwinner/axp81x/Makefile index 589303de4ca..7a07d48cc20 100644 --- a/sys/modules/allwinner/axp81x/Makefile +++ b/sys/modules/allwinner/axp81x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= axp81x diff --git a/sys/modules/allwinner/if_awg/Makefile b/sys/modules/allwinner/if_awg/Makefile index 41d98909583..b0b0abbd8e4 100644 --- a/sys/modules/allwinner/if_awg/Makefile +++ b/sys/modules/allwinner/if_awg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/allwinner KMOD= if_awg diff --git a/sys/modules/alq/Makefile b/sys/modules/alq/Makefile index 4eee884b3b0..28b7b71ac1f 100644 --- a/sys/modules/alq/Makefile +++ b/sys/modules/alq/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= alq SRCS= opt_mac.h vnode_if.h kern_alq.c diff --git a/sys/modules/am335x_dmtpps/Makefile b/sys/modules/am335x_dmtpps/Makefile index 9fabb2aeaf4..35cffe0934f 100644 --- a/sys/modules/am335x_dmtpps/Makefile +++ b/sys/modules/am335x_dmtpps/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti/am335x KMOD= am335x_dmtpps diff --git a/sys/modules/amd_ecc_inject/Makefile b/sys/modules/amd_ecc_inject/Makefile index 93d26d73bee..89b528f1cac 100644 --- a/sys/modules/amd_ecc_inject/Makefile +++ b/sys/modules/amd_ecc_inject/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amd_ecc_inject KMOD= amd_ecc_inject diff --git a/sys/modules/amdgpio/Makefile b/sys/modules/amdgpio/Makefile index f825cd059bd..1ac18e65c51 100644 --- a/sys/modules/amdgpio/Makefile +++ b/sys/modules/amdgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdgpio KMOD= amdgpio SRCS= amdgpio.c diff --git a/sys/modules/amdsbwd/Makefile b/sys/modules/amdsbwd/Makefile index 78166c67c77..29857e6a6a9 100644 --- a/sys/modules/amdsbwd/Makefile +++ b/sys/modules/amdsbwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsbwd KMOD = amdsbwd SRCS = amdsbwd.c diff --git a/sys/modules/amdsmb/Makefile b/sys/modules/amdsmb/Makefile index 91762bf883d..54bc51fe7fd 100644 --- a/sys/modules/amdsmb/Makefile +++ b/sys/modules/amdsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsmb KMOD= amdsmb diff --git a/sys/modules/amdsmn/Makefile b/sys/modules/amdsmn/Makefile index f41b8ac5c2b..86947458010 100644 --- a/sys/modules/amdsmn/Makefile +++ b/sys/modules/amdsmn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsmn KMOD= amdsmn diff --git a/sys/modules/amdtemp/Makefile b/sys/modules/amdtemp/Makefile index 04b2b7b1135..726e758f5d1 100644 --- a/sys/modules/amdtemp/Makefile +++ b/sys/modules/amdtemp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdtemp KMOD= amdtemp diff --git a/sys/modules/aout/Makefile b/sys/modules/aout/Makefile index cd5f6b99dcb..e88d47bad68 100644 --- a/sys/modules/aout/Makefile +++ b/sys/modules/aout/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= aout diff --git a/sys/modules/arcmsr/Makefile b/sys/modules/arcmsr/Makefile index ec5e69f73eb..0231cda2897 100644 --- a/sys/modules/arcmsr/Makefile +++ b/sys/modules/arcmsr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/arcmsr KMOD= arcmsr diff --git a/sys/modules/arm_ti/am335x_ehrpwm/Makefile b/sys/modules/arm_ti/am335x_ehrpwm/Makefile index 75139fff2bb..af66edc6965 100644 --- a/sys/modules/arm_ti/am335x_ehrpwm/Makefile +++ b/sys/modules/arm_ti/am335x_ehrpwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti/am335x KMOD= am335x_ehrpwm diff --git a/sys/modules/arm_ti/ti_i2c/Makefile b/sys/modules/arm_ti/ti_i2c/Makefile index 3a5e1a35b2a..dc6dfb133de 100644 --- a/sys/modules/arm_ti/ti_i2c/Makefile +++ b/sys/modules/arm_ti/ti_i2c/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti KMOD= ti_i2c diff --git a/sys/modules/asmc/Makefile b/sys/modules/asmc/Makefile index 70d8ed84590..f1b4a981ad2 100644 --- a/sys/modules/asmc/Makefile +++ b/sys/modules/asmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/asmc KMOD= asmc diff --git a/sys/modules/ata/Makefile b/sys/modules/ata/Makefile index 3a9ad0dd123..70a4f8e29b7 100644 --- a/sys/modules/ata/Makefile +++ b/sys/modules/ata/Makefile @@ -1,4 +1,3 @@ - SUBDIR = atacore SUBDIR += ataisa SUBDIR += atapci diff --git a/sys/modules/ata/Makefile.inc b/sys/modules/ata/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/ata/Makefile.inc +++ b/sys/modules/ata/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/ata/atacore/Makefile b/sys/modules/ata/atacore/Makefile index f4eff60f7b8..85964afa1f5 100644 --- a/sys/modules/ata/atacore/Makefile +++ b/sys/modules/ata/atacore/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata KMOD= ata diff --git a/sys/modules/ata/ataisa/Makefile b/sys/modules/ata/ataisa/Makefile index 7aab7b999be..b15dad0a649 100644 --- a/sys/modules/ata/ataisa/Makefile +++ b/sys/modules/ata/ataisa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata KMOD= ataisa diff --git a/sys/modules/ata/atapci/Makefile b/sys/modules/ata/atapci/Makefile index dfabcf765a1..c9d8920023f 100644 --- a/sys/modules/ata/atapci/Makefile +++ b/sys/modules/ata/atapci/Makefile @@ -1,4 +1,3 @@ - SUBDIR += chipsets .PATH: ${SRCTOP}/sys/dev/ata diff --git a/sys/modules/ata/atapci/Makefile.inc b/sys/modules/ata/atapci/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/ata/atapci/Makefile.inc +++ b/sys/modules/ata/atapci/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/ata/atapci/chipsets/Makefile b/sys/modules/ata/atapci/chipsets/Makefile index c17c84e6496..e34f1163bb2 100644 --- a/sys/modules/ata/atapci/chipsets/Makefile +++ b/sys/modules/ata/atapci/chipsets/Makefile @@ -1,4 +1,3 @@ - SUBDIR += ataacard ataacerlabs ataamd ataati atacenatek atacypress atacyrix atahighpoint ataintel ataite atajmicron atamarvell atamicron atanational atanetcell atanvidia atapromise ataserverworks atasiliconimage atasis atavia .include diff --git a/sys/modules/ata/atapci/chipsets/Makefile.inc b/sys/modules/ata/atapci/chipsets/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/ata/atapci/chipsets/Makefile.inc +++ b/sys/modules/ata/atapci/chipsets/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/ata/atapci/chipsets/ataacard/Makefile b/sys/modules/ata/atapci/chipsets/ataacard/Makefile index 23ced8d7473..0ad0650d0ae 100644 --- a/sys/modules/ata/atapci/chipsets/ataacard/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacard/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacard diff --git a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile index 971d626dc12..eeb2e1f7eb8 100644 --- a/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataacerlabs diff --git a/sys/modules/ata/atapci/chipsets/ataamd/Makefile b/sys/modules/ata/atapci/chipsets/ataamd/Makefile index eff9a378b13..58b4e6ee797 100644 --- a/sys/modules/ata/atapci/chipsets/ataamd/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataamd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataamd diff --git a/sys/modules/ata/atapci/chipsets/ataati/Makefile b/sys/modules/ata/atapci/chipsets/ataati/Makefile index 6bd4a306f6d..ffc779cf3fa 100644 --- a/sys/modules/ata/atapci/chipsets/ataati/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataati/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataati diff --git a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile index 7c9cec4c3ee..1c8753479fa 100644 --- a/sys/modules/ata/atapci/chipsets/atacenatek/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacenatek/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacenatek diff --git a/sys/modules/ata/atapci/chipsets/atacypress/Makefile b/sys/modules/ata/atapci/chipsets/atacypress/Makefile index c0dae4ce614..edb5c20f585 100644 --- a/sys/modules/ata/atapci/chipsets/atacypress/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacypress/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacypress diff --git a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile index 7a39455ba1d..225318e3b46 100644 --- a/sys/modules/ata/atapci/chipsets/atacyrix/Makefile +++ b/sys/modules/ata/atapci/chipsets/atacyrix/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atacyrix diff --git a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile index a889fc8ea47..e889527bd87 100644 --- a/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile +++ b/sys/modules/ata/atapci/chipsets/atahighpoint/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atahighpoint diff --git a/sys/modules/ata/atapci/chipsets/ataintel/Makefile b/sys/modules/ata/atapci/chipsets/ataintel/Makefile index 4734ccff6d7..12a86fc1d9a 100644 --- a/sys/modules/ata/atapci/chipsets/ataintel/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataintel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataintel diff --git a/sys/modules/ata/atapci/chipsets/ataite/Makefile b/sys/modules/ata/atapci/chipsets/ataite/Makefile index e1a17c373b6..2f434ddb80b 100644 --- a/sys/modules/ata/atapci/chipsets/ataite/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataite/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataite diff --git a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile index 71ee58d6e89..6b9f4c0a543 100644 --- a/sys/modules/ata/atapci/chipsets/atajmicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atajmicron/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atajmicron diff --git a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile index 9fccff59228..df98955ff4b 100644 --- a/sys/modules/ata/atapci/chipsets/atamarvell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamarvell/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamarvell diff --git a/sys/modules/ata/atapci/chipsets/atamicron/Makefile b/sys/modules/ata/atapci/chipsets/atamicron/Makefile index 54934f6d11c..56c339e2607 100644 --- a/sys/modules/ata/atapci/chipsets/atamicron/Makefile +++ b/sys/modules/ata/atapci/chipsets/atamicron/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atamicron diff --git a/sys/modules/ata/atapci/chipsets/atanational/Makefile b/sys/modules/ata/atapci/chipsets/atanational/Makefile index 3e486b1637e..ed599f1afbd 100644 --- a/sys/modules/ata/atapci/chipsets/atanational/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanational/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanational diff --git a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile index b317e950a22..7d6e1cb5d68 100644 --- a/sys/modules/ata/atapci/chipsets/atanetcell/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanetcell/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanetcell diff --git a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile index b4b720cfea1..1ee823eb695 100644 --- a/sys/modules/ata/atapci/chipsets/atanvidia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atanvidia/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atanvidia diff --git a/sys/modules/ata/atapci/chipsets/atapromise/Makefile b/sys/modules/ata/atapci/chipsets/atapromise/Makefile index d6296769f63..b96d0e3e80f 100644 --- a/sys/modules/ata/atapci/chipsets/atapromise/Makefile +++ b/sys/modules/ata/atapci/chipsets/atapromise/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atapromise diff --git a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile index 76662f0a81c..1da7e531583 100644 --- a/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile +++ b/sys/modules/ata/atapci/chipsets/ataserverworks/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= ataserverworks diff --git a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile index 3bb7248468f..858d8afb54d 100644 --- a/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasiliconimage diff --git a/sys/modules/ata/atapci/chipsets/atasis/Makefile b/sys/modules/ata/atapci/chipsets/atasis/Makefile index 16252fff286..ba9efca9b32 100644 --- a/sys/modules/ata/atapci/chipsets/atasis/Makefile +++ b/sys/modules/ata/atapci/chipsets/atasis/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atasis diff --git a/sys/modules/ata/atapci/chipsets/atavia/Makefile b/sys/modules/ata/atapci/chipsets/atavia/Makefile index 04a76295277..1827dca23d7 100644 --- a/sys/modules/ata/atapci/chipsets/atavia/Makefile +++ b/sys/modules/ata/atapci/chipsets/atavia/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ata/chipsets KMOD= atavia diff --git a/sys/modules/ath10k/Makefile b/sys/modules/ath10k/Makefile index 318b49fe43a..eb02bda1699 100644 --- a/sys/modules/ath10k/Makefile +++ b/sys/modules/ath10k/Makefile @@ -1,4 +1,3 @@ - DEVATH10KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath10k .PATH: ${DEVATH10KDIR} diff --git a/sys/modules/ath11k/Makefile b/sys/modules/ath11k/Makefile index 162b22d3307..fb610117dfa 100644 --- a/sys/modules/ath11k/Makefile +++ b/sys/modules/ath11k/Makefile @@ -1,4 +1,3 @@ - DEVATH11KDIR= ${SRCTOP}/sys/contrib/dev/athk/ath11k .PATH: ${DEVATH11KDIR} diff --git a/sys/modules/athk_common/Makefile b/sys/modules/athk_common/Makefile index 284e1b18740..5400cfa7723 100644 --- a/sys/modules/athk_common/Makefile +++ b/sys/modules/athk_common/Makefile @@ -1,4 +1,3 @@ - DEVDIR= ${SRCTOP}/sys/contrib/dev/athk .PATH: ${DEVDIR} diff --git a/sys/modules/autofs/Makefile b/sys/modules/autofs/Makefile index 3fbd3a7db70..92ab40a9259 100644 --- a/sys/modules/autofs/Makefile +++ b/sys/modules/autofs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/autofs KMOD= autofs diff --git a/sys/modules/axgbe/Makefile b/sys/modules/axgbe/Makefile index bc5c5b1299f..f28e50572a2 100644 --- a/sys/modules/axgbe/Makefile +++ b/sys/modules/axgbe/Makefile @@ -1,4 +1,3 @@ - .if ${MACHINE_CPUARCH} == "aarch64" SUBDIR= if_axa .elif ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/modules/axgbe/if_axa/Makefile b/sys/modules/axgbe/if_axa/Makefile index 088e4383b9e..2a096ccb0b0 100644 --- a/sys/modules/axgbe/if_axa/Makefile +++ b/sys/modules/axgbe/if_axa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/axgbe KMOD = if_axa diff --git a/sys/modules/axgbe/if_axp/Makefile b/sys/modules/axgbe/if_axp/Makefile index 6cab3317c1e..c042fe026b9 100644 --- a/sys/modules/axgbe/if_axp/Makefile +++ b/sys/modules/axgbe/if_axp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/axgbe KMOD = if_axp diff --git a/sys/modules/backlight/Makefile b/sys/modules/backlight/Makefile index 48c45d785ad..905203f1aa9 100644 --- a/sys/modules/backlight/Makefile +++ b/sys/modules/backlight/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/backlight KMOD= backlight SRCS= backlight.c diff --git a/sys/modules/bcm283x_clkman/Makefile b/sys/modules/bcm283x_clkman/Makefile index 06ae3cfc566..6c245a2b7dc 100644 --- a/sys/modules/bcm283x_clkman/Makefile +++ b/sys/modules/bcm283x_clkman/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= bcm283x_clkman diff --git a/sys/modules/bcm283x_pwm/Makefile b/sys/modules/bcm283x_pwm/Makefile index 16f3364ef8e..4aa615d8145 100644 --- a/sys/modules/bcm283x_pwm/Makefile +++ b/sys/modules/bcm283x_pwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= bcm283x_pwm diff --git a/sys/modules/bfe/Makefile b/sys/modules/bfe/Makefile index 99458b2bec7..2f3b820de23 100644 --- a/sys/modules/bfe/Makefile +++ b/sys/modules/bfe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bfe KMOD= if_bfe diff --git a/sys/modules/bge/Makefile b/sys/modules/bge/Makefile index 4ded89da977..49e6c455c38 100644 --- a/sys/modules/bge/Makefile +++ b/sys/modules/bge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bge KMOD= if_bge diff --git a/sys/modules/bhnd/Makefile b/sys/modules/bhnd/Makefile index 032d3321007..f07379a2a04 100644 --- a/sys/modules/bhnd/Makefile +++ b/sys/modules/bhnd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd .PATH: ${SRCTOP}/sys/dev/bhnd/cores/chipc .PATH: ${SRCTOP}/sys/dev/bhnd/cores/chipc/pwrctl diff --git a/sys/modules/bhnd/bcma/Makefile b/sys/modules/bhnd/bcma/Makefile index c329aa3c6e9..351424441e5 100644 --- a/sys/modules/bhnd/bcma/Makefile +++ b/sys/modules/bhnd/bcma/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bcma KMOD= bcma diff --git a/sys/modules/bhnd/bcma_bhndb/Makefile b/sys/modules/bhnd/bcma_bhndb/Makefile index c771985ecde..19fd6a89a16 100644 --- a/sys/modules/bhnd/bcma_bhndb/Makefile +++ b/sys/modules/bhnd/bcma_bhndb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bcma KMOD= bcma_bhndb diff --git a/sys/modules/bhnd/bhndb/Makefile b/sys/modules/bhnd/bhndb/Makefile index c4745f17b74..9a0d68519a9 100644 --- a/sys/modules/bhnd/bhndb/Makefile +++ b/sys/modules/bhnd/bhndb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bhndb KMOD= bhndb diff --git a/sys/modules/bhnd/bhndb_pci/Makefile b/sys/modules/bhnd/bhndb_pci/Makefile index 958502b29c0..29fa7cd61cd 100644 --- a/sys/modules/bhnd/bhndb_pci/Makefile +++ b/sys/modules/bhnd/bhndb_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/bhndb KMOD= bhndb_pci diff --git a/sys/modules/bhnd/cores/Makefile b/sys/modules/bhnd/cores/Makefile index 610d735f723..ba7b711b3bc 100644 --- a/sys/modules/bhnd/cores/Makefile +++ b/sys/modules/bhnd/cores/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bhnd_pci \ bhnd_pci_hostb \ bhnd_pcib diff --git a/sys/modules/bhnd/cores/bhnd_pci/Makefile b/sys/modules/bhnd/cores/bhnd_pci/Makefile index 96275c7d5ee..962743c0767 100644 --- a/sys/modules/bhnd/cores/bhnd_pci/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 diff --git a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile index a27d30f5067..350ac6721c9 100644 --- a/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 diff --git a/sys/modules/bhnd/cores/bhnd_pcib/Makefile b/sys/modules/bhnd/cores/bhnd_pcib/Makefile index 93e53415df0..9c7f86eca22 100644 --- a/sys/modules/bhnd/cores/bhnd_pcib/Makefile +++ b/sys/modules/bhnd/cores/bhnd_pcib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pci .PATH: ${SRCTOP}/sys/dev/bhnd/cores/pcie2 diff --git a/sys/modules/bhnd/siba/Makefile b/sys/modules/bhnd/siba/Makefile index 572fab72666..aa933129a9f 100644 --- a/sys/modules/bhnd/siba/Makefile +++ b/sys/modules/bhnd/siba/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/siba KMOD= siba diff --git a/sys/modules/bhnd/siba_bhndb/Makefile b/sys/modules/bhnd/siba_bhndb/Makefile index ccf978edf51..eaaa62e49e4 100644 --- a/sys/modules/bhnd/siba_bhndb/Makefile +++ b/sys/modules/bhnd/siba_bhndb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bhnd/siba KMOD= siba_bhndb diff --git a/sys/modules/blake2/Makefile b/sys/modules/blake2/Makefile index a8863c2e67e..85d4bff8ded 100644 --- a/sys/modules/blake2/Makefile +++ b/sys/modules/blake2/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/libb2 .PATH: ${SRCTOP}/sys/crypto/blake2 .PATH: ${SRCTOP}/sys/opencrypto diff --git a/sys/modules/bnxt/bnxt_en/Makefile b/sys/modules/bnxt/bnxt_en/Makefile index de08d7c500c..d90f3b91d86 100644 --- a/sys/modules/bnxt/bnxt_en/Makefile +++ b/sys/modules/bnxt/bnxt_en/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bnxt/bnxt_en KMOD = if_bnxt diff --git a/sys/modules/bridgestp/Makefile b/sys/modules/bridgestp/Makefile index 79b339bb3d4..71e38351018 100644 --- a/sys/modules/bridgestp/Makefile +++ b/sys/modules/bridgestp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= bridgestp diff --git a/sys/modules/bwi/Makefile b/sys/modules/bwi/Makefile index 6fbf77bc903..42500927648 100644 --- a/sys/modules/bwi/Makefile +++ b/sys/modules/bwi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bwi KMOD = if_bwi diff --git a/sys/modules/bwn/Makefile b/sys/modules/bwn/Makefile index 4385b5498ad..37c7b35db7e 100644 --- a/sys/modules/bwn/Makefile +++ b/sys/modules/bwn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/bwn KMOD= if_bwn diff --git a/sys/modules/bxe/Makefile b/sys/modules/bxe/Makefile index 70b2965ece5..7e6d73a63fa 100644 --- a/sys/modules/bxe/Makefile +++ b/sys/modules/bxe/Makefile @@ -1,4 +1,3 @@ - SYSDIR ?= ${SRCTOP}/sys BXE = ${SYSDIR}/dev/bxe diff --git a/sys/modules/bytgpio/Makefile b/sys/modules/bytgpio/Makefile index a25a7614103..6b5c3fa79d8 100644 --- a/sys/modules/bytgpio/Makefile +++ b/sys/modules/bytgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/gpio KMOD= bytgpio SRCS= bytgpio.c diff --git a/sys/modules/cam/Makefile b/sys/modules/cam/Makefile index 566b245dca2..41783c54e8a 100644 --- a/sys/modules/cam/Makefile +++ b/sys/modules/cam/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/cam $S/cam/scsi $S/cam/ata $S/cam/nvme $S/dev/nvme diff --git a/sys/modules/cardbus/Makefile b/sys/modules/cardbus/Makefile index a87a0de5185..d7111b2451a 100644 --- a/sys/modules/cardbus/Makefile +++ b/sys/modules/cardbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cardbus KMOD= cardbus diff --git a/sys/modules/carp/Makefile b/sys/modules/carp/Makefile index d7a85043539..385c42f12bd 100644 --- a/sys/modules/carp/Makefile +++ b/sys/modules/carp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet .PATH: ${SRCTOP}/sys/crypto diff --git a/sys/modules/cas/Makefile b/sys/modules/cas/Makefile index 45d47573456..6e0098414ef 100644 --- a/sys/modules/cas/Makefile +++ b/sys/modules/cas/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cas KMOD= if_cas diff --git a/sys/modules/cbb/Makefile b/sys/modules/cbb/Makefile index 156a273e01b..a715d428cbd 100644 --- a/sys/modules/cbb/Makefile +++ b/sys/modules/cbb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pccbb KMOD= cbb diff --git a/sys/modules/cc/Makefile b/sys/modules/cc/Makefile index c3e59aef331..2ec1c49621c 100644 --- a/sys/modules/cc/Makefile +++ b/sys/modules/cc/Makefile @@ -1,4 +1,3 @@ - SUBDIR= cc_newreno \ cc_cubic \ cc_dctcp \ diff --git a/sys/modules/cc/cc_cdg/Makefile b/sys/modules/cc/cc_cdg/Makefile index 8da536709e7..828f309dcc0 100644 --- a/sys/modules/cc/cc_cdg/Makefile +++ b/sys/modules/cc/cc_cdg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_cdg SRCS= cc_cdg.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_chd/Makefile b/sys/modules/cc/cc_chd/Makefile index 0f682432d26..b8e6304da9c 100644 --- a/sys/modules/cc/cc_chd/Makefile +++ b/sys/modules/cc/cc_chd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_chd SRCS= cc_chd.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_cubic/Makefile b/sys/modules/cc/cc_cubic/Makefile index 6599126e0b8..28d662c6d1f 100644 --- a/sys/modules/cc/cc_cubic/Makefile +++ b/sys/modules/cc/cc_cubic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_cubic SRCS= cc_cubic.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_dctcp/Makefile b/sys/modules/cc/cc_dctcp/Makefile index a084ae4f6e0..7ef327b5029 100644 --- a/sys/modules/cc/cc_dctcp/Makefile +++ b/sys/modules/cc/cc_dctcp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_dctcp SRCS= cc_dctcp.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_hd/Makefile b/sys/modules/cc/cc_hd/Makefile index ae3fe500a27..d1df7f60761 100644 --- a/sys/modules/cc/cc_hd/Makefile +++ b/sys/modules/cc/cc_hd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_hd SRCS= cc_hd.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_htcp/Makefile b/sys/modules/cc/cc_htcp/Makefile index 0475f768a54..12506b20a71 100644 --- a/sys/modules/cc/cc_htcp/Makefile +++ b/sys/modules/cc/cc_htcp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_htcp SRCS= cc_htcp.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_newreno/Makefile b/sys/modules/cc/cc_newreno/Makefile index d6ec03807b6..7b1ee5a1a8c 100644 --- a/sys/modules/cc/cc_newreno/Makefile +++ b/sys/modules/cc/cc_newreno/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_newreno SRCS= cc_newreno.c opt_kern_tls.h diff --git a/sys/modules/cc/cc_vegas/Makefile b/sys/modules/cc/cc_vegas/Makefile index 87f36414a2e..6929ea55bc8 100644 --- a/sys/modules/cc/cc_vegas/Makefile +++ b/sys/modules/cc/cc_vegas/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/cc KMOD= cc_vegas SRCS= cc_vegas.c opt_kern_tls.h diff --git a/sys/modules/ccp/Makefile b/sys/modules/ccp/Makefile index c31c2a3bfe9..d268f0b58a9 100644 --- a/sys/modules/ccp/Makefile +++ b/sys/modules/ccp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/ccp KMOD= ccp diff --git a/sys/modules/cd9660/Makefile b/sys/modules/cd9660/Makefile index d1563bcafd3..e39e859b933 100644 --- a/sys/modules/cd9660/Makefile +++ b/sys/modules/cd9660/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/cd9660 KMOD= cd9660 diff --git a/sys/modules/cd9660_iconv/Makefile b/sys/modules/cd9660_iconv/Makefile index 9a4f27e829a..1e6f97cf8ce 100644 --- a/sys/modules/cd9660_iconv/Makefile +++ b/sys/modules/cd9660_iconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/cd9660 KMOD= cd9660_iconv SRCS= cd9660_iconv.c diff --git a/sys/modules/cfi/Makefile b/sys/modules/cfi/Makefile index c795803a08f..d71d2ba0cc8 100644 --- a/sys/modules/cfi/Makefile +++ b/sys/modules/cfi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cfi KMOD= cfi diff --git a/sys/modules/cfiscsi/Makefile b/sys/modules/cfiscsi/Makefile index 4d653868403..f896e27c09f 100644 --- a/sys/modules/cfiscsi/Makefile +++ b/sys/modules/cfiscsi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/cam/ctl KMOD= cfiscsi diff --git a/sys/modules/chromebook_platform/Makefile b/sys/modules/chromebook_platform/Makefile index 2f8ff9167b7..287db3565c0 100644 --- a/sys/modules/chromebook_platform/Makefile +++ b/sys/modules/chromebook_platform/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/chromebook_platform KMOD= chromebook_platform SRCS= chromebook_platform.c bus_if.h device_if.h pci_if.h diff --git a/sys/modules/chvgpio/Makefile b/sys/modules/chvgpio/Makefile index 8c4dbcdb283..6983da86bd9 100644 --- a/sys/modules/chvgpio/Makefile +++ b/sys/modules/chvgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/gpio KMOD= chvgpio SRCS= chvgpio.c diff --git a/sys/modules/ciss/Makefile b/sys/modules/ciss/Makefile index b2025106248..81b50a7111d 100644 --- a/sys/modules/ciss/Makefile +++ b/sys/modules/ciss/Makefile @@ -1,4 +1,3 @@ - KMOD = ciss .PATH: ${SRCTOP}/sys/dev/${KMOD} SRCS = ciss.c diff --git a/sys/modules/coretemp/Makefile b/sys/modules/coretemp/Makefile index a77c8c95695..3873009ada4 100644 --- a/sys/modules/coretemp/Makefile +++ b/sys/modules/coretemp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/coretemp KMOD= coretemp diff --git a/sys/modules/cpsw/Makefile b/sys/modules/cpsw/Makefile index 05dc943bace..3b083a32615 100644 --- a/sys/modules/cpsw/Makefile +++ b/sys/modules/cpsw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/ti/cpsw KMOD= if_cpsw diff --git a/sys/modules/cpuctl/Makefile b/sys/modules/cpuctl/Makefile index 4a6e302b60c..35823e95915 100644 --- a/sys/modules/cpuctl/Makefile +++ b/sys/modules/cpuctl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cpuctl KMOD= cpuctl diff --git a/sys/modules/cpufreq/Makefile b/sys/modules/cpufreq/Makefile index 6b88f1a6c02..9a417f72fc2 100644 --- a/sys/modules/cpufreq/Makefile +++ b/sys/modules/cpufreq/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cpufreq \ ${SRCTOP}/sys/${MACHINE_CPUARCH}/cpufreq diff --git a/sys/modules/crypto/Makefile b/sys/modules/crypto/Makefile index 59f66aeff3c..95700b23c72 100644 --- a/sys/modules/crypto/Makefile +++ b/sys/modules/crypto/Makefile @@ -1,4 +1,3 @@ - LIBSODIUM=${SRCTOP}/sys/contrib/libsodium/src/libsodium .PATH: ${SRCTOP}/sys/opencrypto diff --git a/sys/modules/cryptodev/Makefile b/sys/modules/cryptodev/Makefile index a6e9ef9ae82..9a2f30d094a 100644 --- a/sys/modules/cryptodev/Makefile +++ b/sys/modules/cryptodev/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/opencrypto KMOD = cryptodev SRCS = cryptodev.c diff --git a/sys/modules/ctl/Makefile b/sys/modules/ctl/Makefile index 9fb94ddc9bc..86fd89feb4b 100644 --- a/sys/modules/ctl/Makefile +++ b/sys/modules/ctl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/cam/ctl KMOD= ctl diff --git a/sys/modules/cxgb/Makefile b/sys/modules/cxgb/Makefile index 144d8f8531d..2989ad580b9 100644 --- a/sys/modules/cxgb/Makefile +++ b/sys/modules/cxgb/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/cxgb/cxgb/Makefile b/sys/modules/cxgb/cxgb/Makefile index 08644a5d805..736bd75e3f2 100644 --- a/sys/modules/cxgb/cxgb/Makefile +++ b/sys/modules/cxgb/cxgb/Makefile @@ -1,4 +1,3 @@ - CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB} ${CXGB}/common ${CXGB}/sys diff --git a/sys/modules/cxgb/cxgb_t3fw/Makefile b/sys/modules/cxgb/cxgb_t3fw/Makefile index 602fae4ff2a..b97e3179c6c 100644 --- a/sys/modules/cxgb/cxgb_t3fw/Makefile +++ b/sys/modules/cxgb/cxgb_t3fw/Makefile @@ -1,4 +1,3 @@ - CXGB = ${SRCTOP}/sys/dev/cxgb .PATH: ${CXGB} diff --git a/sys/modules/cxgbe/ccr/Makefile b/sys/modules/cxgbe/ccr/Makefile index eb2171f6ea8..dade268baea 100644 --- a/sys/modules/cxgbe/ccr/Makefile +++ b/sys/modules/cxgbe/ccr/Makefile @@ -1,4 +1,3 @@ - CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/crypto diff --git a/sys/modules/cxgbe/cxgbei/Makefile b/sys/modules/cxgbe/cxgbei/Makefile index 6e87566b07e..7238ec6b423 100644 --- a/sys/modules/cxgbe/cxgbei/Makefile +++ b/sys/modules/cxgbe/cxgbei/Makefile @@ -1,4 +1,3 @@ - CXGBE = ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/cxgbei diff --git a/sys/modules/cxgbe/iw_cxgbe/Makefile b/sys/modules/cxgbe/iw_cxgbe/Makefile index 9416cdec5ce..83a861bf9d4 100644 --- a/sys/modules/cxgbe/iw_cxgbe/Makefile +++ b/sys/modules/cxgbe/iw_cxgbe/Makefile @@ -1,4 +1,3 @@ - CXGBE= ${SRCTOP}/sys/dev/cxgbe .PATH: ${CXGBE}/iw_cxgbe diff --git a/sys/modules/dc/Makefile b/sys/modules/dc/Makefile index e45f76fdf91..3ca6edff82a 100644 --- a/sys/modules/dc/Makefile +++ b/sys/modules/dc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/dc KMOD= if_dc diff --git a/sys/modules/dpdk_lpm4/Makefile b/sys/modules/dpdk_lpm4/Makefile index cd9f0f415ce..ff68fac7891 100644 --- a/sys/modules/dpdk_lpm4/Makefile +++ b/sys/modules/dpdk_lpm4/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/dpdk_lpm6/Makefile b/sys/modules/dpdk_lpm6/Makefile index 3145c0646a9..f2248e5d1c1 100644 --- a/sys/modules/dpdk_lpm6/Makefile +++ b/sys/modules/dpdk_lpm6/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/dpms/Makefile b/sys/modules/dpms/Makefile index 55b0a1ef1c3..de15963f108 100644 --- a/sys/modules/dpms/Makefile +++ b/sys/modules/dpms/Makefile @@ -1,4 +1,3 @@ - KMOD= dpms SRCS= bus_if.h device_if.h pci_if.h diff --git a/sys/modules/dtb/sifive/Makefile b/sys/modules/dtb/sifive/Makefile index 818ffa472ec..a0566e5fc9b 100644 --- a/sys/modules/dtb/sifive/Makefile +++ b/sys/modules/dtb/sifive/Makefile @@ -1,4 +1,3 @@ - DTS= \ sifive/hifive-unleashed-a00.dts diff --git a/sys/modules/dtrace/Makefile b/sys/modules/dtrace/Makefile index 3cc672b62c3..9a67f517fc5 100644 --- a/sys/modules/dtrace/Makefile +++ b/sys/modules/dtrace/Makefile @@ -1,4 +1,3 @@ - .include "Makefile.inc" SUBDIR= dtaudit \ diff --git a/sys/modules/dtrace/Makefile.inc b/sys/modules/dtrace/Makefile.inc index fd3c99a9407..c23cf4c476c 100644 --- a/sys/modules/dtrace/Makefile.inc +++ b/sys/modules/dtrace/Makefile.inc @@ -1,4 +1,3 @@ - IGNORE_PRAGMA= 1 load : diff --git a/sys/modules/dtrace/dtaudit/Makefile b/sys/modules/dtrace/dtaudit/Makefile index 22e85a70afa..205c4ef0879 100644 --- a/sys/modules/dtrace/dtaudit/Makefile +++ b/sys/modules/dtrace/dtaudit/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/security/audit diff --git a/sys/modules/dtrace/dtmalloc/Makefile b/sys/modules/dtrace/dtmalloc/Makefile index 5c1570b69e8..6b58ac09737 100644 --- a/sys/modules/dtrace/dtmalloc/Makefile +++ b/sys/modules/dtrace/dtmalloc/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/dtmalloc diff --git a/sys/modules/dtrace/dtnfscl/Makefile b/sys/modules/dtrace/dtnfscl/Makefile index 24e58828a8b..11b254c3d7b 100644 --- a/sys/modules/dtrace/dtnfscl/Makefile +++ b/sys/modules/dtrace/dtnfscl/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/fs/nfsclient diff --git a/sys/modules/dtrace/dtrace/Makefile b/sys/modules/dtrace/dtrace/Makefile index 53e5f1792ad..765a8477f3f 100644 --- a/sys/modules/dtrace/dtrace/Makefile +++ b/sys/modules/dtrace/dtrace/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys ARCHDIR= ${MACHINE_CPUARCH} diff --git a/sys/modules/dtrace/dtrace_test/Makefile b/sys/modules/dtrace/dtrace_test/Makefile index 70f12982162..dacb44710fb 100644 --- a/sys/modules/dtrace/dtrace_test/Makefile +++ b/sys/modules/dtrace/dtrace_test/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/dtrace diff --git a/sys/modules/dtrace/dtraceall/Makefile b/sys/modules/dtrace/dtraceall/Makefile index ecbb0f4a21b..8228a0f0c98 100644 --- a/sys/modules/dtrace/dtraceall/Makefile +++ b/sys/modules/dtrace/dtraceall/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys KMOD= dtraceall diff --git a/sys/modules/dtrace/fasttrap/Makefile b/sys/modules/dtrace/fasttrap/Makefile index 271ac07cfbb..af0cace6c5a 100644 --- a/sys/modules/dtrace/fasttrap/Makefile +++ b/sys/modules/dtrace/fasttrap/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/contrib/opensolaris/uts/common/dtrace diff --git a/sys/modules/dtrace/fbt/Makefile b/sys/modules/dtrace/fbt/Makefile index 370ee316098..97898091fce 100644 --- a/sys/modules/dtrace/fbt/Makefile +++ b/sys/modules/dtrace/fbt/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/fbt diff --git a/sys/modules/dtrace/profile/Makefile b/sys/modules/dtrace/profile/Makefile index b193ee0e3e4..7cb53c4c788 100644 --- a/sys/modules/dtrace/profile/Makefile +++ b/sys/modules/dtrace/profile/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/profile diff --git a/sys/modules/dtrace/prototype/Makefile b/sys/modules/dtrace/prototype/Makefile index b622d628eac..d4e8b57aac6 100644 --- a/sys/modules/dtrace/prototype/Makefile +++ b/sys/modules/dtrace/prototype/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev diff --git a/sys/modules/dtrace/sdt/Makefile b/sys/modules/dtrace/sdt/Makefile index ee6627c5e72..e8db8a77f35 100644 --- a/sys/modules/dtrace/sdt/Makefile +++ b/sys/modules/dtrace/sdt/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/sdt diff --git a/sys/modules/dtrace/systrace/Makefile b/sys/modules/dtrace/systrace/Makefile index ab16dd03124..dff3ca03db8 100644 --- a/sys/modules/dtrace/systrace/Makefile +++ b/sys/modules/dtrace/systrace/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_freebsd32/Makefile b/sys/modules/dtrace/systrace_freebsd32/Makefile index c9376a4b206..06023e79dea 100644 --- a/sys/modules/dtrace/systrace_freebsd32/Makefile +++ b/sys/modules/dtrace/systrace_freebsd32/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_linux/Makefile b/sys/modules/dtrace/systrace_linux/Makefile index acdc7c0c967..204b40ab674 100644 --- a/sys/modules/dtrace/systrace_linux/Makefile +++ b/sys/modules/dtrace/systrace_linux/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dtrace/systrace_linux32/Makefile b/sys/modules/dtrace/systrace_linux32/Makefile index 2970e42a58f..82b6482a7ad 100644 --- a/sys/modules/dtrace/systrace_linux32/Makefile +++ b/sys/modules/dtrace/systrace_linux32/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/dev/systrace diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile index 6c7599eae45..4ff023e6bca 100644 --- a/sys/modules/dummynet/Makefile +++ b/sys/modules/dummynet/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= dummynet SRCS= ip_dummynet.c diff --git a/sys/modules/e6000sw/Makefile b/sys/modules/e6000sw/Makefile index a4315ca16dd..da08f80b0a2 100644 --- a/sys/modules/e6000sw/Makefile +++ b/sys/modules/e6000sw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/etherswitch/e6000sw KMOD= e6000sw diff --git a/sys/modules/efirt/Makefile b/sys/modules/efirt/Makefile index 2993f5de0ef..2befdcb7dd8 100644 --- a/sys/modules/efirt/Makefile +++ b/sys/modules/efirt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE} .PATH: ${SRCTOP}/sys/dev/efidev diff --git a/sys/modules/em/Makefile b/sys/modules/em/Makefile index bcf8d262dc4..aad7cb07a31 100644 --- a/sys/modules/em/Makefile +++ b/sys/modules/em/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/e1000 KMOD = if_em SRCS = device_if.h bus_if.h pci_if.h opt_ddb.h opt_inet.h \ diff --git a/sys/modules/enetc/Makefile b/sys/modules/enetc/Makefile index b54c5171616..e4259b69292 100644 --- a/sys/modules/enetc/Makefile +++ b/sys/modules/enetc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/enetc KMOD = if_enetc diff --git a/sys/modules/epoch_test/Makefile b/sys/modules/epoch_test/Makefile index 64d16faf789..c0d16756e86 100644 --- a/sys/modules/epoch_test/Makefile +++ b/sys/modules/epoch_test/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/tests/epoch KMOD= epoch_test SRCS= epoch_test.c \ diff --git a/sys/modules/evdev/Makefile b/sys/modules/evdev/Makefile index 49183bd3a8d..bd66013885d 100644 --- a/sys/modules/evdev/Makefile +++ b/sys/modules/evdev/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/evdev KMOD= evdev diff --git a/sys/modules/exca/Makefile b/sys/modules/exca/Makefile index 210a6eed545..b8c67212d74 100644 --- a/sys/modules/exca/Makefile +++ b/sys/modules/exca/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/exca KMOD= exca diff --git a/sys/modules/ext2fs/Makefile b/sys/modules/ext2fs/Makefile index 0b0b20e29b1..1e831c89844 100644 --- a/sys/modules/ext2fs/Makefile +++ b/sys/modules/ext2fs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/ext2fs KMOD= ext2fs SRCS= opt_ddb.h opt_directio.h opt_quota.h opt_suiddir.h vnode_if.h \ diff --git a/sys/modules/fdc/Makefile b/sys/modules/fdc/Makefile index 1b131cc4d16..716e935cdc4 100644 --- a/sys/modules/fdc/Makefile +++ b/sys/modules/fdc/Makefile @@ -1,4 +1,3 @@ - KMOD= fdc .PATH: ${SRCTOP}/sys/dev/fdc diff --git a/sys/modules/fdescfs/Makefile b/sys/modules/fdescfs/Makefile index 6745cffcfb2..29536b25c19 100644 --- a/sys/modules/fdescfs/Makefile +++ b/sys/modules/fdescfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/fdescfs KMOD= fdescfs diff --git a/sys/modules/fdt/fdt_slicer/Makefile b/sys/modules/fdt/fdt_slicer/Makefile index 75de4cc5817..7dbbef513db 100644 --- a/sys/modules/fdt/fdt_slicer/Makefile +++ b/sys/modules/fdt/fdt_slicer/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fdt KMOD= fdt_slicer diff --git a/sys/modules/ffec/Makefile b/sys/modules/ffec/Makefile index 72bf600ac44..6cea0ced85a 100644 --- a/sys/modules/ffec/Makefile +++ b/sys/modules/ffec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ffec KMOD= if_ffec diff --git a/sys/modules/fib_dxr/Makefile b/sys/modules/fib_dxr/Makefile index e620fdeb7fa..7d1996ba510 100644 --- a/sys/modules/fib_dxr/Makefile +++ b/sys/modules/fib_dxr/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/filemon/Makefile b/sys/modules/filemon/Makefile index 26c23854b98..97d24e044de 100644 --- a/sys/modules/filemon/Makefile +++ b/sys/modules/filemon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/filemon KMOD= filemon diff --git a/sys/modules/firewire/Makefile b/sys/modules/firewire/Makefile index d5254f528ee..492a59a71e3 100644 --- a/sys/modules/firewire/Makefile +++ b/sys/modules/firewire/Makefile @@ -1,4 +1,3 @@ - SUBDIR= firewire \ fwe \ fwip \ diff --git a/sys/modules/firewire/Makefile.inc b/sys/modules/firewire/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/firewire/Makefile.inc +++ b/sys/modules/firewire/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/firewire/firewire/Makefile b/sys/modules/firewire/firewire/Makefile index 7eb04113b8a..153e6f05c33 100644 --- a/sys/modules/firewire/firewire/Makefile +++ b/sys/modules/firewire/firewire/Makefile @@ -1,4 +1,3 @@ - # Makefile for the IEEE1394 OHCI chipset .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firewire/fwe/Makefile b/sys/modules/firewire/fwe/Makefile index 0e05a7d3548..1b911050d29 100644 --- a/sys/modules/firewire/fwe/Makefile +++ b/sys/modules/firewire/fwe/Makefile @@ -1,4 +1,3 @@ - # Makefile for the fwe(4) module (Ethernet over IEEE1394) .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firewire/fwip/Makefile b/sys/modules/firewire/fwip/Makefile index 063dc2f0d50..b56bdb8d1c7 100644 --- a/sys/modules/firewire/fwip/Makefile +++ b/sys/modules/firewire/fwip/Makefile @@ -1,4 +1,3 @@ - # Makefile for the fwip(4) module (IP over IEEE1394) .PATH: ${SRCTOP}/sys/dev/firewire ${SRCTOP}/sys/net diff --git a/sys/modules/firewire/sbp/Makefile b/sys/modules/firewire/sbp/Makefile index c4fb487c309..f27d37d9f68 100644 --- a/sys/modules/firewire/sbp/Makefile +++ b/sys/modules/firewire/sbp/Makefile @@ -1,4 +1,3 @@ - # Makefile for the SBP-II (Serial Bus Protocol 2/SCSI over IEEE1394) .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firewire/sbp_targ/Makefile b/sys/modules/firewire/sbp_targ/Makefile index ff14615bd54..ab85d97f025 100644 --- a/sys/modules/firewire/sbp_targ/Makefile +++ b/sys/modules/firewire/sbp_targ/Makefile @@ -1,4 +1,3 @@ - # Makefile for the SBP-II Target mode .PATH: ${SRCTOP}/sys/dev/firewire diff --git a/sys/modules/firmware/Makefile b/sys/modules/firmware/Makefile index 949bc3e6cf2..71fe5064c8f 100644 --- a/sys/modules/firmware/Makefile +++ b/sys/modules/firmware/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= firmware diff --git a/sys/modules/flash/flexspi/Makefile b/sys/modules/flash/flexspi/Makefile index 25d937df931..94e36584484 100644 --- a/sys/modules/flash/flexspi/Makefile +++ b/sys/modules/flash/flexspi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/flash/flexspi KMOD= flexspi diff --git a/sys/modules/ftgpio/Makefile b/sys/modules/ftgpio/Makefile index eb8e22b4887..33f329dee9f 100644 --- a/sys/modules/ftgpio/Makefile +++ b/sys/modules/ftgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ftgpio KMOD= ftgpio SRCS= ftgpio.c diff --git a/sys/modules/ftwd/Makefile b/sys/modules/ftwd/Makefile index 56dd7c8a04f..f4220616baf 100644 --- a/sys/modules/ftwd/Makefile +++ b/sys/modules/ftwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ftwd KMOD= ftwd diff --git a/sys/modules/fusefs/Makefile b/sys/modules/fusefs/Makefile index 682505c401b..3c852cf7a3f 100644 --- a/sys/modules/fusefs/Makefile +++ b/sys/modules/fusefs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/fuse KMOD= fusefs diff --git a/sys/modules/fxp/Makefile b/sys/modules/fxp/Makefile index 3f8963b3f38..43dd4be031c 100644 --- a/sys/modules/fxp/Makefile +++ b/sys/modules/fxp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fxp KMOD= if_fxp diff --git a/sys/modules/gem/Makefile b/sys/modules/gem/Makefile index 820ff4f7bd5..00bae15d6f6 100644 --- a/sys/modules/gem/Makefile +++ b/sys/modules/gem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/gem KMOD= if_gem diff --git a/sys/modules/genet/Makefile b/sys/modules/genet/Makefile index fac165c688b..fa7e8f94425 100644 --- a/sys/modules/genet/Makefile +++ b/sys/modules/genet/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm64/broadcom/genet KMOD= if_genet diff --git a/sys/modules/geom/Makefile b/sys/modules/geom/Makefile index 24be5b1b82d..f696a190fde 100644 --- a/sys/modules/geom/Makefile +++ b/sys/modules/geom/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/geom/Makefile.inc b/sys/modules/geom/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/geom/Makefile.inc +++ b/sys/modules/geom/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/geom/geom_cache/Makefile b/sys/modules/geom/geom_cache/Makefile index 73bb7665d74..a8b20fdb210 100644 --- a/sys/modules/geom/geom_cache/Makefile +++ b/sys/modules/geom/geom_cache/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/cache KMOD= geom_cache diff --git a/sys/modules/geom/geom_ccd/Makefile b/sys/modules/geom/geom_ccd/Makefile index ada4b9259c0..4e8af6f5857 100644 --- a/sys/modules/geom/geom_ccd/Makefile +++ b/sys/modules/geom/geom_ccd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom KMOD= geom_ccd diff --git a/sys/modules/geom/geom_concat/Makefile b/sys/modules/geom/geom_concat/Makefile index 603f7d81cb1..e322da86f67 100644 --- a/sys/modules/geom/geom_concat/Makefile +++ b/sys/modules/geom/geom_concat/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/concat KMOD= geom_concat diff --git a/sys/modules/geom/geom_eli/Makefile b/sys/modules/geom/geom_eli/Makefile index 68907218fda..88f13bbde33 100644 --- a/sys/modules/geom/geom_eli/Makefile +++ b/sys/modules/geom/geom_eli/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/eli KMOD= geom_eli diff --git a/sys/modules/geom/geom_flashmap/Makefile b/sys/modules/geom/geom_flashmap/Makefile index 520d0ad783c..189102a547d 100644 --- a/sys/modules/geom/geom_flashmap/Makefile +++ b/sys/modules/geom/geom_flashmap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom KMOD= geom_flashmap diff --git a/sys/modules/geom/geom_gate/Makefile b/sys/modules/geom/geom_gate/Makefile index 3d084790eb7..3946e855487 100644 --- a/sys/modules/geom/geom_gate/Makefile +++ b/sys/modules/geom/geom_gate/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/gate KMOD= geom_gate diff --git a/sys/modules/geom/geom_journal/Makefile b/sys/modules/geom/geom_journal/Makefile index b8bd96d3b24..69c76dbf911 100644 --- a/sys/modules/geom/geom_journal/Makefile +++ b/sys/modules/geom/geom_journal/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/journal KMOD= geom_journal diff --git a/sys/modules/geom/geom_label/Makefile b/sys/modules/geom/geom_label/Makefile index 37ee312f849..e867d6ae0b9 100644 --- a/sys/modules/geom/geom_label/Makefile +++ b/sys/modules/geom/geom_label/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/label KMOD= geom_label diff --git a/sys/modules/geom/geom_linux_lvm/Makefile b/sys/modules/geom/geom_linux_lvm/Makefile index 0d0ee72e8d8..66661692a90 100644 --- a/sys/modules/geom/geom_linux_lvm/Makefile +++ b/sys/modules/geom/geom_linux_lvm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/linux_lvm KMOD= geom_linux_lvm diff --git a/sys/modules/geom/geom_mirror/Makefile b/sys/modules/geom/geom_mirror/Makefile index a46e0ceebf3..fcf8dc7d697 100644 --- a/sys/modules/geom/geom_mirror/Makefile +++ b/sys/modules/geom/geom_mirror/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/mirror KMOD= geom_mirror diff --git a/sys/modules/geom/geom_mountver/Makefile b/sys/modules/geom/geom_mountver/Makefile index f5df29d8f29..c1fb3fcfb3b 100644 --- a/sys/modules/geom/geom_mountver/Makefile +++ b/sys/modules/geom/geom_mountver/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/mountver KMOD= geom_mountver diff --git a/sys/modules/geom/geom_multipath/Makefile b/sys/modules/geom/geom_multipath/Makefile index a45f5d33063..a6dd25191d4 100644 --- a/sys/modules/geom/geom_multipath/Makefile +++ b/sys/modules/geom/geom_multipath/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/multipath KMOD= geom_multipath diff --git a/sys/modules/geom/geom_nop/Makefile b/sys/modules/geom/geom_nop/Makefile index 2436fc81e26..ebc2f9e8b7e 100644 --- a/sys/modules/geom/geom_nop/Makefile +++ b/sys/modules/geom/geom_nop/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/nop KMOD= geom_nop diff --git a/sys/modules/geom/geom_part/Makefile b/sys/modules/geom/geom_part/Makefile index f9a6076f184..80802c500c1 100644 --- a/sys/modules/geom/geom_part/Makefile +++ b/sys/modules/geom/geom_part/Makefile @@ -1,4 +1,3 @@ - SUBDIR= geom_part_apm \ geom_part_bsd \ geom_part_bsd64 \ diff --git a/sys/modules/geom/geom_part/geom_part_apm/Makefile b/sys/modules/geom/geom_part/geom_part_apm/Makefile index 2922e575ac0..1df21acd5f7 100644 --- a/sys/modules/geom/geom_part/geom_part_apm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_apm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_apm diff --git a/sys/modules/geom/geom_part/geom_part_bsd/Makefile b/sys/modules/geom/geom_part/geom_part_bsd/Makefile index 63c8a4813bd..558056d2a99 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part ${SRCTOP}/sys/geom KMOD= geom_part_bsd diff --git a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile index c4848ffd3c0..f316c3eec03 100644 --- a/sys/modules/geom/geom_part/geom_part_bsd64/Makefile +++ b/sys/modules/geom/geom_part/geom_part_bsd64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_bsd64 diff --git a/sys/modules/geom/geom_part/geom_part_ebr/Makefile b/sys/modules/geom/geom_part/geom_part_ebr/Makefile index cbc97075444..947eca3b203 100644 --- a/sys/modules/geom/geom_part/geom_part_ebr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ebr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ebr diff --git a/sys/modules/geom/geom_part/geom_part_gpt/Makefile b/sys/modules/geom/geom_part/geom_part_gpt/Makefile index 0183caa98e5..bdc4a9ab18c 100644 --- a/sys/modules/geom/geom_part/geom_part_gpt/Makefile +++ b/sys/modules/geom/geom_part/geom_part_gpt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_gpt diff --git a/sys/modules/geom/geom_part/geom_part_ldm/Makefile b/sys/modules/geom/geom_part/geom_part_ldm/Makefile index dcf3a83f403..a9bab9fd5fd 100644 --- a/sys/modules/geom/geom_part/geom_part_ldm/Makefile +++ b/sys/modules/geom/geom_part/geom_part_ldm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_ldm diff --git a/sys/modules/geom/geom_part/geom_part_mbr/Makefile b/sys/modules/geom/geom_part/geom_part_mbr/Makefile index b0c6664a33c..1c71b0b6a22 100644 --- a/sys/modules/geom/geom_part/geom_part_mbr/Makefile +++ b/sys/modules/geom/geom_part/geom_part_mbr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/part KMOD= geom_part_mbr diff --git a/sys/modules/geom/geom_raid/Makefile b/sys/modules/geom/geom_raid/Makefile index 65bd41b9269..9ef0fbce93f 100644 --- a/sys/modules/geom/geom_raid/Makefile +++ b/sys/modules/geom/geom_raid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/raid KMOD= geom_raid diff --git a/sys/modules/geom/geom_raid3/Makefile b/sys/modules/geom/geom_raid3/Makefile index 8581b689aac..11f1e3ac972 100644 --- a/sys/modules/geom/geom_raid3/Makefile +++ b/sys/modules/geom/geom_raid3/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/raid3 KMOD= geom_raid3 diff --git a/sys/modules/geom/geom_shsec/Makefile b/sys/modules/geom/geom_shsec/Makefile index 618dfba4387..bb22968aae0 100644 --- a/sys/modules/geom/geom_shsec/Makefile +++ b/sys/modules/geom/geom_shsec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/shsec KMOD= geom_shsec diff --git a/sys/modules/geom/geom_stripe/Makefile b/sys/modules/geom/geom_stripe/Makefile index 4ae94ca09bd..d7be4d8a645 100644 --- a/sys/modules/geom/geom_stripe/Makefile +++ b/sys/modules/geom/geom_stripe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/stripe KMOD= geom_stripe diff --git a/sys/modules/geom/geom_union/Makefile b/sys/modules/geom/geom_union/Makefile index 3ca2f4ce151..3dfde4a9fc8 100644 --- a/sys/modules/geom/geom_union/Makefile +++ b/sys/modules/geom/geom_union/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/union KMOD= geom_union diff --git a/sys/modules/geom/geom_uzip/Makefile b/sys/modules/geom/geom_uzip/Makefile index 958da0c9d21..953436484d3 100644 --- a/sys/modules/geom/geom_uzip/Makefile +++ b/sys/modules/geom/geom_uzip/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/sys/geom/uzip ${SRCTOP}/sys/net diff --git a/sys/modules/geom/geom_vinum/Makefile b/sys/modules/geom/geom_vinum/Makefile index d66ac02a13d..ba40c497736 100644 --- a/sys/modules/geom/geom_vinum/Makefile +++ b/sys/modules/geom/geom_vinum/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/vinum KMOD= geom_vinum diff --git a/sys/modules/geom/geom_virstor/Makefile b/sys/modules/geom/geom_virstor/Makefile index 2e19affd247..8ffcf4493cc 100644 --- a/sys/modules/geom/geom_virstor/Makefile +++ b/sys/modules/geom/geom_virstor/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/virstor KMOD= geom_virstor diff --git a/sys/modules/geom/geom_zero/Makefile b/sys/modules/geom/geom_zero/Makefile index c43d896d539..06c23835f72 100644 --- a/sys/modules/geom/geom_zero/Makefile +++ b/sys/modules/geom/geom_zero/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/zero KMOD= geom_zero diff --git a/sys/modules/glxiic/Makefile b/sys/modules/glxiic/Makefile index 09853747adb..c2a21e6d9ae 100644 --- a/sys/modules/glxiic/Makefile +++ b/sys/modules/glxiic/Makefile @@ -1,4 +1,3 @@ - #CFLAGS+= -DGLXIIC_DEBUG .PATH: ${SRCTOP}/sys/dev/glxiic diff --git a/sys/modules/glxsb/Makefile b/sys/modules/glxsb/Makefile index 8a138e0fea7..395916b2c64 100644 --- a/sys/modules/glxsb/Makefile +++ b/sys/modules/glxsb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/glxsb KMOD = glxsb SRCS = glxsb.c glxsb_hash.c glxsb.h diff --git a/sys/modules/hid/Makefile b/sys/modules/hid/Makefile index f2331d7db72..56c3267d868 100644 --- a/sys/modules/hid/Makefile +++ b/sys/modules/hid/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ hid \ hidbus \ diff --git a/sys/modules/hid/bcm5974/Makefile b/sys/modules/hid/bcm5974/Makefile index 50b51f497d8..803a43c9610 100644 --- a/sys/modules/hid/bcm5974/Makefile +++ b/sys/modules/hid/bcm5974/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= bcm5974 diff --git a/sys/modules/hid/hconf/Makefile b/sys/modules/hid/hconf/Makefile index 32ab19a954f..86475e06ad2 100644 --- a/sys/modules/hid/hconf/Makefile +++ b/sys/modules/hid/hconf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hconf diff --git a/sys/modules/hid/hcons/Makefile b/sys/modules/hid/hcons/Makefile index d012a3f4956..d020ba08a22 100644 --- a/sys/modules/hid/hcons/Makefile +++ b/sys/modules/hid/hcons/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hcons diff --git a/sys/modules/hid/hgame/Makefile b/sys/modules/hid/hgame/Makefile index 3af829d1e97..a9d6dadbdbc 100644 --- a/sys/modules/hid/hgame/Makefile +++ b/sys/modules/hid/hgame/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hgame diff --git a/sys/modules/hid/hid/Makefile b/sys/modules/hid/hid/Makefile index e9104b27e37..26f98d7eb57 100644 --- a/sys/modules/hid/hid/Makefile +++ b/sys/modules/hid/hid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hid diff --git a/sys/modules/hid/hidbus/Makefile b/sys/modules/hid/hidbus/Makefile index c3aa91acff4..f92f17deb5c 100644 --- a/sys/modules/hid/hidbus/Makefile +++ b/sys/modules/hid/hidbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hidbus diff --git a/sys/modules/hid/hidmap/Makefile b/sys/modules/hid/hidmap/Makefile index f682a39925e..9be54e725d4 100644 --- a/sys/modules/hid/hidmap/Makefile +++ b/sys/modules/hid/hidmap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hidmap diff --git a/sys/modules/hid/hidraw/Makefile b/sys/modules/hid/hidraw/Makefile index 6148cf9e193..996b8770e53 100644 --- a/sys/modules/hid/hidraw/Makefile +++ b/sys/modules/hid/hidraw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hidraw diff --git a/sys/modules/hid/hkbd/Makefile b/sys/modules/hid/hkbd/Makefile index 5dc4040783e..42b5d69dda9 100644 --- a/sys/modules/hid/hkbd/Makefile +++ b/sys/modules/hid/hkbd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hkbd diff --git a/sys/modules/hid/hms/Makefile b/sys/modules/hid/hms/Makefile index 573757cad52..0c6e9c1b1ec 100644 --- a/sys/modules/hid/hms/Makefile +++ b/sys/modules/hid/hms/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hms diff --git a/sys/modules/hid/hmt/Makefile b/sys/modules/hid/hmt/Makefile index a96fdd44b31..0f46acba198 100644 --- a/sys/modules/hid/hmt/Makefile +++ b/sys/modules/hid/hmt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hmt diff --git a/sys/modules/hid/hpen/Makefile b/sys/modules/hid/hpen/Makefile index ed008b43565..e1db07a9c3f 100644 --- a/sys/modules/hid/hpen/Makefile +++ b/sys/modules/hid/hpen/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hpen diff --git a/sys/modules/hid/hsctrl/Makefile b/sys/modules/hid/hsctrl/Makefile index 4e0dd5d0c4c..68984958895 100644 --- a/sys/modules/hid/hsctrl/Makefile +++ b/sys/modules/hid/hsctrl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= hsctrl diff --git a/sys/modules/hid/ietp/Makefile b/sys/modules/hid/ietp/Makefile index c3b39e7b7a5..1b8baf36ec8 100644 --- a/sys/modules/hid/ietp/Makefile +++ b/sys/modules/hid/ietp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= ietp diff --git a/sys/modules/hid/ps4dshock/Makefile b/sys/modules/hid/ps4dshock/Makefile index bb12c8a1697..0b00f16ca98 100644 --- a/sys/modules/hid/ps4dshock/Makefile +++ b/sys/modules/hid/ps4dshock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= ps4dshock diff --git a/sys/modules/hid/xb360gp/Makefile b/sys/modules/hid/xb360gp/Makefile index 1570a6cfadc..3cc846292e6 100644 --- a/sys/modules/hid/xb360gp/Makefile +++ b/sys/modules/hid/xb360gp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hid KMOD= xb360gp diff --git a/sys/modules/hifn/Makefile b/sys/modules/hifn/Makefile index 8c36def0c97..a425cc39768 100644 --- a/sys/modules/hifn/Makefile +++ b/sys/modules/hifn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hifn KMOD = hifn SRCS = hifn7751.c opt_hifn.h diff --git a/sys/modules/hptiop/Makefile b/sys/modules/hptiop/Makefile index ca28125f3c1..09249b24a2b 100644 --- a/sys/modules/hptiop/Makefile +++ b/sys/modules/hptiop/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hptiop KMOD= hptiop diff --git a/sys/modules/hyperv/Makefile b/sys/modules/hyperv/Makefile index 4b9c179641d..170564a730a 100644 --- a/sys/modules/hyperv/Makefile +++ b/sys/modules/hyperv/Makefile @@ -1,4 +1,3 @@ - SUBDIR = vmbus netvsc storvsc utilities hvsock hid .include diff --git a/sys/modules/hyperv/hid/Makefile b/sys/modules/hyperv/hid/Makefile index 22c8c46490c..f714ec3756a 100644 --- a/sys/modules/hyperv/hid/Makefile +++ b/sys/modules/hyperv/hid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/input KMOD= hv_hid diff --git a/sys/modules/hyperv/hvsock/Makefile b/sys/modules/hyperv/hvsock/Makefile index d00b8dd35dc..b168a044775 100644 --- a/sys/modules/hyperv/hvsock/Makefile +++ b/sys/modules/hyperv/hvsock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/hvsock KMOD= hv_sock diff --git a/sys/modules/hyperv/netvsc/Makefile b/sys/modules/hyperv/netvsc/Makefile index 1dad0d7b6b6..37b398de1f4 100644 --- a/sys/modules/hyperv/netvsc/Makefile +++ b/sys/modules/hyperv/netvsc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/netvsc \ ${SRCTOP}/sys/dev/hyperv/vmbus diff --git a/sys/modules/hyperv/pcib/Makefile b/sys/modules/hyperv/pcib/Makefile index ae785de5e09..be0a905aab8 100644 --- a/sys/modules/hyperv/pcib/Makefile +++ b/sys/modules/hyperv/pcib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/pcib \ ${SRCTOP}/sys/dev/hyperv/vmbus diff --git a/sys/modules/hyperv/storvsc/Makefile b/sys/modules/hyperv/storvsc/Makefile index 9802a8af02c..3c96db8e3d6 100644 --- a/sys/modules/hyperv/storvsc/Makefile +++ b/sys/modules/hyperv/storvsc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/storvsc \ ${SRCTOP}/sys/dev/hyperv/vmbus \ diff --git a/sys/modules/hyperv/utilities/Makefile b/sys/modules/hyperv/utilities/Makefile index 353b59af9e5..42b314e1f15 100644 --- a/sys/modules/hyperv/utilities/Makefile +++ b/sys/modules/hyperv/utilities/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/utilities KMOD= hv_utils diff --git a/sys/modules/hyperv/vmbus/Makefile b/sys/modules/hyperv/vmbus/Makefile index 9863f4db46c..5cd9535585d 100644 --- a/sys/modules/hyperv/vmbus/Makefile +++ b/sys/modules/hyperv/vmbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/hyperv/vmbus \ ${SRCTOP}/sys/dev/hyperv/vmbus/${MACHINE_CPUARCH} \ ${SRCTOP}/sys/dev/hyperv/vmbus/x86 diff --git a/sys/modules/i2c/Makefile b/sys/modules/i2c/Makefile index 6c976e9303f..6561327abfc 100644 --- a/sys/modules/i2c/Makefile +++ b/sys/modules/i2c/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ ads111x \ controllers \ diff --git a/sys/modules/i2c/Makefile.inc b/sys/modules/i2c/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/i2c/Makefile.inc +++ b/sys/modules/i2c/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/i2c/ads111x/Makefile b/sys/modules/i2c/ads111x/Makefile index d02cb704146..bcc7c52ef08 100644 --- a/sys/modules/i2c/ads111x/Makefile +++ b/sys/modules/i2c/ads111x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= ads111x diff --git a/sys/modules/i2c/controllers/Makefile b/sys/modules/i2c/controllers/Makefile index ce96c9d5ac8..2faf6d51a2b 100644 --- a/sys/modules/i2c/controllers/Makefile +++ b/sys/modules/i2c/controllers/Makefile @@ -1,4 +1,3 @@ - SUBDIR = alpm amdpm amdsmb ichiic ichsmb intpm ismt nfsmb viapm lpbb pcf .if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" diff --git a/sys/modules/i2c/controllers/Makefile.inc b/sys/modules/i2c/controllers/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/i2c/controllers/Makefile.inc +++ b/sys/modules/i2c/controllers/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/i2c/controllers/alpm/Makefile b/sys/modules/i2c/controllers/alpm/Makefile index 5c09fbf1db5..6afa48d70a6 100644 --- a/sys/modules/i2c/controllers/alpm/Makefile +++ b/sys/modules/i2c/controllers/alpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/alpm KMOD = alpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ diff --git a/sys/modules/i2c/controllers/amdpm/Makefile b/sys/modules/i2c/controllers/amdpm/Makefile index d04ea542cd3..ef1bccf91ae 100644 --- a/sys/modules/i2c/controllers/amdpm/Makefile +++ b/sys/modules/i2c/controllers/amdpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdpm KMOD = amdpm SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/amdsmb/Makefile b/sys/modules/i2c/controllers/amdsmb/Makefile index 2c3dd2a2e6b..db68b51286a 100644 --- a/sys/modules/i2c/controllers/amdsmb/Makefile +++ b/sys/modules/i2c/controllers/amdsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/amdsmb KMOD= amdsmb diff --git a/sys/modules/i2c/controllers/ichiic/Makefile b/sys/modules/i2c/controllers/ichiic/Makefile index 02ea3694fc8..735a222bea8 100644 --- a/sys/modules/i2c/controllers/ichiic/Makefile +++ b/sys/modules/i2c/controllers/ichiic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ichiic KMOD = ig4 SRCS = acpi_if.h device_if.h bus_if.h iicbus_if.h pci_if.h \ diff --git a/sys/modules/i2c/controllers/ichsmb/Makefile b/sys/modules/i2c/controllers/ichsmb/Makefile index 3601f737628..7141216d587 100644 --- a/sys/modules/i2c/controllers/ichsmb/Makefile +++ b/sys/modules/i2c/controllers/ichsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ichsmb KMOD = ichsmb SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/imcsmb/Makefile b/sys/modules/i2c/controllers/imcsmb/Makefile index 25fa1965f46..d51628546e9 100644 --- a/sys/modules/i2c/controllers/imcsmb/Makefile +++ b/sys/modules/i2c/controllers/imcsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/imcsmb KMOD = imcsmb SRCS = device_if.h bus_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/intpm/Makefile b/sys/modules/i2c/controllers/intpm/Makefile index 294f7e05ecd..f9f25569cc6 100644 --- a/sys/modules/i2c/controllers/intpm/Makefile +++ b/sys/modules/i2c/controllers/intpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/intpm KMOD = intpm SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ diff --git a/sys/modules/i2c/controllers/ismt/Makefile b/sys/modules/i2c/controllers/ismt/Makefile index ac00cfad17b..6daeb9e0ef8 100644 --- a/sys/modules/i2c/controllers/ismt/Makefile +++ b/sys/modules/i2c/controllers/ismt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ismt KMOD = ismt SRCS = device_if.h bus_if.h iicbb_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/controllers/lpbb/Makefile b/sys/modules/i2c/controllers/lpbb/Makefile index 20f39f4b5ad..b74bc2d55f3 100644 --- a/sys/modules/i2c/controllers/lpbb/Makefile +++ b/sys/modules/i2c/controllers/lpbb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD = lpbb SRCS = device_if.h bus_if.h iicbb_if.h ppbus_if.h \ diff --git a/sys/modules/i2c/controllers/nfsmb/Makefile b/sys/modules/i2c/controllers/nfsmb/Makefile index 5ad83865022..658c980faa1 100644 --- a/sys/modules/i2c/controllers/nfsmb/Makefile +++ b/sys/modules/i2c/controllers/nfsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nfsmb KMOD= nfsmb diff --git a/sys/modules/i2c/controllers/pcf/Makefile b/sys/modules/i2c/controllers/pcf/Makefile index fc42100b8cf..e4599dea9d5 100644 --- a/sys/modules/i2c/controllers/pcf/Makefile +++ b/sys/modules/i2c/controllers/pcf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pcf KMOD= pcf diff --git a/sys/modules/i2c/controllers/viapm/Makefile b/sys/modules/i2c/controllers/viapm/Makefile index 9a6c5bda1c1..910edf720d8 100644 --- a/sys/modules/i2c/controllers/viapm/Makefile +++ b/sys/modules/i2c/controllers/viapm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/viapm KMOD = viapm SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ diff --git a/sys/modules/i2c/cyapa/Makefile b/sys/modules/i2c/cyapa/Makefile index f69e270f855..e14a9359b69 100644 --- a/sys/modules/i2c/cyapa/Makefile +++ b/sys/modules/i2c/cyapa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/cyapa KMOD = cyapa SRCS = cyapa.c device_if.h bus_if.h iicbus_if.h vnode_if.h \ diff --git a/sys/modules/i2c/ds1307/Makefile b/sys/modules/i2c/ds1307/Makefile index 363aa412cbd..7ca283e7247 100644 --- a/sys/modules/i2c/ds1307/Makefile +++ b/sys/modules/i2c/ds1307/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1307 SRCS = ds1307.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds13rtc/Makefile b/sys/modules/i2c/ds13rtc/Makefile index a9616765b7a..daa19a0842a 100644 --- a/sys/modules/i2c/ds13rtc/Makefile +++ b/sys/modules/i2c/ds13rtc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds13rtc SRCS = ds13rtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/ds1672/Makefile b/sys/modules/i2c/ds1672/Makefile index c160e317c36..25ccce37a75 100644 --- a/sys/modules/i2c/ds1672/Makefile +++ b/sys/modules/i2c/ds1672/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds1672 SRCS = ds1672.c diff --git a/sys/modules/i2c/ds3231/Makefile b/sys/modules/i2c/ds3231/Makefile index 4c6a7241bf7..7365ef4edf1 100644 --- a/sys/modules/i2c/ds3231/Makefile +++ b/sys/modules/i2c/ds3231/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = ds3231 SRCS = ds3231.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/htu21/Makefile b/sys/modules/i2c/htu21/Makefile index e049139c20c..1c2ded0389e 100644 --- a/sys/modules/i2c/htu21/Makefile +++ b/sys/modules/i2c/htu21/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= htu21 SRCS= htu21.c diff --git a/sys/modules/i2c/hym8563/Makefile b/sys/modules/i2c/hym8563/Makefile index e6419088761..e0377ccd6c7 100644 --- a/sys/modules/i2c/hym8563/Makefile +++ b/sys/modules/i2c/hym8563/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD= hym8563 SRCS= hym8563.c diff --git a/sys/modules/i2c/icee/Makefile b/sys/modules/i2c/icee/Makefile index b66bb5a5f8c..bf6c539abef 100644 --- a/sys/modules/i2c/icee/Makefile +++ b/sys/modules/i2c/icee/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD= icee SRCS= icee.c diff --git a/sys/modules/i2c/if_ic/Makefile b/sys/modules/i2c/if_ic/Makefile index 4fac1ac0fef..b96b631902f 100644 --- a/sys/modules/i2c/if_ic/Makefile +++ b/sys/modules/i2c/if_ic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = if_ic SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/iic/Makefile b/sys/modules/i2c/iic/Makefile index 34ca739a06a..788d106064f 100644 --- a/sys/modules/i2c/iic/Makefile +++ b/sys/modules/i2c/iic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iic SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/iicbb/Makefile b/sys/modules/i2c/iicbb/Makefile index e0b7e4049de..71c120253ce 100644 --- a/sys/modules/i2c/iicbb/Makefile +++ b/sys/modules/i2c/iicbb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iicbb SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/iicbus/Makefile b/sys/modules/i2c/iicbus/Makefile index 11df1b902e7..13a63764271 100644 --- a/sys/modules/i2c/iicbus/Makefile +++ b/sys/modules/i2c/iicbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD= iicbus diff --git a/sys/modules/i2c/iichid/Makefile b/sys/modules/i2c/iichid/Makefile index 96c0257ca89..cf0d8006a79 100644 --- a/sys/modules/i2c/iichid/Makefile +++ b/sys/modules/i2c/iichid/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iichid SRCS = iichid.c diff --git a/sys/modules/i2c/iicsmb/Makefile b/sys/modules/i2c/iicsmb/Makefile index ca70677c453..06a8a5664b9 100644 --- a/sys/modules/i2c/iicsmb/Makefile +++ b/sys/modules/i2c/iicsmb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus KMOD = iicsmb SRCS = device_if.h bus_if.h iicbus_if.h \ diff --git a/sys/modules/i2c/isl/Makefile b/sys/modules/i2c/isl/Makefile index 320f6ed6704..60a9c218cbe 100644 --- a/sys/modules/i2c/isl/Makefile +++ b/sys/modules/i2c/isl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/isl KMOD = isl SRCS = isl.c device_if.h bus_if.h iicbus_if.h opt_platform.h diff --git a/sys/modules/i2c/isl12xx/Makefile b/sys/modules/i2c/isl12xx/Makefile index be0b409eeff..8ce41388dc2 100644 --- a/sys/modules/i2c/isl12xx/Makefile +++ b/sys/modules/i2c/isl12xx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = isl12xx SRCS = isl12xx.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/jedec_dimm/Makefile b/sys/modules/i2c/jedec_dimm/Makefile index 15d4034aec9..6df941e4798 100644 --- a/sys/modules/i2c/jedec_dimm/Makefile +++ b/sys/modules/i2c/jedec_dimm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../dev/jedec_dimm KMOD = jedec_dimm SRCS = jedec_dimm.c jedec_dimm.h bus_if.h device_if.h smbus_if.h diff --git a/sys/modules/i2c/max44009/Makefile b/sys/modules/i2c/max44009/Makefile index c4342b5819a..adef7594eaa 100644 --- a/sys/modules/i2c/max44009/Makefile +++ b/sys/modules/i2c/max44009/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD= max44009 SRCS= max44009.c diff --git a/sys/modules/i2c/mux/Makefile b/sys/modules/i2c/mux/Makefile index e197793e5d8..e06b96e4389 100644 --- a/sys/modules/i2c/mux/Makefile +++ b/sys/modules/i2c/mux/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ iicmux \ ltc430x \ diff --git a/sys/modules/i2c/mux/iic_gpiomux/Makefile b/sys/modules/i2c/mux/iic_gpiomux/Makefile index 7c26dd89e20..be886cb3d38 100644 --- a/sys/modules/i2c/mux/iic_gpiomux/Makefile +++ b/sys/modules/i2c/mux/iic_gpiomux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= iic_gpiomux diff --git a/sys/modules/i2c/mux/iicmux/Makefile b/sys/modules/i2c/mux/iicmux/Makefile index b8bbad587bc..7bd267797b5 100644 --- a/sys/modules/i2c/mux/iicmux/Makefile +++ b/sys/modules/i2c/mux/iicmux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= iicmux diff --git a/sys/modules/i2c/mux/ltc430x/Makefile b/sys/modules/i2c/mux/ltc430x/Makefile index 3fd5838d5ad..bcfbcd59498 100644 --- a/sys/modules/i2c/mux/ltc430x/Makefile +++ b/sys/modules/i2c/mux/ltc430x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= ltc430x diff --git a/sys/modules/i2c/mux/pca954x/Makefile b/sys/modules/i2c/mux/pca954x/Makefile index b70802b43bc..58d620312b3 100644 --- a/sys/modules/i2c/mux/pca954x/Makefile +++ b/sys/modules/i2c/mux/pca954x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/mux KMOD= pca954x diff --git a/sys/modules/i2c/nxprtc/Makefile b/sys/modules/i2c/nxprtc/Makefile index 3501909f6ea..d7f7dc04fdc 100644 --- a/sys/modules/i2c/nxprtc/Makefile +++ b/sys/modules/i2c/nxprtc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = nxprtc SRCS = nxprtc.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/pcf8574/Makefile b/sys/modules/i2c/pcf8574/Makefile index 53290fb8cce..b3b357d6b33 100644 --- a/sys/modules/i2c/pcf8574/Makefile +++ b/sys/modules/i2c/pcf8574/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/gpio/ KMOD = pcf8574 SRCS = pcf8574.c diff --git a/sys/modules/i2c/pcf8591/Makefile b/sys/modules/i2c/pcf8591/Makefile index 8f17f3dc3ae..ee2e788272c 100644 --- a/sys/modules/i2c/pcf8591/Makefile +++ b/sys/modules/i2c/pcf8591/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/adc KMOD= pcf8591 SRCS= pcf8591.c diff --git a/sys/modules/i2c/rtc8583/Makefile b/sys/modules/i2c/rtc8583/Makefile index a474da20685..035d6de652e 100644 --- a/sys/modules/i2c/rtc8583/Makefile +++ b/sys/modules/i2c/rtc8583/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = rtc8583 SRCS = rtc8583.c diff --git a/sys/modules/i2c/rv3032/Makefile b/sys/modules/i2c/rv3032/Makefile index 7d3f8ac47aa..32ff79c9e03 100644 --- a/sys/modules/i2c/rv3032/Makefile +++ b/sys/modules/i2c/rv3032/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD= rv3032 SRCS= rv3032.c diff --git a/sys/modules/i2c/rx8803/Makefile b/sys/modules/i2c/rx8803/Makefile index a2b30582cab..b630fd17c1f 100644 --- a/sys/modules/i2c/rx8803/Makefile +++ b/sys/modules/i2c/rx8803/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc/ KMOD = rx8803 SRCS = rx8803.c diff --git a/sys/modules/i2c/s35390a/Makefile b/sys/modules/i2c/s35390a/Makefile index e12ddeece2e..9fd63d731a3 100644 --- a/sys/modules/i2c/s35390a/Makefile +++ b/sys/modules/i2c/s35390a/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/rtc KMOD = s35390a SRCS = s35390a.c bus_if.h clock_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/i2c/smb/Makefile b/sys/modules/i2c/smb/Makefile index 99cf7751426..57b6a3ba55e 100644 --- a/sys/modules/i2c/smb/Makefile +++ b/sys/modules/i2c/smb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/smbus KMOD = smb SRCS = device_if.h bus_if.h smbus_if.h \ diff --git a/sys/modules/i2c/smbus/Makefile b/sys/modules/i2c/smbus/Makefile index 530d576ba80..e22d607eaaa 100644 --- a/sys/modules/i2c/smbus/Makefile +++ b/sys/modules/i2c/smbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/smbus KMOD = smbus SRCS = device_if.h bus_if.h smbus_if.h smbus_if.c \ diff --git a/sys/modules/i2c/tmp461/Makefile b/sys/modules/i2c/tmp461/Makefile index 9c4d6518d59..381a68f0dd5 100644 --- a/sys/modules/i2c/tmp461/Makefile +++ b/sys/modules/i2c/tmp461/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/sensor KMOD = tmp461 SRCS = tmp461.c bus_if.h device_if.h iicbus_if.h ofw_bus_if.h opt_platform.h diff --git a/sys/modules/iavf/Makefile b/sys/modules/iavf/Makefile index d572c79d544..92e929b9048 100644 --- a/sys/modules/iavf/Makefile +++ b/sys/modules/iavf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iavf KMOD = if_iavf diff --git a/sys/modules/ice/Makefile b/sys/modules/ice/Makefile index 54f82489416..91f20193d87 100644 --- a/sys/modules/ice/Makefile +++ b/sys/modules/ice/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ice KMOD = if_ice diff --git a/sys/modules/ice_ddp/Makefile b/sys/modules/ice_ddp/Makefile index e0ef344a828..bacf95365c8 100644 --- a/sys/modules/ice_ddp/Makefile +++ b/sys/modules/ice_ddp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ice KMOD= ice_ddp diff --git a/sys/modules/ichwd/Makefile b/sys/modules/ichwd/Makefile index 5a136c180f2..3c3bbc37eff 100644 --- a/sys/modules/ichwd/Makefile +++ b/sys/modules/ichwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ichwd KMOD= ichwd diff --git a/sys/modules/ida/Makefile b/sys/modules/ida/Makefile index 4e67e16a10b..fee7a2fbab7 100644 --- a/sys/modules/ida/Makefile +++ b/sys/modules/ida/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ida KMOD= ida diff --git a/sys/modules/if_bridge/Makefile b/sys/modules/if_bridge/Makefile index 0835d1a383a..6fb47110c33 100644 --- a/sys/modules/if_bridge/Makefile +++ b/sys/modules/if_bridge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_bridge SRCS= if_bridge.c opt_inet.h opt_inet6.h opt_carp.h diff --git a/sys/modules/if_disc/Makefile b/sys/modules/if_disc/Makefile index 53b9ab146da..8879be2e591 100644 --- a/sys/modules/if_disc/Makefile +++ b/sys/modules/if_disc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_disc diff --git a/sys/modules/if_edsc/Makefile b/sys/modules/if_edsc/Makefile index 5a72f3951d8..32f1b6dedc0 100644 --- a/sys/modules/if_edsc/Makefile +++ b/sys/modules/if_edsc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_edsc diff --git a/sys/modules/if_enc/Makefile b/sys/modules/if_enc/Makefile index be57d3114d3..449d869d6a2 100644 --- a/sys/modules/if_enc/Makefile +++ b/sys/modules/if_enc/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_epair/Makefile b/sys/modules/if_epair/Makefile index bb4be21c712..86b8c849a1e 100644 --- a/sys/modules/if_epair/Makefile +++ b/sys/modules/if_epair/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_epair diff --git a/sys/modules/if_gif/Makefile b/sys/modules/if_gif/Makefile index fb13f7af32f..efcd6952a8a 100644 --- a/sys/modules/if_gif/Makefile +++ b/sys/modules/if_gif/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_gre/Makefile b/sys/modules/if_gre/Makefile index 44643e5f097..9f50708a14d 100644 --- a/sys/modules/if_gre/Makefile +++ b/sys/modules/if_gre/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/net ${SYSDIR}/netinet ${SYSDIR}/netinet6 .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/if_infiniband/Makefile b/sys/modules/if_infiniband/Makefile index ac191c14329..01e3164b127 100644 --- a/sys/modules/if_infiniband/Makefile +++ b/sys/modules/if_infiniband/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_infiniband diff --git a/sys/modules/if_lagg/Makefile b/sys/modules/if_lagg/Makefile index 7952fa836a8..6a570f3b0c6 100644 --- a/sys/modules/if_lagg/Makefile +++ b/sys/modules/if_lagg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_lagg SRCS= if_lagg.c ieee8023ad_lacp.c opt_inet.h opt_inet6.h opt_kern_tls.h diff --git a/sys/modules/if_me/Makefile b/sys/modules/if_me/Makefile index c9b045cf734..21fdbd2b766 100644 --- a/sys/modules/if_me/Makefile +++ b/sys/modules/if_me/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_me diff --git a/sys/modules/if_stf/Makefile b/sys/modules/if_stf/Makefile index 6cac98219a4..7545f8507fa 100644 --- a/sys/modules/if_stf/Makefile +++ b/sys/modules/if_stf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_stf diff --git a/sys/modules/if_tuntap/Makefile b/sys/modules/if_tuntap/Makefile index 22ca9a144c1..8a23a4bbed8 100644 --- a/sys/modules/if_tuntap/Makefile +++ b/sys/modules/if_tuntap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_tuntap diff --git a/sys/modules/if_vlan/Makefile b/sys/modules/if_vlan/Makefile index a9eb44e2527..3077f4289d5 100644 --- a/sys/modules/if_vlan/Makefile +++ b/sys/modules/if_vlan/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_vlan diff --git a/sys/modules/if_vxlan/Makefile b/sys/modules/if_vxlan/Makefile index 60d38d4d185..a9be25cf2db 100644 --- a/sys/modules/if_vxlan/Makefile +++ b/sys/modules/if_vxlan/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= if_vxlan diff --git a/sys/modules/iflib/Makefile b/sys/modules/iflib/Makefile index 5d30b5fdad9..a4a5706cfd5 100644 --- a/sys/modules/iflib/Makefile +++ b/sys/modules/iflib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net KMOD= iflib diff --git a/sys/modules/igc/Makefile b/sys/modules/igc/Makefile index 54cdbee3242..229da5f6592 100644 --- a/sys/modules/igc/Makefile +++ b/sys/modules/igc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/igc KMOD = if_igc diff --git a/sys/modules/imgact_binmisc/Makefile b/sys/modules/imgact_binmisc/Makefile index a77f79dfeaa..fbe9d8d0f82 100644 --- a/sys/modules/imgact_binmisc/Makefile +++ b/sys/modules/imgact_binmisc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= imgact_binmisc diff --git a/sys/modules/imx/imx6_ahci/Makefile b/sys/modules/imx/imx6_ahci/Makefile index 5d7ad5c6786..0fd16a8614c 100644 --- a/sys/modules/imx/imx6_ahci/Makefile +++ b/sys/modules/imx/imx6_ahci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx6_ahci diff --git a/sys/modules/imx/imx6_snvs/Makefile b/sys/modules/imx/imx6_snvs/Makefile index 1c0d5c1accf..3208ea2c075 100644 --- a/sys/modules/imx/imx6_snvs/Makefile +++ b/sys/modules/imx/imx6_snvs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx6_snvs diff --git a/sys/modules/imx/imx_i2c/Makefile b/sys/modules/imx/imx_i2c/Makefile index b089d587489..82297b3d6e9 100644 --- a/sys/modules/imx/imx_i2c/Makefile +++ b/sys/modules/imx/imx_i2c/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx_i2c diff --git a/sys/modules/imx/imx_spi/Makefile b/sys/modules/imx/imx_spi/Makefile index 5dc6cd65076..e79814e7898 100644 --- a/sys/modules/imx/imx_spi/Makefile +++ b/sys/modules/imx/imx_spi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx_spi diff --git a/sys/modules/imx/imx_wdog/Makefile b/sys/modules/imx/imx_wdog/Makefile index ef6ca085476..7923798d66b 100644 --- a/sys/modules/imx/imx_wdog/Makefile +++ b/sys/modules/imx/imx_wdog/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/freescale/imx KMOD= imx_wdog diff --git a/sys/modules/intelspi/Makefile b/sys/modules/intelspi/Makefile index ec97b0a6ede..8f2205b8b11 100644 --- a/sys/modules/intelspi/Makefile +++ b/sys/modules/intelspi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/intel KMOD= intelspi SRCS= spi.c spi_acpi.c spi_pci.c diff --git a/sys/modules/io/Makefile b/sys/modules/io/Makefile index ed0f1f1643e..d9102ee8557 100644 --- a/sys/modules/io/Makefile +++ b/sys/modules/io/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/io .PATH: ${SRCTOP}/sys/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} diff --git a/sys/modules/ip6_mroute_mod/Makefile b/sys/modules/ip6_mroute_mod/Makefile index 9772c1ed0ea..3516893ea18 100644 --- a/sys/modules/ip6_mroute_mod/Makefile +++ b/sys/modules/ip6_mroute_mod/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet6 KMOD= ip6_mroute diff --git a/sys/modules/ip_mroute_mod/Makefile b/sys/modules/ip_mroute_mod/Makefile index 2c1364539d9..1da154894dd 100644 --- a/sys/modules/ip_mroute_mod/Makefile +++ b/sys/modules/ip_mroute_mod/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet ${SRCTOP}/sys/netinet6 KMOD= ip_mroute diff --git a/sys/modules/ipdivert/Makefile b/sys/modules/ipdivert/Makefile index 981d1559fce..c319ec81348 100644 --- a/sys/modules/ipdivert/Makefile +++ b/sys/modules/ipdivert/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= ipdivert diff --git a/sys/modules/ipfilter/Makefile b/sys/modules/ipfilter/Makefile index d2f32538b68..6c5fc140f36 100644 --- a/sys/modules/ipfilter/Makefile +++ b/sys/modules/ipfilter/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfilter/netinet KMOD= ipl diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index 35723925d12..7d16c17f0b2 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= ipfw diff --git a/sys/modules/ipfw_nat/Makefile b/sys/modules/ipfw_nat/Makefile index 0ebc25f95be..bace25d5324 100644 --- a/sys/modules/ipfw_nat/Makefile +++ b/sys/modules/ipfw_nat/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw KMOD= ipfw_nat diff --git a/sys/modules/ipfw_nat64/Makefile b/sys/modules/ipfw_nat64/Makefile index 4beffc8426c..bb67bf74085 100644 --- a/sys/modules/ipfw_nat64/Makefile +++ b/sys/modules/ipfw_nat64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw/nat64 KMOD= ipfw_nat64 diff --git a/sys/modules/ipfw_nptv6/Makefile b/sys/modules/ipfw_nptv6/Makefile index 7b49d72027e..2d5dac19296 100644 --- a/sys/modules/ipfw_nptv6/Makefile +++ b/sys/modules/ipfw_nptv6/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw/nptv6 KMOD= ipfw_nptv6 diff --git a/sys/modules/ipfw_pmod/Makefile b/sys/modules/ipfw_pmod/Makefile index d2473573ee2..ddf7bd56e20 100644 --- a/sys/modules/ipfw_pmod/Makefile +++ b/sys/modules/ipfw_pmod/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/ipfw/pmod KMOD= ipfw_pmod diff --git a/sys/modules/ipmi/Makefile b/sys/modules/ipmi/Makefile index 41c4d528531..9419100cc01 100644 --- a/sys/modules/ipmi/Makefile +++ b/sys/modules/ipmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ipmi # XXX - ipmi_smbus and ipmi_ssif depend on smbus diff --git a/sys/modules/ipmi/ipmi_linux/Makefile b/sys/modules/ipmi/ipmi_linux/Makefile index 50e918db804..bab62d7fdc8 100644 --- a/sys/modules/ipmi/ipmi_linux/Makefile +++ b/sys/modules/ipmi/ipmi_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ipmi KMOD= ipmi_linux diff --git a/sys/modules/ips/Makefile b/sys/modules/ips/Makefile index b505e7d62b6..09d3cf9c1da 100644 --- a/sys/modules/ips/Makefile +++ b/sys/modules/ips/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ips KMOD = ips SRCS = ips.c ips_pci.c ips.h ips_disk.c ips_disk.h ips_commands.c \ diff --git a/sys/modules/ipsec/Makefile b/sys/modules/ipsec/Makefile index 8979508375a..1e2d73ca7a1 100644 --- a/sys/modules/ipsec/Makefile +++ b/sys/modules/ipsec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net ${SRCTOP}/sys/netipsec KMOD= ipsec diff --git a/sys/modules/ipw/Makefile b/sys/modules/ipw/Makefile index b91464b894d..076d5a19c1d 100644 --- a/sys/modules/ipw/Makefile +++ b/sys/modules/ipw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ipw KMOD = if_ipw diff --git a/sys/modules/ipwfw/Makefile b/sys/modules/ipwfw/Makefile index 59ff2c4face..47cbe06967b 100644 --- a/sys/modules/ipwfw/Makefile +++ b/sys/modules/ipwfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ipw_bss \ ipw_ibss \ ipw_monitor diff --git a/sys/modules/ipwfw/ipw_bss/Makefile b/sys/modules/ipwfw/ipw_bss/Makefile index 2e7fcd9e45a..368d6575f8e 100644 --- a/sys/modules/ipwfw/ipw_bss/Makefile +++ b/sys/modules/ipwfw/ipw_bss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_bss diff --git a/sys/modules/ipwfw/ipw_ibss/Makefile b/sys/modules/ipwfw/ipw_ibss/Makefile index 75788b756ff..77f06ff61ed 100644 --- a/sys/modules/ipwfw/ipw_ibss/Makefile +++ b/sys/modules/ipwfw/ipw_ibss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_ibss diff --git a/sys/modules/ipwfw/ipw_monitor/Makefile b/sys/modules/ipwfw/ipw_monitor/Makefile index 39179ab231e..29230eb22b6 100644 --- a/sys/modules/ipwfw/ipw_monitor/Makefile +++ b/sys/modules/ipwfw/ipw_monitor/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/ipw KMOD= ipw_monitor diff --git a/sys/modules/iscsi/Makefile b/sys/modules/iscsi/Makefile index c80f32d19da..7ec5d455932 100644 --- a/sys/modules/iscsi/Makefile +++ b/sys/modules/iscsi/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/iser/Makefile b/sys/modules/iser/Makefile index d0db499e6fd..615199ec97a 100644 --- a/sys/modules/iser/Makefile +++ b/sys/modules/iser/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/isp/Makefile b/sys/modules/isp/Makefile index d203b8f464c..05bc1c8e1f8 100644 --- a/sys/modules/isp/Makefile +++ b/sys/modules/isp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/isp KMOD= isp diff --git a/sys/modules/itwd/Makefile b/sys/modules/itwd/Makefile index 02a5959387d..f6ee5495d8a 100644 --- a/sys/modules/itwd/Makefile +++ b/sys/modules/itwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/itwd KMOD= itwd diff --git a/sys/modules/iwi/Makefile b/sys/modules/iwi/Makefile index 3994161da39..54f49a08f7c 100644 --- a/sys/modules/iwi/Makefile +++ b/sys/modules/iwi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iwi KMOD = if_iwi diff --git a/sys/modules/iwifw/Makefile b/sys/modules/iwifw/Makefile index 6d5ab036cd3..52343aa6fb4 100644 --- a/sys/modules/iwifw/Makefile +++ b/sys/modules/iwifw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwi_bss \ iwi_ibss \ iwi_monitor diff --git a/sys/modules/iwifw/iwi_bss/Makefile b/sys/modules/iwifw/iwi_bss/Makefile index 6452289898f..278929d5b93 100644 --- a/sys/modules/iwifw/iwi_bss/Makefile +++ b/sys/modules/iwifw/iwi_bss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_bss diff --git a/sys/modules/iwifw/iwi_ibss/Makefile b/sys/modules/iwifw/iwi_ibss/Makefile index ad4e7670662..008439f94ab 100644 --- a/sys/modules/iwifw/iwi_ibss/Makefile +++ b/sys/modules/iwifw/iwi_ibss/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_ibss diff --git a/sys/modules/iwifw/iwi_monitor/Makefile b/sys/modules/iwifw/iwi_monitor/Makefile index 91dc7f33b07..9c8e8e23abc 100644 --- a/sys/modules/iwifw/iwi_monitor/Makefile +++ b/sys/modules/iwifw/iwi_monitor/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/iwi KMOD= iwi_monitor diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index 256e08282ad..72864caedea 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -1,4 +1,3 @@ - DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi .PATH: ${DEVIWLWIFIDIR} diff --git a/sys/modules/iwlwififw/Makefile b/sys/modules/iwlwififw/Makefile index 756fb2f73af..dcecb2072d0 100644 --- a/sys/modules/iwlwififw/Makefile +++ b/sys/modules/iwlwififw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ iwlwifi-3160-fw \ iwlwifi-3168-fw \ diff --git a/sys/modules/iwlwififw/Makefile.inc b/sys/modules/iwlwififw/Makefile.inc index ea3e8878380..1fe51a087f5 100644 --- a/sys/modules/iwlwififw/Makefile.inc +++ b/sys/modules/iwlwififw/Makefile.inc @@ -1,4 +1,3 @@ - # Common rules for building iwlwifi firmware. EXT?= ucode diff --git a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile index 69d537c8975..22817a07053 100644 --- a/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 17 NAME= 3160 diff --git a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile index 2e98c2148a7..8f5ab6a1511 100644 --- a/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 29 NAME= 3168 diff --git a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile index befd607a269..d18dca802cb 100644 --- a/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 17 NAME= 7260 diff --git a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile index 42d7c508dd1..3058f7e26d2 100644 --- a/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 17 NAME= 7265 diff --git a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile index 37af2799e1e..30d1788fa0b 100644 --- a/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 29 NAME= 7265D diff --git a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile index 0b3efe221d0..d0e9113028b 100644 --- a/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 36 NAME= 8000C diff --git a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile index 5f238c8aa61..344c76d69db 100644 --- a/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 36 NAME= 8265 diff --git a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile index 03b5d5d142d..4475367933e 100644 --- a/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 46 NAME= 9000-pu-b0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile index 37ae25a4a83..b33ac5a53f7 100644 --- a/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 46 NAME= 9260-th-b0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile index e781e790a04..d991ff20e09 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-b0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile index ac8b13cd177..2876476060b 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-b0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile index 15389b3c3e2..dc3f899e52c 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-c0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile index bd9cd507702..3d8ab9d436a 100644 --- a/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= Qu-c0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile index d15ee364367..387813717cd 100644 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= QuZ-a0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile index ac0f398a10d..b4198a3068b 100644 --- a/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= QuZ-a0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile index 645e3c94684..b6949c29c30 100644 --- a/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= cc-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile index 4a078a28c3b..e44c7c406e8 100644 --- a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= gl-c0-fm-c0 diff --git a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile index 8b1f4692271..4fc1b42284d 100644 --- a/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-gl-c0-fm-c0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= gl-c0-fm-c0 EXT= pnvm diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile index 4106eedfa33..5c1d26d1e8c 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile index 56b5cbde6c2..bf14a597c5b 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf-a0 EXT= pnvm diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile index f89756193b8..c75525c620e 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf4-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile index a13ba593b62..49eae25d5e5 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= so-a0-gf4-a0 EXT= pnvm diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile index ae908c41376..4c056fcfd3c 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 81 NAME= so-a0-hr-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile index 372a04314cf..1ffc42d0ea1 100644 --- a/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 77 NAME= so-a0-jf-b0 diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile index 3bb0931b524..032c3a9d217 100644 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= ty-a0-gf-a0 diff --git a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile index 1dcb4141475..83a7b625d64 100644 --- a/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile +++ b/sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile @@ -1,4 +1,3 @@ - FWVERSION= 83 NAME= ty-a0-gf-a0 EXT= pnvm diff --git a/sys/modules/iwm/Makefile b/sys/modules/iwm/Makefile index a115c4a807b..07b8334c569 100644 --- a/sys/modules/iwm/Makefile +++ b/sys/modules/iwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iwm KMOD= if_iwm diff --git a/sys/modules/iwmfw/Makefile b/sys/modules/iwmfw/Makefile index 1ff62d2ab3b..9101f0f816e 100644 --- a/sys/modules/iwmfw/Makefile +++ b/sys/modules/iwmfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwm3160fw \ iwm3168fw \ iwm7260fw \ diff --git a/sys/modules/iwmfw/iwm3160fw/Makefile b/sys/modules/iwmfw/iwm3160fw/Makefile index 42701d1d58d..cc507306a32 100644 --- a/sys/modules/iwmfw/iwm3160fw/Makefile +++ b/sys/modules/iwmfw/iwm3160fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm3160fw IMG= iwm-3160-17 diff --git a/sys/modules/iwmfw/iwm3168fw/Makefile b/sys/modules/iwmfw/iwm3168fw/Makefile index 2ee4ff4292b..3b325c82729 100644 --- a/sys/modules/iwmfw/iwm3168fw/Makefile +++ b/sys/modules/iwmfw/iwm3168fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm3168fw IMG= iwm-3168-22 diff --git a/sys/modules/iwmfw/iwm7260fw/Makefile b/sys/modules/iwmfw/iwm7260fw/Makefile index 5d22c234303..56b8b1d43e5 100644 --- a/sys/modules/iwmfw/iwm7260fw/Makefile +++ b/sys/modules/iwmfw/iwm7260fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm7260fw IMG= iwm-7260-17 diff --git a/sys/modules/iwmfw/iwm7265Dfw/Makefile b/sys/modules/iwmfw/iwm7265Dfw/Makefile index e3f8af5cbcf..d2a5097a723 100644 --- a/sys/modules/iwmfw/iwm7265Dfw/Makefile +++ b/sys/modules/iwmfw/iwm7265Dfw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm7265Dfw IMG= iwm-7265D-22 diff --git a/sys/modules/iwmfw/iwm7265fw/Makefile b/sys/modules/iwmfw/iwm7265fw/Makefile index 9be31560ccc..5ccdb7aacd6 100644 --- a/sys/modules/iwmfw/iwm7265fw/Makefile +++ b/sys/modules/iwmfw/iwm7265fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm7265fw IMG= iwm-7265-17 diff --git a/sys/modules/iwmfw/iwm8000Cfw/Makefile b/sys/modules/iwmfw/iwm8000Cfw/Makefile index 3ba360d4040..d09a6243b53 100644 --- a/sys/modules/iwmfw/iwm8000Cfw/Makefile +++ b/sys/modules/iwmfw/iwm8000Cfw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm8000Cfw IMG= iwm-8000C-22 diff --git a/sys/modules/iwmfw/iwm8265fw/Makefile b/sys/modules/iwmfw/iwm8265fw/Makefile index 1a4930c5e77..1ad04a45556 100644 --- a/sys/modules/iwmfw/iwm8265fw/Makefile +++ b/sys/modules/iwmfw/iwm8265fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm8265fw IMG= iwm-8265-22 diff --git a/sys/modules/iwmfw/iwm9000fw/Makefile b/sys/modules/iwmfw/iwm9000fw/Makefile index d78dce7be8a..3c921ba9729 100644 --- a/sys/modules/iwmfw/iwm9000fw/Makefile +++ b/sys/modules/iwmfw/iwm9000fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm9000fw IMG= iwm-9000-34 diff --git a/sys/modules/iwmfw/iwm9260fw/Makefile b/sys/modules/iwmfw/iwm9260fw/Makefile index a8693d2b6d6..63985872500 100644 --- a/sys/modules/iwmfw/iwm9260fw/Makefile +++ b/sys/modules/iwmfw/iwm9260fw/Makefile @@ -1,4 +1,3 @@ - KMOD= iwm9260fw IMG= iwm-9260-34 diff --git a/sys/modules/iwn/Makefile b/sys/modules/iwn/Makefile index 5a219ffa5c6..4cd2f02f6b2 100644 --- a/sys/modules/iwn/Makefile +++ b/sys/modules/iwn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iwn KMOD = if_iwn diff --git a/sys/modules/iwnfw/Makefile b/sys/modules/iwnfw/Makefile index 487009a027a..bb2d6a11cec 100644 --- a/sys/modules/iwnfw/Makefile +++ b/sys/modules/iwnfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwn100 \ iwn105 \ iwn135 \ diff --git a/sys/modules/iwnfw/iwn100/Makefile b/sys/modules/iwnfw/iwn100/Makefile index 24a3943934a..883033887bf 100644 --- a/sys/modules/iwnfw/iwn100/Makefile +++ b/sys/modules/iwnfw/iwn100/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn100fw IMG= iwlwifi-100-39.31.5.1 diff --git a/sys/modules/iwnfw/iwn1000/Makefile b/sys/modules/iwnfw/iwn1000/Makefile index 4107d5a69a2..af9231d91f3 100644 --- a/sys/modules/iwnfw/iwn1000/Makefile +++ b/sys/modules/iwnfw/iwn1000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn1000fw IMG= iwlwifi-1000-39.31.5.1 diff --git a/sys/modules/iwnfw/iwn105/Makefile b/sys/modules/iwnfw/iwn105/Makefile index 71a93d240db..0727fc8ca55 100644 --- a/sys/modules/iwnfw/iwn105/Makefile +++ b/sys/modules/iwnfw/iwn105/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn105fw IMG= iwlwifi-105-6-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn135/Makefile b/sys/modules/iwnfw/iwn135/Makefile index 24f6cf7cf9c..05b3c8af053 100644 --- a/sys/modules/iwnfw/iwn135/Makefile +++ b/sys/modules/iwnfw/iwn135/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn135fw IMG= iwlwifi-135-6-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn2000/Makefile b/sys/modules/iwnfw/iwn2000/Makefile index 72a676886b0..f761c8dc60f 100644 --- a/sys/modules/iwnfw/iwn2000/Makefile +++ b/sys/modules/iwnfw/iwn2000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn2000fw IMG= iwlwifi-2000-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn2030/Makefile b/sys/modules/iwnfw/iwn2030/Makefile index c11fa66fe9c..d2faaee47bb 100644 --- a/sys/modules/iwnfw/iwn2030/Makefile +++ b/sys/modules/iwnfw/iwn2030/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn2030fw IMG= iwnwifi-2030-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn4965/Makefile b/sys/modules/iwnfw/iwn4965/Makefile index f3bad9ecbf2..0c430782c3c 100644 --- a/sys/modules/iwnfw/iwn4965/Makefile +++ b/sys/modules/iwnfw/iwn4965/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn4965fw IMG= iwlwifi-4965-228.61.2.24 diff --git a/sys/modules/iwnfw/iwn5000/Makefile b/sys/modules/iwnfw/iwn5000/Makefile index 7c79e86c3f9..821e096a00a 100644 --- a/sys/modules/iwnfw/iwn5000/Makefile +++ b/sys/modules/iwnfw/iwn5000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn5000fw IMG= iwlwifi-5000-8.83.5.1 diff --git a/sys/modules/iwnfw/iwn5150/Makefile b/sys/modules/iwnfw/iwn5150/Makefile index c4616797b01..ae220149f2d 100644 --- a/sys/modules/iwnfw/iwn5150/Makefile +++ b/sys/modules/iwnfw/iwn5150/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn5150fw IMG= iwlwifi-5150-8.24.2.2 diff --git a/sys/modules/iwnfw/iwn6000/Makefile b/sys/modules/iwnfw/iwn6000/Makefile index 76164ed97f8..c38b6d88b68 100644 --- a/sys/modules/iwnfw/iwn6000/Makefile +++ b/sys/modules/iwnfw/iwn6000/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6000fw IMG= iwlwifi-6000-9.221.4.1 diff --git a/sys/modules/iwnfw/iwn6000g2a/Makefile b/sys/modules/iwnfw/iwn6000g2a/Makefile index 61375d6708a..5e7ceb639b9 100644 --- a/sys/modules/iwnfw/iwn6000g2a/Makefile +++ b/sys/modules/iwnfw/iwn6000g2a/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6000g2afw IMG= iwlwifi-6000g2a-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn6000g2b/Makefile b/sys/modules/iwnfw/iwn6000g2b/Makefile index d9020b807d4..e7c0891d1d4 100644 --- a/sys/modules/iwnfw/iwn6000g2b/Makefile +++ b/sys/modules/iwnfw/iwn6000g2b/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6000g2bfw IMG= iwlwifi-6000g2b-18.168.6.1 diff --git a/sys/modules/iwnfw/iwn6050/Makefile b/sys/modules/iwnfw/iwn6050/Makefile index 742a96ca65c..5ccae842acb 100644 --- a/sys/modules/iwnfw/iwn6050/Makefile +++ b/sys/modules/iwnfw/iwn6050/Makefile @@ -1,4 +1,3 @@ - KMOD= iwn6050fw IMG= iwlwifi-6050-41.28.5.1 diff --git a/sys/modules/ix/Makefile b/sys/modules/ix/Makefile index 2c71371b88f..ad9f36e054e 100644 --- a/sys/modules/ix/Makefile +++ b/sys/modules/ix/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ixgbe KMOD = if_ix diff --git a/sys/modules/ixl/Makefile b/sys/modules/ixl/Makefile index 32f000734c9..cfb64440281 100644 --- a/sys/modules/ixl/Makefile +++ b/sys/modules/ixl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ixl KMOD = if_ixl diff --git a/sys/modules/ixv/Makefile b/sys/modules/ixv/Makefile index e2616e2cfd5..1b4431ac11c 100644 --- a/sys/modules/ixv/Makefile +++ b/sys/modules/ixv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ixgbe KMOD = if_ixv diff --git a/sys/modules/jme/Makefile b/sys/modules/jme/Makefile index 414b579e06d..1390357137c 100644 --- a/sys/modules/jme/Makefile +++ b/sys/modules/jme/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/jme KMOD= if_jme diff --git a/sys/modules/kgssapi/Makefile b/sys/modules/kgssapi/Makefile index a3eb812fd6e..f060a3039b4 100644 --- a/sys/modules/kgssapi/Makefile +++ b/sys/modules/kgssapi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kgssapi ${SRCTOP}/sys/rpc/rpcsec_gss KMOD= kgssapi diff --git a/sys/modules/kgssapi_krb5/Makefile b/sys/modules/kgssapi_krb5/Makefile index a540e9a7401..60e94586c0a 100644 --- a/sys/modules/kgssapi_krb5/Makefile +++ b/sys/modules/kgssapi_krb5/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kgssapi/krb5 KMOD= kgssapi_krb5 diff --git a/sys/modules/khelp/Makefile b/sys/modules/khelp/Makefile index 173ba679bfc..fc8fc1ac836 100644 --- a/sys/modules/khelp/Makefile +++ b/sys/modules/khelp/Makefile @@ -1,4 +1,3 @@ - SUBDIR= # Do we have the TCP_HHOOK symbol defined? If not, there is no point in diff --git a/sys/modules/khelp/h_ertt/Makefile b/sys/modules/khelp/h_ertt/Makefile index d149cf254b6..007e17c4a18 100644 --- a/sys/modules/khelp/h_ertt/Makefile +++ b/sys/modules/khelp/h_ertt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/khelp KMOD= h_ertt SRCS= h_ertt.c opt_kern_tls.h diff --git a/sys/modules/krpc/Makefile b/sys/modules/krpc/Makefile index 168d1a3fc62..a49207b7812 100644 --- a/sys/modules/krpc/Makefile +++ b/sys/modules/krpc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/rpc ${SRCTOP}/sys/rpc/rpcsec_tls KMOD= krpc SRCS= auth_none.c \ diff --git a/sys/modules/ksyms/Makefile b/sys/modules/ksyms/Makefile index bf5f5fec89d..ccf9a092c49 100644 --- a/sys/modules/ksyms/Makefile +++ b/sys/modules/ksyms/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ksyms KMOD= ksyms diff --git a/sys/modules/ktest/ktest/Makefile b/sys/modules/ktest/ktest/Makefile index 264eb7b9f44..3d4f1a8c2cc 100644 --- a/sys/modules/ktest/ktest/Makefile +++ b/sys/modules/ktest/ktest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/ktest/ktest_example/Makefile b/sys/modules/ktest/ktest_example/Makefile index a5fe6d6d784..2b572d867aa 100644 --- a/sys/modules/ktest/ktest_example/Makefile +++ b/sys/modules/ktest/ktest_example/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/ktest/ktest_netlink_message_writer/Makefile b/sys/modules/ktest/ktest_netlink_message_writer/Makefile index 2f84b2fecd7..a91c45755d0 100644 --- a/sys/modules/ktest/ktest_netlink_message_writer/Makefile +++ b/sys/modules/ktest/ktest_netlink_message_writer/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/le/Makefile b/sys/modules/le/Makefile index 4364a4fc660..908247b957d 100644 --- a/sys/modules/le/Makefile +++ b/sys/modules/le/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/le KMOD= if_le diff --git a/sys/modules/lge/Makefile b/sys/modules/lge/Makefile index 45869c03945..d1ae05c2143 100644 --- a/sys/modules/lge/Makefile +++ b/sys/modules/lge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/lge KMOD= if_lge diff --git a/sys/modules/libalias/Makefile b/sys/modules/libalias/Makefile index 02fd37c62a1..c847f55e8e0 100644 --- a/sys/modules/libalias/Makefile +++ b/sys/modules/libalias/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libalias modules .include diff --git a/sys/modules/libalias/libalias/Makefile b/sys/modules/libalias/libalias/Makefile index e72e8e0e129..61ada50950d 100644 --- a/sys/modules/libalias/libalias/Makefile +++ b/sys/modules/libalias/libalias/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias KMOD= libalias diff --git a/sys/modules/libalias/modules/Makefile b/sys/modules/libalias/modules/Makefile index a2c945965ca..04b32bc8bb2 100644 --- a/sys/modules/libalias/modules/Makefile +++ b/sys/modules/libalias/modules/Makefile @@ -1,4 +1,3 @@ - .include "${.CURDIR}/modules.inc" SUBDIR= ${MODULES} diff --git a/sys/modules/libalias/modules/Makefile.inc b/sys/modules/libalias/modules/Makefile.inc index 86228d56da8..241a3ecbdf2 100644 --- a/sys/modules/libalias/modules/Makefile.inc +++ b/sys/modules/libalias/modules/Makefile.inc @@ -1,2 +1 @@ - .PATH: ${SRCTOP}/sys/netinet/libalias diff --git a/sys/modules/libalias/modules/dummy/Makefile b/sys/modules/libalias/modules/dummy/Makefile index 77f54c6e393..8fa8571d477 100644 --- a/sys/modules/libalias/modules/dummy/Makefile +++ b/sys/modules/libalias/modules/dummy/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_dummy SRCS= alias_dummy.c diff --git a/sys/modules/libalias/modules/ftp/Makefile b/sys/modules/libalias/modules/ftp/Makefile index b3297081b2d..62810462495 100644 --- a/sys/modules/libalias/modules/ftp/Makefile +++ b/sys/modules/libalias/modules/ftp/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_ftp SRCS= alias_ftp.c diff --git a/sys/modules/libalias/modules/irc/Makefile b/sys/modules/libalias/modules/irc/Makefile index b2bd99ca88c..002011076ed 100644 --- a/sys/modules/libalias/modules/irc/Makefile +++ b/sys/modules/libalias/modules/irc/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_irc SRCS= alias_irc.c diff --git a/sys/modules/libalias/modules/nbt/Makefile b/sys/modules/libalias/modules/nbt/Makefile index 3de4a9a1e0a..abb12a65760 100644 --- a/sys/modules/libalias/modules/nbt/Makefile +++ b/sys/modules/libalias/modules/nbt/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_nbt SRCS= alias_nbt.c diff --git a/sys/modules/libalias/modules/pptp/Makefile b/sys/modules/libalias/modules/pptp/Makefile index 379cc180d53..f0bc0299ed7 100644 --- a/sys/modules/libalias/modules/pptp/Makefile +++ b/sys/modules/libalias/modules/pptp/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_pptp SRCS= alias_pptp.c diff --git a/sys/modules/libalias/modules/skinny/Makefile b/sys/modules/libalias/modules/skinny/Makefile index d62ba63b2f0..8507770c435 100644 --- a/sys/modules/libalias/modules/skinny/Makefile +++ b/sys/modules/libalias/modules/skinny/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_skinny SRCS= alias_skinny.c diff --git a/sys/modules/libalias/modules/smedia/Makefile b/sys/modules/libalias/modules/smedia/Makefile index e0a7e7747c5..ebf88604716 100644 --- a/sys/modules/libalias/modules/smedia/Makefile +++ b/sys/modules/libalias/modules/smedia/Makefile @@ -1,4 +1,3 @@ - KMOD= alias_smedia SRCS= alias_smedia.c diff --git a/sys/modules/libiconv/Makefile b/sys/modules/libiconv/Makefile index 0100bd707cf..4958de835b9 100644 --- a/sys/modules/libiconv/Makefile +++ b/sys/modules/libiconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/libkern ${SRCTOP}/sys/sys KMOD= libiconv diff --git a/sys/modules/libmchain/Makefile b/sys/modules/libmchain/Makefile index aabaa311ac4..cef5d82de91 100644 --- a/sys/modules/libmchain/Makefile +++ b/sys/modules/libmchain/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= libmchain diff --git a/sys/modules/lindebugfs/Makefile b/sys/modules/lindebugfs/Makefile index 542a2fb7b6d..0933208d60f 100644 --- a/sys/modules/lindebugfs/Makefile +++ b/sys/modules/lindebugfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/lindebugfs KMOD= lindebugfs diff --git a/sys/modules/linprocfs/Makefile b/sys/modules/linprocfs/Makefile index df282d7eef3..ccb1818d85c 100644 --- a/sys/modules/linprocfs/Makefile +++ b/sys/modules/linprocfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linprocfs KMOD= linprocfs diff --git a/sys/modules/linsysfs/Makefile b/sys/modules/linsysfs/Makefile index a9741d13cfe..4b354efa3be 100644 --- a/sys/modules/linsysfs/Makefile +++ b/sys/modules/linsysfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linsysfs KMOD= linsysfs diff --git a/sys/modules/linux/Makefile b/sys/modules/linux/Makefile index 37ba17e09e9..eb4e17ec706 100644 --- a/sys/modules/linux/Makefile +++ b/sys/modules/linux/Makefile @@ -1,4 +1,3 @@ - .if ${MACHINE_CPUARCH} == "amd64" SFX= 32 CFLAGS+=-DCOMPAT_FREEBSD32 -DCOMPAT_LINUX32 diff --git a/sys/modules/linux64/Makefile b/sys/modules/linux64/Makefile index beed5ec59c4..d558319f3ba 100644 --- a/sys/modules/linux64/Makefile +++ b/sys/modules/linux64/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linux ${SRCTOP}/sys/${MACHINE}/linux .if ${MACHINE_CPUARCH} == "amd64" .PATH: ${SRCTOP}/sys/x86/linux diff --git a/sys/modules/linux_common/Makefile b/sys/modules/linux_common/Makefile index 374bc32215a..f9f4c791e9d 100644 --- a/sys/modules/linux_common/Makefile +++ b/sys/modules/linux_common/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/compat/linux .if ${MACHINE_CPUARCH} == "amd64" .PATH: ${SRCTOP}/sys/x86/linux diff --git a/sys/modules/lio/Makefile b/sys/modules/lio/Makefile index 3f8b5e04ec3..f2819292bfa 100644 --- a/sys/modules/lio/Makefile +++ b/sys/modules/lio/Makefile @@ -1,4 +1,3 @@ - #.PATH: ${.CURDIR} .PATH: ${.CURDIR}/../../dev/liquidio .PATH: ${.CURDIR}/../../dev/liquidio/base diff --git a/sys/modules/lpt/Makefile b/sys/modules/lpt/Makefile index 74b5a9c90fa..43a97ac3d49 100644 --- a/sys/modules/lpt/Makefile +++ b/sys/modules/lpt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= lpt SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/mac_biba/Makefile b/sys/modules/mac_biba/Makefile index 21a85dc1960..a7982f8239d 100644 --- a/sys/modules/mac_biba/Makefile +++ b/sys/modules/mac_biba/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_biba KMOD= mac_biba diff --git a/sys/modules/mac_bsdextended/Makefile b/sys/modules/mac_bsdextended/Makefile index 5921ac70dcb..9dec5ab707b 100644 --- a/sys/modules/mac_bsdextended/Makefile +++ b/sys/modules/mac_bsdextended/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_bsdextended KMOD= mac_bsdextended diff --git a/sys/modules/mac_ifoff/Makefile b/sys/modules/mac_ifoff/Makefile index b7f8806352b..75759973b92 100644 --- a/sys/modules/mac_ifoff/Makefile +++ b/sys/modules/mac_ifoff/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_ifoff KMOD= mac_ifoff diff --git a/sys/modules/mac_ipacl/Makefile b/sys/modules/mac_ipacl/Makefile index 17059e14508..012741fe01a 100644 --- a/sys/modules/mac_ipacl/Makefile +++ b/sys/modules/mac_ipacl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_ipacl KMOD= mac_ipacl diff --git a/sys/modules/mac_lomac/Makefile b/sys/modules/mac_lomac/Makefile index 9172d35ddf1..8f4be7a5955 100644 --- a/sys/modules/mac_lomac/Makefile +++ b/sys/modules/mac_lomac/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_lomac KMOD= mac_lomac diff --git a/sys/modules/mac_mls/Makefile b/sys/modules/mac_mls/Makefile index 7169ba30420..ca70a3ace5d 100644 --- a/sys/modules/mac_mls/Makefile +++ b/sys/modules/mac_mls/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_mls KMOD= mac_mls diff --git a/sys/modules/mac_none/Makefile b/sys/modules/mac_none/Makefile index 9a015aaff12..6079b4d298c 100644 --- a/sys/modules/mac_none/Makefile +++ b/sys/modules/mac_none/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_none KMOD= mac_none diff --git a/sys/modules/mac_ntpd/Makefile b/sys/modules/mac_ntpd/Makefile index edd4ff70717..ffde3db439b 100644 --- a/sys/modules/mac_ntpd/Makefile +++ b/sys/modules/mac_ntpd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_ntpd KMOD= mac_ntpd diff --git a/sys/modules/mac_partition/Makefile b/sys/modules/mac_partition/Makefile index 26fae45e6cd..25bd4a710ca 100644 --- a/sys/modules/mac_partition/Makefile +++ b/sys/modules/mac_partition/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_partition KMOD= mac_partition diff --git a/sys/modules/mac_pimd/Makefile b/sys/modules/mac_pimd/Makefile index 5e2ba518865..0d3c78d90cc 100644 --- a/sys/modules/mac_pimd/Makefile +++ b/sys/modules/mac_pimd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_pimd KMOD= mac_pimd diff --git a/sys/modules/mac_portacl/Makefile b/sys/modules/mac_portacl/Makefile index e2ab1da0a2e..c1b4eb8c3fc 100644 --- a/sys/modules/mac_portacl/Makefile +++ b/sys/modules/mac_portacl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_portacl KMOD= mac_portacl diff --git a/sys/modules/mac_seeotheruids/Makefile b/sys/modules/mac_seeotheruids/Makefile index adf50d946c6..76d89005c6d 100644 --- a/sys/modules/mac_seeotheruids/Makefile +++ b/sys/modules/mac_seeotheruids/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_seeotheruids KMOD= mac_seeotheruids diff --git a/sys/modules/mac_stub/Makefile b/sys/modules/mac_stub/Makefile index 19b9a2fbd84..3b0b2fdc6df 100644 --- a/sys/modules/mac_stub/Makefile +++ b/sys/modules/mac_stub/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_stub KMOD= mac_stub diff --git a/sys/modules/mac_test/Makefile b/sys/modules/mac_test/Makefile index a96aa12c08b..4a89b8fad0d 100644 --- a/sys/modules/mac_test/Makefile +++ b/sys/modules/mac_test/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/security/mac_test KMOD= mac_test diff --git a/sys/modules/mac_veriexec/Makefile b/sys/modules/mac_veriexec/Makefile index 82cf468fec5..ec1d7816055 100644 --- a/sys/modules/mac_veriexec/Makefile +++ b/sys/modules/mac_veriexec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.PARSEDIR:H:H}/security/mac_veriexec KMOD = mac_veriexec diff --git a/sys/modules/mac_veriexec_sha1/Makefile b/sys/modules/mac_veriexec_sha1/Makefile index a8c16f179b8..768a0df3a04 100644 --- a/sys/modules/mac_veriexec_sha1/Makefile +++ b/sys/modules/mac_veriexec_sha1/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.PARSEDIR:H:H}/security/mac_veriexec .PATH: ${.PARSEDIR:H:H}/crypto diff --git a/sys/modules/mac_veriexec_sha256/Makefile b/sys/modules/mac_veriexec_sha256/Makefile index c09b0ac2954..d745fa17dde 100644 --- a/sys/modules/mac_veriexec_sha256/Makefile +++ b/sys/modules/mac_veriexec_sha256/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../security/mac_veriexec .PATH: ${.CURDIR}/../../crypto/sha2 diff --git a/sys/modules/mac_veriexec_sha384/Makefile b/sys/modules/mac_veriexec_sha384/Makefile index 55ecabbac73..a1c621baafe 100644 --- a/sys/modules/mac_veriexec_sha384/Makefile +++ b/sys/modules/mac_veriexec_sha384/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../security/mac_veriexec .PATH: ${.CURDIR}/../../crypto/sha2 diff --git a/sys/modules/mac_veriexec_sha512/Makefile b/sys/modules/mac_veriexec_sha512/Makefile index f201ea696d3..d1c02401a62 100644 --- a/sys/modules/mac_veriexec_sha512/Makefile +++ b/sys/modules/mac_veriexec_sha512/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../security/mac_veriexec .PATH: ${.CURDIR}/../../crypto/sha2 diff --git a/sys/modules/malo/Makefile b/sys/modules/malo/Makefile index 628d30aa064..95cd346eee1 100644 --- a/sys/modules/malo/Makefile +++ b/sys/modules/malo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/malo KMOD = if_malo diff --git a/sys/modules/mana/Makefile b/sys/modules/mana/Makefile index 6b37c209e9c..c603963ea8c 100644 --- a/sys/modules/mana/Makefile +++ b/sys/modules/mana/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mana KMOD = if_mana diff --git a/sys/modules/md/Makefile b/sys/modules/md/Makefile index 2473e3715bd..2b0586c4471 100644 --- a/sys/modules/md/Makefile +++ b/sys/modules/md/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/md KMOD= geom_md diff --git a/sys/modules/mdio/Makefile b/sys/modules/mdio/Makefile index 6decada8938..fee29b333a2 100644 --- a/sys/modules/mdio/Makefile +++ b/sys/modules/mdio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mdio KMOD= mdio diff --git a/sys/modules/mem/Makefile b/sys/modules/mem/Makefile index 6ba998923d0..4e9be89e857 100644 --- a/sys/modules/mem/Makefile +++ b/sys/modules/mem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mem .PATH: ${SRCTOP}/sys/${MACHINE}/${MACHINE} .PATH: ${SRCTOP}/sys/${MACHINE_CPUARCH}/${MACHINE_CPUARCH} diff --git a/sys/modules/mfi/Makefile b/sys/modules/mfi/Makefile index a7541ab85e2..41626370f21 100644 --- a/sys/modules/mfi/Makefile +++ b/sys/modules/mfi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mfi SUBDIR= mfip diff --git a/sys/modules/mfi/mfi_linux/Makefile b/sys/modules/mfi/mfi_linux/Makefile index f685ea699a3..026e69043c5 100644 --- a/sys/modules/mfi/mfi_linux/Makefile +++ b/sys/modules/mfi/mfi_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mfi KMOD= mfi_linux diff --git a/sys/modules/mfi/mfip/Makefile b/sys/modules/mfi/mfip/Makefile index c3f8111dd60..e2b273b07f1 100644 --- a/sys/modules/mfi/mfip/Makefile +++ b/sys/modules/mfi/mfip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mfi KMOD= mfip diff --git a/sys/modules/mgb/Makefile b/sys/modules/mgb/Makefile index e45ac034a1a..53197d42b06 100644 --- a/sys/modules/mgb/Makefile +++ b/sys/modules/mgb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mgb KMOD = if_mgb diff --git a/sys/modules/mii/Makefile b/sys/modules/mii/Makefile index 2413959cc67..353d92a5116 100644 --- a/sys/modules/mii/Makefile +++ b/sys/modules/mii/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mii KMOD= miibus diff --git a/sys/modules/mlx/Makefile b/sys/modules/mlx/Makefile index 0f19a48f733..709feca9045 100644 --- a/sys/modules/mlx/Makefile +++ b/sys/modules/mlx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mlx KMOD= mlx diff --git a/sys/modules/mmc/Makefile b/sys/modules/mmc/Makefile index b626eba0a10..690b0bfb956 100644 --- a/sys/modules/mmc/Makefile +++ b/sys/modules/mmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mmc KMOD= mmc diff --git a/sys/modules/mmcnull/Makefile b/sys/modules/mmcnull/Makefile index 0aeea797444..a5354808bc4 100644 --- a/sys/modules/mmcnull/Makefile +++ b/sys/modules/mmcnull/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../dev/mmcnull KMOD= mmcnull diff --git a/sys/modules/mmcsd/Makefile b/sys/modules/mmcsd/Makefile index 4fdeaf88024..32daec4b49f 100644 --- a/sys/modules/mmcsd/Makefile +++ b/sys/modules/mmcsd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mmc KMOD= mmcsd diff --git a/sys/modules/mpi3mr/Makefile b/sys/modules/mpi3mr/Makefile index 1c44ed920d1..81d2e86afc7 100644 --- a/sys/modules/mpi3mr/Makefile +++ b/sys/modules/mpi3mr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpi3mr KMOD= mpi3mr diff --git a/sys/modules/mpr/Makefile b/sys/modules/mpr/Makefile index f2ca7bb7e1b..caf8000da6d 100644 --- a/sys/modules/mpr/Makefile +++ b/sys/modules/mpr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpr KMOD= mpr diff --git a/sys/modules/mps/Makefile b/sys/modules/mps/Makefile index af844fbe1a2..d097b885ad4 100644 --- a/sys/modules/mps/Makefile +++ b/sys/modules/mps/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mps KMOD= mps diff --git a/sys/modules/mpt/Makefile b/sys/modules/mpt/Makefile index 9a6b5251cee..a519039cf87 100644 --- a/sys/modules/mpt/Makefile +++ b/sys/modules/mpt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mpt KMOD= mpt diff --git a/sys/modules/mqueue/Makefile b/sys/modules/mqueue/Makefile index b929c6b84ad..dbc804ba30f 100644 --- a/sys/modules/mqueue/Makefile +++ b/sys/modules/mqueue/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= mqueuefs diff --git a/sys/modules/msdosfs/Makefile b/sys/modules/msdosfs/Makefile index 794e7ba3d18..b520eb62643 100644 --- a/sys/modules/msdosfs/Makefile +++ b/sys/modules/msdosfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/msdosfs KMOD= msdosfs diff --git a/sys/modules/msdosfs_iconv/Makefile b/sys/modules/msdosfs_iconv/Makefile index 7bf6442b312..3064e4e2fcc 100644 --- a/sys/modules/msdosfs_iconv/Makefile +++ b/sys/modules/msdosfs_iconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/msdosfs KMOD= msdosfs_iconv SRCS= msdosfs_iconv.c diff --git a/sys/modules/msk/Makefile b/sys/modules/msk/Makefile index 4e898a85b70..6a49d142a5d 100644 --- a/sys/modules/msk/Makefile +++ b/sys/modules/msk/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/msk KMOD= if_msk diff --git a/sys/modules/mt76/Makefile b/sys/modules/mt76/Makefile index 95d6e10a699..fbc9265c912 100644 --- a/sys/modules/mt76/Makefile +++ b/sys/modules/mt76/Makefile @@ -1,4 +1,3 @@ - SUBDIR= core SUBDIR+= mt7915 SUBDIR+= mt7921 diff --git a/sys/modules/mt76/Makefile.inc b/sys/modules/mt76/Makefile.inc index f1aa69f1bc8..da5fe913388 100644 --- a/sys/modules/mt76/Makefile.inc +++ b/sys/modules/mt76/Makefile.inc @@ -1,4 +1,3 @@ - # Common information shared by all submodule builds. COMMONDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76 diff --git a/sys/modules/mt76/core/Makefile b/sys/modules/mt76/core/Makefile index 9e915fc5f96..88068b7bb18 100644 --- a/sys/modules/mt76/core/Makefile +++ b/sys/modules/mt76/core/Makefile @@ -1,4 +1,3 @@ - KMOD= mt76_core # Basic stuff. diff --git a/sys/modules/mt76/mt7915/Makefile b/sys/modules/mt76/mt7915/Makefile index 8d5b17dbac1..049c919949f 100644 --- a/sys/modules/mt76/mt7915/Makefile +++ b/sys/modules/mt76/mt7915/Makefile @@ -1,4 +1,3 @@ - DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7915 .PATH: ${DEVDIR} diff --git a/sys/modules/mt76/mt7921/Makefile b/sys/modules/mt76/mt7921/Makefile index 0fb5f0c26fb..d3f201997a2 100644 --- a/sys/modules/mt76/mt7921/Makefile +++ b/sys/modules/mt76/mt7921/Makefile @@ -1,4 +1,3 @@ - DEVDIR= ${SRCTOP}/sys/contrib/dev/mediatek/mt76/mt7921 .PATH: ${DEVDIR} diff --git a/sys/modules/mvs/Makefile b/sys/modules/mvs/Makefile index 512a885a55c..b3d014f408b 100644 --- a/sys/modules/mvs/Makefile +++ b/sys/modules/mvs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mvs KMOD= mvs diff --git a/sys/modules/mwlfw/Makefile b/sys/modules/mwlfw/Makefile index c4b9c046d09..913ccc0eb42 100644 --- a/sys/modules/mwlfw/Makefile +++ b/sys/modules/mwlfw/Makefile @@ -1,4 +1,3 @@ - KMOD= mw88W8363fw FIRMWS= mw88W8363.fw:mw88W8363fw mwlboot.fw:mwlboot diff --git a/sys/modules/mxge/Makefile b/sys/modules/mxge/Makefile index 358adf109d1..b897429dee1 100644 --- a/sys/modules/mxge/Makefile +++ b/sys/modules/mxge/Makefile @@ -1,4 +1,3 @@ - SUBDIR= mxge SUBDIR+=mxge_eth_z8e SUBDIR+=mxge_ethp_z8e diff --git a/sys/modules/mxge/mxge/Makefile b/sys/modules/mxge/mxge/Makefile index b1b079b41ad..4b17d1bd543 100644 --- a/sys/modules/mxge/mxge/Makefile +++ b/sys/modules/mxge/mxge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= if_mxge diff --git a/sys/modules/mxge/mxge_eth_z8e/Makefile b/sys/modules/mxge/mxge_eth_z8e/Makefile index 9870ff5f4e6..d6ce8410002 100644 --- a/sys/modules/mxge/mxge_eth_z8e/Makefile +++ b/sys/modules/mxge/mxge_eth_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_eth_z8e SRCS= mxge_eth_z8e.c diff --git a/sys/modules/mxge/mxge_ethp_z8e/Makefile b/sys/modules/mxge/mxge_ethp_z8e/Makefile index 28752de996f..2aef89175d6 100644 --- a/sys/modules/mxge/mxge_ethp_z8e/Makefile +++ b/sys/modules/mxge/mxge_ethp_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_ethp_z8e SRCS= mxge_ethp_z8e.c diff --git a/sys/modules/mxge/mxge_rss_eth_z8e/Makefile b/sys/modules/mxge/mxge_rss_eth_z8e/Makefile index 90b88931bf0..08255305133 100644 --- a/sys/modules/mxge/mxge_rss_eth_z8e/Makefile +++ b/sys/modules/mxge/mxge_rss_eth_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_rss_eth_z8e SRCS= mxge_rss_eth_z8e.c diff --git a/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile b/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile index 668d3727374..998931256e2 100644 --- a/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile +++ b/sys/modules/mxge/mxge_rss_ethp_z8e/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mxge KMOD= mxge_rss_ethp_z8e SRCS= mxge_rss_ethp_z8e.c diff --git a/sys/modules/my/Makefile b/sys/modules/my/Makefile index f3d192fbcc2..c270c41f5da 100644 --- a/sys/modules/my/Makefile +++ b/sys/modules/my/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/my KMOD= if_my diff --git a/sys/modules/nctgpio/Makefile b/sys/modules/nctgpio/Makefile index b48a11f1f89..aaaea9222d2 100644 --- a/sys/modules/nctgpio/Makefile +++ b/sys/modules/nctgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nctgpio KMOD= nctgpio SRCS= nctgpio.c diff --git a/sys/modules/ncthwm/Makefile b/sys/modules/ncthwm/Makefile index 266a476b6b7..8235c5e1a6d 100644 --- a/sys/modules/ncthwm/Makefile +++ b/sys/modules/ncthwm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ncthwm KMOD= ncthwm SRCS= ncthwm.c diff --git a/sys/modules/neta/Makefile b/sys/modules/neta/Makefile index 635b15c2d61..eb22487ecf3 100644 --- a/sys/modules/neta/Makefile +++ b/sys/modules/neta/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/neta CFLAGS+= -DFDT diff --git a/sys/modules/netgraph/bluetooth/Makefile.inc b/sys/modules/netgraph/bluetooth/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/netgraph/bluetooth/Makefile.inc +++ b/sys/modules/netgraph/bluetooth/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/netgraph/bridge/Makefile b/sys/modules/netgraph/bridge/Makefile index 77ed20d85ce..57a8afc76ff 100644 --- a/sys/modules/netgraph/bridge/Makefile +++ b/sys/modules/netgraph/bridge/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_bridge SRCS= ng_bridge.c diff --git a/sys/modules/netgraph/car/Makefile b/sys/modules/netgraph/car/Makefile index b3ca9ab9d3b..baf316e87c8 100644 --- a/sys/modules/netgraph/car/Makefile +++ b/sys/modules/netgraph/car/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_car SRCS= ng_car.c diff --git a/sys/modules/netgraph/checksum/Makefile b/sys/modules/netgraph/checksum/Makefile index 4b41bce3bc5..4e2b1f547a4 100644 --- a/sys/modules/netgraph/checksum/Makefile +++ b/sys/modules/netgraph/checksum/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/netgraph/deflate/Makefile b/sys/modules/netgraph/deflate/Makefile index b6f505fc8b8..157df926d06 100644 --- a/sys/modules/netgraph/deflate/Makefile +++ b/sys/modules/netgraph/deflate/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_deflate SRCS= ng_deflate.c diff --git a/sys/modules/netgraph/eiface/Makefile b/sys/modules/netgraph/eiface/Makefile index 5c7b4fe46b3..eac59c8fbbe 100644 --- a/sys/modules/netgraph/eiface/Makefile +++ b/sys/modules/netgraph/eiface/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_eiface SRCS= ng_eiface.c diff --git a/sys/modules/netgraph/ether/Makefile b/sys/modules/netgraph/ether/Makefile index 7bfa7b1c063..0fecfee3028 100644 --- a/sys/modules/netgraph/ether/Makefile +++ b/sys/modules/netgraph/ether/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ether SRCS= ng_ether.c diff --git a/sys/modules/netgraph/gif/Makefile b/sys/modules/netgraph/gif/Makefile index e7897492fa2..4d0645faaa9 100644 --- a/sys/modules/netgraph/gif/Makefile +++ b/sys/modules/netgraph/gif/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_gif SRCS= ng_gif.c opt_inet.h opt_inet6.h diff --git a/sys/modules/netgraph/gif_demux/Makefile b/sys/modules/netgraph/gif_demux/Makefile index d95bf3d2d66..ec35e2c8a63 100644 --- a/sys/modules/netgraph/gif_demux/Makefile +++ b/sys/modules/netgraph/gif_demux/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_gif_demux SRCS= ng_gif_demux.c diff --git a/sys/modules/netgraph/hub/Makefile b/sys/modules/netgraph/hub/Makefile index 5829c1609b3..1d4af5d307b 100644 --- a/sys/modules/netgraph/hub/Makefile +++ b/sys/modules/netgraph/hub/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_hub SRCS= ng_hub.c diff --git a/sys/modules/netgraph/ip_input/Makefile b/sys/modules/netgraph/ip_input/Makefile index 7aa3009ee8c..55468f920d1 100644 --- a/sys/modules/netgraph/ip_input/Makefile +++ b/sys/modules/netgraph/ip_input/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ip_input SRCS= ng_ip_input.c diff --git a/sys/modules/netgraph/ipfw/Makefile b/sys/modules/netgraph/ipfw/Makefile index bdc23e7039e..34163090ee2 100644 --- a/sys/modules/netgraph/ipfw/Makefile +++ b/sys/modules/netgraph/ipfw/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ipfw SRCS= ng_ipfw.c opt_inet.h opt_inet6.h diff --git a/sys/modules/netgraph/ksocket/Makefile b/sys/modules/netgraph/ksocket/Makefile index 5e05eb1cc62..395fdbd7b3e 100644 --- a/sys/modules/netgraph/ksocket/Makefile +++ b/sys/modules/netgraph/ksocket/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_ksocket SRCS= ng_ksocket.c diff --git a/sys/modules/netgraph/l2tp/Makefile b/sys/modules/netgraph/l2tp/Makefile index 7ff128ef6bc..c2c78073c4b 100644 --- a/sys/modules/netgraph/l2tp/Makefile +++ b/sys/modules/netgraph/l2tp/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_l2tp SRCS= ng_l2tp.c diff --git a/sys/modules/netgraph/macfilter/Makefile b/sys/modules/netgraph/macfilter/Makefile index c52a66dc0c2..28830b7f046 100644 --- a/sys/modules/netgraph/macfilter/Makefile +++ b/sys/modules/netgraph/macfilter/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_macfilter SRCS= ng_macfilter.c diff --git a/sys/modules/netgraph/nat/Makefile b/sys/modules/netgraph/nat/Makefile index 4569cfddfbe..fd65b622494 100644 --- a/sys/modules/netgraph/nat/Makefile +++ b/sys/modules/netgraph/nat/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_nat SRCS= ng_nat.c diff --git a/sys/modules/netgraph/one2many/Makefile b/sys/modules/netgraph/one2many/Makefile index 07596a73114..2c61c6035f6 100644 --- a/sys/modules/netgraph/one2many/Makefile +++ b/sys/modules/netgraph/one2many/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_one2many SRCS= ng_one2many.c diff --git a/sys/modules/netgraph/patch/Makefile b/sys/modules/netgraph/patch/Makefile index ebbae47cf0a..619b925b2f9 100644 --- a/sys/modules/netgraph/patch/Makefile +++ b/sys/modules/netgraph/patch/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_patch SRCS= ng_patch.c diff --git a/sys/modules/netgraph/pipe/Makefile b/sys/modules/netgraph/pipe/Makefile index 68b5d1a7c1e..04e644d7131 100644 --- a/sys/modules/netgraph/pipe/Makefile +++ b/sys/modules/netgraph/pipe/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_pipe SRCS= ng_pipe.c diff --git a/sys/modules/netgraph/pred1/Makefile b/sys/modules/netgraph/pred1/Makefile index a4c95fdbb97..1d51bf5ec3f 100644 --- a/sys/modules/netgraph/pred1/Makefile +++ b/sys/modules/netgraph/pred1/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_pred1 SRCS= ng_pred1.c diff --git a/sys/modules/netgraph/sample/Makefile b/sys/modules/netgraph/sample/Makefile index d675a8b8444..e5cc44da6d3 100644 --- a/sys/modules/netgraph/sample/Makefile +++ b/sys/modules/netgraph/sample/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_sample SRCS= ng_sample.c diff --git a/sys/modules/netgraph/source/Makefile b/sys/modules/netgraph/source/Makefile index 603a6b05bee..d7d289e99f8 100644 --- a/sys/modules/netgraph/source/Makefile +++ b/sys/modules/netgraph/source/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_source SRCS= ng_source.c # 4.x only diff --git a/sys/modules/netgraph/tag/Makefile b/sys/modules/netgraph/tag/Makefile index cdc19325d09..84cf9b5cc1e 100644 --- a/sys/modules/netgraph/tag/Makefile +++ b/sys/modules/netgraph/tag/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_tag SRCS= ng_tag.c diff --git a/sys/modules/netgraph/tcpmss/Makefile b/sys/modules/netgraph/tcpmss/Makefile index 3ed465b2dd2..443e5b2d3a9 100644 --- a/sys/modules/netgraph/tcpmss/Makefile +++ b/sys/modules/netgraph/tcpmss/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_tcpmss SRCS= ng_tcpmss.c diff --git a/sys/modules/netgraph/vlan/Makefile b/sys/modules/netgraph/vlan/Makefile index 2f6708de374..135ac8eca7f 100644 --- a/sys/modules/netgraph/vlan/Makefile +++ b/sys/modules/netgraph/vlan/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_vlan SRCS= ng_vlan.c diff --git a/sys/modules/netgraph/vlan_rotate/Makefile b/sys/modules/netgraph/vlan_rotate/Makefile index 619b5b432ad..26e2e5d14e2 100644 --- a/sys/modules/netgraph/vlan_rotate/Makefile +++ b/sys/modules/netgraph/vlan_rotate/Makefile @@ -1,4 +1,3 @@ - KMOD= ng_vlan_rotate SRCS= ng_vlan_rotate.c diff --git a/sys/modules/nfe/Makefile b/sys/modules/nfe/Makefile index c7361ac97ae..2450875e923 100644 --- a/sys/modules/nfe/Makefile +++ b/sys/modules/nfe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nfe KMOD= if_nfe diff --git a/sys/modules/nfscl/Makefile b/sys/modules/nfscl/Makefile index 6394d0fba75..82cf5def65b 100644 --- a/sys/modules/nfscl/Makefile +++ b/sys/modules/nfscl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nfsclient ${SRCTOP}/sys/nfs KMOD= nfscl SRCS= vnode_if.h \ diff --git a/sys/modules/nfscommon/Makefile b/sys/modules/nfscommon/Makefile index 7f03ba5a2b4..317b14d3fbd 100644 --- a/sys/modules/nfscommon/Makefile +++ b/sys/modules/nfscommon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nfs KMOD= nfscommon SRCS= vnode_if.h \ diff --git a/sys/modules/nfsd/Makefile b/sys/modules/nfsd/Makefile index 5ec7717e3f1..6861ace2868 100644 --- a/sys/modules/nfsd/Makefile +++ b/sys/modules/nfsd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nfsserver KMOD= nfsd SRCS= vnode_if.h \ diff --git a/sys/modules/nfslockd/Makefile b/sys/modules/nfslockd/Makefile index 310b9e3611b..20cbe1d02c6 100644 --- a/sys/modules/nfslockd/Makefile +++ b/sys/modules/nfslockd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/nlm ${SRCTOP}/sys/rpc KMOD= nfslockd SRCS= vnode_if.h \ diff --git a/sys/modules/nfssvc/Makefile b/sys/modules/nfssvc/Makefile index 04bbf910eea..02c0acb808d 100644 --- a/sys/modules/nfssvc/Makefile +++ b/sys/modules/nfssvc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/nfs KMOD= nfssvc SRCS= nfs_nfssvc.c \ diff --git a/sys/modules/nge/Makefile b/sys/modules/nge/Makefile index ea8d1ed2b35..ac746a87fce 100644 --- a/sys/modules/nge/Makefile +++ b/sys/modules/nge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nge KMOD= if_nge diff --git a/sys/modules/nlsysevent/Makefile b/sys/modules/nlsysevent/Makefile index be9b985409b..cffedc9539c 100644 --- a/sys/modules/nlsysevent/Makefile +++ b/sys/modules/nlsysevent/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netlink/ KMOD= nlsysevent diff --git a/sys/modules/nmdm/Makefile b/sys/modules/nmdm/Makefile index d9d2fc8523e..81e5e4b37c6 100644 --- a/sys/modules/nmdm/Makefile +++ b/sys/modules/nmdm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nmdm KMOD= nmdm diff --git a/sys/modules/ntb/Makefile b/sys/modules/ntb/Makefile index a1374f3d0f7..421a98b5fad 100644 --- a/sys/modules/ntb/Makefile +++ b/sys/modules/ntb/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ntb ntb_hw_amd ntb_hw_intel ntb_hw_plx ntb_transport ntb_tool if_ntb .include diff --git a/sys/modules/ntb/if_ntb/Makefile b/sys/modules/ntb/if_ntb/Makefile index fb99668e2d1..3657bf64bb7 100644 --- a/sys/modules/ntb/if_ntb/Makefile +++ b/sys/modules/ntb/if_ntb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/if_ntb KMOD = if_ntb diff --git a/sys/modules/ntb/ntb/Makefile b/sys/modules/ntb/ntb/Makefile index 97f54fff368..45bc0678cc9 100644 --- a/sys/modules/ntb/ntb/Makefile +++ b/sys/modules/ntb/ntb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb KMOD = ntb diff --git a/sys/modules/ntb/ntb_hw_amd/Makefile b/sys/modules/ntb/ntb_hw_amd/Makefile index 59693dbec29..d69f1f5daed 100644 --- a/sys/modules/ntb/ntb_hw_amd/Makefile +++ b/sys/modules/ntb/ntb_hw_amd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw_amd diff --git a/sys/modules/ntb/ntb_hw_intel/Makefile b/sys/modules/ntb/ntb_hw_intel/Makefile index 688eeeb17e7..f28b02d7a0e 100644 --- a/sys/modules/ntb/ntb_hw_intel/Makefile +++ b/sys/modules/ntb/ntb_hw_intel/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw_intel diff --git a/sys/modules/ntb/ntb_hw_plx/Makefile b/sys/modules/ntb/ntb_hw_plx/Makefile index 08075af35fc..2785da7ea0c 100644 --- a/sys/modules/ntb/ntb_hw_plx/Makefile +++ b/sys/modules/ntb/ntb_hw_plx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/ntb_hw KMOD = ntb_hw_plx diff --git a/sys/modules/ntb/ntb_tool/Makefile b/sys/modules/ntb/ntb_tool/Makefile index 5fa4b1cfc7c..a4c554f4670 100644 --- a/sys/modules/ntb/ntb_tool/Makefile +++ b/sys/modules/ntb/ntb_tool/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb/test KMOD = ntb_tool diff --git a/sys/modules/ntb/ntb_transport/Makefile b/sys/modules/ntb/ntb_transport/Makefile index 47af0b4ff21..5692bb4361b 100644 --- a/sys/modules/ntb/ntb_transport/Makefile +++ b/sys/modules/ntb/ntb_transport/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ntb KMOD = ntb_transport diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile index 3f5d1aef3f8..e9644106773 100644 --- a/sys/modules/nullfs/Makefile +++ b/sys/modules/nullfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/nullfs KMOD= nullfs diff --git a/sys/modules/nvd/Makefile b/sys/modules/nvd/Makefile index 2a1c49024fb..08b2d61859e 100644 --- a/sys/modules/nvd/Makefile +++ b/sys/modules/nvd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvd KMOD= nvd diff --git a/sys/modules/nvdimm/Makefile b/sys/modules/nvdimm/Makefile index 043c1d287a7..81beca9adf1 100644 --- a/sys/modules/nvdimm/Makefile +++ b/sys/modules/nvdimm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvdimm KMOD= nvdimm diff --git a/sys/modules/nvme/Makefile b/sys/modules/nvme/Makefile index 9b7003bdea6..9d7cf19b925 100644 --- a/sys/modules/nvme/Makefile +++ b/sys/modules/nvme/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvme KMOD = nvme diff --git a/sys/modules/nvram/Makefile b/sys/modules/nvram/Makefile index 5f6ab7b244b..1cba445eb97 100644 --- a/sys/modules/nvram/Makefile +++ b/sys/modules/nvram/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/nvram KMOD= nvram diff --git a/sys/modules/ocs_fc/Makefile b/sys/modules/ocs_fc/Makefile index 24abff9eccc..a855f71ec19 100644 --- a/sys/modules/ocs_fc/Makefile +++ b/sys/modules/ocs_fc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ocs_fc KMOD = ocs_fc diff --git a/sys/modules/opal_nvram/Makefile b/sys/modules/opal_nvram/Makefile index 8898dbb4629..c607684258b 100644 --- a/sys/modules/opal_nvram/Makefile +++ b/sys/modules/opal_nvram/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/powerpc/powernv KMOD= opal_nvram diff --git a/sys/modules/opensolaris/Makefile b/sys/modules/opensolaris/Makefile index 42702d0c685..98f52057e45 100644 --- a/sys/modules/opensolaris/Makefile +++ b/sys/modules/opensolaris/Makefile @@ -1,4 +1,3 @@ - SYSDIR?= ${SRCTOP}/sys .PATH: ${SYSDIR}/cddl/compat/opensolaris/kern diff --git a/sys/modules/ossl/Makefile b/sys/modules/ossl/Makefile index edaebe26ff9..7a92742d6b3 100644 --- a/sys/modules/ossl/Makefile +++ b/sys/modules/ossl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/openssl .PATH: ${SRCTOP}/sys/crypto/openssl/${MACHINE_CPUARCH} diff --git a/sys/modules/otus/Makefile b/sys/modules/otus/Makefile index 8c0c322429b..5e5d9c16dc8 100644 --- a/sys/modules/otus/Makefile +++ b/sys/modules/otus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/otus KMOD = if_otus diff --git a/sys/modules/otusfw/Makefile b/sys/modules/otusfw/Makefile index f55b73d06f5..4535be9f596 100644 --- a/sys/modules/otusfw/Makefile +++ b/sys/modules/otusfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR=otusfw_init otusfw_main .include diff --git a/sys/modules/otusfw/otusfw_init/Makefile b/sys/modules/otusfw/otusfw_init/Makefile index d3acbc16bee..0b06fddcfee 100644 --- a/sys/modules/otusfw/otusfw_init/Makefile +++ b/sys/modules/otusfw/otusfw_init/Makefile @@ -1,4 +1,3 @@ - KMOD= otusfw_init FIRMWS= otusfw_init:otusfw_init:1 diff --git a/sys/modules/otusfw/otusfw_main/Makefile b/sys/modules/otusfw/otusfw_main/Makefile index cd563b3ed1d..d83863486cb 100644 --- a/sys/modules/otusfw/otusfw_main/Makefile +++ b/sys/modules/otusfw/otusfw_main/Makefile @@ -1,4 +1,3 @@ - KMOD= otusfw_main FIRMWS= otusfw_main:otusfw_main:1 diff --git a/sys/modules/ow/Makefile b/sys/modules/ow/Makefile index 498dd15a032..76fefe3e63b 100644 --- a/sys/modules/ow/Makefile +++ b/sys/modules/ow/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/ow/ow/Makefile b/sys/modules/ow/ow/Makefile index fbfbd1b5d58..d1b4896dfbf 100644 --- a/sys/modules/ow/ow/Makefile +++ b/sys/modules/ow/ow/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ow KMOD= ow diff --git a/sys/modules/ow/ow_temp/Makefile b/sys/modules/ow/ow_temp/Makefile index 6c6d2df4780..918bb19fbe1 100644 --- a/sys/modules/ow/ow_temp/Makefile +++ b/sys/modules/ow/ow_temp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ow KMOD= ow_temp diff --git a/sys/modules/ow/owc/Makefile b/sys/modules/ow/owc/Makefile index 5c98574c071..ba8f672d4ab 100644 --- a/sys/modules/ow/owc/Makefile +++ b/sys/modules/ow/owc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ow KMOD= owc diff --git a/sys/modules/padlock/Makefile b/sys/modules/padlock/Makefile index 167282c99ff..2515ddb1d5f 100644 --- a/sys/modules/padlock/Makefile +++ b/sys/modules/padlock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/via KMOD= padlock diff --git a/sys/modules/padlock_rng/Makefile b/sys/modules/padlock_rng/Makefile index fe224a7c812..f9c137ed69c 100644 --- a/sys/modules/padlock_rng/Makefile +++ b/sys/modules/padlock_rng/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD= padlock_rng diff --git a/sys/modules/pcfclock/Makefile b/sys/modules/pcfclock/Makefile index 60f71e7b217..51a9e3a11ed 100644 --- a/sys/modules/pcfclock/Makefile +++ b/sys/modules/pcfclock/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= pcfclock diff --git a/sys/modules/pchtherm/Makefile b/sys/modules/pchtherm/Makefile index eb69b508f86..10cffb2fd0a 100644 --- a/sys/modules/pchtherm/Makefile +++ b/sys/modules/pchtherm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/intel KMOD= pchtherm SRCS= pchtherm.c diff --git a/sys/modules/pf/Makefile b/sys/modules/pf/Makefile index 6158943139c..4a12730f361 100644 --- a/sys/modules/pf/Makefile +++ b/sys/modules/pf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pf diff --git a/sys/modules/pflog/Makefile b/sys/modules/pflog/Makefile index 8352a6c16ce..f7da8c3cbcb 100644 --- a/sys/modules/pflog/Makefile +++ b/sys/modules/pflog/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pflog diff --git a/sys/modules/pfsync/Makefile b/sys/modules/pfsync/Makefile index fc2cdbf4ba8..aecd3a9f044 100644 --- a/sys/modules/pfsync/Makefile +++ b/sys/modules/pfsync/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netpfil/pf KMOD= pfsync diff --git a/sys/modules/plip/Makefile b/sys/modules/plip/Makefile index dab5d4c64d8..e54f2beef56 100644 --- a/sys/modules/plip/Makefile +++ b/sys/modules/plip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= plip SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/pms/Makefile.inc b/sys/modules/pms/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/pms/Makefile.inc +++ b/sys/modules/pms/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/powermac_nvram/Makefile b/sys/modules/powermac_nvram/Makefile index 06e3b66e3e1..c2f724a54d9 100644 --- a/sys/modules/powermac_nvram/Makefile +++ b/sys/modules/powermac_nvram/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/powermac_nvram KMOD= powermac_nvram diff --git a/sys/modules/ppbus/Makefile b/sys/modules/ppbus/Makefile index 37ce59ea9c2..eef4d8c5683 100644 --- a/sys/modules/ppbus/Makefile +++ b/sys/modules/ppbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= ppbus SRCS= bus_if.h device_if.h ppbus_if.h ppbus_if.c \ diff --git a/sys/modules/ppc/Makefile b/sys/modules/ppc/Makefile index 8537acae9b3..3142dbdaebb 100644 --- a/sys/modules/ppc/Makefile +++ b/sys/modules/ppc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppc KMOD= ppc SRCS= bus_if.h device_if.h ppbus_if.h isa_if.h pci_if.h serdev_if.h \ diff --git a/sys/modules/ppi/Makefile b/sys/modules/ppi/Makefile index 5875e6e57dd..213d6f17580 100644 --- a/sys/modules/ppi/Makefile +++ b/sys/modules/ppi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= ppi SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/pps/Makefile b/sys/modules/pps/Makefile index 59979e4b11a..11ad95e68e0 100644 --- a/sys/modules/pps/Makefile +++ b/sys/modules/pps/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ppbus KMOD= pps SRCS= bus_if.h device_if.h ppbus_if.h \ diff --git a/sys/modules/procfs/Makefile b/sys/modules/procfs/Makefile index 65708288a52..0ee750b6d92 100644 --- a/sys/modules/procfs/Makefile +++ b/sys/modules/procfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/procfs KMOD= procfs diff --git a/sys/modules/proto/Makefile b/sys/modules/proto/Makefile index fd9ea1b51dd..ab417090643 100644 --- a/sys/modules/proto/Makefile +++ b/sys/modules/proto/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/proto KMOD= proto diff --git a/sys/modules/pseudofs/Makefile b/sys/modules/pseudofs/Makefile index 52c01d1859c..cb92b8912c8 100644 --- a/sys/modules/pseudofs/Makefile +++ b/sys/modules/pseudofs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/pseudofs KMOD= pseudofs diff --git a/sys/modules/pst/Makefile b/sys/modules/pst/Makefile index 2fd5f4a356f..77387e1a26c 100644 --- a/sys/modules/pst/Makefile +++ b/sys/modules/pst/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pst KMOD= pst diff --git a/sys/modules/pty/Makefile b/sys/modules/pty/Makefile index 63f8c8f50ee..fc708d42263 100644 --- a/sys/modules/pty/Makefile +++ b/sys/modules/pty/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pty KMOD= pty diff --git a/sys/modules/puc/Makefile b/sys/modules/puc/Makefile index cfd48bee5ff..afa4fe07470 100644 --- a/sys/modules/puc/Makefile +++ b/sys/modules/puc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/puc ${SRCTOP}/sys/dev/uart/ KMOD= puc diff --git a/sys/modules/pwm/Makefile b/sys/modules/pwm/Makefile index 9b18a0be390..bee79714584 100644 --- a/sys/modules/pwm/Makefile +++ b/sys/modules/pwm/Makefile @@ -1,4 +1,3 @@ - # Modules for dev/pwm drivers. SUBDIR = \ diff --git a/sys/modules/pwm/pwm_backlight/Makefile b/sys/modules/pwm/pwm_backlight/Makefile index b15ba296a13..635ebe513f3 100644 --- a/sys/modules/pwm/pwm_backlight/Makefile +++ b/sys/modules/pwm/pwm_backlight/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm KMOD= pwm_backlight SRCS= pwm_backlight.c diff --git a/sys/modules/pwm/pwmbus/Makefile b/sys/modules/pwm/pwmbus/Makefile index 3c0acecdf32..5c5f0051ee0 100644 --- a/sys/modules/pwm/pwmbus/Makefile +++ b/sys/modules/pwm/pwmbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm KMOD= pwmbus diff --git a/sys/modules/pwm/pwmc/Makefile b/sys/modules/pwm/pwmc/Makefile index 3ba120f5150..a5c589cc7ae 100644 --- a/sys/modules/pwm/pwmc/Makefile +++ b/sys/modules/pwm/pwmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/pwm KMOD= pwmc SRCS= pwmc.c diff --git a/sys/modules/qat_c2xxx/Makefile b/sys/modules/qat_c2xxx/Makefile index 950566d8146..a0509e84bc5 100644 --- a/sys/modules/qat_c2xxx/Makefile +++ b/sys/modules/qat_c2xxx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/qat_c2xxx KMOD= qat_c2xxx diff --git a/sys/modules/qat_c2xxxfw/Makefile b/sys/modules/qat_c2xxxfw/Makefile index d8284907ce4..04e16214886 100644 --- a/sys/modules/qat_c2xxxfw/Makefile +++ b/sys/modules/qat_c2xxxfw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/qat_c2xxx KMOD= qat_c2xxxfw diff --git a/sys/modules/ral/Makefile b/sys/modules/ral/Makefile index 4b26a3414c7..156b1ab36dd 100644 --- a/sys/modules/ral/Makefile +++ b/sys/modules/ral/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ral KMOD= if_ral diff --git a/sys/modules/ralfw/Makefile b/sys/modules/ralfw/Makefile index e8c74240cb1..b474ee6c351 100644 --- a/sys/modules/ralfw/Makefile +++ b/sys/modules/ralfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= rt2561 rt2561s rt2661 rt2860 .include diff --git a/sys/modules/ralfw/Makefile.inc b/sys/modules/ralfw/Makefile.inc index 5cf040ba545..f5b29d81730 100644 --- a/sys/modules/ralfw/Makefile.inc +++ b/sys/modules/ralfw/Makefile.inc @@ -1,4 +1,3 @@ - # # Common rules for building firmware. Note this gets auto-included # by the subdir Makefile's as a consequence of included bsd.kmod.mk. diff --git a/sys/modules/ralfw/rt2561/Makefile b/sys/modules/ralfw/rt2561/Makefile index 3f5ba22d61b..906b4127866 100644 --- a/sys/modules/ralfw/rt2561/Makefile +++ b/sys/modules/ralfw/rt2561/Makefile @@ -1,4 +1,3 @@ - IMG= rt2561 .include diff --git a/sys/modules/ralfw/rt2561s/Makefile b/sys/modules/ralfw/rt2561s/Makefile index 660d98d26ae..7890f8bc8b3 100644 --- a/sys/modules/ralfw/rt2561s/Makefile +++ b/sys/modules/ralfw/rt2561s/Makefile @@ -1,4 +1,3 @@ - IMG= rt2561s .include diff --git a/sys/modules/ralfw/rt2661/Makefile b/sys/modules/ralfw/rt2661/Makefile index 576d3b6c41f..e4b01e03013 100644 --- a/sys/modules/ralfw/rt2661/Makefile +++ b/sys/modules/ralfw/rt2661/Makefile @@ -1,4 +1,3 @@ - IMG= rt2661 .include diff --git a/sys/modules/ralfw/rt2860/Makefile b/sys/modules/ralfw/rt2860/Makefile index 9fee45718f8..fadf41f4495 100644 --- a/sys/modules/ralfw/rt2860/Makefile +++ b/sys/modules/ralfw/rt2860/Makefile @@ -1,4 +1,3 @@ - IMG= rt2860 .include diff --git a/sys/modules/random_fortuna/Makefile b/sys/modules/random_fortuna/Makefile index 854085d6452..0cddaa4ab30 100644 --- a/sys/modules/random_fortuna/Makefile +++ b/sys/modules/random_fortuna/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD = random_fortuna diff --git a/sys/modules/random_other/Makefile b/sys/modules/random_other/Makefile index 2add4bfe048..a67c53b790e 100644 --- a/sys/modules/random_other/Makefile +++ b/sys/modules/random_other/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD = random_OTHER diff --git a/sys/modules/rc4/Makefile b/sys/modules/rc4/Makefile index 5643ed40cb9..845e7403e46 100644 --- a/sys/modules/rc4/Makefile +++ b/sys/modules/rc4/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/rc4 KMOD= rc4 diff --git a/sys/modules/rccgpio/Makefile b/sys/modules/rccgpio/Makefile index 47e8a7915ea..ba132e671b6 100644 --- a/sys/modules/rccgpio/Makefile +++ b/sys/modules/rccgpio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rccgpio KMOD= rccgpio SRCS= rccgpio.c diff --git a/sys/modules/rdma/Makefile b/sys/modules/rdma/Makefile index 81ddf6e71bf..0e9b3e6b365 100644 --- a/sys/modules/rdma/Makefile +++ b/sys/modules/rdma/Makefile @@ -1,4 +1,3 @@ - SUBDIR+= krping .include diff --git a/sys/modules/rdrand_rng/Makefile b/sys/modules/rdrand_rng/Makefile index 601bfcab51e..7fa7a8bb8fb 100644 --- a/sys/modules/rdrand_rng/Makefile +++ b/sys/modules/rdrand_rng/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/random KMOD= rdrand_rng diff --git a/sys/modules/re/Makefile b/sys/modules/re/Makefile index 6923d8d631c..7967efc2085 100644 --- a/sys/modules/re/Makefile +++ b/sys/modules/re/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/re KMOD= if_re diff --git a/sys/modules/rl/Makefile b/sys/modules/rl/Makefile index e615ec36482..f0f0d61539b 100644 --- a/sys/modules/rl/Makefile +++ b/sys/modules/rl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rl KMOD= if_rl diff --git a/sys/modules/rndtest/Makefile b/sys/modules/rndtest/Makefile index cb0f1349264..5adb33f9250 100644 --- a/sys/modules/rndtest/Makefile +++ b/sys/modules/rndtest/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rndtest KMOD = rndtest SRCS = rndtest.c diff --git a/sys/modules/rockchip/rk805/Makefile b/sys/modules/rockchip/rk805/Makefile index a5529531d14..5147f55080a 100644 --- a/sys/modules/rockchip/rk805/Makefile +++ b/sys/modules/rockchip/rk805/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/pmic/rockchip KMOD= rk805 diff --git a/sys/modules/rockchip/rk808/Makefile b/sys/modules/rockchip/rk808/Makefile index 6cf48cb4054..fbbb4a02743 100644 --- a/sys/modules/rockchip/rk808/Makefile +++ b/sys/modules/rockchip/rk808/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/pmic/rockchip KMOD= rk808 diff --git a/sys/modules/rockchip/rk_dwmmc/Makefile b/sys/modules/rockchip/rk_dwmmc/Makefile index b5641675db3..d8f28683fa8 100644 --- a/sys/modules/rockchip/rk_dwmmc/Makefile +++ b/sys/modules/rockchip/rk_dwmmc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/mmc/host/ KMOD= rk_dwmmc diff --git a/sys/modules/rockchip/rk_i2c/Makefile b/sys/modules/rockchip/rk_i2c/Makefile index 3cf847e1d1c..5c6e40ec15c 100644 --- a/sys/modules/rockchip/rk_i2c/Makefile +++ b/sys/modules/rockchip/rk_i2c/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/iicbus/controller/rockchip KMOD= rk_i2c diff --git a/sys/modules/rockchip/rk_spi/Makefile b/sys/modules/rockchip/rk_spi/Makefile index 70526cdaf2c..3c083bfdd37 100644 --- a/sys/modules/rockchip/rk_spi/Makefile +++ b/sys/modules/rockchip/rk_spi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/spibus/controller/rockchip KMOD= rk_spi diff --git a/sys/modules/rpi_ft5406/Makefile b/sys/modules/rpi_ft5406/Makefile index 052886cc3c2..1c78bd4e412 100644 --- a/sys/modules/rpi_ft5406/Makefile +++ b/sys/modules/rpi_ft5406/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/arm/broadcom/bcm2835/ KMOD= rpi_ft5406 diff --git a/sys/modules/rtsx/Makefile b/sys/modules/rtsx/Makefile index 5cf75b0c719..95d0607e41f 100644 --- a/sys/modules/rtsx/Makefile +++ b/sys/modules/rtsx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtsx KMOD= rtsx diff --git a/sys/modules/rtw88/Makefile b/sys/modules/rtw88/Makefile index da4233b7c79..b0e6b59b708 100644 --- a/sys/modules/rtw88/Makefile +++ b/sys/modules/rtw88/Makefile @@ -1,4 +1,3 @@ - DEVRTW88DIR= ${SRCTOP}/sys/contrib/dev/rtw88 .PATH: ${DEVRTW88DIR} diff --git a/sys/modules/rtw88fw/Makefile b/sys/modules/rtw88fw/Makefile index 1b92f28e024..928c80fbff9 100644 --- a/sys/modules/rtw88fw/Makefile +++ b/sys/modules/rtw88fw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ rtw8723d \ rtw8821c \ diff --git a/sys/modules/rtw88fw/rtw8723d/Makefile b/sys/modules/rtw88fw/rtw8723d/Makefile index 50a14fce3d2..e60918ea845 100644 --- a/sys/modules/rtw88fw/rtw8723d/Makefile +++ b/sys/modules/rtw88fw/rtw8723d/Makefile @@ -1,4 +1,3 @@ - VERSION= 48 NAME= 8723d diff --git a/sys/modules/rtw88fw/rtw8821c/Makefile b/sys/modules/rtw88fw/rtw8821c/Makefile index 875dbb2628d..d71aaa7d866 100644 --- a/sys/modules/rtw88fw/rtw8821c/Makefile +++ b/sys/modules/rtw88fw/rtw8821c/Makefile @@ -1,4 +1,3 @@ - VERSION= 2408 NAME= 8821c diff --git a/sys/modules/rtw88fw/rtw8822b/Makefile b/sys/modules/rtw88fw/rtw8822b/Makefile index 709ef82cd72..1b428c30a3f 100644 --- a/sys/modules/rtw88fw/rtw8822b/Makefile +++ b/sys/modules/rtw88fw/rtw8822b/Makefile @@ -1,4 +1,3 @@ - VERSION= 0 NAME= 8822b diff --git a/sys/modules/rtw88fw/rtw8822c/Makefile b/sys/modules/rtw88fw/rtw8822c/Makefile index 5fad1210b57..06676b5a0fa 100644 --- a/sys/modules/rtw88fw/rtw8822c/Makefile +++ b/sys/modules/rtw88fw/rtw8822c/Makefile @@ -1,4 +1,3 @@ - VERSION= 9910 NAME= 8822c diff --git a/sys/modules/rtw88fw/rtw8822c_wow/Makefile b/sys/modules/rtw88fw/rtw8822c_wow/Makefile index f1061a4aa15..d03b5c7d05a 100644 --- a/sys/modules/rtw88fw/rtw8822c_wow/Makefile +++ b/sys/modules/rtw88fw/rtw8822c_wow/Makefile @@ -1,4 +1,3 @@ - VERSION= 994 NAME= 8822c_wow diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index 9f81912a762..f13924e1aa5 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -1,4 +1,3 @@ - DEVRTW89DIR= ${SRCTOP}/sys/contrib/dev/rtw89 .PATH: ${DEVRTW89DIR} diff --git a/sys/modules/rtw89fw/Makefile b/sys/modules/rtw89fw/Makefile index 7732d9d868f..62340479737 100644 --- a/sys/modules/rtw89fw/Makefile +++ b/sys/modules/rtw89fw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ rtw8852a \ rtw8852c diff --git a/sys/modules/rtw89fw/rtw8852a/Makefile b/sys/modules/rtw89fw/rtw8852a/Makefile index 910468870e7..876e8145759 100644 --- a/sys/modules/rtw89fw/rtw8852a/Makefile +++ b/sys/modules/rtw89fw/rtw8852a/Makefile @@ -1,4 +1,3 @@ - VERSION= 013360 NAME= 8852a diff --git a/sys/modules/rtw89fw/rtw8852c/Makefile b/sys/modules/rtw89fw/rtw8852c/Makefile index b051945017e..1479e43b707 100644 --- a/sys/modules/rtw89fw/rtw8852c/Makefile +++ b/sys/modules/rtw89fw/rtw8852c/Makefile @@ -1,4 +1,3 @@ - VERSION= 027200 NAME= 8852c diff --git a/sys/modules/rtwn/Makefile b/sys/modules/rtwn/Makefile index 07a128a9968..9afdd2084ec 100644 --- a/sys/modules/rtwn/Makefile +++ b/sys/modules/rtwn/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtwn SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/rtwn_pci/Makefile b/sys/modules/rtwn_pci/Makefile index 2d6650238c2..ce2144121e8 100644 --- a/sys/modules/rtwn_pci/Makefile +++ b/sys/modules/rtwn_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtwn/pci SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/rtwn_usb/Makefile b/sys/modules/rtwn_usb/Makefile index a599f13095e..16899b8a8c4 100644 --- a/sys/modules/rtwn_usb/Makefile +++ b/sys/modules/rtwn_usb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/rtwn/usb SYSDIR?=${SRCTOP}/sys diff --git a/sys/modules/rtwnfw/Makefile b/sys/modules/rtwnfw/Makefile index f747612c752..a8eedea81d9 100644 --- a/sys/modules/rtwnfw/Makefile +++ b/sys/modules/rtwnfw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= rtwnrtl8188eu rtwnrtl8192cT rtwnrtl8192cU rtwnrtl8192eu rtwnrtl8812au \ rtwnrtl8821au rtwnrtl8192cE rtwnrtl8192cEB rtwnrtl8188ee diff --git a/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile b/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile index 4d3ed50d557..6d030b069b2 100644 --- a/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8188ee/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8188eefw IMG= rtwn-rtl8188eefw diff --git a/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile b/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile index df896ca7dcc..985f8439ddb 100644 --- a/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8188eu/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8188eufw IMG= rtwn-rtl8188eufw diff --git a/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile index 8b6ddb2a119..6f253e75723 100644 --- a/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cE/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwE IMG= rtwn-rtl8192cfwE diff --git a/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile index 15412322d52..bbe6013b361 100644 --- a/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cEB/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwE_B IMG= rtwn-rtl8192cfwE_B diff --git a/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile index 98349e9b7ca..799425ae357 100644 --- a/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cT/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwT IMG= rtwn-rtl8192cfwT diff --git a/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile b/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile index 84a2e1c69c6..6c62a3cac07 100644 --- a/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192cU/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192cfwU IMG= rtwn-rtl8192cfwU diff --git a/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile b/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile index 30cfd185c76..89676d44336 100644 --- a/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8192eu/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8192eufw IMG= rtwn-rtl8192eufw diff --git a/sys/modules/rtwnfw/rtwnrtl8812au/Makefile b/sys/modules/rtwnfw/rtwnrtl8812au/Makefile index cb69e8a1785..5d37b3b4465 100644 --- a/sys/modules/rtwnfw/rtwnrtl8812au/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8812au/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8812aufw IMG= rtwn-rtl8812aufw diff --git a/sys/modules/rtwnfw/rtwnrtl8821au/Makefile b/sys/modules/rtwnfw/rtwnrtl8821au/Makefile index c874a7b9356..b018cb3f16d 100644 --- a/sys/modules/rtwnfw/rtwnrtl8821au/Makefile +++ b/sys/modules/rtwnfw/rtwnrtl8821au/Makefile @@ -1,4 +1,3 @@ - KMOD= rtwn-rtl8821aufw IMG= rtwn-rtl8821aufw diff --git a/sys/modules/s3/Makefile b/sys/modules/s3/Makefile index 153b41332aa..2b2716e3e8f 100644 --- a/sys/modules/s3/Makefile +++ b/sys/modules/s3/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fb KMOD= s3 diff --git a/sys/modules/sbni/Makefile b/sys/modules/sbni/Makefile index 5f43f4ed289..3d69f087ca1 100644 --- a/sys/modules/sbni/Makefile +++ b/sys/modules/sbni/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sbni KMOD= if_sbni diff --git a/sys/modules/scc/Makefile b/sys/modules/scc/Makefile index cd9e5b77422..c4bb5064e56 100644 --- a/sys/modules/scc/Makefile +++ b/sys/modules/scc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/scc .if ${MACHINE_CPUARCH} == "powerpc" diff --git a/sys/modules/sctp/Makefile b/sys/modules/sctp/Makefile index 4e91d7572ab..626f195dbf1 100644 --- a/sys/modules/sctp/Makefile +++ b/sys/modules/sctp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet .PATH: ${SRCTOP}/sys/netinet6 diff --git a/sys/modules/sdhci/Makefile b/sys/modules/sdhci/Makefile index cbd58d891a6..2e3104573cd 100644 --- a/sys/modules/sdhci/Makefile +++ b/sys/modules/sdhci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci diff --git a/sys/modules/sdhci_acpi/Makefile b/sys/modules/sdhci_acpi/Makefile index 597471eccef..b6f6efeb579 100644 --- a/sys/modules/sdhci_acpi/Makefile +++ b/sys/modules/sdhci_acpi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci_acpi diff --git a/sys/modules/sdhci_pci/Makefile b/sys/modules/sdhci_pci/Makefile index b0629919305..4a804941ac3 100644 --- a/sys/modules/sdhci_pci/Makefile +++ b/sys/modules/sdhci_pci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sdhci KMOD= sdhci_pci diff --git a/sys/modules/sdio/Makefile b/sys/modules/sdio/Makefile index 7f5bcb78a84..a6f1016404d 100644 --- a/sys/modules/sdio/Makefile +++ b/sys/modules/sdio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../dev/sdio KMOD= sdio diff --git a/sys/modules/sem/Makefile b/sys/modules/sem/Makefile index 1d3a88e09eb..506d1c9be5c 100644 --- a/sys/modules/sem/Makefile +++ b/sys/modules/sem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sem diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile index e4d2a44d827..78a51995493 100644 --- a/sys/modules/sfxge/Makefile +++ b/sys/modules/sfxge/Makefile @@ -1,4 +1,3 @@ - KMOD= sfxge SFXGE= ${SRCTOP}/sys/dev/sfxge diff --git a/sys/modules/sge/Makefile b/sys/modules/sge/Makefile index d4032dfab29..6d1a776da26 100644 --- a/sys/modules/sge/Makefile +++ b/sys/modules/sge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sge KMOD= if_sge diff --git a/sys/modules/sgx/Makefile b/sys/modules/sgx/Makefile index 504fa6d2e29..3c82e731856 100644 --- a/sys/modules/sgx/Makefile +++ b/sys/modules/sgx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/amd64/sgx KMOD= sgx diff --git a/sys/modules/sgx_linux/Makefile b/sys/modules/sgx_linux/Makefile index 366918d3ab5..4f68431903c 100644 --- a/sys/modules/sgx_linux/Makefile +++ b/sys/modules/sgx_linux/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/amd64/sgx KMOD= sgx_linux diff --git a/sys/modules/siftr/Makefile b/sys/modules/siftr/Makefile index 5bb038bf542..e18c5db9ba0 100644 --- a/sys/modules/siftr/Makefile +++ b/sys/modules/siftr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= siftr SRCS= siftr.c opt_kern_tls.h diff --git a/sys/modules/siis/Makefile b/sys/modules/siis/Makefile index 0027fbaa373..026fc174836 100644 --- a/sys/modules/siis/Makefile +++ b/sys/modules/siis/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/siis KMOD= siis diff --git a/sys/modules/sis/Makefile b/sys/modules/sis/Makefile index 3ef619d9999..c54acdab419 100644 --- a/sys/modules/sis/Makefile +++ b/sys/modules/sis/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sis KMOD= if_sis diff --git a/sys/modules/sk/Makefile b/sys/modules/sk/Makefile index 1f7b477d9b6..370baf75007 100644 --- a/sys/modules/sk/Makefile +++ b/sys/modules/sk/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sk KMOD= if_sk diff --git a/sys/modules/smbfs/Makefile b/sys/modules/smbfs/Makefile index 703343eb1b4..c796fb0701c 100644 --- a/sys/modules/smbfs/Makefile +++ b/sys/modules/smbfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/crypto/des \ ${SRCTOP}/sys/crypto/des/arch/${MACHINE_CPUARCH} \ ${SRCTOP}/sys/kern \ diff --git a/sys/modules/snp/Makefile b/sys/modules/snp/Makefile index d963b8e10e6..06a2160b31b 100644 --- a/sys/modules/snp/Makefile +++ b/sys/modules/snp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/snp KMOD= snp diff --git a/sys/modules/sound/Makefile b/sys/modules/sound/Makefile index 41314d322c9..57058d7bbb1 100644 --- a/sys/modules/sound/Makefile +++ b/sys/modules/sound/Makefile @@ -1,4 +1,3 @@ - SUBDIR = SUBDIR += sound SUBDIR += driver diff --git a/sys/modules/sound/Makefile.inc b/sys/modules/sound/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/sound/Makefile.inc +++ b/sys/modules/sound/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/sound/driver/Makefile b/sys/modules/sound/driver/Makefile index 2391d1c5a8a..9b157f0c76a 100644 --- a/sys/modules/sound/driver/Makefile +++ b/sys/modules/sound/driver/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/sound/driver/Makefile.inc b/sys/modules/sound/driver/Makefile.inc index 980084ed099..2dc6b1e6944 100644 --- a/sys/modules/sound/driver/Makefile.inc +++ b/sys/modules/sound/driver/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= ac97_if.h channel_if.h feeder_if.h mixer_if.h .include "../Makefile.inc" diff --git a/sys/modules/sound/driver/ai2s/Makefile b/sys/modules/sound/driver/ai2s/Makefile index 76c00494bd8..459880df8c7 100644 --- a/sys/modules/sound/driver/ai2s/Makefile +++ b/sys/modules/sound/driver/ai2s/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/macio KMOD= snd_ai2s diff --git a/sys/modules/sound/driver/als4000/Makefile b/sys/modules/sound/driver/als4000/Makefile index a81692cb183..f4b4d6f5d6a 100644 --- a/sys/modules/sound/driver/als4000/Makefile +++ b/sys/modules/sound/driver/als4000/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_als4000 diff --git a/sys/modules/sound/driver/atiixp/Makefile b/sys/modules/sound/driver/atiixp/Makefile index 7a500dd7e05..65380f7bdc5 100644 --- a/sys/modules/sound/driver/atiixp/Makefile +++ b/sys/modules/sound/driver/atiixp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_atiixp diff --git a/sys/modules/sound/driver/cmi/Makefile b/sys/modules/sound/driver/cmi/Makefile index ece46bf80fe..925700cded0 100644 --- a/sys/modules/sound/driver/cmi/Makefile +++ b/sys/modules/sound/driver/cmi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_cmi diff --git a/sys/modules/sound/driver/cs4281/Makefile b/sys/modules/sound/driver/cs4281/Makefile index d521d3240ff..0a9f529eb76 100644 --- a/sys/modules/sound/driver/cs4281/Makefile +++ b/sys/modules/sound/driver/cs4281/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_cs4281 diff --git a/sys/modules/sound/driver/csa/Makefile b/sys/modules/sound/driver/csa/Makefile index 0cc2a3da16a..52ca5b5fcaa 100644 --- a/sys/modules/sound/driver/csa/Makefile +++ b/sys/modules/sound/driver/csa/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_csa diff --git a/sys/modules/sound/driver/davbus/Makefile b/sys/modules/sound/driver/davbus/Makefile index 12df61b69d0..cbc2bf28011 100644 --- a/sys/modules/sound/driver/davbus/Makefile +++ b/sys/modules/sound/driver/davbus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/macio KMOD= snd_davbus diff --git a/sys/modules/sound/driver/driver/Makefile b/sys/modules/sound/driver/driver/Makefile index ce35900039c..3ba4eb77803 100644 --- a/sys/modules/sound/driver/driver/Makefile +++ b/sys/modules/sound/driver/driver/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound KMOD= snd_driver diff --git a/sys/modules/sound/driver/emu10k1/Makefile b/sys/modules/sound/driver/emu10k1/Makefile index 4ab78cee3bb..c0cdbadd464 100644 --- a/sys/modules/sound/driver/emu10k1/Makefile +++ b/sys/modules/sound/driver/emu10k1/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_emu10k1 diff --git a/sys/modules/sound/driver/envy24/Makefile b/sys/modules/sound/driver/envy24/Makefile index c2c0e171a47..5328f1fcd71 100644 --- a/sys/modules/sound/driver/envy24/Makefile +++ b/sys/modules/sound/driver/envy24/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_envy24 diff --git a/sys/modules/sound/driver/envy24ht/Makefile b/sys/modules/sound/driver/envy24ht/Makefile index 179352c39ae..262131c587d 100644 --- a/sys/modules/sound/driver/envy24ht/Makefile +++ b/sys/modules/sound/driver/envy24ht/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_envy24ht diff --git a/sys/modules/sound/driver/es137x/Makefile b/sys/modules/sound/driver/es137x/Makefile index 5f08e6d3566..2f7a47df5aa 100644 --- a/sys/modules/sound/driver/es137x/Makefile +++ b/sys/modules/sound/driver/es137x/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_es137x diff --git a/sys/modules/sound/driver/fm801/Makefile b/sys/modules/sound/driver/fm801/Makefile index 826eaf9522b..af706bcab02 100644 --- a/sys/modules/sound/driver/fm801/Makefile +++ b/sys/modules/sound/driver/fm801/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_fm801 diff --git a/sys/modules/sound/driver/hda/Makefile b/sys/modules/sound/driver/hda/Makefile index f1dbe405410..0eec98fc53e 100644 --- a/sys/modules/sound/driver/hda/Makefile +++ b/sys/modules/sound/driver/hda/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci/hda KMOD= snd_hda diff --git a/sys/modules/sound/driver/hdspe/Makefile b/sys/modules/sound/driver/hdspe/Makefile index c7be05fce73..f923634ea5c 100644 --- a/sys/modules/sound/driver/hdspe/Makefile +++ b/sys/modules/sound/driver/hdspe/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_hdspe diff --git a/sys/modules/sound/driver/ich/Makefile b/sys/modules/sound/driver/ich/Makefile index b68e872cbf6..927d9ad58ef 100644 --- a/sys/modules/sound/driver/ich/Makefile +++ b/sys/modules/sound/driver/ich/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD = snd_ich SRCS = device_if.h bus_if.h pci_if.h diff --git a/sys/modules/sound/driver/maestro3/Makefile b/sys/modules/sound/driver/maestro3/Makefile index db6c21035ff..efdc26ca208 100644 --- a/sys/modules/sound/driver/maestro3/Makefile +++ b/sys/modules/sound/driver/maestro3/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_maestro3 diff --git a/sys/modules/sound/driver/neomagic/Makefile b/sys/modules/sound/driver/neomagic/Makefile index 7a8befaba6f..4e64894daf6 100644 --- a/sys/modules/sound/driver/neomagic/Makefile +++ b/sys/modules/sound/driver/neomagic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_neomagic diff --git a/sys/modules/sound/driver/solo/Makefile b/sys/modules/sound/driver/solo/Makefile index a429db8d29e..f2824626e2a 100644 --- a/sys/modules/sound/driver/solo/Makefile +++ b/sys/modules/sound/driver/solo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_solo diff --git a/sys/modules/sound/driver/spicds/Makefile b/sys/modules/sound/driver/spicds/Makefile index bf9bc86dc10..c279a418cb4 100644 --- a/sys/modules/sound/driver/spicds/Makefile +++ b/sys/modules/sound/driver/spicds/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_spicds diff --git a/sys/modules/sound/driver/t4dwave/Makefile b/sys/modules/sound/driver/t4dwave/Makefile index 4aaf1bd1d90..375373a1525 100644 --- a/sys/modules/sound/driver/t4dwave/Makefile +++ b/sys/modules/sound/driver/t4dwave/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_t4dwave diff --git a/sys/modules/sound/driver/uaudio/Makefile b/sys/modules/sound/driver/uaudio/Makefile index a246f23afff..ed40adb3c67 100644 --- a/sys/modules/sound/driver/uaudio/Makefile +++ b/sys/modules/sound/driver/uaudio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/usb KMOD= snd_uaudio diff --git a/sys/modules/sound/driver/via8233/Makefile b/sys/modules/sound/driver/via8233/Makefile index 07832592c83..2af4e67ac33 100644 --- a/sys/modules/sound/driver/via8233/Makefile +++ b/sys/modules/sound/driver/via8233/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_via8233 diff --git a/sys/modules/sound/driver/via82c686/Makefile b/sys/modules/sound/driver/via82c686/Makefile index acf83ce7814..a9629518354 100644 --- a/sys/modules/sound/driver/via82c686/Makefile +++ b/sys/modules/sound/driver/via82c686/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_via82c686 diff --git a/sys/modules/sound/driver/vibes/Makefile b/sys/modules/sound/driver/vibes/Makefile index 53d1763d0cd..88ab043c5c7 100644 --- a/sys/modules/sound/driver/vibes/Makefile +++ b/sys/modules/sound/driver/vibes/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sound/pci KMOD= snd_vibes diff --git a/sys/modules/sound/sound/Makefile b/sys/modules/sound/sound/Makefile index 1c368571550..f31a751b3f2 100644 --- a/sys/modules/sound/sound/Makefile +++ b/sys/modules/sound/sound/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/dev/sound diff --git a/sys/modules/speaker/Makefile b/sys/modules/speaker/Makefile index 91b3312c230..8a25744cafa 100644 --- a/sys/modules/speaker/Makefile +++ b/sys/modules/speaker/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/speaker KMOD= speaker diff --git a/sys/modules/spi/Makefile b/sys/modules/spi/Makefile index 494ff6dc2dc..1c174b8dfbd 100644 --- a/sys/modules/spi/Makefile +++ b/sys/modules/spi/Makefile @@ -1,4 +1,3 @@ - SUBDIR = \ ../spigen \ at45d \ diff --git a/sys/modules/spi/at45d/Makefile b/sys/modules/spi/at45d/Makefile index a6e27b79a33..53ca181ebd1 100644 --- a/sys/modules/spi/at45d/Makefile +++ b/sys/modules/spi/at45d/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/flash KMOD= at45d diff --git a/sys/modules/spi/mx25l/Makefile b/sys/modules/spi/mx25l/Makefile index 0c52f1f760c..a7aabc7c227 100644 --- a/sys/modules/spi/mx25l/Makefile +++ b/sys/modules/spi/mx25l/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/flash KMOD= mx25l diff --git a/sys/modules/spi/spibus/Makefile b/sys/modules/spi/spibus/Makefile index 834fbdb2717..18ddb8be872 100644 --- a/sys/modules/spi/spibus/Makefile +++ b/sys/modules/spi/spibus/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/spibus KMOD= spibus diff --git a/sys/modules/spigen/Makefile b/sys/modules/spigen/Makefile index e23d7dd214b..c8aee6c2ef7 100644 --- a/sys/modules/spigen/Makefile +++ b/sys/modules/spigen/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/spibus KMOD= spigen SRCS= spigen.c diff --git a/sys/modules/splash/Makefile b/sys/modules/splash/Makefile index 8af6313e578..050bd543eb0 100644 --- a/sys/modules/splash/Makefile +++ b/sys/modules/splash/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bmp pcx txt .include diff --git a/sys/modules/splash/Makefile.inc b/sys/modules/splash/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/splash/Makefile.inc +++ b/sys/modules/splash/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/splash/bmp/Makefile b/sys/modules/splash/bmp/Makefile index 8bb4e09590e..f89523532a3 100644 --- a/sys/modules/splash/bmp/Makefile +++ b/sys/modules/splash/bmp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_bmp diff --git a/sys/modules/splash/pcx/Makefile b/sys/modules/splash/pcx/Makefile index e29d24ab69a..ff5e1af789e 100644 --- a/sys/modules/splash/pcx/Makefile +++ b/sys/modules/splash/pcx/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/fb KMOD= splash_pcx diff --git a/sys/modules/ste/Makefile b/sys/modules/ste/Makefile index 552d84f2c91..adab90f2f4f 100644 --- a/sys/modules/ste/Makefile +++ b/sys/modules/ste/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/ste KMOD= if_ste diff --git a/sys/modules/stge/Makefile b/sys/modules/stge/Makefile index 31bdb03fde2..329efbe27f9 100644 --- a/sys/modules/stge/Makefile +++ b/sys/modules/stge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/stge KMOD= if_stge diff --git a/sys/modules/sume/Makefile b/sys/modules/sume/Makefile index f10e26a7153..f463c51829c 100644 --- a/sys/modules/sume/Makefile +++ b/sys/modules/sume/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sume KMOD= if_sume diff --git a/sys/modules/superio/Makefile b/sys/modules/superio/Makefile index 1936c86395b..e9f6dbb2473 100644 --- a/sys/modules/superio/Makefile +++ b/sys/modules/superio/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../dev/superio KMOD= superio diff --git a/sys/modules/sym/Makefile b/sys/modules/sym/Makefile index a3ca47eee71..82208208268 100644 --- a/sys/modules/sym/Makefile +++ b/sys/modules/sym/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/sym KMOD= sym diff --git a/sys/modules/syscons/Makefile b/sys/modules/syscons/Makefile index 83c2e34bfcb..77466d84d6e 100644 --- a/sys/modules/syscons/Makefile +++ b/sys/modules/syscons/Makefile @@ -1,4 +1,3 @@ - SUBDIR= beastie \ blank \ daemon \ diff --git a/sys/modules/syscons/Makefile.inc b/sys/modules/syscons/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/syscons/Makefile.inc +++ b/sys/modules/syscons/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/syscons/beastie/Makefile b/sys/modules/syscons/beastie/Makefile index 263f2940f69..73ca08641cc 100644 --- a/sys/modules/syscons/beastie/Makefile +++ b/sys/modules/syscons/beastie/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/logo KMOD= beastie_saver diff --git a/sys/modules/syscons/blank/Makefile b/sys/modules/syscons/blank/Makefile index 763d895cb32..cb2286a5b3f 100644 --- a/sys/modules/syscons/blank/Makefile +++ b/sys/modules/syscons/blank/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/blank KMOD= blank_saver diff --git a/sys/modules/syscons/daemon/Makefile b/sys/modules/syscons/daemon/Makefile index 296fc734513..5f7fa4a3bf7 100644 --- a/sys/modules/syscons/daemon/Makefile +++ b/sys/modules/syscons/daemon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/daemon KMOD= daemon_saver diff --git a/sys/modules/syscons/dragon/Makefile b/sys/modules/syscons/dragon/Makefile index 6f2b2fbac27..23af4562921 100644 --- a/sys/modules/syscons/dragon/Makefile +++ b/sys/modules/syscons/dragon/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/dragon KMOD= dragon_saver diff --git a/sys/modules/syscons/fade/Makefile b/sys/modules/syscons/fade/Makefile index e04df9da9fe..1aafeecf6ae 100644 --- a/sys/modules/syscons/fade/Makefile +++ b/sys/modules/syscons/fade/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/fade KMOD= fade_saver diff --git a/sys/modules/syscons/fire/Makefile b/sys/modules/syscons/fire/Makefile index 83c5cd60a04..5003196ffd6 100644 --- a/sys/modules/syscons/fire/Makefile +++ b/sys/modules/syscons/fire/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/fire KMOD= fire_saver diff --git a/sys/modules/syscons/green/Makefile b/sys/modules/syscons/green/Makefile index be5db35f864..4b55b41d26d 100644 --- a/sys/modules/syscons/green/Makefile +++ b/sys/modules/syscons/green/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/green KMOD= green_saver diff --git a/sys/modules/syscons/logo/Makefile b/sys/modules/syscons/logo/Makefile index 0a3e9c6c2af..0dc144ec472 100644 --- a/sys/modules/syscons/logo/Makefile +++ b/sys/modules/syscons/logo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/logo KMOD= logo_saver diff --git a/sys/modules/syscons/plasma/Makefile b/sys/modules/syscons/plasma/Makefile index dd47c7e1e21..2de97f2ad4b 100644 --- a/sys/modules/syscons/plasma/Makefile +++ b/sys/modules/syscons/plasma/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/plasma KMOD= plasma_saver diff --git a/sys/modules/syscons/rain/Makefile b/sys/modules/syscons/rain/Makefile index 8041246c126..e68b44dbd9b 100644 --- a/sys/modules/syscons/rain/Makefile +++ b/sys/modules/syscons/rain/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/rain KMOD= rain_saver diff --git a/sys/modules/syscons/snake/Makefile b/sys/modules/syscons/snake/Makefile index 23bd60b6b62..b07c02123b0 100644 --- a/sys/modules/syscons/snake/Makefile +++ b/sys/modules/syscons/snake/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/snake KMOD= snake_saver diff --git a/sys/modules/syscons/star/Makefile b/sys/modules/syscons/star/Makefile index 25ece2cb02f..9ad996afbc5 100644 --- a/sys/modules/syscons/star/Makefile +++ b/sys/modules/syscons/star/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/star KMOD= star_saver diff --git a/sys/modules/syscons/warp/Makefile b/sys/modules/syscons/warp/Makefile index e3970032de2..b1237c2fdf7 100644 --- a/sys/modules/syscons/warp/Makefile +++ b/sys/modules/syscons/warp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/syscons/warp KMOD= warp_saver diff --git a/sys/modules/sysvipc/Makefile b/sys/modules/sysvipc/Makefile index fc9e27c8173..c9dd5ecac33 100644 --- a/sys/modules/sysvipc/Makefile +++ b/sys/modules/sysvipc/Makefile @@ -1,4 +1,3 @@ - SUBDIR= sysvmsg sysvsem sysvshm .include diff --git a/sys/modules/sysvipc/Makefile.inc b/sys/modules/sysvipc/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/sys/modules/sysvipc/Makefile.inc +++ b/sys/modules/sysvipc/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/sys/modules/sysvipc/sysvmsg/Makefile b/sys/modules/sysvipc/sysvmsg/Makefile index c31e6952472..3b2fdda1a29 100644 --- a/sys/modules/sysvipc/sysvmsg/Makefile +++ b/sys/modules/sysvipc/sysvmsg/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sysvmsg diff --git a/sys/modules/sysvipc/sysvsem/Makefile b/sys/modules/sysvipc/sysvsem/Makefile index 516d275f41e..f5a6e6aab54 100644 --- a/sys/modules/sysvipc/sysvsem/Makefile +++ b/sys/modules/sysvipc/sysvsem/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sysvsem diff --git a/sys/modules/sysvipc/sysvshm/Makefile b/sys/modules/sysvipc/sysvshm/Makefile index 6add9050736..757c0c94dba 100644 --- a/sys/modules/sysvipc/sysvshm/Makefile +++ b/sys/modules/sysvipc/sysvshm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/kern KMOD= sysvshm diff --git a/sys/modules/tarfs/Makefile b/sys/modules/tarfs/Makefile index 1510d2ea58b..b882037afc9 100644 --- a/sys/modules/tarfs/Makefile +++ b/sys/modules/tarfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H:H}/fs/tarfs KMOD= tarfs diff --git a/sys/modules/tcp/tcpmd5/Makefile b/sys/modules/tcp/tcpmd5/Makefile index 15a71e9fe25..560688cf66c 100644 --- a/sys/modules/tcp/tcpmd5/Makefile +++ b/sys/modules/tcp/tcpmd5/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netipsec KMOD= tcpmd5 diff --git a/sys/modules/tests/Makefile b/sys/modules/tests/Makefile index 7481a0a3a4b..ed06d043822 100644 --- a/sys/modules/tests/Makefile +++ b/sys/modules/tests/Makefile @@ -1,4 +1,3 @@ - SUBDIR+= framework SUBDIR+= .WAIT diff --git a/sys/modules/tests/fib_lookup/Makefile b/sys/modules/tests/fib_lookup/Makefile index 8ad6340acdf..7d619839691 100644 --- a/sys/modules/tests/fib_lookup/Makefile +++ b/sys/modules/tests/fib_lookup/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/tmpfs/Makefile b/sys/modules/tmpfs/Makefile index 7a778c487cf..984ccf94046 100644 --- a/sys/modules/tmpfs/Makefile +++ b/sys/modules/tmpfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/tmpfs KMOD= tmpfs diff --git a/sys/modules/toecore/Makefile b/sys/modules/toecore/Makefile index 90cb4103c75..00764c1f8e3 100644 --- a/sys/modules/toecore/Makefile +++ b/sys/modules/toecore/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/netinet KMOD= toecore diff --git a/sys/modules/tpm/Makefile b/sys/modules/tpm/Makefile index 372c2dcad86..d929649d40f 100644 --- a/sys/modules/tpm/Makefile +++ b/sys/modules/tpm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/tpm KMOD= tpm diff --git a/sys/modules/tsec/Makefile b/sys/modules/tsec/Makefile index 56cd28e1dbf..ec79f2a9ffa 100644 --- a/sys/modules/tsec/Makefile +++ b/sys/modules/tsec/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .PATH: ${SYSDIR}/dev/tsec diff --git a/sys/modules/uart/Makefile b/sys/modules/uart/Makefile index 38ffc2d49dd..5d20a349e70 100644 --- a/sys/modules/uart/Makefile +++ b/sys/modules/uart/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/uart .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ diff --git a/sys/modules/ubser/Makefile b/sys/modules/ubser/Makefile index 2543659e4a0..d4e3fbead47 100644 --- a/sys/modules/ubser/Makefile +++ b/sys/modules/ubser/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/uchcom/Makefile b/sys/modules/uchcom/Makefile index d8d7e7b417c..e8ea071965f 100644 --- a/sys/modules/uchcom/Makefile +++ b/sys/modules/uchcom/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/ucycom/Makefile b/sys/modules/ucycom/Makefile index 490c84368c1..f3021f61984 100644 --- a/sys/modules/ucycom/Makefile +++ b/sys/modules/ucycom/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/serial diff --git a/sys/modules/udf/Makefile b/sys/modules/udf/Makefile index 45e7c6cca18..da8653d67de 100644 --- a/sys/modules/udf/Makefile +++ b/sys/modules/udf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/udf KMOD= udf diff --git a/sys/modules/udf_iconv/Makefile b/sys/modules/udf_iconv/Makefile index 13dd047c0ba..9d2af27dbfa 100644 --- a/sys/modules/udf_iconv/Makefile +++ b/sys/modules/udf_iconv/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/udf KMOD= udf_iconv SRCS= udf_iconv.c diff --git a/sys/modules/ufs/Makefile b/sys/modules/ufs/Makefile index 225f6b09ac6..f8f360aee4d 100644 --- a/sys/modules/ufs/Makefile +++ b/sys/modules/ufs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/ufs/ufs ${SRCTOP}/sys/ufs/ffs KMOD= ufs diff --git a/sys/modules/uinput/Makefile b/sys/modules/uinput/Makefile index 623151c580a..66ade2a5bb3 100644 --- a/sys/modules/uinput/Makefile +++ b/sys/modules/uinput/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/evdev KMOD= uinput diff --git a/sys/modules/unionfs/Makefile b/sys/modules/unionfs/Makefile index b3edfe7f5dd..69299f0ee19 100644 --- a/sys/modules/unionfs/Makefile +++ b/sys/modules/unionfs/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/fs/unionfs KMOD= unionfs diff --git a/sys/modules/usb/atp/Makefile b/sys/modules/usb/atp/Makefile index ae7bccda3ae..968bc27f6c5 100644 --- a/sys/modules/usb/atp/Makefile +++ b/sys/modules/usb/atp/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/axge/Makefile b/sys/modules/usb/axge/Makefile index cc1ad19068c..5c38e2246e8 100644 --- a/sys/modules/usb/axge/Makefile +++ b/sys/modules/usb/axge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/net KMOD= if_axge diff --git a/sys/modules/usb/cfumass/Makefile b/sys/modules/usb/cfumass/Makefile index 72b882efadb..5ddefb712b9 100644 --- a/sys/modules/usb/cfumass/Makefile +++ b/sys/modules/usb/cfumass/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/storage KMOD= cfumass diff --git a/sys/modules/usb/muge/Makefile b/sys/modules/usb/muge/Makefile index 7985ea81663..5acc40d5b1c 100644 --- a/sys/modules/usb/muge/Makefile +++ b/sys/modules/usb/muge/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/net diff --git a/sys/modules/usb/rsu/Makefile b/sys/modules/usb/rsu/Makefile index d9258591a2a..8dc0fb84cbb 100644 --- a/sys/modules/usb/rsu/Makefile +++ b/sys/modules/usb/rsu/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_rsu diff --git a/sys/modules/usb/rsufw/Makefile b/sys/modules/usb/rsufw/Makefile index ae154d51f97..3f69e6414d3 100644 --- a/sys/modules/usb/rsufw/Makefile +++ b/sys/modules/usb/rsufw/Makefile @@ -1,4 +1,3 @@ - SUBDIR= rsurtl8712fw .include diff --git a/sys/modules/usb/rsufw/rsurtl8712fw/Makefile b/sys/modules/usb/rsufw/rsurtl8712fw/Makefile index cdeeb8f7333..be9c4ce883a 100644 --- a/sys/modules/usb/rsufw/rsurtl8712fw/Makefile +++ b/sys/modules/usb/rsufw/rsurtl8712fw/Makefile @@ -1,4 +1,3 @@ - KMOD= rsu-rtl8712fw IMG= rsu-rtl8712fw diff --git a/sys/modules/usb/runfw/Makefile b/sys/modules/usb/runfw/Makefile index 6369337268b..58d026b7129 100644 --- a/sys/modules/usb/runfw/Makefile +++ b/sys/modules/usb/runfw/Makefile @@ -1,4 +1,3 @@ - KMOD= runfw FIRMWS= run.fw:runfw:1 diff --git a/sys/modules/usb/uath/Makefile b/sys/modules/usb/uath/Makefile index 04d167486fb..e49167ddfda 100644 --- a/sys/modules/usb/uath/Makefile +++ b/sys/modules/usb/uath/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_uath diff --git a/sys/modules/usb/udl/Makefile b/sys/modules/usb/udl/Makefile index 6bc0a99f250..4440cbd90a5 100644 --- a/sys/modules/usb/udl/Makefile +++ b/sys/modules/usb/udl/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/video diff --git a/sys/modules/usb/uep/Makefile b/sys/modules/usb/uep/Makefile index e7fb87517b3..5425fd7489b 100644 --- a/sys/modules/usb/uep/Makefile +++ b/sys/modules/usb/uep/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/upgt/Makefile b/sys/modules/usb/upgt/Makefile index 4db4b167915..2d719135ffa 100644 --- a/sys/modules/usb/upgt/Makefile +++ b/sys/modules/usb/upgt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_upgt diff --git a/sys/modules/usb/ure/Makefile b/sys/modules/usb/ure/Makefile index 0ff0fce8a43..100fe5df67e 100644 --- a/sys/modules/usb/ure/Makefile +++ b/sys/modules/usb/ure/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/net KMOD= if_ure diff --git a/sys/modules/usb/urtw/Makefile b/sys/modules/usb/urtw/Makefile index 89c1baf9cde..13ea006e166 100644 --- a/sys/modules/usb/urtw/Makefile +++ b/sys/modules/usb/urtw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/usb/wlan KMOD = if_urtw diff --git a/sys/modules/usb/usbhid/Makefile b/sys/modules/usb/usbhid/Makefile index 910385d1314..f0994bb8416 100644 --- a/sys/modules/usb/usbhid/Makefile +++ b/sys/modules/usb/usbhid/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/usb/wmt/Makefile b/sys/modules/usb/wmt/Makefile index b20fa8f1429..72cf1d81490 100644 --- a/sys/modules/usb/wmt/Makefile +++ b/sys/modules/usb/wmt/Makefile @@ -1,4 +1,3 @@ - S= ${SRCTOP}/sys .PATH: $S/dev/usb/input diff --git a/sys/modules/veriexec/Makefile b/sys/modules/veriexec/Makefile index 453177fe199..2916e0b5c98 100644 --- a/sys/modules/veriexec/Makefile +++ b/sys/modules/veriexec/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.PARSEDIR:H:H}/dev/veriexec .include diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile index 9f539d20a13..83555cee68d 100644 --- a/sys/modules/vesa/Makefile +++ b/sys/modules/vesa/Makefile @@ -1,4 +1,3 @@ - KMOD= vesa SRCS= opt_vga.h opt_vesa.h SRCS+= bus_if.h device_if.h pci_if.h diff --git a/sys/modules/vge/Makefile b/sys/modules/vge/Makefile index f6b3655366e..fcc12fb07c2 100644 --- a/sys/modules/vge/Makefile +++ b/sys/modules/vge/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vge KMOD= if_vge diff --git a/sys/modules/viawd/Makefile b/sys/modules/viawd/Makefile index fb8efb69ca1..89996d6a528 100644 --- a/sys/modules/viawd/Makefile +++ b/sys/modules/viawd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/viawd KMOD= viawd diff --git a/sys/modules/vmd/Makefile b/sys/modules/vmd/Makefile index c9f2f40730e..906317f55e8 100644 --- a/sys/modules/vmd/Makefile +++ b/sys/modules/vmd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vmd KMOD= vmd diff --git a/sys/modules/vmm/Makefile b/sys/modules/vmm/Makefile index 96155753f1d..fc9340e9cd8 100644 --- a/sys/modules/vmm/Makefile +++ b/sys/modules/vmm/Makefile @@ -1,4 +1,3 @@ - .include KMOD= vmm diff --git a/sys/modules/vmware/pvscsi/Makefile b/sys/modules/vmware/pvscsi/Makefile index 60951e886ce..451a44a5481 100644 --- a/sys/modules/vmware/pvscsi/Makefile +++ b/sys/modules/vmware/pvscsi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vmware/pvscsi KMOD= pvscsi diff --git a/sys/modules/vmware/vmci/Makefile b/sys/modules/vmware/vmci/Makefile index 45accc068cc..84b27417fbb 100644 --- a/sys/modules/vmware/vmci/Makefile +++ b/sys/modules/vmware/vmci/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vmware/vmci KMOD= vmci diff --git a/sys/modules/vnic/Makefile b/sys/modules/vnic/Makefile index 79e206c8ef0..7b975bfebe8 100644 --- a/sys/modules/vnic/Makefile +++ b/sys/modules/vnic/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/mrmlbus/Makefile b/sys/modules/vnic/mrmlbus/Makefile index e7397f8d840..a3581b7a79a 100644 --- a/sys/modules/vnic/mrmlbus/Makefile +++ b/sys/modules/vnic/mrmlbus/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/thunder_bgx/Makefile b/sys/modules/vnic/thunder_bgx/Makefile index b51fe40a3b1..90df4b25df9 100644 --- a/sys/modules/vnic/thunder_bgx/Makefile +++ b/sys/modules/vnic/thunder_bgx/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/thunder_mdio/Makefile b/sys/modules/vnic/thunder_mdio/Makefile index 899a9dfb578..37032516f3c 100644 --- a/sys/modules/vnic/thunder_mdio/Makefile +++ b/sys/modules/vnic/thunder_mdio/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/vnicpf/Makefile b/sys/modules/vnic/vnicpf/Makefile index 8ba2cd02985..37cd29e6fdd 100644 --- a/sys/modules/vnic/vnicpf/Makefile +++ b/sys/modules/vnic/vnicpf/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vnic/vnicvf/Makefile b/sys/modules/vnic/vnicvf/Makefile index 3f81ba16cff..c6ffaaa2c30 100644 --- a/sys/modules/vnic/vnicvf/Makefile +++ b/sys/modules/vnic/vnicvf/Makefile @@ -1,4 +1,3 @@ - SYSDIR?=${SRCTOP}/sys .include "${SYSDIR}/conf/kern.opts.mk" diff --git a/sys/modules/vr/Makefile b/sys/modules/vr/Makefile index 980243faea4..cd441957a35 100644 --- a/sys/modules/vr/Makefile +++ b/sys/modules/vr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vr KMOD= if_vr diff --git a/sys/modules/vte/Makefile b/sys/modules/vte/Makefile index 3dc09ebf829..1b750d1bbb4 100644 --- a/sys/modules/vte/Makefile +++ b/sys/modules/vte/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/vte KMOD= if_vte diff --git a/sys/modules/wbwd/Makefile b/sys/modules/wbwd/Makefile index 053d4a7aa9e..c464a3f8fc0 100644 --- a/sys/modules/wbwd/Makefile +++ b/sys/modules/wbwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/wbwd KMOD= wbwd diff --git a/sys/modules/wdatwd/Makefile b/sys/modules/wdatwd/Makefile index d9f578c8ad0..ecfbb7c046a 100644 --- a/sys/modules/wdatwd/Makefile +++ b/sys/modules/wdatwd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/wdatwd KMOD= wdatwd diff --git a/sys/modules/wlan/Makefile b/sys/modules/wlan/Makefile index 1233e8216b4..d0a761a8109 100644 --- a/sys/modules/wlan/Makefile +++ b/sys/modules/wlan/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan diff --git a/sys/modules/wlan_acl/Makefile b/sys/modules/wlan_acl/Makefile index 168966aa0d8..bb8541e79bb 100644 --- a/sys/modules/wlan_acl/Makefile +++ b/sys/modules/wlan_acl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_acl diff --git a/sys/modules/wlan_amrr/Makefile b/sys/modules/wlan_amrr/Makefile index 13503fff695..4ad964d095f 100644 --- a/sys/modules/wlan_amrr/Makefile +++ b/sys/modules/wlan_amrr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_amrr diff --git a/sys/modules/wlan_ccmp/Makefile b/sys/modules/wlan_ccmp/Makefile index a00d61b5f23..5115ef73bc6 100644 --- a/sys/modules/wlan_ccmp/Makefile +++ b/sys/modules/wlan_ccmp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 .PATH: ${SRCTOP}/sys/crypto/rijndael diff --git a/sys/modules/wlan_rssadapt/Makefile b/sys/modules/wlan_rssadapt/Makefile index df3f86611d9..88f3ec505ce 100644 --- a/sys/modules/wlan_rssadapt/Makefile +++ b/sys/modules/wlan_rssadapt/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_rssadapt diff --git a/sys/modules/wlan_tkip/Makefile b/sys/modules/wlan_tkip/Makefile index 2888597dde8..b173faa1b34 100644 --- a/sys/modules/wlan_tkip/Makefile +++ b/sys/modules/wlan_tkip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_tkip diff --git a/sys/modules/wlan_wep/Makefile b/sys/modules/wlan_wep/Makefile index 4d3e7580328..f995b9747b1 100644 --- a/sys/modules/wlan_wep/Makefile +++ b/sys/modules/wlan_wep/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_wep diff --git a/sys/modules/wlan_xauth/Makefile b/sys/modules/wlan_xauth/Makefile index 6d5cb21147f..cb1530d1036 100644 --- a/sys/modules/wlan_xauth/Makefile +++ b/sys/modules/wlan_xauth/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/net80211 KMOD= wlan_xauth diff --git a/sys/modules/wpi/Makefile b/sys/modules/wpi/Makefile index d292618f5fc..d827f451a67 100644 --- a/sys/modules/wpi/Makefile +++ b/sys/modules/wpi/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/wpi KMOD = if_wpi diff --git a/sys/modules/wpifw/Makefile b/sys/modules/wpifw/Makefile index 60638d514db..f13108abb5c 100644 --- a/sys/modules/wpifw/Makefile +++ b/sys/modules/wpifw/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/contrib/dev/wpi KMOD= wpifw diff --git a/sys/modules/wtap/Makefile b/sys/modules/wtap/Makefile index 0ad01b627b1..a157695915a 100644 --- a/sys/modules/wtap/Makefile +++ b/sys/modules/wtap/Makefile @@ -1,4 +1,3 @@ - KMOD= wtap .PATH: ${SRCTOP}/sys/dev/wtap diff --git a/sys/modules/x86bios/Makefile b/sys/modules/x86bios/Makefile index c3708b27750..225d8e0293b 100644 --- a/sys/modules/x86bios/Makefile +++ b/sys/modules/x86bios/Makefile @@ -1,4 +1,3 @@ - KMOD= x86bios SRCS= opt_x86bios.h SRCS+= bus_if.h device_if.h pci_if.h diff --git a/sys/modules/xdr/Makefile b/sys/modules/xdr/Makefile index 44274237aac..86212b5dcc4 100644 --- a/sys/modules/xdr/Makefile +++ b/sys/modules/xdr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/xdr KMOD= xdr SRCS= xdr.c \ diff --git a/sys/modules/xl/Makefile b/sys/modules/xl/Makefile index 74f82c998d7..dfe8ffc0ad9 100644 --- a/sys/modules/xl/Makefile +++ b/sys/modules/xl/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/xl KMOD= if_xl diff --git a/sys/modules/xz/Makefile b/sys/modules/xz/Makefile index fae30d8ad88..8951123635c 100644 --- a/sys/modules/xz/Makefile +++ b/sys/modules/xz/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/dev/xz .PATH: ${SRCTOP}/sys/contrib/xz-embedded/freebsd .PATH: ${SRCTOP}/sys/contrib/xz-embedded/linux/lib/xz diff --git a/sys/modules/zfs/Makefile b/sys/modules/zfs/Makefile index 654f0044a8f..d45488dcb34 100644 --- a/sys/modules/zfs/Makefile +++ b/sys/modules/zfs/Makefile @@ -1,4 +1,3 @@ - SRCDIR=${SRCTOP}/sys/contrib/openzfs/module INCDIR=${SRCTOP}/sys/contrib/openzfs/include diff --git a/sys/modules/zlib/Makefile b/sys/modules/zlib/Makefile index 7f4f76fa211..4790ad1fd70 100644 --- a/sys/modules/zlib/Makefile +++ b/sys/modules/zlib/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/libkern .PATH: ${SRCTOP}/sys/dev/zlib .PATH: ${SRCTOP}/sys/contrib/zlib diff --git a/sys/teken/demo/Makefile b/sys/teken/demo/Makefile index b547e423e14..8b43e59b1ec 100644 --- a/sys/teken/demo/Makefile +++ b/sys/teken/demo/Makefile @@ -1,4 +1,3 @@ - PROG= teken_demo LDADD= -lncursesw -lteken -lutil MAN= diff --git a/sys/teken/libteken/Makefile b/sys/teken/libteken/Makefile index 55ffc7d92a6..11103550426 100644 --- a/sys/teken/libteken/Makefile +++ b/sys/teken/libteken/Makefile @@ -1,4 +1,3 @@ - LIB= teken SHLIB_MAJOR= 0 diff --git a/sys/teken/stress/Makefile b/sys/teken/stress/Makefile index 6f4785d3585..4c776a65851 100644 --- a/sys/teken/stress/Makefile +++ b/sys/teken/stress/Makefile @@ -1,4 +1,3 @@ - PROG= teken_stress LDADD= -lteken MAN= diff --git a/targets/Makefile b/targets/Makefile index e6253c7f031..a1fd2aabc6c 100644 --- a/targets/Makefile +++ b/targets/Makefile @@ -1,4 +1,3 @@ - # This is the top-level makefile - derived from the Junos version # # If a subdir that matches the requested target exists, we assume diff --git a/targets/Makefile.inc b/targets/Makefile.inc index 22fc9698c4d..6a30d2e35e8 100644 --- a/targets/Makefile.inc +++ b/targets/Makefile.inc @@ -1,4 +1,3 @@ - .if !target(__${_this}__) __${_this}__: diff --git a/targets/pseudo/Makefile.inc b/targets/pseudo/Makefile.inc index 5173461eae7..dbe8b961ea8 100644 --- a/targets/pseudo/Makefile.inc +++ b/targets/pseudo/Makefile.inc @@ -1,4 +1,3 @@ - # we don't do anything in these dirs # they are just for triggering building of other things diff --git a/targets/pseudo/bootstrap-tools/Makefile b/targets/pseudo/bootstrap-tools/Makefile index 4c6bd8bc275..f3ed985e14b 100644 --- a/targets/pseudo/bootstrap-tools/Makefile +++ b/targets/pseudo/bootstrap-tools/Makefile @@ -1,4 +1,3 @@ - # building clang is particularly tedious - so avoid re-inventing wheels all: bootstrap-toolchain diff --git a/targets/pseudo/bootstrap-tools/Makefile.depend.host b/targets/pseudo/bootstrap-tools/Makefile.depend.host index d3ddeb5c1b8..d22118bdfad 100644 --- a/targets/pseudo/bootstrap-tools/Makefile.depend.host +++ b/targets/pseudo/bootstrap-tools/Makefile.depend.host @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = diff --git a/targets/pseudo/clang/Makefile b/targets/pseudo/clang/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/clang/Makefile +++ b/targets/pseudo/clang/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/clang/Makefile.depend b/targets/pseudo/clang/Makefile.depend index 7b094a258fa..98fd61e7b38 100644 --- a/targets/pseudo/clang/Makefile.depend +++ b/targets/pseudo/clang/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/gcc/Makefile b/targets/pseudo/gcc/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/gcc/Makefile +++ b/targets/pseudo/gcc/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/gcc/Makefile.depend b/targets/pseudo/gcc/Makefile.depend index 19e6d638291..a381e9bd2ab 100644 --- a/targets/pseudo/gcc/Makefile.depend +++ b/targets/pseudo/gcc/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/hosttools/Makefile b/targets/pseudo/hosttools/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/hosttools/Makefile +++ b/targets/pseudo/hosttools/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/hosttools/Makefile.depend.host b/targets/pseudo/hosttools/Makefile.depend.host index a54437970d5..899433463e7 100644 --- a/targets/pseudo/hosttools/Makefile.depend.host +++ b/targets/pseudo/hosttools/Makefile.depend.host @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_KERBEROS) diff --git a/targets/pseudo/kernel/Makefile b/targets/pseudo/kernel/Makefile index 052532a532f..aa9c2f08980 100644 --- a/targets/pseudo/kernel/Makefile +++ b/targets/pseudo/kernel/Makefile @@ -1,4 +1,3 @@ - # Build the kernel ${KERNCONF} KERNCONF?= ${KERNEL:UGENERIC} diff --git a/targets/pseudo/kernel/Makefile.depend b/targets/pseudo/kernel/Makefile.depend index 5a4e8b865e1..da8fc1d6435 100644 --- a/targets/pseudo/kernel/Makefile.depend +++ b/targets/pseudo/kernel/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/stage/Makefile b/targets/pseudo/stage/Makefile index ac02e1c9099..792c380c725 100644 --- a/targets/pseudo/stage/Makefile +++ b/targets/pseudo/stage/Makefile @@ -1,4 +1,3 @@ - # this makefile gets hooked into everyone's dependencies so that # distrib-dirs can be done in STAGE_OBJTOP all: diff --git a/targets/pseudo/tests/Makefile b/targets/pseudo/tests/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/tests/Makefile +++ b/targets/pseudo/tests/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/tests/Makefile.depend b/targets/pseudo/tests/Makefile.depend index 54aa2f7ff52..06771ad0970 100644 --- a/targets/pseudo/tests/Makefile.depend +++ b/targets/pseudo/tests/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/the-lot/Makefile b/targets/pseudo/the-lot/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/the-lot/Makefile +++ b/targets/pseudo/the-lot/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/the-lot/Makefile.depend b/targets/pseudo/the-lot/Makefile.depend index 5ffafd8f7ec..b98e8d3c269 100644 --- a/targets/pseudo/the-lot/Makefile.depend +++ b/targets/pseudo/the-lot/Makefile.depend @@ -1,4 +1,3 @@ - .include # This file is not autogenerated - take care! diff --git a/targets/pseudo/toolchain/Makefile b/targets/pseudo/toolchain/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/toolchain/Makefile +++ b/targets/pseudo/toolchain/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/toolchain/Makefile.depend b/targets/pseudo/toolchain/Makefile.depend index 286b072dfcd..e0c30675fc2 100644 --- a/targets/pseudo/toolchain/Makefile.depend +++ b/targets/pseudo/toolchain/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_CLANG) diff --git a/targets/pseudo/universe/Makefile b/targets/pseudo/universe/Makefile index 1a9e17ffa12..4f8e2cb94d4 100644 --- a/targets/pseudo/universe/Makefile +++ b/targets/pseudo/universe/Makefile @@ -1,4 +1,3 @@ - # This target is "special". # # The actual work is done via another target; diff --git a/targets/pseudo/universe/Makefile.depend b/targets/pseudo/universe/Makefile.depend index f2a6736ad99..70e52a1101f 100644 --- a/targets/pseudo/universe/Makefile.depend +++ b/targets/pseudo/universe/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! # this is not normally needed, but we are not normal diff --git a/targets/pseudo/userland/Makefile b/targets/pseudo/userland/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/Makefile +++ b/targets/pseudo/userland/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/Makefile.depend b/targets/pseudo/userland/Makefile.depend index f6733e3228b..378531b68cc 100644 --- a/targets/pseudo/userland/Makefile.depend +++ b/targets/pseudo/userland/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/userland/Makefile.inc b/targets/pseudo/userland/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/Makefile.inc +++ b/targets/pseudo/userland/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/cddl/Makefile b/targets/pseudo/userland/cddl/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/cddl/Makefile +++ b/targets/pseudo/userland/cddl/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/cddl/Makefile.depend b/targets/pseudo/userland/cddl/Makefile.depend index 41042893cb7..85d8f2a3f46 100644 --- a/targets/pseudo/userland/cddl/Makefile.depend +++ b/targets/pseudo/userland/cddl/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_CTF) diff --git a/targets/pseudo/userland/games/Makefile b/targets/pseudo/userland/games/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/games/Makefile +++ b/targets/pseudo/userland/games/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/games/Makefile.depend b/targets/pseudo/userland/games/Makefile.depend index 13227c60e0c..1aee166af71 100644 --- a/targets/pseudo/userland/games/Makefile.depend +++ b/targets/pseudo/userland/games/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/gnu/Makefile b/targets/pseudo/userland/gnu/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/gnu/Makefile +++ b/targets/pseudo/userland/gnu/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/gnu/Makefile.depend b/targets/pseudo/userland/gnu/Makefile.depend index 33ca85f86e6..18884960156 100644 --- a/targets/pseudo/userland/gnu/Makefile.depend +++ b/targets/pseudo/userland/gnu/Makefile.depend @@ -1,4 +1,3 @@ - .include "${SRCTOP}/share/mk/src.opts.mk" # This file is not autogenerated - take care! diff --git a/targets/pseudo/userland/include/Makefile b/targets/pseudo/userland/include/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/include/Makefile +++ b/targets/pseudo/userland/include/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/include/Makefile.depend b/targets/pseudo/userland/include/Makefile.depend index 6bbeb95c647..0208e9f08bf 100644 --- a/targets/pseudo/userland/include/Makefile.depend +++ b/targets/pseudo/userland/include/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/kerberos5/Makefile b/targets/pseudo/userland/kerberos5/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/kerberos5/Makefile +++ b/targets/pseudo/userland/kerberos5/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/kerberos5/Makefile.depend b/targets/pseudo/userland/kerberos5/Makefile.depend index 09de4a621e5..86ee91f874e 100644 --- a/targets/pseudo/userland/kerberos5/Makefile.depend +++ b/targets/pseudo/userland/kerberos5/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/lib/Makefile b/targets/pseudo/userland/lib/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/lib/Makefile +++ b/targets/pseudo/userland/lib/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/lib/Makefile.depend b/targets/pseudo/userland/lib/Makefile.depend index 5af2280ec05..8e1b0282be4 100644 --- a/targets/pseudo/userland/lib/Makefile.depend +++ b/targets/pseudo/userland/lib/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/userland/libexec/Makefile b/targets/pseudo/userland/libexec/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/libexec/Makefile +++ b/targets/pseudo/userland/libexec/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/libexec/Makefile.depend b/targets/pseudo/userland/libexec/Makefile.depend index 034e2a2ea08..4a6d72f914e 100644 --- a/targets/pseudo/userland/libexec/Makefile.depend +++ b/targets/pseudo/userland/libexec/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .include diff --git a/targets/pseudo/userland/misc/Makefile b/targets/pseudo/userland/misc/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/misc/Makefile +++ b/targets/pseudo/userland/misc/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/misc/Makefile.depend b/targets/pseudo/userland/misc/Makefile.depend index 203e446dca5..d3c97fc56b4 100644 --- a/targets/pseudo/userland/misc/Makefile.depend +++ b/targets/pseudo/userland/misc/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! .if !defined(MK_FORTH) diff --git a/targets/pseudo/userland/secure/Makefile b/targets/pseudo/userland/secure/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/secure/Makefile +++ b/targets/pseudo/userland/secure/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/secure/Makefile.depend b/targets/pseudo/userland/secure/Makefile.depend index f6bfb82ddd9..fd7ba71219b 100644 --- a/targets/pseudo/userland/secure/Makefile.depend +++ b/targets/pseudo/userland/secure/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/targets/pseudo/userland/share/Makefile b/targets/pseudo/userland/share/Makefile index d3b5cbd3a79..01b5f23410c 100644 --- a/targets/pseudo/userland/share/Makefile +++ b/targets/pseudo/userland/share/Makefile @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/targets/pseudo/userland/share/Makefile.depend b/targets/pseudo/userland/share/Makefile.depend index a56f022ecdd..dd56515a53a 100644 --- a/targets/pseudo/userland/share/Makefile.depend +++ b/targets/pseudo/userland/share/Makefile.depend @@ -1,4 +1,3 @@ - # This file is not autogenerated - take care! DIRDEPS = \ diff --git a/tests/Makefile b/tests/Makefile index 09c0fbc62a2..e8dd7793f16 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE} diff --git a/tests/Makefile.inc0 b/tests/Makefile.inc0 index c826809a305..dc84ddc6099 100644 --- a/tests/Makefile.inc0 +++ b/tests/Makefile.inc0 @@ -1,4 +1,3 @@ - # tests/... doesn't conform to bsd.lib.mk and bsd.prog.mk, so specify a sane # default for MK_CHECK_USE_SANDBOX. src.opts.mk will override the value if the # user sets it to no. diff --git a/tests/etc/Makefile b/tests/etc/Makefile index b0c1fbcdc77..d78ac932e0d 100644 --- a/tests/etc/Makefile +++ b/tests/etc/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/etc diff --git a/tests/etc/Makefile.inc b/tests/etc/Makefile.inc index 03efce15f85..cec69b26e14 100644 --- a/tests/etc/Makefile.inc +++ b/tests/etc/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/etc/rc.d/Makefile b/tests/etc/rc.d/Makefile index c8b1e7d81c1..185bc9e7c11 100644 --- a/tests/etc/rc.d/Makefile +++ b/tests/etc/rc.d/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/etc/rc.d ATF_TESTS_SH+= routing_test diff --git a/tests/examples/Makefile b/tests/examples/Makefile index 5a88e0f9ea1..869fae2e963 100644 --- a/tests/examples/Makefile +++ b/tests/examples/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/examples diff --git a/tests/sys/Makefile b/tests/sys/Makefile index 20ea4f181c7..7167f77ff47 100644 --- a/tests/sys/Makefile +++ b/tests/sys/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys diff --git a/tests/sys/Makefile.inc b/tests/sys/Makefile.inc index 03efce15f85..cec69b26e14 100644 --- a/tests/sys/Makefile.inc +++ b/tests/sys/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/acl/Makefile b/tests/sys/acl/Makefile index e8db261edae..0080e8dd5b5 100644 --- a/tests/sys/acl/Makefile +++ b/tests/sys/acl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/acl diff --git a/tests/sys/aio/Makefile b/tests/sys/aio/Makefile index b0bddb04426..5cddb28c27a 100644 --- a/tests/sys/aio/Makefile +++ b/tests/sys/aio/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/aio ATF_TESTS_C+= aio_test diff --git a/tests/sys/audit/Makefile b/tests/sys/audit/Makefile index c9068d0a804..d6d9c2874d0 100644 --- a/tests/sys/audit/Makefile +++ b/tests/sys/audit/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/audit ATF_TESTS_C= file-attribute-access diff --git a/tests/sys/auditpipe/Makefile b/tests/sys/auditpipe/Makefile index 20832301f04..189535ee74c 100644 --- a/tests/sys/auditpipe/Makefile +++ b/tests/sys/auditpipe/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/auditpipe ATF_TESTS_C= auditpipe_test diff --git a/tests/sys/capsicum/Makefile b/tests/sys/capsicum/Makefile index 81cb4fa1cee..6d37cfa0805 100644 --- a/tests/sys/capsicum/Makefile +++ b/tests/sys/capsicum/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/capsicum diff --git a/tests/sys/cddl/Makefile b/tests/sys/cddl/Makefile index 80c72ea5ec4..6049a70fc61 100644 --- a/tests/sys/cddl/Makefile +++ b/tests/sys/cddl/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/cddl diff --git a/tests/sys/cddl/zfs/Makefile b/tests/sys/cddl/zfs/Makefile index 18097f9b261..f215f7438e7 100644 --- a/tests/sys/cddl/zfs/Makefile +++ b/tests/sys/cddl/zfs/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/cddl/zfs diff --git a/tests/sys/cddl/zfs/bin/Makefile b/tests/sys/cddl/zfs/bin/Makefile index 3dfb86b1bd5..98db25e396d 100644 --- a/tests/sys/cddl/zfs/bin/Makefile +++ b/tests/sys/cddl/zfs/bin/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/include/Makefile b/tests/sys/cddl/zfs/include/Makefile index 81e81cb2e0c..c7712a7d0a8 100644 --- a/tests/sys/cddl/zfs/include/Makefile +++ b/tests/sys/cddl/zfs/include/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/Makefile b/tests/sys/cddl/zfs/tests/Makefile index efaae7bfc2c..f007e78992f 100644 --- a/tests/sys/cddl/zfs/tests/Makefile +++ b/tests/sys/cddl/zfs/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/Makefile.inc b/tests/sys/cddl/zfs/tests/Makefile.inc index 069272ab810..1b911c451c0 100644 --- a/tests/sys/cddl/zfs/tests/Makefile.inc +++ b/tests/sys/cddl/zfs/tests/Makefile.inc @@ -1,2 +1 @@ - WARNS?= 0 diff --git a/tests/sys/cddl/zfs/tests/acl/Makefile b/tests/sys/cddl/zfs/tests/acl/Makefile index 062a007a409..95cbc40972e 100644 --- a/tests/sys/cddl/zfs/tests/acl/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/acl/cifs/Makefile b/tests/sys/cddl/zfs/tests/acl/cifs/Makefile index 30bfd2183a4..bbb54429ec2 100644 --- a/tests/sys/cddl/zfs/tests/acl/cifs/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/cifs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile b/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile index f942fa2ace4..1332371f757 100644 --- a/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/nontrivial/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/acl/trivial/Makefile b/tests/sys/cddl/zfs/tests/acl/trivial/Makefile index ca54995a53a..5a00bc05746 100644 --- a/tests/sys/cddl/zfs/tests/acl/trivial/Makefile +++ b/tests/sys/cddl/zfs/tests/acl/trivial/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/atime/Makefile b/tests/sys/cddl/zfs/tests/atime/Makefile index 315123c59bb..f89f32c149f 100644 --- a/tests/sys/cddl/zfs/tests/atime/Makefile +++ b/tests/sys/cddl/zfs/tests/atime/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/bootfs/Makefile b/tests/sys/cddl/zfs/tests/bootfs/Makefile index f59b0826198..53e2224e1d8 100644 --- a/tests/sys/cddl/zfs/tests/bootfs/Makefile +++ b/tests/sys/cddl/zfs/tests/bootfs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cache/Makefile b/tests/sys/cddl/zfs/tests/cache/Makefile index 1955009834f..df46dedcc8e 100644 --- a/tests/sys/cddl/zfs/tests/cache/Makefile +++ b/tests/sys/cddl/zfs/tests/cache/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cachefile/Makefile b/tests/sys/cddl/zfs/tests/cachefile/Makefile index 60bfda066a1..09b55f1681a 100644 --- a/tests/sys/cddl/zfs/tests/cachefile/Makefile +++ b/tests/sys/cddl/zfs/tests/cachefile/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/clean_mirror/Makefile b/tests/sys/cddl/zfs/tests/clean_mirror/Makefile index a95d1a286df..881d6cdedb7 100644 --- a/tests/sys/cddl/zfs/tests/clean_mirror/Makefile +++ b/tests/sys/cddl/zfs/tests/clean_mirror/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/Makefile b/tests/sys/cddl/zfs/tests/cli_root/Makefile index 33b97022fc4..05b2f480e00 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile index 33ae1fcdbdc..7bf850245a8 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zdb/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile index 814b790f158..e123a67e482 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile index ea8808442e1..017e2c312ac 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_clone/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile index 6bb2031caf6..f608eca9abf 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_copies/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile index 0a46a9e0b4c..6f048fd37e7 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_create/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile index 0aff64173c4..8e8777ff42a 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_destroy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile index d2e61fdc8aa..2b6288c76ba 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_diff/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile index 2763a53db4e..140e5634d23 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_get/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile index 0949c040825..3b532596cee 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_inherit/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile index 4d06e3e082a..b5b68263d8a 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_mount/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile index 94929d25dcf..53c59cf0bd9 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_promote/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile index ae621146fef..91b14e1aead 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_property/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile index b71daeb9351..066039a3fa0 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_receive/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile index 6794da9b054..431ab61354b 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rename/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile index eb1b17251ae..07f9e88fe96 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_reservation/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile index f8426d398d7..d288ea35914 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_rollback/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile index 6b505a3bee2..ff100e37f33 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_send/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile index 10e68def5db..69300727fd9 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_set/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile index 29b992e97c2..1027523ddcd 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_share/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile index f1a7f4a4e7f..7cad43c9d79 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_snapshot/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile index 930191f2b7b..ba37c8fc0f6 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unmount/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile index e5d0ac04194..eeaceb593ef 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_unshare/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile index a26461b6210..0b01b8f05ab 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zfs_upgrade/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile index fbbdb8c3dcf..1d09a43ee97 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile index ed89d7ca995..27986f8207f 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_add/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile index 24ad0b17f73..d094cf65cbf 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_attach/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile index a4027230078..de2992fe86b 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_clear/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile index a331da6db05..73026cf21ad 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_create/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile index a1be860244a..90ceee214b0 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_destroy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile index 7e4d63ea4c0..353b8d22be7 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_detach/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile index 0d1f98cab00..68265a18bbd 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_expand/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile index 5e87a94da1b..fb15c0421a3 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_export/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile index b24ce38a356..7066d97f02b 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_get/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile index f2e930ad2fc..c1341eaeec6 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_history/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile index a946dd6ceeb..508bfef28e4 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile index 4f7e6e1a105..13235edd1f4 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_import/blockfiles/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile index e1b55de436d..22728ca4031 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_offline/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile index 28ee77f2de3..73d3cb438b8 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_online/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile index 1de45591b80..39fdf272482 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_remove/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile index 00302f3833e..dfe0a7c265d 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_replace/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile index fed1bd5a109..5c855230c0d 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_scrub/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile index 0477b0d99a6..4e8936cdb3b 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_set/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile index 74b7a66e5e7..4340af72889 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_status/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile index 583d490387a..f6365bbb46d 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile index a31ad913b50..2380e3be9e4 100644 --- a/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_root/zpool_upgrade/blockfiles/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/Makefile b/tests/sys/cddl/zfs/tests/cli_user/Makefile index 667d4133ae7..947337d5836 100644 --- a/tests/sys/cddl/zfs/tests/cli_user/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile b/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile index 85ff511360a..d22caa7382c 100644 --- a/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/misc/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile index 5443ff4dec0..14185efb74d 100644 --- a/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/zfs_list/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile index 4de5d385756..4c66f6d8343 100644 --- a/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_iostat/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile index d9f524c75d8..b50c82ccc1b 100644 --- a/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile +++ b/tests/sys/cddl/zfs/tests/cli_user/zpool_list/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/compression/Makefile b/tests/sys/cddl/zfs/tests/compression/Makefile index 3ad018047e6..3ed64fc3460 100644 --- a/tests/sys/cddl/zfs/tests/compression/Makefile +++ b/tests/sys/cddl/zfs/tests/compression/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/ctime/Makefile b/tests/sys/cddl/zfs/tests/ctime/Makefile index 752ff9695a4..d7cf76d4517 100644 --- a/tests/sys/cddl/zfs/tests/ctime/Makefile +++ b/tests/sys/cddl/zfs/tests/ctime/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/delegate/Makefile b/tests/sys/cddl/zfs/tests/delegate/Makefile index 5fb0be84930..c25841283c2 100644 --- a/tests/sys/cddl/zfs/tests/delegate/Makefile +++ b/tests/sys/cddl/zfs/tests/delegate/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/devices/Makefile b/tests/sys/cddl/zfs/tests/devices/Makefile index 4734f61096c..6902f8c270b 100644 --- a/tests/sys/cddl/zfs/tests/devices/Makefile +++ b/tests/sys/cddl/zfs/tests/devices/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/exec/Makefile b/tests/sys/cddl/zfs/tests/exec/Makefile index 33dfcfad177..2a8efb84b07 100644 --- a/tests/sys/cddl/zfs/tests/exec/Makefile +++ b/tests/sys/cddl/zfs/tests/exec/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/grow_pool/Makefile b/tests/sys/cddl/zfs/tests/grow_pool/Makefile index 9537fb62fde..31fdf1fc9b3 100644 --- a/tests/sys/cddl/zfs/tests/grow_pool/Makefile +++ b/tests/sys/cddl/zfs/tests/grow_pool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/grow_replicas/Makefile b/tests/sys/cddl/zfs/tests/grow_replicas/Makefile index 1eebf5ef0a3..06ee0c68c43 100644 --- a/tests/sys/cddl/zfs/tests/grow_replicas/Makefile +++ b/tests/sys/cddl/zfs/tests/grow_replicas/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/history/Makefile b/tests/sys/cddl/zfs/tests/history/Makefile index 8cd1babd3ec..8a8175abbae 100644 --- a/tests/sys/cddl/zfs/tests/history/Makefile +++ b/tests/sys/cddl/zfs/tests/history/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/hotplug/Makefile b/tests/sys/cddl/zfs/tests/hotplug/Makefile index 3da1b0f4174..2264668f14b 100644 --- a/tests/sys/cddl/zfs/tests/hotplug/Makefile +++ b/tests/sys/cddl/zfs/tests/hotplug/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/hotspare/Makefile b/tests/sys/cddl/zfs/tests/hotspare/Makefile index 9371186866b..02a7aa3a1ac 100644 --- a/tests/sys/cddl/zfs/tests/hotspare/Makefile +++ b/tests/sys/cddl/zfs/tests/hotspare/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/inheritance/Makefile b/tests/sys/cddl/zfs/tests/inheritance/Makefile index b337fd541ed..8dc20cb7b3b 100644 --- a/tests/sys/cddl/zfs/tests/inheritance/Makefile +++ b/tests/sys/cddl/zfs/tests/inheritance/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/interop/Makefile b/tests/sys/cddl/zfs/tests/interop/Makefile index e81bcb33262..cd26031d634 100644 --- a/tests/sys/cddl/zfs/tests/interop/Makefile +++ b/tests/sys/cddl/zfs/tests/interop/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/inuse/Makefile b/tests/sys/cddl/zfs/tests/inuse/Makefile index eb26734de6a..81405a420e9 100644 --- a/tests/sys/cddl/zfs/tests/inuse/Makefile +++ b/tests/sys/cddl/zfs/tests/inuse/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/iscsi/Makefile b/tests/sys/cddl/zfs/tests/iscsi/Makefile index 523e83904d3..c531c390e4f 100644 --- a/tests/sys/cddl/zfs/tests/iscsi/Makefile +++ b/tests/sys/cddl/zfs/tests/iscsi/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/large_files/Makefile b/tests/sys/cddl/zfs/tests/large_files/Makefile index b169b19e6e1..e18bf056e29 100644 --- a/tests/sys/cddl/zfs/tests/large_files/Makefile +++ b/tests/sys/cddl/zfs/tests/large_files/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/largest_pool/Makefile b/tests/sys/cddl/zfs/tests/largest_pool/Makefile index 4a5fdcbaae5..12cb14f3a26 100644 --- a/tests/sys/cddl/zfs/tests/largest_pool/Makefile +++ b/tests/sys/cddl/zfs/tests/largest_pool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/link_count/Makefile b/tests/sys/cddl/zfs/tests/link_count/Makefile index 8bbdc98f20a..fd9aab99f35 100644 --- a/tests/sys/cddl/zfs/tests/link_count/Makefile +++ b/tests/sys/cddl/zfs/tests/link_count/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/migration/Makefile b/tests/sys/cddl/zfs/tests/migration/Makefile index dae2827fe2f..68c9977d34b 100644 --- a/tests/sys/cddl/zfs/tests/migration/Makefile +++ b/tests/sys/cddl/zfs/tests/migration/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/mmap/Makefile b/tests/sys/cddl/zfs/tests/mmap/Makefile index aeeecf79170..494b84b8e15 100644 --- a/tests/sys/cddl/zfs/tests/mmap/Makefile +++ b/tests/sys/cddl/zfs/tests/mmap/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/mount/Makefile b/tests/sys/cddl/zfs/tests/mount/Makefile index fbbdc22506a..6b00ecf96c1 100644 --- a/tests/sys/cddl/zfs/tests/mount/Makefile +++ b/tests/sys/cddl/zfs/tests/mount/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/mv_files/Makefile b/tests/sys/cddl/zfs/tests/mv_files/Makefile index 8409af69bf5..b81bf3fa49a 100644 --- a/tests/sys/cddl/zfs/tests/mv_files/Makefile +++ b/tests/sys/cddl/zfs/tests/mv_files/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/nestedfs/Makefile b/tests/sys/cddl/zfs/tests/nestedfs/Makefile index c15cdb402e5..0ffdee46247 100644 --- a/tests/sys/cddl/zfs/tests/nestedfs/Makefile +++ b/tests/sys/cddl/zfs/tests/nestedfs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/no_space/Makefile b/tests/sys/cddl/zfs/tests/no_space/Makefile index 69aac3b4adb..db55c267416 100644 --- a/tests/sys/cddl/zfs/tests/no_space/Makefile +++ b/tests/sys/cddl/zfs/tests/no_space/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/online_offline/Makefile b/tests/sys/cddl/zfs/tests/online_offline/Makefile index a66642a57d8..5f0e68a5ccd 100644 --- a/tests/sys/cddl/zfs/tests/online_offline/Makefile +++ b/tests/sys/cddl/zfs/tests/online_offline/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/pool_names/Makefile b/tests/sys/cddl/zfs/tests/pool_names/Makefile index 040f9ebd46e..34350e28a80 100644 --- a/tests/sys/cddl/zfs/tests/pool_names/Makefile +++ b/tests/sys/cddl/zfs/tests/pool_names/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/poolversion/Makefile b/tests/sys/cddl/zfs/tests/poolversion/Makefile index 45ddce8deec..6c04aac0f5f 100644 --- a/tests/sys/cddl/zfs/tests/poolversion/Makefile +++ b/tests/sys/cddl/zfs/tests/poolversion/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/quota/Makefile b/tests/sys/cddl/zfs/tests/quota/Makefile index 36784d03ae8..beae44a4a50 100644 --- a/tests/sys/cddl/zfs/tests/quota/Makefile +++ b/tests/sys/cddl/zfs/tests/quota/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/redundancy/Makefile b/tests/sys/cddl/zfs/tests/redundancy/Makefile index cef8705f12e..30345b04cc7 100644 --- a/tests/sys/cddl/zfs/tests/redundancy/Makefile +++ b/tests/sys/cddl/zfs/tests/redundancy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/refquota/Makefile b/tests/sys/cddl/zfs/tests/refquota/Makefile index 3b9caf86c05..0b86cf46eaf 100644 --- a/tests/sys/cddl/zfs/tests/refquota/Makefile +++ b/tests/sys/cddl/zfs/tests/refquota/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/refreserv/Makefile b/tests/sys/cddl/zfs/tests/refreserv/Makefile index 0c04cf3284b..983cc768a33 100644 --- a/tests/sys/cddl/zfs/tests/refreserv/Makefile +++ b/tests/sys/cddl/zfs/tests/refreserv/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/rename_dirs/Makefile b/tests/sys/cddl/zfs/tests/rename_dirs/Makefile index ce111219676..9aafbf75937 100644 --- a/tests/sys/cddl/zfs/tests/rename_dirs/Makefile +++ b/tests/sys/cddl/zfs/tests/rename_dirs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/replacement/Makefile b/tests/sys/cddl/zfs/tests/replacement/Makefile index e172a1f6ac6..f818166cdaa 100644 --- a/tests/sys/cddl/zfs/tests/replacement/Makefile +++ b/tests/sys/cddl/zfs/tests/replacement/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/reservation/Makefile b/tests/sys/cddl/zfs/tests/reservation/Makefile index 781146bd241..cda06d9c96c 100644 --- a/tests/sys/cddl/zfs/tests/reservation/Makefile +++ b/tests/sys/cddl/zfs/tests/reservation/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/rootpool/Makefile b/tests/sys/cddl/zfs/tests/rootpool/Makefile index c82ea9ab292..b4ddcc9b325 100644 --- a/tests/sys/cddl/zfs/tests/rootpool/Makefile +++ b/tests/sys/cddl/zfs/tests/rootpool/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/cddl/zfs/tests/rsend/Makefile b/tests/sys/cddl/zfs/tests/rsend/Makefile index 2d459ea74c9..708b53ed90e 100644 --- a/tests/sys/cddl/zfs/tests/rsend/Makefile +++ b/tests/sys/cddl/zfs/tests/rsend/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile b/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile index ae8f222f16a..504f6210f6a 100644 --- a/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile +++ b/tests/sys/cddl/zfs/tests/scrub_mirror/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/slog/Makefile b/tests/sys/cddl/zfs/tests/slog/Makefile index 69167acfc30..0cdbca1395f 100644 --- a/tests/sys/cddl/zfs/tests/slog/Makefile +++ b/tests/sys/cddl/zfs/tests/slog/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/snapshot/Makefile b/tests/sys/cddl/zfs/tests/snapshot/Makefile index 04275f3b235..369dde3ba7a 100644 --- a/tests/sys/cddl/zfs/tests/snapshot/Makefile +++ b/tests/sys/cddl/zfs/tests/snapshot/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/snapused/Makefile b/tests/sys/cddl/zfs/tests/snapused/Makefile index f65ecc1251a..f831ac5dc69 100644 --- a/tests/sys/cddl/zfs/tests/snapused/Makefile +++ b/tests/sys/cddl/zfs/tests/snapused/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/sparse/Makefile b/tests/sys/cddl/zfs/tests/sparse/Makefile index df147d10832..c606a58e3b4 100644 --- a/tests/sys/cddl/zfs/tests/sparse/Makefile +++ b/tests/sys/cddl/zfs/tests/sparse/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/threadsappend/Makefile b/tests/sys/cddl/zfs/tests/threadsappend/Makefile index f62ad46f377..fd179e27e71 100644 --- a/tests/sys/cddl/zfs/tests/threadsappend/Makefile +++ b/tests/sys/cddl/zfs/tests/threadsappend/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/truncate/Makefile b/tests/sys/cddl/zfs/tests/truncate/Makefile index 783456d9663..98c8e085408 100644 --- a/tests/sys/cddl/zfs/tests/truncate/Makefile +++ b/tests/sys/cddl/zfs/tests/truncate/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/txg_integrity/Makefile b/tests/sys/cddl/zfs/tests/txg_integrity/Makefile index 01002157235..6a200b0c12b 100644 --- a/tests/sys/cddl/zfs/tests/txg_integrity/Makefile +++ b/tests/sys/cddl/zfs/tests/txg_integrity/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/userquota/Makefile b/tests/sys/cddl/zfs/tests/userquota/Makefile index 6ec2a4f0b15..678678ced1d 100644 --- a/tests/sys/cddl/zfs/tests/userquota/Makefile +++ b/tests/sys/cddl/zfs/tests/userquota/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/utils_test/Makefile b/tests/sys/cddl/zfs/tests/utils_test/Makefile index 2b550b166a1..e14bf458658 100644 --- a/tests/sys/cddl/zfs/tests/utils_test/Makefile +++ b/tests/sys/cddl/zfs/tests/utils_test/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/write_dirs/Makefile b/tests/sys/cddl/zfs/tests/write_dirs/Makefile index ae7858b9772..69d11aa3003 100644 --- a/tests/sys/cddl/zfs/tests/write_dirs/Makefile +++ b/tests/sys/cddl/zfs/tests/write_dirs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/xattr/Makefile b/tests/sys/cddl/zfs/tests/xattr/Makefile index 7a88513edc1..a1f76ef79d7 100644 --- a/tests/sys/cddl/zfs/tests/xattr/Makefile +++ b/tests/sys/cddl/zfs/tests/xattr/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zfsd/Makefile b/tests/sys/cddl/zfs/tests/zfsd/Makefile index 7d3f29a7359..e34e24b4090 100644 --- a/tests/sys/cddl/zfs/tests/zfsd/Makefile +++ b/tests/sys/cddl/zfs/tests/zfsd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zil/Makefile b/tests/sys/cddl/zfs/tests/zil/Makefile index 387e799de35..db30bfc9f6e 100644 --- a/tests/sys/cddl/zfs/tests/zil/Makefile +++ b/tests/sys/cddl/zfs/tests/zil/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zinject/Makefile b/tests/sys/cddl/zfs/tests/zinject/Makefile index a317d61aa37..6f37d7060ab 100644 --- a/tests/sys/cddl/zfs/tests/zinject/Makefile +++ b/tests/sys/cddl/zfs/tests/zinject/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zones/Makefile b/tests/sys/cddl/zfs/tests/zones/Makefile index d06e7a613ae..4b27462d1c0 100644 --- a/tests/sys/cddl/zfs/tests/zones/Makefile +++ b/tests/sys/cddl/zfs/tests/zones/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/Makefile b/tests/sys/cddl/zfs/tests/zvol/Makefile index deeb1b027b3..a0c4899ae10 100644 --- a/tests/sys/cddl/zfs/tests/zvol/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile index 3f35f6b3ee8..ffcc0f79e88 100644 --- a/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_ENOSPC/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile index d6cb44734f1..4282538eecb 100644 --- a/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_cli/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile index 19d944278c6..5f29f33a9b3 100644 --- a/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_misc/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile index 50d1f728638..21acc05d844 100644 --- a/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol/zvol_swap/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile b/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile index bd3847db678..71c8f330b15 100644 --- a/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile +++ b/tests/sys/cddl/zfs/tests/zvol_thrash/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=tests diff --git a/tests/sys/common/Makefile b/tests/sys/common/Makefile index 383fd17a5ba..269aa9d52f9 100644 --- a/tests/sys/common/Makefile +++ b/tests/sys/common/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/common ${PACKAGE}FILES+= vnet.subr diff --git a/tests/sys/compat32/Makefile b/tests/sys/compat32/Makefile index 31834de1624..e1a35422410 100644 --- a/tests/sys/compat32/Makefile +++ b/tests/sys/compat32/Makefile @@ -1,4 +1,3 @@ - .if exists(${.CURDIR}/${MACHINE_ARCH}) SUBDIR+= ${MACHINE_ARCH} .endif diff --git a/tests/sys/compat32/Makefile.inc b/tests/sys/compat32/Makefile.inc index 0220ac0431e..7f870e3701f 100644 --- a/tests/sys/compat32/Makefile.inc +++ b/tests/sys/compat32/Makefile.inc @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/compat32 .include "../Makefile.inc" diff --git a/tests/sys/devrandom/Makefile b/tests/sys/devrandom/Makefile index e8a28789a7a..342925246ae 100644 --- a/tests/sys/devrandom/Makefile +++ b/tests/sys/devrandom/Makefile @@ -1,4 +1,3 @@ - .include SDEVRANDOM= ${SRCTOP}/sys/dev/random diff --git a/tests/sys/fifo/Makefile b/tests/sys/fifo/Makefile index 766e9ee452a..6d4c859288d 100644 --- a/tests/sys/fifo/Makefile +++ b/tests/sys/fifo/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/fifo PLAIN_TESTS_C+= fifo_create diff --git a/tests/sys/file/Makefile b/tests/sys/file/Makefile index 010606bfeba..f80d1b271b8 100644 --- a/tests/sys/file/Makefile +++ b/tests/sys/file/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/file BINDIR= ${TESTSDIR} diff --git a/tests/sys/fs/Makefile b/tests/sys/fs/Makefile index f0fd2cc5955..e36a97d2335 100644 --- a/tests/sys/fs/Makefile +++ b/tests/sys/fs/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/tests/sys/fs/Makefile.inc b/tests/sys/fs/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/tests/sys/fs/Makefile.inc +++ b/tests/sys/fs/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/fs/fusefs/Makefile b/tests/sys/fs/fusefs/Makefile index f45f2f93e1c..86d942bea47 100644 --- a/tests/sys/fs/fusefs/Makefile +++ b/tests/sys/fs/fusefs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/fs/tmpfs/Makefile b/tests/sys/fs/tmpfs/Makefile index 106b28c7c46..ce4ca959838 100644 --- a/tests/sys/fs/tmpfs/Makefile +++ b/tests/sys/fs/tmpfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests FILESYSTEM?= ${.CURDIR:T} diff --git a/tests/sys/geom/Makefile b/tests/sys/geom/Makefile index 7e6e7cd2bb6..78257e180cf 100644 --- a/tests/sys/geom/Makefile +++ b/tests/sys/geom/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/geom TESTS_SUBDIRS+= class diff --git a/tests/sys/geom/class/Makefile b/tests/sys/geom/class/Makefile index b640b0b4685..3cf3a15273a 100644 --- a/tests/sys/geom/class/Makefile +++ b/tests/sys/geom/class/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/geom/class/Makefile.inc b/tests/sys/geom/class/Makefile.inc index 03efce15f85..cec69b26e14 100644 --- a/tests/sys/geom/class/Makefile.inc +++ b/tests/sys/geom/class/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/geom/class/concat/Makefile b/tests/sys/geom/class/concat/Makefile index 335c7632c6e..d5457b64bd2 100644 --- a/tests/sys/geom/class/concat/Makefile +++ b/tests/sys/geom/class/concat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/eli/Makefile b/tests/sys/geom/class/eli/Makefile index d8faff182ac..e1a28f39d5d 100644 --- a/tests/sys/geom/class/eli/Makefile +++ b/tests/sys/geom/class/eli/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/sys/geom/eli ${SRCTOP}/sys/crypto/sha2 PACKAGE= tests diff --git a/tests/sys/geom/class/gate/Makefile b/tests/sys/geom/class/gate/Makefile index a51c983f5cf..5ebc1d9304e 100644 --- a/tests/sys/geom/class/gate/Makefile +++ b/tests/sys/geom/class/gate/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/mirror/Makefile b/tests/sys/geom/class/mirror/Makefile index fdef410ab97..635288cc3d5 100644 --- a/tests/sys/geom/class/mirror/Makefile +++ b/tests/sys/geom/class/mirror/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/multipath/Makefile b/tests/sys/geom/class/multipath/Makefile index 9a2a9a29ec3..1246015e8fc 100644 --- a/tests/sys/geom/class/multipath/Makefile +++ b/tests/sys/geom/class/multipath/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/nop/Makefile b/tests/sys/geom/class/nop/Makefile index a3347e0cdb6..e2cb249bcf5 100644 --- a/tests/sys/geom/class/nop/Makefile +++ b/tests/sys/geom/class/nop/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/part/Makefile b/tests/sys/geom/class/part/Makefile index 6ca33655c80..0d7d8622443 100644 --- a/tests/sys/geom/class/part/Makefile +++ b/tests/sys/geom/class/part/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/raid3/Makefile b/tests/sys/geom/class/raid3/Makefile index 97b9cd34b8f..8f398a0f5fe 100644 --- a/tests/sys/geom/class/raid3/Makefile +++ b/tests/sys/geom/class/raid3/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/shsec/Makefile b/tests/sys/geom/class/shsec/Makefile index 7615142f605..500c14cca51 100644 --- a/tests/sys/geom/class/shsec/Makefile +++ b/tests/sys/geom/class/shsec/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/geom/class/stripe/Makefile b/tests/sys/geom/class/stripe/Makefile index 7615142f605..500c14cca51 100644 --- a/tests/sys/geom/class/stripe/Makefile +++ b/tests/sys/geom/class/stripe/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} diff --git a/tests/sys/kern/Makefile b/tests/sys/kern/Makefile index 0b9182b0808..113e044b449 100644 --- a/tests/sys/kern/Makefile +++ b/tests/sys/kern/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/tests/sys/kern/Makefile.inc b/tests/sys/kern/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/tests/sys/kern/Makefile.inc +++ b/tests/sys/kern/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/kern/acct/Makefile b/tests/sys/kern/acct/Makefile index 6f1181fe6d8..779be0ae591 100644 --- a/tests/sys/kern/acct/Makefile +++ b/tests/sys/kern/acct/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kern/acct ATF_TESTS_C= acct_test diff --git a/tests/sys/kern/execve/Makefile b/tests/sys/kern/execve/Makefile index 77221b2d2df..afa537031c3 100644 --- a/tests/sys/kern/execve/Makefile +++ b/tests/sys/kern/execve/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kern/execve BINDIR= ${TESTSDIR} diff --git a/tests/sys/kern/pipe/Makefile b/tests/sys/kern/pipe/Makefile index e9bc0b048c5..e8fa05ee8e0 100644 --- a/tests/sys/kern/pipe/Makefile +++ b/tests/sys/kern/pipe/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kern/pipe PLAIN_TESTS_C+= big_pipe_test diff --git a/tests/sys/kqueue/Makefile.inc b/tests/sys/kqueue/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/tests/sys/kqueue/Makefile.inc +++ b/tests/sys/kqueue/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/kqueue/libkqueue/Makefile b/tests/sys/kqueue/libkqueue/Makefile index 797ff98f87a..31eee2bd7c4 100644 --- a/tests/sys/kqueue/libkqueue/Makefile +++ b/tests/sys/kqueue/libkqueue/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/kqueue/libkqueue BINDIR= ${TESTSDIR} diff --git a/tests/sys/mac/Makefile b/tests/sys/mac/Makefile index 4c38ce1d6c7..3447d00122f 100644 --- a/tests/sys/mac/Makefile +++ b/tests/sys/mac/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/mac TESTS_SUBDIRS+= bsdextended diff --git a/tests/sys/mac/Makefile.inc b/tests/sys/mac/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/tests/sys/mac/Makefile.inc +++ b/tests/sys/mac/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/mac/bsdextended/Makefile b/tests/sys/mac/bsdextended/Makefile index f5b07db386c..69cd27c0e32 100644 --- a/tests/sys/mac/bsdextended/Makefile +++ b/tests/sys/mac/bsdextended/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/mac/bsdextended ATF_TESTS_SH+= matches_test diff --git a/tests/sys/mac/ipacl/Makefile b/tests/sys/mac/ipacl/Makefile index 4a5dfaa015c..e083f6c1a69 100644 --- a/tests/sys/mac/ipacl/Makefile +++ b/tests/sys/mac/ipacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/mac/ipacl diff --git a/tests/sys/mac/portacl/Makefile b/tests/sys/mac/portacl/Makefile index 47993fe54c5..c9fb6bbaae3 100644 --- a/tests/sys/mac/portacl/Makefile +++ b/tests/sys/mac/portacl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/mac/portacl diff --git a/tests/sys/mqueue/Makefile b/tests/sys/mqueue/Makefile index 05b5fc97c24..743c82ecc95 100644 --- a/tests/sys/mqueue/Makefile +++ b/tests/sys/mqueue/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/mqueue ATF_TESTS_SH= mqueue_test diff --git a/tests/sys/net/routing/Makefile b/tests/sys/net/routing/Makefile index c98e4e2a2ea..c725d23f15d 100644 --- a/tests/sys/net/routing/Makefile +++ b/tests/sys/net/routing/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 1 diff --git a/tests/sys/netgraph/Makefile b/tests/sys/netgraph/Makefile index 2240570ff46..f0eb4928ec7 100644 --- a/tests/sys/netgraph/Makefile +++ b/tests/sys/netgraph/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netgraph diff --git a/tests/sys/netinet/Makefile b/tests/sys/netinet/Makefile index fb3281028af..7e12dae6a4f 100644 --- a/tests/sys/netinet/Makefile +++ b/tests/sys/netinet/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet diff --git a/tests/sys/netinet/libalias/Makefile b/tests/sys/netinet/libalias/Makefile index 20d90451153..43bef996fae 100644 --- a/tests/sys/netinet/libalias/Makefile +++ b/tests/sys/netinet/libalias/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet/libalias diff --git a/tests/sys/netinet6/Makefile b/tests/sys/netinet6/Makefile index 82e84859ecb..78df34af46d 100644 --- a/tests/sys/netinet6/Makefile +++ b/tests/sys/netinet6/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet6 diff --git a/tests/sys/netinet6/frag6/Makefile b/tests/sys/netinet6/frag6/Makefile index d1661060368..3fca0522e53 100644 --- a/tests/sys/netinet6/frag6/Makefile +++ b/tests/sys/netinet6/frag6/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netinet6/frag6 diff --git a/tests/sys/netipsec/Makefile b/tests/sys/netipsec/Makefile index af5c0f75e8b..bb10297e0cc 100644 --- a/tests/sys/netipsec/Makefile +++ b/tests/sys/netipsec/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/sys/netipsec TESTS_SUBDIRS+= tunnel diff --git a/tests/sys/netipsec/tunnel/Makefile b/tests/sys/netipsec/tunnel/Makefile index c28826711cb..c6060a790cc 100644 --- a/tests/sys/netipsec/tunnel/Makefile +++ b/tests/sys/netipsec/tunnel/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netipsec/tunnel diff --git a/tests/sys/netlink/Makefile b/tests/sys/netlink/Makefile index c52149674ce..c07ef866386 100644 --- a/tests/sys/netlink/Makefile +++ b/tests/sys/netlink/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 1 diff --git a/tests/sys/netmap/Makefile b/tests/sys/netmap/Makefile index 8c3ae26284e..ee00d042162 100644 --- a/tests/sys/netmap/Makefile +++ b/tests/sys/netmap/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netmap diff --git a/tests/sys/netpfil/Makefile b/tests/sys/netpfil/Makefile index bdbb9078cfc..b449902aabc 100644 --- a/tests/sys/netpfil/Makefile +++ b/tests/sys/netpfil/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/netpfil diff --git a/tests/sys/netpfil/common/Makefile b/tests/sys/netpfil/common/Makefile index 0003aac2877..320e61f3fb8 100644 --- a/tests/sys/netpfil/common/Makefile +++ b/tests/sys/netpfil/common/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/common diff --git a/tests/sys/netpfil/pf/Makefile b/tests/sys/netpfil/pf/Makefile index 71f26979415..c3e77415e99 100644 --- a/tests/sys/netpfil/pf/Makefile +++ b/tests/sys/netpfil/pf/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf diff --git a/tests/sys/netpfil/pf/ioctl/Makefile b/tests/sys/netpfil/pf/ioctl/Makefile index 5d4e9dbcff5..6bcf48432d3 100644 --- a/tests/sys/netpfil/pf/ioctl/Makefile +++ b/tests/sys/netpfil/pf/ioctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/netpfil/pf/ioctl diff --git a/tests/sys/opencrypto/Makefile b/tests/sys/opencrypto/Makefile index 8be069349aa..a9c06ef2a93 100644 --- a/tests/sys/opencrypto/Makefile +++ b/tests/sys/opencrypto/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/opencrypto diff --git a/tests/sys/pjdfstest/Makefile b/tests/sys/pjdfstest/Makefile index 9ad68c2ac6f..f8a6f1cd6b8 100644 --- a/tests/sys/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests SUBDIR+= pjdfstest diff --git a/tests/sys/pjdfstest/Makefile.inc b/tests/sys/pjdfstest/Makefile.inc index 03efce15f85..cec69b26e14 100644 --- a/tests/sys/pjdfstest/Makefile.inc +++ b/tests/sys/pjdfstest/Makefile.inc @@ -1,2 +1 @@ - .include "${SRCTOP}/tests/Makefile.inc0" diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile b/tests/sys/pjdfstest/pjdfstest/Makefile index 30c4713da17..95e6d953d14 100644 --- a/tests/sys/pjdfstest/pjdfstest/Makefile +++ b/tests/sys/pjdfstest/pjdfstest/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .PATH: ${SRCTOP}/contrib/pjdfstest diff --git a/tests/sys/pjdfstest/tests/Makefile b/tests/sys/pjdfstest/tests/Makefile index c2b5c3d166d..abe854eb8c3 100644 --- a/tests/sys/pjdfstest/tests/Makefile +++ b/tests/sys/pjdfstest/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest diff --git a/tests/sys/pjdfstest/tests/Makefile.inc b/tests/sys/pjdfstest/tests/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/tests/sys/pjdfstest/tests/Makefile.inc +++ b/tests/sys/pjdfstest/tests/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/tests/sys/pjdfstest/tests/chflags/Makefile b/tests/sys/pjdfstest/tests/chflags/Makefile index 308e86e9f53..e0dd497b680 100644 --- a/tests/sys/pjdfstest/tests/chflags/Makefile +++ b/tests/sys/pjdfstest/tests/chflags/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/chmod/Makefile b/tests/sys/pjdfstest/tests/chmod/Makefile index a3e600f4d23..441bec65a35 100644 --- a/tests/sys/pjdfstest/tests/chmod/Makefile +++ b/tests/sys/pjdfstest/tests/chmod/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/chown/Makefile b/tests/sys/pjdfstest/tests/chown/Makefile index 1012341c82a..8138a674f05 100644 --- a/tests/sys/pjdfstest/tests/chown/Makefile +++ b/tests/sys/pjdfstest/tests/chown/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/ftruncate/Makefile b/tests/sys/pjdfstest/tests/ftruncate/Makefile index 2f342542376..30aeb30cb52 100644 --- a/tests/sys/pjdfstest/tests/ftruncate/Makefile +++ b/tests/sys/pjdfstest/tests/ftruncate/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/granular/Makefile b/tests/sys/pjdfstest/tests/granular/Makefile index a67a50ede7b..28ff001d695 100644 --- a/tests/sys/pjdfstest/tests/granular/Makefile +++ b/tests/sys/pjdfstest/tests/granular/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/link/Makefile b/tests/sys/pjdfstest/tests/link/Makefile index 7a890e96aef..a94c3281a01 100644 --- a/tests/sys/pjdfstest/tests/link/Makefile +++ b/tests/sys/pjdfstest/tests/link/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/mkdir/Makefile b/tests/sys/pjdfstest/tests/mkdir/Makefile index a3e600f4d23..441bec65a35 100644 --- a/tests/sys/pjdfstest/tests/mkdir/Makefile +++ b/tests/sys/pjdfstest/tests/mkdir/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/mkfifo/Makefile b/tests/sys/pjdfstest/tests/mkfifo/Makefile index a3e600f4d23..441bec65a35 100644 --- a/tests/sys/pjdfstest/tests/mkfifo/Makefile +++ b/tests/sys/pjdfstest/tests/mkfifo/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/mknod/Makefile b/tests/sys/pjdfstest/tests/mknod/Makefile index edfa0847268..03f178034e8 100644 --- a/tests/sys/pjdfstest/tests/mknod/Makefile +++ b/tests/sys/pjdfstest/tests/mknod/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/open/Makefile b/tests/sys/pjdfstest/tests/open/Makefile index e4c656242d0..12f54ba412d 100644 --- a/tests/sys/pjdfstest/tests/open/Makefile +++ b/tests/sys/pjdfstest/tests/open/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/rename/Makefile b/tests/sys/pjdfstest/tests/rename/Makefile index 913c0d5d2a4..b6a4c06c28a 100644 --- a/tests/sys/pjdfstest/tests/rename/Makefile +++ b/tests/sys/pjdfstest/tests/rename/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/rmdir/Makefile b/tests/sys/pjdfstest/tests/rmdir/Makefile index 19ecd8b0743..974f7f74182 100644 --- a/tests/sys/pjdfstest/tests/rmdir/Makefile +++ b/tests/sys/pjdfstest/tests/rmdir/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/symlink/Makefile b/tests/sys/pjdfstest/tests/symlink/Makefile index a3e600f4d23..441bec65a35 100644 --- a/tests/sys/pjdfstest/tests/symlink/Makefile +++ b/tests/sys/pjdfstest/tests/symlink/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/truncate/Makefile b/tests/sys/pjdfstest/tests/truncate/Makefile index 2f342542376..30aeb30cb52 100644 --- a/tests/sys/pjdfstest/tests/truncate/Makefile +++ b/tests/sys/pjdfstest/tests/truncate/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/unlink/Makefile b/tests/sys/pjdfstest/tests/unlink/Makefile index 308e86e9f53..e0dd497b680 100644 --- a/tests/sys/pjdfstest/tests/unlink/Makefile +++ b/tests/sys/pjdfstest/tests/unlink/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/pjdfstest/tests/utimensat/Makefile b/tests/sys/pjdfstest/tests/utimensat/Makefile index 7dd5b6a02b2..16b90be6d6d 100644 --- a/tests/sys/pjdfstest/tests/utimensat/Makefile +++ b/tests/sys/pjdfstest/tests/utimensat/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= 00 TAP_TESTS_SH+= 01 TAP_TESTS_SH+= 02 diff --git a/tests/sys/posixshm/Makefile b/tests/sys/posixshm/Makefile index d7b46cd1386..9b87860fba5 100644 --- a/tests/sys/posixshm/Makefile +++ b/tests/sys/posixshm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/posixshm diff --git a/tests/sys/sys/Makefile b/tests/sys/sys/Makefile index e9c9bfef7db..8d9cd552d9d 100644 --- a/tests/sys/sys/Makefile +++ b/tests/sys/sys/Makefile @@ -1,4 +1,3 @@ - .include TESTSDIR= ${TESTSBASE}/sys/sys diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile index 9670ec52674..e25282b2c70 100644 --- a/tests/sys/vfs/Makefile +++ b/tests/sys/vfs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/vfs diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index d63610ed272..8be4b8666fd 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/vm diff --git a/tests/sys/vm/soxstack/Makefile b/tests/sys/vm/soxstack/Makefile index c0b8ef095bc..bd159c2fde7 100644 --- a/tests/sys/vm/soxstack/Makefile +++ b/tests/sys/vm/soxstack/Makefile @@ -1,4 +1,3 @@ - SHLIB= soxstack SHLIB_NAME= libsoxstack.so SHLIB_MAJOR= 1 diff --git a/tests/sys/vm/stack/Makefile b/tests/sys/vm/stack/Makefile index 4279e4f48b8..06ffcf4d4b4 100644 --- a/tests/sys/vm/stack/Makefile +++ b/tests/sys/vm/stack/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/sys/vm/stack diff --git a/tools/boot/smbios/Makefile b/tools/boot/smbios/Makefile index 042b3aaee27..42a17aa54b5 100644 --- a/tools/boot/smbios/Makefile +++ b/tools/boot/smbios/Makefile @@ -1,4 +1,3 @@ - PROG= smbios MAN= .PATH: ${SRCTOP}/stand/libsa diff --git a/tools/bsdbox/Makefile b/tools/bsdbox/Makefile index 008b6664707..a164ddf54cb 100644 --- a/tools/bsdbox/Makefile +++ b/tools/bsdbox/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/tools/build/Makefile b/tools/build/Makefile index e60c8694d56..9e9d203f108 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../include LIB= egacy diff --git a/tools/build/bootstrap-m4/Makefile b/tools/build/bootstrap-m4/Makefile index c0b82b307d5..c12c8245595 100644 --- a/tools/build/bootstrap-m4/Makefile +++ b/tools/build/bootstrap-m4/Makefile @@ -1,4 +1,3 @@ - # Build a bootstrap version of m4 (needed in order to build libelf and lex) .PATH: ${SRCTOP}/usr.bin/m4 ${.CURDIR} diff --git a/tools/build/cross-build/Makefile b/tools/build/cross-build/Makefile index 72d78d7b658..3c51dae472e 100644 --- a/tools/build/cross-build/Makefile +++ b/tools/build/cross-build/Makefile @@ -1,4 +1,3 @@ - NO_OBJ= SCRIPTS= date.sh hostname.sh BINDIR= /usr/bin diff --git a/tools/build/cross-build/fake_chflags/Makefile b/tools/build/cross-build/fake_chflags/Makefile index 75c251a2b27..f5b867d5093 100644 --- a/tools/build/cross-build/fake_chflags/Makefile +++ b/tools/build/cross-build/fake_chflags/Makefile @@ -1,4 +1,3 @@ - NO_OBJ= SCRIPTS= chflags BINDIR= /usr/bin diff --git a/tools/build/cross-build/mkimg/Makefile b/tools/build/cross-build/mkimg/Makefile index 405d579fb63..cbef4a9f36e 100644 --- a/tools/build/cross-build/mkimg/Makefile +++ b/tools/build/cross-build/mkimg/Makefile @@ -1,4 +1,3 @@ - # allow building mkimg as a host tool. MKIMG_SRC = ${SRCTOP}/usr.bin/mkimg diff --git a/tools/build/make_check/Makefile b/tools/build/make_check/Makefile index d9efa7e4f8a..74e28ad1c9f 100644 --- a/tools/build/make_check/Makefile +++ b/tools/build/make_check/Makefile @@ -1,4 +1,3 @@ - .MAKE.MODE= normal # Failure is handled by the invoker, don't kill other legs of a parallel build. diff --git a/tools/build/mk/Makefile.boot b/tools/build/mk/Makefile.boot index b8a5c778094..43246f3ceeb 100644 --- a/tools/build/mk/Makefile.boot +++ b/tools/build/mk/Makefile.boot @@ -1,4 +1,3 @@ - CFLAGS+= -I${WORLDTMP}/legacy/usr/include DPADD+= ${WORLDTMP}/legacy/usr/lib/libegacy.a LDADD+= -legacy diff --git a/tools/build/mk/Makefile.boot.pre b/tools/build/mk/Makefile.boot.pre index afad8d17b92..4bd8b964f90 100644 --- a/tools/build/mk/Makefile.boot.pre +++ b/tools/build/mk/Makefile.boot.pre @@ -1,4 +1,3 @@ - # Various MK_* options need to be set before including bsd.prog.mk/bsd.lib.mk .if ${.MAKE.OS} != "FreeBSD" # Most Linux distributions don't ship the .a files for static linking. diff --git a/tools/bus_space/C/Makefile b/tools/bus_space/C/Makefile index 050fa3730fd..91444122731 100644 --- a/tools/bus_space/C/Makefile +++ b/tools/bus_space/C/Makefile @@ -1,4 +1,3 @@ - LIB= bus SHLIB_MAJOR= 0 SRCS= lang.c diff --git a/tools/bus_space/Makefile b/tools/bus_space/Makefile index 95ea368ffd7..5f75db0103a 100644 --- a/tools/bus_space/Makefile +++ b/tools/bus_space/Makefile @@ -1,4 +1,3 @@ - SUBDIR= \ C \ Python diff --git a/tools/bus_space/Makefile.inc b/tools/bus_space/Makefile.inc index af885574a3d..06fc95199ab 100644 --- a/tools/bus_space/Makefile.inc +++ b/tools/bus_space/Makefile.inc @@ -1,3 +1,2 @@ - .PATH: ${.CURDIR}/.. SRCS+= bus.c busdma.c diff --git a/tools/bus_space/Python/Makefile b/tools/bus_space/Python/Makefile index e56b9d2b1c1..23e5b00c152 100644 --- a/tools/bus_space/Python/Makefile +++ b/tools/bus_space/Python/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= bus.so SRCS= lang.c diff --git a/tools/diag/dumpvfscache/Makefile b/tools/diag/dumpvfscache/Makefile index 3b3959c318e..4ab0e2b5906 100644 --- a/tools/diag/dumpvfscache/Makefile +++ b/tools/diag/dumpvfscache/Makefile @@ -1,4 +1,3 @@ - PROG= dumpvfscache LIBADD= kvm diff --git a/tools/diag/localeck/Makefile b/tools/diag/localeck/Makefile index 24ca74c8489..b8642a70af4 100644 --- a/tools/diag/localeck/Makefile +++ b/tools/diag/localeck/Makefile @@ -1,4 +1,3 @@ - PROG= localeck MAN= WARNS?= 4 diff --git a/tools/diag/prtblknos/Makefile b/tools/diag/prtblknos/Makefile index c337eec72a7..9e4f8b4a55b 100644 --- a/tools/diag/prtblknos/Makefile +++ b/tools/diag/prtblknos/Makefile @@ -1,4 +1,3 @@ - BINDIR?= /usr/bin PROG= prtblknos diff --git a/tools/kerneldoc/Makefile b/tools/kerneldoc/Makefile index 6e9053aa22c..36739c42ed1 100644 --- a/tools/kerneldoc/Makefile +++ b/tools/kerneldoc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../kern SRCS+= kern diff --git a/tools/regression/aio/aiop/Makefile b/tools/regression/aio/aiop/Makefile index 4c6d3ac16fe..e5d835cb276 100644 --- a/tools/regression/aio/aiop/Makefile +++ b/tools/regression/aio/aiop/Makefile @@ -1,4 +1,3 @@ - PROG= aiop MAN= diff --git a/tools/regression/bpf/Makefile b/tools/regression/bpf/Makefile index 154b61fa280..7bb25728d9f 100644 --- a/tools/regression/bpf/Makefile +++ b/tools/regression/bpf/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bpf_filter .include diff --git a/tools/regression/bpf/bpf_filter/Makefile b/tools/regression/bpf/bpf_filter/Makefile index 0f88a27c4e8..a02f2cbd571 100644 --- a/tools/regression/bpf/bpf_filter/Makefile +++ b/tools/regression/bpf/bpf_filter/Makefile @@ -1,4 +1,3 @@ - TEST_CASES?= test0001 test0002 test0003 test0004 \ test0005 test0006 test0007 test0008 \ test0009 test0010 test0011 test0012 \ diff --git a/tools/regression/capsicum/syscalls/Makefile b/tools/regression/capsicum/syscalls/Makefile index 86a3c48ba15..7f5a4075213 100644 --- a/tools/regression/capsicum/syscalls/Makefile +++ b/tools/regression/capsicum/syscalls/Makefile @@ -1,4 +1,3 @@ - SYSCALLS= cap_fcntls_limit cap_getmode cap_ioctls_limit CFLAGS= -O2 -pipe -std=gnu99 -fstack-protector diff --git a/tools/regression/doat/Makefile b/tools/regression/doat/Makefile index 96b1c6ebdff..f102e7dd643 100644 --- a/tools/regression/doat/Makefile +++ b/tools/regression/doat/Makefile @@ -1,4 +1,3 @@ - PROG= doat MAN= diff --git a/tools/regression/ethernet/ethermulti/Makefile b/tools/regression/ethernet/ethermulti/Makefile index ad0fa68320b..a079cd6fcf4 100644 --- a/tools/regression/ethernet/ethermulti/Makefile +++ b/tools/regression/ethernet/ethermulti/Makefile @@ -1,4 +1,3 @@ - PROG= ethermulti SRCS+= ethermulti.c MAN= diff --git a/tools/regression/fsx/Makefile b/tools/regression/fsx/Makefile index 0f5e8e81d32..78f6dd970cf 100644 --- a/tools/regression/fsx/Makefile +++ b/tools/regression/fsx/Makefile @@ -1,4 +1,3 @@ - PROG= fsx MAN= diff --git a/tools/regression/gaithrstress/Makefile b/tools/regression/gaithrstress/Makefile index a9d9687c811..fd1a7e82101 100644 --- a/tools/regression/gaithrstress/Makefile +++ b/tools/regression/gaithrstress/Makefile @@ -1,4 +1,3 @@ - PROG= gaithrstress LIBADD= pthread diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile index bbb6a14819c..a03de0e9bcd 100644 --- a/tools/regression/geom/ConfCmp/Makefile +++ b/tools/regression/geom/ConfCmp/Makefile @@ -1,4 +1,3 @@ - PROG= ConfCmp SRCS+= ConfCmp.c SRCS+= subr_sbuf.c diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile index 4b998ee5258..0a5473ee9b9 100644 --- a/tools/regression/geom/MdLoad/Makefile +++ b/tools/regression/geom/MdLoad/Makefile @@ -1,4 +1,3 @@ - PROG= MdLoad LIBADD= sbuf bsdxml NO_OBJ= t diff --git a/tools/regression/geom_gpt/Makefile b/tools/regression/geom_gpt/Makefile index ef7f98e03c8..603ceb0d61b 100644 --- a/tools/regression/geom_gpt/Makefile +++ b/tools/regression/geom_gpt/Makefile @@ -1,4 +1,3 @@ - PROG= gctl_test_helper MAN= diff --git a/tools/regression/include/stdatomic/Makefile b/tools/regression/include/stdatomic/Makefile index ea6d0c7fb86..d0bbc93a2a2 100644 --- a/tools/regression/include/stdatomic/Makefile +++ b/tools/regression/include/stdatomic/Makefile @@ -1,4 +1,3 @@ - PROG= logic MAN= diff --git a/tools/regression/include/tgmath/Makefile b/tools/regression/include/tgmath/Makefile index 0e843bcf4b0..aebd7e1b81e 100644 --- a/tools/regression/include/tgmath/Makefile +++ b/tools/regression/include/tgmath/Makefile @@ -1,4 +1,3 @@ - PROG= tgmath CSTD= c99 CFLAGS+= -fno-builtin diff --git a/tools/regression/kgssapi/Makefile b/tools/regression/kgssapi/Makefile index 8b3998599be..582658663d3 100644 --- a/tools/regression/kgssapi/Makefile +++ b/tools/regression/kgssapi/Makefile @@ -1,4 +1,3 @@ - PROG= gsstest MAN= WARNS?= 2 diff --git a/tools/regression/kthread/kld/Makefile b/tools/regression/kthread/kld/Makefile index 125fdcf1767..8ed2dabb423 100644 --- a/tools/regression/kthread/kld/Makefile +++ b/tools/regression/kthread/kld/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR} KMOD= kthrdlk diff --git a/tools/regression/lib/libc/regex/Makefile b/tools/regression/lib/libc/regex/Makefile index 33f6d812d73..9b070b75cfb 100644 --- a/tools/regression/lib/libc/regex/Makefile +++ b/tools/regression/lib/libc/regex/Makefile @@ -1,4 +1,3 @@ - GROT= ../../../../../lib/libc/regex/grot .PHONY: tests diff --git a/tools/regression/mlock/Makefile b/tools/regression/mlock/Makefile index ce523f2cdb7..77d295ceb7c 100644 --- a/tools/regression/mlock/Makefile +++ b/tools/regression/mlock/Makefile @@ -1,4 +1,3 @@ - PROG= mlock MAN= diff --git a/tools/regression/net80211/ccmp/Makefile b/tools/regression/net80211/ccmp/Makefile index 3c309a81872..298e41836f2 100644 --- a/tools/regression/net80211/ccmp/Makefile +++ b/tools/regression/net80211/ccmp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/net80211 KMOD= test_ccmp diff --git a/tools/regression/net80211/tkip/Makefile b/tools/regression/net80211/tkip/Makefile index 7873ffc17e7..e6295bc1eea 100644 --- a/tools/regression/net80211/tkip/Makefile +++ b/tools/regression/net80211/tkip/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/net80211 KMOD= test_tkip diff --git a/tools/regression/net80211/wep/Makefile b/tools/regression/net80211/wep/Makefile index e16ccb434e2..dd742a45401 100644 --- a/tools/regression/net80211/wep/Makefile +++ b/tools/regression/net80211/wep/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/net80211 KMOD= test_wep diff --git a/tools/regression/netinet/arphold/Makefile b/tools/regression/netinet/arphold/Makefile index d8170303d42..97cedfc3f9d 100644 --- a/tools/regression/netinet/arphold/Makefile +++ b/tools/regression/netinet/arphold/Makefile @@ -1,4 +1,3 @@ - PROG= arphold MAN= CFLAGS+= -Wall diff --git a/tools/regression/netinet/msocket/Makefile b/tools/regression/netinet/msocket/Makefile index 64e10b153ec..221b27d0dbf 100644 --- a/tools/regression/netinet/msocket/Makefile +++ b/tools/regression/netinet/msocket/Makefile @@ -1,4 +1,3 @@ - PROG= msocket MAN= CFLAGS+= -Wall diff --git a/tools/regression/netinet/msocket_ifnet_remove/Makefile b/tools/regression/netinet/msocket_ifnet_remove/Makefile index 50f602f243a..08640d862ce 100644 --- a/tools/regression/netinet/msocket_ifnet_remove/Makefile +++ b/tools/regression/netinet/msocket_ifnet_remove/Makefile @@ -1,4 +1,3 @@ - PROG= msocket_ifnet_remove WARNS?= 3 MAN= diff --git a/tools/regression/netinet/tcpfullwindowrst/Makefile b/tools/regression/netinet/tcpfullwindowrst/Makefile index d86a3029bd8..ad401e9df1c 100644 --- a/tools/regression/netinet/tcpfullwindowrst/Makefile +++ b/tools/regression/netinet/tcpfullwindowrst/Makefile @@ -1,4 +1,3 @@ - PROG= tcpfullwindowrsttest MAN= diff --git a/tools/regression/netinet/udpconnectjail/Makefile b/tools/regression/netinet/udpconnectjail/Makefile index 23480a3a2ca..88a14afb91d 100644 --- a/tools/regression/netinet/udpconnectjail/Makefile +++ b/tools/regression/netinet/udpconnectjail/Makefile @@ -1,4 +1,3 @@ - PROG= udpconnectjail MAN= WARNS?= 2 diff --git a/tools/regression/netinet/udpzerobyte/Makefile b/tools/regression/netinet/udpzerobyte/Makefile index 7ac697d75d3..3cba327d2bd 100644 --- a/tools/regression/netinet/udpzerobyte/Makefile +++ b/tools/regression/netinet/udpzerobyte/Makefile @@ -1,4 +1,3 @@ - PROG= udpzerobyte MAN= WARNS?= 2 diff --git a/tools/regression/nfsmmap/Makefile b/tools/regression/nfsmmap/Makefile index 4c3c96ebccf..c731d428f7c 100644 --- a/tools/regression/nfsmmap/Makefile +++ b/tools/regression/nfsmmap/Makefile @@ -1,4 +1,3 @@ - SUBDIR= test1 test2 .include diff --git a/tools/regression/nfsmmap/test1/Makefile b/tools/regression/nfsmmap/test1/Makefile index f42c89aa765..97b2b655321 100644 --- a/tools/regression/nfsmmap/test1/Makefile +++ b/tools/regression/nfsmmap/test1/Makefile @@ -1,4 +1,3 @@ - PROG= test1 MAN= NFSSERVER?= herring.nlsystems.com diff --git a/tools/regression/nfsmmap/test2/Makefile b/tools/regression/nfsmmap/test2/Makefile index c321daa3c8a..6d785a140dc 100644 --- a/tools/regression/nfsmmap/test2/Makefile +++ b/tools/regression/nfsmmap/test2/Makefile @@ -1,4 +1,3 @@ - PROG= test2 MAN= NFSSERVER?= herring.nlsystems.com diff --git a/tools/regression/p1003_1b/Makefile b/tools/regression/p1003_1b/Makefile index 0c234ff29d6..b5e7034792b 100644 --- a/tools/regression/p1003_1b/Makefile +++ b/tools/regression/p1003_1b/Makefile @@ -1,4 +1,3 @@ - PROG=p1003_1b SRCS=\ diff --git a/tools/regression/posixsem/Makefile b/tools/regression/posixsem/Makefile index 1de91196d13..2054d64afa4 100644 --- a/tools/regression/posixsem/Makefile +++ b/tools/regression/posixsem/Makefile @@ -1,4 +1,3 @@ - PROG= posixsem SRCS= posixsem.c test.c LIBADD= kvm diff --git a/tools/regression/posixsem2/Makefile b/tools/regression/posixsem2/Makefile index d5d87822a91..3e8227a1c95 100644 --- a/tools/regression/posixsem2/Makefile +++ b/tools/regression/posixsem2/Makefile @@ -1,4 +1,3 @@ - PROG= semtest SRCS= semtest.c MAN= diff --git a/tools/regression/pthread/cv_cancel1/Makefile b/tools/regression/pthread/cv_cancel1/Makefile index 04b151a138f..1a27b8adfe7 100644 --- a/tools/regression/pthread/cv_cancel1/Makefile +++ b/tools/regression/pthread/cv_cancel1/Makefile @@ -1,4 +1,3 @@ - PROG= cv_cancel1 MAN= LIBADD= pthread diff --git a/tools/regression/pthread/mutex_isowned_np/Makefile b/tools/regression/pthread/mutex_isowned_np/Makefile index 650baa65563..31dbd470d7d 100644 --- a/tools/regression/pthread/mutex_isowned_np/Makefile +++ b/tools/regression/pthread/mutex_isowned_np/Makefile @@ -1,4 +1,3 @@ - PROG= mutex_isowned_np MAN= LIBADD= pthread diff --git a/tools/regression/redzone9/Makefile b/tools/regression/redzone9/Makefile index fe2d71ecd77..a7e56e1bd50 100644 --- a/tools/regression/redzone9/Makefile +++ b/tools/regression/redzone9/Makefile @@ -1,4 +1,3 @@ - KMOD= redzone SRCS= redzone.c diff --git a/tools/regression/rpcsec_gss/Makefile b/tools/regression/rpcsec_gss/Makefile index 60ece71252a..6697fd9eaf9 100644 --- a/tools/regression/rpcsec_gss/Makefile +++ b/tools/regression/rpcsec_gss/Makefile @@ -1,4 +1,3 @@ - PROG= rpctest MAN= LIBADD= rpcsec_gss diff --git a/tools/regression/security/access/Makefile b/tools/regression/security/access/Makefile index 4f1b9a5fb2d..59f52230e0e 100644 --- a/tools/regression/security/access/Makefile +++ b/tools/regression/security/access/Makefile @@ -1,4 +1,3 @@ - PROG= testaccess MAN= diff --git a/tools/regression/security/cap_test/Makefile b/tools/regression/security/cap_test/Makefile index 05c7724af82..0fdc274edbe 100644 --- a/tools/regression/security/cap_test/Makefile +++ b/tools/regression/security/cap_test/Makefile @@ -1,4 +1,3 @@ - PROG= cap_test SRCS= cap_test.c \ cap_test_capmode.c \ diff --git a/tools/regression/security/open_to_operation/Makefile b/tools/regression/security/open_to_operation/Makefile index 87f46c1f303..e319e4f7867 100644 --- a/tools/regression/security/open_to_operation/Makefile +++ b/tools/regression/security/open_to_operation/Makefile @@ -1,4 +1,3 @@ - PROG= open_to_operation MAN= WARNS?= 3 diff --git a/tools/regression/security/proc_to_proc/Makefile b/tools/regression/security/proc_to_proc/Makefile index 041aea2000e..984791c299b 100644 --- a/tools/regression/security/proc_to_proc/Makefile +++ b/tools/regression/security/proc_to_proc/Makefile @@ -1,4 +1,3 @@ - PROG= testuid MAN= diff --git a/tools/regression/sigqueue/Makefile b/tools/regression/sigqueue/Makefile index 2913e8870e8..a35b2305815 100644 --- a/tools/regression/sigqueue/Makefile +++ b/tools/regression/sigqueue/Makefile @@ -1,4 +1,3 @@ - SUBDIR=sigqtest1 sigqtest2 .include diff --git a/tools/regression/sigqueue/sigqtest1/Makefile b/tools/regression/sigqueue/sigqtest1/Makefile index 28e45853705..9efd0c2eec2 100644 --- a/tools/regression/sigqueue/sigqtest1/Makefile +++ b/tools/regression/sigqueue/sigqtest1/Makefile @@ -1,4 +1,3 @@ - PROG=sigqtest1 MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/sigqueue/sigqtest2/Makefile b/tools/regression/sigqueue/sigqtest2/Makefile index 6f278fab171..9eea81bb59e 100644 --- a/tools/regression/sigqueue/sigqtest2/Makefile +++ b/tools/regression/sigqueue/sigqtest2/Makefile @@ -1,4 +1,3 @@ - PROG=sigqtest2 MAN= DEBUG_FLAGS=-g diff --git a/tools/regression/sockets/listen_backlog/Makefile b/tools/regression/sockets/listen_backlog/Makefile index 24efd15aebd..c7414442582 100644 --- a/tools/regression/sockets/listen_backlog/Makefile +++ b/tools/regression/sockets/listen_backlog/Makefile @@ -1,4 +1,3 @@ - PROG= listen_backlog MAN= diff --git a/tools/regression/sockets/listen_kqueue/Makefile b/tools/regression/sockets/listen_kqueue/Makefile index 3ebdb1c4fac..e67350d9ff1 100644 --- a/tools/regression/sockets/listen_kqueue/Makefile +++ b/tools/regression/sockets/listen_kqueue/Makefile @@ -1,4 +1,3 @@ - PROG= listen_kqueue MAN= diff --git a/tools/regression/sockets/pr_atomic/Makefile b/tools/regression/sockets/pr_atomic/Makefile index 3c13ea53d06..e9e5a2fa2e5 100644 --- a/tools/regression/sockets/pr_atomic/Makefile +++ b/tools/regression/sockets/pr_atomic/Makefile @@ -1,4 +1,3 @@ - PROG= pr_atomic MAN= diff --git a/tools/regression/sockets/rtsocket/Makefile b/tools/regression/sockets/rtsocket/Makefile index 666f6c1ab8d..31120210ee2 100644 --- a/tools/regression/sockets/rtsocket/Makefile +++ b/tools/regression/sockets/rtsocket/Makefile @@ -1,4 +1,3 @@ - PROG= rtsocket MAN= diff --git a/tools/regression/sockets/so_setfib/Makefile b/tools/regression/sockets/so_setfib/Makefile index c7c8e69fef6..3670514e6c4 100644 --- a/tools/regression/sockets/so_setfib/Makefile +++ b/tools/regression/sockets/so_setfib/Makefile @@ -1,4 +1,3 @@ - .include PROG= so_setfib diff --git a/tools/regression/sockets/udp_pingpong/Makefile b/tools/regression/sockets/udp_pingpong/Makefile index 8ba9ee40826..72090d725e7 100644 --- a/tools/regression/sockets/udp_pingpong/Makefile +++ b/tools/regression/sockets/udp_pingpong/Makefile @@ -1,4 +1,3 @@ - PROG= udp_pingpong MAN= diff --git a/tools/regression/sockets/unix_bindconnect/Makefile b/tools/regression/sockets/unix_bindconnect/Makefile index 776723eadad..0e5c32e67b9 100644 --- a/tools/regression/sockets/unix_bindconnect/Makefile +++ b/tools/regression/sockets/unix_bindconnect/Makefile @@ -1,4 +1,3 @@ - PROG= unix_bindconnect MAN= diff --git a/tools/regression/sockets/unix_close_race/Makefile b/tools/regression/sockets/unix_close_race/Makefile index b4fa340ed0d..ca151dc7af4 100644 --- a/tools/regression/sockets/unix_close_race/Makefile +++ b/tools/regression/sockets/unix_close_race/Makefile @@ -1,4 +1,3 @@ - PROG= unix_close_race MAN= diff --git a/tools/regression/sockets/unix_cmsg/Makefile b/tools/regression/sockets/unix_cmsg/Makefile index b3caf4996c4..24ca702e0a9 100644 --- a/tools/regression/sockets/unix_cmsg/Makefile +++ b/tools/regression/sockets/unix_cmsg/Makefile @@ -1,4 +1,3 @@ - PROG= unix_cmsg SRCS= ${AUTOSRCS} unix_cmsg.c uc_common.h uc_common.c \ t_generic.h t_generic.c t_peercred.h t_peercred.c \ diff --git a/tools/regression/sockets/unix_gc/Makefile b/tools/regression/sockets/unix_gc/Makefile index 81791f4b521..c9f98fca871 100644 --- a/tools/regression/sockets/unix_gc/Makefile +++ b/tools/regression/sockets/unix_gc/Makefile @@ -1,4 +1,3 @@ - PROG= unix_gc MAN= diff --git a/tools/regression/sockets/unix_sendtorace/Makefile b/tools/regression/sockets/unix_sendtorace/Makefile index fb1a25429f8..1e7b53d4037 100644 --- a/tools/regression/sockets/unix_sendtorace/Makefile +++ b/tools/regression/sockets/unix_sendtorace/Makefile @@ -1,4 +1,3 @@ - PROG= unix_sendtorace MAN= diff --git a/tools/regression/sockets/unix_socket/Makefile b/tools/regression/sockets/unix_socket/Makefile index 0a62bf25a0d..61612323e98 100644 --- a/tools/regression/sockets/unix_socket/Makefile +++ b/tools/regression/sockets/unix_socket/Makefile @@ -1,4 +1,3 @@ - PROG= unix_socket MAN= diff --git a/tools/regression/sockets/unix_sorflush/Makefile b/tools/regression/sockets/unix_sorflush/Makefile index a7f52e47d1f..b41cb474f94 100644 --- a/tools/regression/sockets/unix_sorflush/Makefile +++ b/tools/regression/sockets/unix_sorflush/Makefile @@ -1,4 +1,3 @@ - PROG= unix_sorflush MAN= diff --git a/tools/regression/sockets/zerosend/Makefile b/tools/regression/sockets/zerosend/Makefile index 4ceb95dd16b..2f270d05cfa 100644 --- a/tools/regression/sockets/zerosend/Makefile +++ b/tools/regression/sockets/zerosend/Makefile @@ -1,4 +1,3 @@ - PROG= zerosend MAN= diff --git a/tools/regression/tls/Makefile b/tools/regression/tls/Makefile index 96cd680987c..063e3dec7d8 100644 --- a/tools/regression/tls/Makefile +++ b/tools/regression/tls/Makefile @@ -1,4 +1,3 @@ - SUBDIR=libxx libyy ttls1 ttls2 ttls4 .if ${MACHINE_ARCH} == "i386" diff --git a/tools/regression/tls/libxx/Makefile b/tools/regression/tls/libxx/Makefile index adf4da1cb6b..18195384ad9 100644 --- a/tools/regression/tls/libxx/Makefile +++ b/tools/regression/tls/libxx/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= libxx.so SRCS= xx.c diff --git a/tools/regression/tls/libyy/Makefile b/tools/regression/tls/libyy/Makefile index 634be2ad58e..05ecfc735c6 100644 --- a/tools/regression/tls/libyy/Makefile +++ b/tools/regression/tls/libyy/Makefile @@ -1,4 +1,3 @@ - SHLIB_NAME= libyy.so SRCS= yy.c diff --git a/tools/regression/tls/ttls1/Makefile b/tools/regression/tls/ttls1/Makefile index fd0f5edfd0b..8560de58cc9 100644 --- a/tools/regression/tls/ttls1/Makefile +++ b/tools/regression/tls/ttls1/Makefile @@ -1,4 +1,3 @@ - PROG= ttls1 LDFLAGS+= -L../libxx -lxx -Wl,--rpath=${.OBJDIR}/../libxx LDFLAGS+= -L../libyy -lyy -Wl,--rpath=${.OBJDIR}/../libyy diff --git a/tools/regression/tls/ttls2/Makefile b/tools/regression/tls/ttls2/Makefile index 044520a6b73..782808823ef 100644 --- a/tools/regression/tls/ttls2/Makefile +++ b/tools/regression/tls/ttls2/Makefile @@ -1,4 +1,3 @@ - PROG= ttls2 LIBADD= pthread MAN= diff --git a/tools/regression/tls/ttls3/Makefile b/tools/regression/tls/ttls3/Makefile index 4695889067e..ef00223e4c2 100644 --- a/tools/regression/tls/ttls3/Makefile +++ b/tools/regression/tls/ttls3/Makefile @@ -1,4 +1,3 @@ - all: ttls3 LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined diff --git a/tools/regression/tls/ttls4/Makefile b/tools/regression/tls/ttls4/Makefile index f6f54d48f1b..b87343ecdd0 100644 --- a/tools/regression/tls/ttls4/Makefile +++ b/tools/regression/tls/ttls4/Makefile @@ -1,4 +1,3 @@ - PROG= ttls4 LIBADD= pthread MAN= diff --git a/tools/regression/ufs/uprintf/Makefile b/tools/regression/ufs/uprintf/Makefile index a1de5f3cb9c..c1a7c4de03a 100644 --- a/tools/regression/ufs/uprintf/Makefile +++ b/tools/regression/ufs/uprintf/Makefile @@ -1,4 +1,3 @@ - PROG= ufs_uprintf WARNS?= 3 MAN= diff --git a/tools/regression/usr.bin/cc/Makefile b/tools/regression/usr.bin/cc/Makefile index 890875b1abb..1f8b5d8f03f 100644 --- a/tools/regression/usr.bin/cc/Makefile +++ b/tools/regression/usr.bin/cc/Makefile @@ -1,4 +1,3 @@ - TESTS= float CFLAGS+=-lm diff --git a/tools/regression/usr.bin/env/Makefile b/tools/regression/usr.bin/env/Makefile index 2a4e6bd61ce..06f1fbe82e2 100644 --- a/tools/regression/usr.bin/env/Makefile +++ b/tools/regression/usr.bin/env/Makefile @@ -1,4 +1,3 @@ - TESTPGM?=TestProgramNotSpecifed all: diff --git a/tools/test/auxinfo/Makefile b/tools/test/auxinfo/Makefile index f848a58f144..e1edd843bd5 100644 --- a/tools/test/auxinfo/Makefile +++ b/tools/test/auxinfo/Makefile @@ -1,4 +1,3 @@ - PROG= auxinfo MAN= diff --git a/tools/test/bsnmp/Makefile b/tools/test/bsnmp/Makefile index 47f03ac48a1..c3bcf832ff3 100644 --- a/tools/test/bsnmp/Makefile +++ b/tools/test/bsnmp/Makefile @@ -1,4 +1,3 @@ - CONTRIB=${SRCTOP}/contrib/bsnmp .PATH: ${CONTRIB}/tests diff --git a/tools/test/callout_free/Makefile b/tools/test/callout_free/Makefile index cc1583aa7a2..6421c072c5b 100644 --- a/tools/test/callout_free/Makefile +++ b/tools/test/callout_free/Makefile @@ -1,4 +1,3 @@ - KMOD= callout_free SRCS= callout_free.c diff --git a/tools/test/gpioevents/Makefile b/tools/test/gpioevents/Makefile index 4bc4422ae33..8d256534447 100644 --- a/tools/test/gpioevents/Makefile +++ b/tools/test/gpioevents/Makefile @@ -1,4 +1,3 @@ - PROG= gpioevents SRCS= gpioevents.c diff --git a/tools/test/iconv/Makefile b/tools/test/iconv/Makefile index 5452b20686f..0d152df97c9 100644 --- a/tools/test/iconv/Makefile +++ b/tools/test/iconv/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tablegen refgen posix gnu ENCODING= ASCII ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5 ISO8859-6 \ diff --git a/tools/test/iconv/gnu/Makefile b/tools/test/iconv/gnu/Makefile index 3feb4845cee..a90b2fea691 100644 --- a/tools/test/iconv/gnu/Makefile +++ b/tools/test/iconv/gnu/Makefile @@ -1,4 +1,3 @@ - PROG= gnu MAN= diff --git a/tools/test/iconv/posix/Makefile b/tools/test/iconv/posix/Makefile index 55c939a32e8..6e15a6fa74e 100644 --- a/tools/test/iconv/posix/Makefile +++ b/tools/test/iconv/posix/Makefile @@ -1,4 +1,3 @@ - PROG= posix MAN= diff --git a/tools/test/iconv/refgen/Makefile b/tools/test/iconv/refgen/Makefile index 5dc332c9d0e..6052bd3604f 100644 --- a/tools/test/iconv/refgen/Makefile +++ b/tools/test/iconv/refgen/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../tablegen PROG= refgen diff --git a/tools/test/iconv/tablegen/Makefile b/tools/test/iconv/tablegen/Makefile index ab79bacdb9c..66362a70c12 100644 --- a/tools/test/iconv/tablegen/Makefile +++ b/tools/test/iconv/tablegen/Makefile @@ -1,4 +1,3 @@ - PROG= tablegen MAN= diff --git a/tools/test/net/Makefile b/tools/test/net/Makefile index bdbc46c5ad5..b07506d9838 100644 --- a/tools/test/net/Makefile +++ b/tools/test/net/Makefile @@ -1,4 +1,3 @@ - PROGS= listen connect MAN= diff --git a/tools/test/netfibs/Makefile b/tools/test/netfibs/Makefile index 02db4c8d82d..5e870a0d19d 100644 --- a/tools/test/netfibs/Makefile +++ b/tools/test/netfibs/Makefile @@ -1,4 +1,3 @@ - PROG= reflect MAN= diff --git a/tools/test/ppsapi/Makefile b/tools/test/ppsapi/Makefile index 91a017f393b..056a1fc31d6 100644 --- a/tools/test/ppsapi/Makefile +++ b/tools/test/ppsapi/Makefile @@ -1,4 +1,3 @@ - PROG= ppsapitest MAN= diff --git a/tools/test/ptrace/Makefile b/tools/test/ptrace/Makefile index b2c9c7a91c3..ebc329a343b 100644 --- a/tools/test/ptrace/Makefile +++ b/tools/test/ptrace/Makefile @@ -1,4 +1,3 @@ - PROG= scescx MAN= diff --git a/tools/test/sort/regression/Makefile b/tools/test/sort/regression/Makefile index e8f78e2e7f7..81dc44d8ef7 100644 --- a/tools/test/sort/regression/Makefile +++ b/tools/test/sort/regression/Makefile @@ -1,4 +1,3 @@ - TESTFILE= test01 test02 test03 test04 test05 test06 test07 test08 \ test09 test10 test11 test12 test13 test14 test15 test16 test17 \ test_nums diff --git a/tools/test/upsdl/Makefile b/tools/test/upsdl/Makefile index 2e58b42c094..e134d92ea66 100644 --- a/tools/test/upsdl/Makefile +++ b/tools/test/upsdl/Makefile @@ -1,4 +1,3 @@ - PROG= upsdl MAN= diff --git a/tools/test/vm86/Makefile b/tools/test/vm86/Makefile index a275cc638b6..4fd25a7f4ad 100644 --- a/tools/test/vm86/Makefile +++ b/tools/test/vm86/Makefile @@ -1,4 +1,3 @@ - all: vm86_test vm86_test: vm86_test_asm.s vm86_test.c diff --git a/tools/test/xregs_sig/Makefile b/tools/test/xregs_sig/Makefile index a8817c37284..fe0de78b40a 100644 --- a/tools/test/xregs_sig/Makefile +++ b/tools/test/xregs_sig/Makefile @@ -1,4 +1,3 @@ - .include PROG= xregs_sig diff --git a/tools/tools/aac/Makefile b/tools/tools/aac/Makefile index b55c90e832b..2967029e792 100644 --- a/tools/tools/aac/Makefile +++ b/tools/tools/aac/Makefile @@ -1,4 +1,3 @@ - PROG= aac_checkq MAN= BINDIR?=/usr/local/bin diff --git a/tools/tools/ansify/Makefile b/tools/tools/ansify/Makefile index 9acbb961830..b1dc9ec037d 100644 --- a/tools/tools/ansify/Makefile +++ b/tools/tools/ansify/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= ansify.pl BINDIR?= /usr/local/bin diff --git a/tools/tools/ath/Makefile b/tools/tools/ath/Makefile index 33dd5b0fe3b..dd4526d7ab4 100644 --- a/tools/tools/ath/Makefile +++ b/tools/tools/ath/Makefile @@ -1,4 +1,3 @@ - SUBDIR= arcode athdebug athdecode athkey athpoke athprom athrd athregs athalq SUBDIR+= athstats ath_prom_read athradar athaggrstats SUBDIR+= ath_ee_v14_print ath_ee_v4k_print ath_ee_9287_print ath_ee_9300_print diff --git a/tools/tools/ath/Makefile.inc b/tools/tools/ath/Makefile.inc index 19fde77051c..705d318948b 100644 --- a/tools/tools/ath/Makefile.inc +++ b/tools/tools/ath/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/ath/arcode/Makefile b/tools/tools/ath/arcode/Makefile index 9073e1dc2c8..1c4aa6558f4 100644 --- a/tools/tools/ath/arcode/Makefile +++ b/tools/tools/ath/arcode/Makefile @@ -1,4 +1,3 @@ - PROG= arcode MAN= diff --git a/tools/tools/ath/ath_ee_9287_print/Makefile b/tools/tools/ath/ath_ee_9287_print/Makefile index 200dbba6052..7948141c0e0 100644 --- a/tools/tools/ath/ath_ee_9287_print/Makefile +++ b/tools/tools/ath/ath_ee_9287_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_9287_print diff --git a/tools/tools/ath/ath_ee_9300_print/Makefile b/tools/tools/ath/ath_ee_9300_print/Makefile index 3df47a96efa..c57f7e8c83b 100644 --- a/tools/tools/ath/ath_ee_9300_print/Makefile +++ b/tools/tools/ath/ath_ee_9300_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_9300_print diff --git a/tools/tools/ath/ath_ee_v14_print/Makefile b/tools/tools/ath/ath_ee_v14_print/Makefile index ebb126388cf..c85903d423b 100644 --- a/tools/tools/ath/ath_ee_v14_print/Makefile +++ b/tools/tools/ath/ath_ee_v14_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_v14_print diff --git a/tools/tools/ath/ath_ee_v4k_print/Makefile b/tools/tools/ath/ath_ee_v4k_print/Makefile index 2bf0d969b1c..a75e7fba878 100644 --- a/tools/tools/ath/ath_ee_v4k_print/Makefile +++ b/tools/tools/ath/ath_ee_v4k_print/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= ath_ee_v4k_print diff --git a/tools/tools/ath/ath_prom_read/Makefile b/tools/tools/ath/ath_prom_read/Makefile index bc6fdd7dd24..7338a6b8a22 100644 --- a/tools/tools/ath/ath_prom_read/Makefile +++ b/tools/tools/ath/ath_prom_read/Makefile @@ -1,4 +1,3 @@ - PROG= ath_prom_read .include diff --git a/tools/tools/ath/athaggrstats/Makefile b/tools/tools/ath/athaggrstats/Makefile index a615a3c3f1e..ea79e5734b2 100644 --- a/tools/tools/ath/athaggrstats/Makefile +++ b/tools/tools/ath/athaggrstats/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= athaggrstats diff --git a/tools/tools/ath/athalq/Makefile b/tools/tools/ath/athalq/Makefile index e8f27327e70..c8bb2f4446e 100644 --- a/tools/tools/ath/athalq/Makefile +++ b/tools/tools/ath/athalq/Makefile @@ -1,4 +1,3 @@ - PROG= athalq MAN= diff --git a/tools/tools/ath/athani/Makefile b/tools/tools/ath/athani/Makefile index ba233de9aaf..af1325af55f 100644 --- a/tools/tools/ath/athani/Makefile +++ b/tools/tools/ath/athani/Makefile @@ -1,4 +1,3 @@ - PROG= athani MAN= diff --git a/tools/tools/ath/athdebug/Makefile b/tools/tools/ath/athdebug/Makefile index b50c63891e2..f05e11fc5d0 100644 --- a/tools/tools/ath/athdebug/Makefile +++ b/tools/tools/ath/athdebug/Makefile @@ -1,4 +1,3 @@ - PROG= athdebug .include <../Makefile.inc> diff --git a/tools/tools/ath/athkey/Makefile b/tools/tools/ath/athkey/Makefile index ef129fa5ecf..f03223cfc43 100644 --- a/tools/tools/ath/athkey/Makefile +++ b/tools/tools/ath/athkey/Makefile @@ -1,4 +1,3 @@ - PROG= athkey SRCS= athkey.c diff --git a/tools/tools/ath/athpoke/Makefile b/tools/tools/ath/athpoke/Makefile index aede5d19113..e82c3f81fcc 100644 --- a/tools/tools/ath/athpoke/Makefile +++ b/tools/tools/ath/athpoke/Makefile @@ -1,4 +1,3 @@ - PROG= athpoke LINKS= ${BINDIR}/${PROG} ${BINDIR}/athpeek diff --git a/tools/tools/ath/athpow/Makefile b/tools/tools/ath/athpow/Makefile index 6ed6f9d455f..cfa6c8d5a3d 100644 --- a/tools/tools/ath/athpow/Makefile +++ b/tools/tools/ath/athpow/Makefile @@ -1,4 +1,3 @@ - PROG= athpow .include <../Makefile.inc> diff --git a/tools/tools/ath/athprom/Makefile b/tools/tools/ath/athprom/Makefile index 6af0225d5f3..dc273a35a79 100644 --- a/tools/tools/ath/athprom/Makefile +++ b/tools/tools/ath/athprom/Makefile @@ -1,4 +1,3 @@ - PROG= athprom .include <../Makefile.inc> diff --git a/tools/tools/ath/athradar/Makefile b/tools/tools/ath/athradar/Makefile index 0b1604a0239..542a1401e13 100644 --- a/tools/tools/ath/athradar/Makefile +++ b/tools/tools/ath/athradar/Makefile @@ -1,4 +1,3 @@ - PROG= athradar .include <../Makefile.inc> diff --git a/tools/tools/ath/athratestats/Makefile b/tools/tools/ath/athratestats/Makefile index 96a49433a69..cd2eb507326 100644 --- a/tools/tools/ath/athratestats/Makefile +++ b/tools/tools/ath/athratestats/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal .PATH: ${.CURDIR}/../../../../sys/dev/ath/ diff --git a/tools/tools/ath/athrd/Makefile b/tools/tools/ath/athrd/Makefile index eb8d42c8402..07e48492dfc 100644 --- a/tools/tools/ath/athrd/Makefile +++ b/tools/tools/ath/athrd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR}/../../../../sys/dev/ath/ath_hal PROG= athrd diff --git a/tools/tools/ath/athregs/Makefile b/tools/tools/ath/athregs/Makefile index 8248b193f36..3bc6d38a594 100644 --- a/tools/tools/ath/athregs/Makefile +++ b/tools/tools/ath/athregs/Makefile @@ -1,4 +1,3 @@ - PROG= athregs CFLAGS+= -I${.CURDIR}/../common/ diff --git a/tools/tools/ath/athspectral/Makefile b/tools/tools/ath/athspectral/Makefile index 0311d4a673f..ef683994335 100644 --- a/tools/tools/ath/athspectral/Makefile +++ b/tools/tools/ath/athspectral/Makefile @@ -1,4 +1,3 @@ - PROG= athspectral .include <../Makefile.inc> diff --git a/tools/tools/ath/athstats/Makefile b/tools/tools/ath/athstats/Makefile index 0c2b74967b9..0c90fe35579 100644 --- a/tools/tools/ath/athstats/Makefile +++ b/tools/tools/ath/athstats/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/tools/tools/ath/athsurvey/Makefile b/tools/tools/ath/athsurvey/Makefile index 125fa6a839e..68fd0881fd6 100644 --- a/tools/tools/ath/athsurvey/Makefile +++ b/tools/tools/ath/athsurvey/Makefile @@ -1,4 +1,3 @@ - PROG= athsurvey .include <../Makefile.inc> diff --git a/tools/tools/bootparttest/Makefile b/tools/tools/bootparttest/Makefile index dcf5cddfd84..296a178bda3 100644 --- a/tools/tools/bootparttest/Makefile +++ b/tools/tools/bootparttest/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/stand/common BINDIR?= /usr/bin diff --git a/tools/tools/cfi/Makefile b/tools/tools/cfi/Makefile index 967a5850ccf..5c6f5eee36e 100644 --- a/tools/tools/cfi/Makefile +++ b/tools/tools/cfi/Makefile @@ -1,4 +1,3 @@ - PROG= cfi BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/cxgbtool/Makefile b/tools/tools/cxgbtool/Makefile index ce21555fedc..b8f8348cc70 100644 --- a/tools/tools/cxgbtool/Makefile +++ b/tools/tools/cxgbtool/Makefile @@ -1,4 +1,3 @@ - PROG= cxgbtool SRCS= cxgbtool.c MAN= diff --git a/tools/tools/decioctl/Makefile b/tools/tools/decioctl/Makefile index ffbc4b49f73..0b54c9c6d79 100644 --- a/tools/tools/decioctl/Makefile +++ b/tools/tools/decioctl/Makefile @@ -1,4 +1,3 @@ - PROG= decioctl SRCS= decioctl.c MAN= diff --git a/tools/tools/dmardump/Makefile b/tools/tools/dmardump/Makefile index 2181072927b..9ef73583bcb 100644 --- a/tools/tools/dmardump/Makefile +++ b/tools/tools/dmardump/Makefile @@ -1,4 +1,3 @@ - PROG= dmardump SRCS= dmardump.c MAN= diff --git a/tools/tools/drm/radeon/mkregtable/Makefile b/tools/tools/drm/radeon/mkregtable/Makefile index 0d346eb6eb2..e6fadef710a 100644 --- a/tools/tools/drm/radeon/mkregtable/Makefile +++ b/tools/tools/drm/radeon/mkregtable/Makefile @@ -1,4 +1,3 @@ - all: regtables PROG= mkregtable diff --git a/tools/tools/find-sb/Makefile b/tools/tools/find-sb/Makefile index 413ac2a3c1c..0642ccf2d94 100644 --- a/tools/tools/find-sb/Makefile +++ b/tools/tools/find-sb/Makefile @@ -1,4 +1,3 @@ - PROG= find-sb MAN= diff --git a/tools/tools/fixwhite/Makefile b/tools/tools/fixwhite/Makefile index f8932cfb77d..299bf470471 100644 --- a/tools/tools/fixwhite/Makefile +++ b/tools/tools/fixwhite/Makefile @@ -1,4 +1,3 @@ - PROG= fixwhite BINDIR= /usr/bin diff --git a/tools/tools/genericize/Makefile b/tools/tools/genericize/Makefile index 25fe89a5166..15374b3558a 100644 --- a/tools/tools/genericize/Makefile +++ b/tools/tools/genericize/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= genericize.pl BINDIR?= /usr/local/bin diff --git a/tools/tools/hcomp/Makefile b/tools/tools/hcomp/Makefile index 6adaa3456bf..d1d1f640553 100644 --- a/tools/tools/hcomp/Makefile +++ b/tools/tools/hcomp/Makefile @@ -1,4 +1,3 @@ - BINDIR ?= ${HOME}/bin BINOWN ?= ${USER} BINGRP ?= ${USER} diff --git a/tools/tools/ifinfo/Makefile b/tools/tools/ifinfo/Makefile index 9b0c6073356..3e95a642ca5 100644 --- a/tools/tools/ifinfo/Makefile +++ b/tools/tools/ifinfo/Makefile @@ -1,4 +1,3 @@ - PROG= ifinfo SRCS= ifinfo.c rfc1650.c MAN= diff --git a/tools/tools/ifpifa/Makefile b/tools/tools/ifpifa/Makefile index b822022defd..b5aa64fe8b7 100644 --- a/tools/tools/ifpifa/Makefile +++ b/tools/tools/ifpifa/Makefile @@ -1,4 +1,3 @@ - PROG= ifpifa MAN= BINDIR?=/usr/local/bin diff --git a/tools/tools/intel-ucode-split/Makefile b/tools/tools/intel-ucode-split/Makefile index 61a61d79445..52d35505095 100644 --- a/tools/tools/intel-ucode-split/Makefile +++ b/tools/tools/intel-ucode-split/Makefile @@ -1,4 +1,3 @@ - PROG= intel-ucode-split MAN= diff --git a/tools/tools/ioat/Makefile b/tools/tools/ioat/Makefile index 50601d250de..7822cb5b0e9 100644 --- a/tools/tools/ioat/Makefile +++ b/tools/tools/ioat/Makefile @@ -1,4 +1,3 @@ - PROG= ioatcontrol MAN= ioatcontrol.8 BINDIR?= /usr/bin diff --git a/tools/tools/ipw/Makefile b/tools/tools/ipw/Makefile index f10ec3a03e3..cb8fcaf9fa8 100644 --- a/tools/tools/ipw/Makefile +++ b/tools/tools/ipw/Makefile @@ -1,4 +1,3 @@ - PROG= ipwstats MAN= diff --git a/tools/tools/iwi/Makefile b/tools/tools/iwi/Makefile index 42a72a901ad..0e3c3c78fe0 100644 --- a/tools/tools/iwi/Makefile +++ b/tools/tools/iwi/Makefile @@ -1,4 +1,3 @@ - PROG= iwistats MAN= diff --git a/tools/tools/iwn/Makefile b/tools/tools/iwn/Makefile index 948299d6c43..34ec4aa669e 100644 --- a/tools/tools/iwn/Makefile +++ b/tools/tools/iwn/Makefile @@ -1,4 +1,3 @@ - SUBDIR= iwnstats .include diff --git a/tools/tools/iwn/iwnstats/Makefile b/tools/tools/iwn/iwnstats/Makefile index ccf1617c64b..c5cf15a2bce 100644 --- a/tools/tools/iwn/iwnstats/Makefile +++ b/tools/tools/iwn/iwnstats/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/tools/tools/kttcp/Makefile b/tools/tools/kttcp/Makefile index fe332e3c048..cfa275f5d5e 100644 --- a/tools/tools/kttcp/Makefile +++ b/tools/tools/kttcp/Makefile @@ -1,4 +1,3 @@ - SHELL= /bin/sh PROG= kttcp diff --git a/tools/tools/kttcp/sys/Makefile b/tools/tools/kttcp/sys/Makefile index 851921a54e9..c8f46841889 100644 --- a/tools/tools/kttcp/sys/Makefile +++ b/tools/tools/kttcp/sys/Makefile @@ -1,4 +1,3 @@ - KMOD = kttcp SRCS = kttcp.c SRCS += device_if.h diff --git a/tools/tools/makeroot/Makefile b/tools/tools/makeroot/Makefile index 218d77cf521..fffe06d26f7 100644 --- a/tools/tools/makeroot/Makefile +++ b/tools/tools/makeroot/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= makeroot.sh MAN= makeroot.8 diff --git a/tools/tools/mcgrab/Makefile b/tools/tools/mcgrab/Makefile index 460c8beded1..61eca34b4d5 100644 --- a/tools/tools/mcgrab/Makefile +++ b/tools/tools/mcgrab/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= mcgrab CFLAGS+= -I${.CURDIR}/../mctest diff --git a/tools/tools/mctest/Makefile b/tools/tools/mctest/Makefile index 6ffc0bedbfc..0616e599ecf 100644 --- a/tools/tools/mctest/Makefile +++ b/tools/tools/mctest/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= mctest LIBADD= pthread diff --git a/tools/tools/mfi/Makefile b/tools/tools/mfi/Makefile index 84e11395e76..bfae20586df 100644 --- a/tools/tools/mfi/Makefile +++ b/tools/tools/mfi/Makefile @@ -1,4 +1,3 @@ - PROG= mfi_checkq MAN= BINDIR?=/usr/local/bin diff --git a/tools/tools/mwl/Makefile b/tools/tools/mwl/Makefile index f3a00af70d8..fc0f2287871 100644 --- a/tools/tools/mwl/Makefile +++ b/tools/tools/mwl/Makefile @@ -1,4 +1,3 @@ - SUBDIR= mwlstats mwldebug .include diff --git a/tools/tools/mwl/mwldebug/Makefile b/tools/tools/mwl/mwldebug/Makefile index cbbfdeb7361..8ec0d0cf5a6 100644 --- a/tools/tools/mwl/mwldebug/Makefile +++ b/tools/tools/mwl/mwldebug/Makefile @@ -1,4 +1,3 @@ - PROG= mwldebug BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/mwl/mwlstats/Makefile b/tools/tools/mwl/mwlstats/Makefile index af1833f9ea1..74d8c7df80b 100644 --- a/tools/tools/mwl/mwlstats/Makefile +++ b/tools/tools/mwl/mwlstats/Makefile @@ -1,4 +1,3 @@ - PROG= mwlstats BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/ncpus/Makefile b/tools/tools/ncpus/Makefile index 1b77b68b4ed..a6f740d8c61 100644 --- a/tools/tools/ncpus/Makefile +++ b/tools/tools/ncpus/Makefile @@ -1,4 +1,3 @@ - PROG= ncpus MAN= SRCS= ncpus.c acpi.c diff --git a/tools/tools/net80211/Makefile b/tools/tools/net80211/Makefile index 216d3bfa2d8..b4b32899cd2 100644 --- a/tools/tools/net80211/Makefile +++ b/tools/tools/net80211/Makefile @@ -1,4 +1,3 @@ - SUBDIR= stumbler w00t wesside wlaninject wlanstats wlantxtime wlanwatch wlanwds .include diff --git a/tools/tools/net80211/stumbler/Makefile b/tools/tools/net80211/stumbler/Makefile index ad553e006d2..b8d5da3340b 100644 --- a/tools/tools/net80211/stumbler/Makefile +++ b/tools/tools/net80211/stumbler/Makefile @@ -1,4 +1,3 @@ - PROG= stumbler BINDIR= /usr/local/bin LIBADD= pcap tinfow ncursesw diff --git a/tools/tools/net80211/w00t/Makefile b/tools/tools/net80211/w00t/Makefile index 04a165de9bc..8cc9184a005 100644 --- a/tools/tools/net80211/w00t/Makefile +++ b/tools/tools/net80211/w00t/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libw00t ap assoc expand prga redir .include diff --git a/tools/tools/net80211/w00t/Makefile.inc b/tools/tools/net80211/w00t/Makefile.inc index d5596cc580b..69c06542d36 100644 --- a/tools/tools/net80211/w00t/Makefile.inc +++ b/tools/tools/net80211/w00t/Makefile.inc @@ -1,4 +1,3 @@ - W00T= ../libw00t # NB: we get crc32 from -lz DPADD= ${W00T}/libw00t.a diff --git a/tools/tools/net80211/w00t/ap/Makefile b/tools/tools/net80211/w00t/ap/Makefile index 178470c5ca2..f561227d5d1 100644 --- a/tools/tools/net80211/w00t/ap/Makefile +++ b/tools/tools/net80211/w00t/ap/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= ap diff --git a/tools/tools/net80211/w00t/assoc/Makefile b/tools/tools/net80211/w00t/assoc/Makefile index d5ed3ebae4c..623efd4a856 100644 --- a/tools/tools/net80211/w00t/assoc/Makefile +++ b/tools/tools/net80211/w00t/assoc/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= assoc diff --git a/tools/tools/net80211/w00t/expand/Makefile b/tools/tools/net80211/w00t/expand/Makefile index d413af5fdb2..3dadccf97b8 100644 --- a/tools/tools/net80211/w00t/expand/Makefile +++ b/tools/tools/net80211/w00t/expand/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= expand diff --git a/tools/tools/net80211/w00t/libw00t/Makefile b/tools/tools/net80211/w00t/libw00t/Makefile index 2146da5a9e3..190cc4fd874 100644 --- a/tools/tools/net80211/w00t/libw00t/Makefile +++ b/tools/tools/net80211/w00t/libw00t/Makefile @@ -1,4 +1,3 @@ - LIB= w00t SRCS= w00t.c INTERNALLIB= true diff --git a/tools/tools/net80211/w00t/prga/Makefile b/tools/tools/net80211/w00t/prga/Makefile index 9d4a2395c2d..a95727443d2 100644 --- a/tools/tools/net80211/w00t/prga/Makefile +++ b/tools/tools/net80211/w00t/prga/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= prga diff --git a/tools/tools/net80211/w00t/redir/Makefile b/tools/tools/net80211/w00t/redir/Makefile index 0bc0729de5a..d9a22f0110e 100644 --- a/tools/tools/net80211/w00t/redir/Makefile +++ b/tools/tools/net80211/w00t/redir/Makefile @@ -1,4 +1,3 @@ - .include <../Makefile.inc> PROG= redir diff --git a/tools/tools/net80211/wesside/Makefile b/tools/tools/net80211/wesside/Makefile index 8badc634353..563e8b0f1c5 100644 --- a/tools/tools/net80211/wesside/Makefile +++ b/tools/tools/net80211/wesside/Makefile @@ -1,4 +1,3 @@ - SUBDIR= dics udps wesside .include diff --git a/tools/tools/net80211/wesside/dics/Makefile b/tools/tools/net80211/wesside/dics/Makefile index ec94e0dc988..f5411a28d9e 100644 --- a/tools/tools/net80211/wesside/dics/Makefile +++ b/tools/tools/net80211/wesside/dics/Makefile @@ -1,4 +1,3 @@ - PROG= dics BINDIR= /usr/local/bin LIBADD= z diff --git a/tools/tools/net80211/wesside/udps/Makefile b/tools/tools/net80211/wesside/udps/Makefile index 40177a533c2..34b045cb52c 100644 --- a/tools/tools/net80211/wesside/udps/Makefile +++ b/tools/tools/net80211/wesside/udps/Makefile @@ -1,4 +1,3 @@ - PROG= udps BINDIR= /usr/local/bin LIBADD= z diff --git a/tools/tools/net80211/wesside/wesside/Makefile b/tools/tools/net80211/wesside/wesside/Makefile index 0c2bb0f42b2..50a599e848f 100644 --- a/tools/tools/net80211/wesside/wesside/Makefile +++ b/tools/tools/net80211/wesside/wesside/Makefile @@ -1,4 +1,3 @@ - PROG= wesside BINDIR= /usr/local/bin LIBADD= z diff --git a/tools/tools/net80211/wlaninject/Makefile b/tools/tools/net80211/wlaninject/Makefile index c072ef10e3b..5923248ad2e 100644 --- a/tools/tools/net80211/wlaninject/Makefile +++ b/tools/tools/net80211/wlaninject/Makefile @@ -1,4 +1,3 @@ - PROG= wlaninject BINDIR= /usr/local/bin CFLAGS=-g diff --git a/tools/tools/net80211/wlanstats/Makefile b/tools/tools/net80211/wlanstats/Makefile index dec8e84e125..f3b6f718d44 100644 --- a/tools/tools/net80211/wlanstats/Makefile +++ b/tools/tools/net80211/wlanstats/Makefile @@ -1,4 +1,3 @@ - .include PROG= wlanstats diff --git a/tools/tools/net80211/wlantxtime/Makefile b/tools/tools/net80211/wlantxtime/Makefile index 4948d818f46..b133375f5a4 100644 --- a/tools/tools/net80211/wlantxtime/Makefile +++ b/tools/tools/net80211/wlantxtime/Makefile @@ -1,4 +1,3 @@ - PROG= wlantxtime BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/net80211/wlanwatch/Makefile b/tools/tools/net80211/wlanwatch/Makefile index 28a13096f45..0cace0f00bc 100644 --- a/tools/tools/net80211/wlanwatch/Makefile +++ b/tools/tools/net80211/wlanwatch/Makefile @@ -1,4 +1,3 @@ - PROG= wlanwatch BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/net80211/wlanwds/Makefile b/tools/tools/net80211/wlanwds/Makefile index 0a2ab16381c..1e993cc07c2 100644 --- a/tools/tools/net80211/wlanwds/Makefile +++ b/tools/tools/net80211/wlanwds/Makefile @@ -1,4 +1,3 @@ - PROG= wlanwds BINDIR= /usr/local/bin MAN= diff --git a/tools/tools/netrate/Makefile.inc b/tools/tools/netrate/Makefile.inc index 59704fbd89d..cf63a151e33 100644 --- a/tools/tools/netrate/Makefile.inc +++ b/tools/tools/netrate/Makefile.inc @@ -1,3 +1,2 @@ - WARNS?= 5 WFORMAT?= 2 diff --git a/tools/tools/netrate/http/Makefile b/tools/tools/netrate/http/Makefile index cfdea3e0975..588199f2ae6 100644 --- a/tools/tools/netrate/http/Makefile +++ b/tools/tools/netrate/http/Makefile @@ -1,4 +1,3 @@ - PROG= http MAN= LIBADD= pthread diff --git a/tools/tools/netrate/httpd/Makefile b/tools/tools/netrate/httpd/Makefile index 5282df918de..18bd38009e4 100644 --- a/tools/tools/netrate/httpd/Makefile +++ b/tools/tools/netrate/httpd/Makefile @@ -1,4 +1,3 @@ - PROG= httpd MAN= WARNS?= 3 diff --git a/tools/tools/netrate/juggle/Makefile b/tools/tools/netrate/juggle/Makefile index 7b624d7e4e7..15665e63e2e 100644 --- a/tools/tools/netrate/juggle/Makefile +++ b/tools/tools/netrate/juggle/Makefile @@ -1,4 +1,3 @@ - PROG= juggle MAN= WARNS?= 3 diff --git a/tools/tools/netrate/tcpconnect/Makefile b/tools/tools/netrate/tcpconnect/Makefile index 3686c823d89..a038ba496b8 100644 --- a/tools/tools/netrate/tcpconnect/Makefile +++ b/tools/tools/netrate/tcpconnect/Makefile @@ -1,4 +1,3 @@ - PROG= tcpconnect MAN= WARNS?= 3 diff --git a/tools/tools/netrate/tcpp/Makefile b/tools/tools/netrate/tcpp/Makefile index 79ee56b8f7c..a25d418f264 100644 --- a/tools/tools/netrate/tcpp/Makefile +++ b/tools/tools/netrate/tcpp/Makefile @@ -1,4 +1,3 @@ - PROG= tcpp INCS= tcpp.h MAN= diff --git a/tools/tools/netrate/tcpreceive/Makefile b/tools/tools/netrate/tcpreceive/Makefile index 1564bd5a41e..1d02a57656a 100644 --- a/tools/tools/netrate/tcpreceive/Makefile +++ b/tools/tools/netrate/tcpreceive/Makefile @@ -1,4 +1,3 @@ - PROG= tcpreceive MAN= WARNS?= 3 diff --git a/tools/tools/notescheck/Makefile b/tools/tools/notescheck/Makefile index c86b2ee41bc..493068e67ee 100644 --- a/tools/tools/notescheck/Makefile +++ b/tools/tools/notescheck/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= notescheck.py .include diff --git a/tools/tools/npe/Makefile b/tools/tools/npe/Makefile index 67634bf343f..e89e95afe4a 100644 --- a/tools/tools/npe/Makefile +++ b/tools/tools/npe/Makefile @@ -1,4 +1,3 @@ - SUBDIR= npestats .include diff --git a/tools/tools/npe/npestats/Makefile b/tools/tools/npe/npestats/Makefile index 3c1cca48f90..3fa9dd50c55 100644 --- a/tools/tools/npe/npestats/Makefile +++ b/tools/tools/npe/npestats/Makefile @@ -1,4 +1,3 @@ - PROG= npestats SRCS= main.c npestats.c BINDIR= /usr/local/bin diff --git a/tools/tools/pirtool/Makefile b/tools/tools/pirtool/Makefile index df60b2d9ce8..e291511839c 100644 --- a/tools/tools/pirtool/Makefile +++ b/tools/tools/pirtool/Makefile @@ -1,4 +1,3 @@ - PROG= pirtool SRCS= pirtool.c MAN= diff --git a/tools/tools/shlib-compat/Makefile.sysfake b/tools/tools/shlib-compat/Makefile.sysfake index 9ef5a3a752d..34a790be3f8 100644 --- a/tools/tools/shlib-compat/Makefile.sysfake +++ b/tools/tools/shlib-compat/Makefile.sysfake @@ -1,4 +1,3 @@ - SRCS+= sysfake.c CLEANFILES+= sysfake.c diff --git a/tools/tools/shlib-compat/test/Makefile b/tools/tools/shlib-compat/test/Makefile index 6af16f2f9e6..e28b6ee2ad7 100644 --- a/tools/tools/shlib-compat/test/Makefile +++ b/tools/tools/shlib-compat/test/Makefile @@ -1,4 +1,3 @@ - SUBDIR= libtest1 \ libtest2 \ libtest3 \ diff --git a/tools/tools/shlib-compat/test/Makefile.inc b/tools/tools/shlib-compat/test/Makefile.inc index 6417cdc826f..dc0bf23f863 100644 --- a/tools/tools/shlib-compat/test/Makefile.inc +++ b/tools/tools/shlib-compat/test/Makefile.inc @@ -1,4 +1,3 @@ - LIB= test${TESTNUM} SHLIB_MAJOR= 0 diff --git a/tools/tools/shlib-compat/test/libtest1/Makefile b/tools/tools/shlib-compat/test/libtest1/Makefile index 36b4e702439..cbbb9d30d96 100644 --- a/tools/tools/shlib-compat/test/libtest1/Makefile +++ b/tools/tools/shlib-compat/test/libtest1/Makefile @@ -1,4 +1,3 @@ - TESTNUM= 1 .include <../Makefile.inc> diff --git a/tools/tools/shlib-compat/test/libtest2/Makefile b/tools/tools/shlib-compat/test/libtest2/Makefile index a205258710a..fe2b7b22b11 100644 --- a/tools/tools/shlib-compat/test/libtest2/Makefile +++ b/tools/tools/shlib-compat/test/libtest2/Makefile @@ -1,4 +1,3 @@ - TESTNUM= 2 .include <../Makefile.inc> diff --git a/tools/tools/shlib-compat/test/libtest3/Makefile b/tools/tools/shlib-compat/test/libtest3/Makefile index 232da97d255..d5942c588a1 100644 --- a/tools/tools/shlib-compat/test/libtest3/Makefile +++ b/tools/tools/shlib-compat/test/libtest3/Makefile @@ -1,4 +1,3 @@ - TESTNUM= 3 .include <../Makefile.inc> diff --git a/tools/tools/shlib-compat/test/libtestsys/Makefile b/tools/tools/shlib-compat/test/libtestsys/Makefile index 8bf88e27430..631fb817817 100644 --- a/tools/tools/shlib-compat/test/libtestsys/Makefile +++ b/tools/tools/shlib-compat/test/libtestsys/Makefile @@ -1,4 +1,3 @@ - TESTNUM= sys CLEANFILES+= test.c diff --git a/tools/tools/sortbench/Makefile b/tools/tools/sortbench/Makefile index a3a6dc410af..33d3b73442e 100644 --- a/tools/tools/sortbench/Makefile +++ b/tools/tools/sortbench/Makefile @@ -1,4 +1,3 @@ - PROG= sort_bench MAN= diff --git a/tools/tools/switch_tls/Makefile b/tools/tools/switch_tls/Makefile index 796b9c5c9c3..00bb882cc60 100644 --- a/tools/tools/switch_tls/Makefile +++ b/tools/tools/switch_tls/Makefile @@ -1,4 +1,3 @@ - PROG= switch_tls MAN= diff --git a/tools/tools/sysdoc/Makefile b/tools/tools/sysdoc/Makefile index 2dec25afb9a..e00cdad8ea5 100644 --- a/tools/tools/sysdoc/Makefile +++ b/tools/tools/sysdoc/Makefile @@ -1,4 +1,3 @@ - sysctl.5: sh ${.CURDIR}/sysdoc.sh -k /boot/kernel diff --git a/tools/tools/tionxcl/Makefile b/tools/tools/tionxcl/Makefile index 0bb9f733d22..a7987d9e6df 100644 --- a/tools/tools/tionxcl/Makefile +++ b/tools/tools/tionxcl/Makefile @@ -1,4 +1,3 @@ - PROG= tionxcl MAN= diff --git a/tools/tools/track/Makefile b/tools/tools/track/Makefile index c494c7375a4..c5acc6e2803 100644 --- a/tools/tools/track/Makefile +++ b/tools/tools/track/Makefile @@ -1,4 +1,3 @@ - PREFIX?= /usr/local BINDIR?= ${PREFIX}/bin SCRIPTS= track.sh diff --git a/tools/tools/tscdrift/Makefile b/tools/tools/tscdrift/Makefile index 190bb4ecee3..28d9493643f 100644 --- a/tools/tools/tscdrift/Makefile +++ b/tools/tools/tscdrift/Makefile @@ -1,4 +1,3 @@ - PROG= tscdrift MAN= diff --git a/tools/tools/umastat/Makefile b/tools/tools/umastat/Makefile index 97ac4cdb32c..29c128b6a86 100644 --- a/tools/tools/umastat/Makefile +++ b/tools/tools/umastat/Makefile @@ -1,4 +1,3 @@ - PROG= umastat MAN= WARNS?= 3 diff --git a/tools/tools/vimage/Makefile b/tools/tools/vimage/Makefile index a52562abfd6..0536413b26f 100644 --- a/tools/tools/vimage/Makefile +++ b/tools/tools/vimage/Makefile @@ -1,4 +1,3 @@ - PROG= vimage LIBADD= jail diff --git a/tools/tools/vt/mkkfont/Makefile b/tools/tools/vt/mkkfont/Makefile index 3044eff66c3..f9758be0ef1 100644 --- a/tools/tools/vt/mkkfont/Makefile +++ b/tools/tools/vt/mkkfont/Makefile @@ -1,4 +1,3 @@ - PROG= mkkfont MAN1= diff --git a/tools/tools/whereintheworld/Makefile b/tools/tools/whereintheworld/Makefile index 374a2196df1..96e3d7eabe3 100644 --- a/tools/tools/whereintheworld/Makefile +++ b/tools/tools/whereintheworld/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= whereintheworld.pl .include diff --git a/tools/tools/wtap/Makefile b/tools/tools/wtap/Makefile index e34cb2e325a..24768af795e 100644 --- a/tools/tools/wtap/Makefile +++ b/tools/tools/wtap/Makefile @@ -1,4 +1,3 @@ - SUBDIR= wtap vis_map .include diff --git a/tools/tools/wtap/vis_map/Makefile b/tools/tools/wtap/vis_map/Makefile index 41c1c643754..4510ccc6ae7 100644 --- a/tools/tools/wtap/vis_map/Makefile +++ b/tools/tools/wtap/vis_map/Makefile @@ -1,4 +1,3 @@ - BINDIR?= /usr/local/bin/ PROG= vis_map SRC= vis_map.c diff --git a/tools/tools/wtap/wtap/Makefile b/tools/tools/wtap/wtap/Makefile index 9cc83c77d04..9d66f6d6436 100644 --- a/tools/tools/wtap/wtap/Makefile +++ b/tools/tools/wtap/wtap/Makefile @@ -1,4 +1,3 @@ - BINDIR?= /usr/local/bin PROG= wtap SRC= wtap.c diff --git a/tools/tools/zfsboottest/Makefile b/tools/tools/zfsboottest/Makefile index cc8f0ab7860..458e39aab6c 100644 --- a/tools/tools/zfsboottest/Makefile +++ b/tools/tools/zfsboottest/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/stand/zfs ${SRCTOP}/sys/cddl/boot/zfs BINDIR?= /usr/bin diff --git a/usr.bin/Makefile b/usr.bin/Makefile index a9d5c156379..039dd8ed2f8 100644 --- a/usr.bin/Makefile +++ b/usr.bin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= alias \ diff --git a/usr.bin/Makefile.amd64 b/usr.bin/Makefile.amd64 index cf4d9c94d05..8763d7fe0f2 100644 --- a/usr.bin/Makefile.amd64 +++ b/usr.bin/Makefile.amd64 @@ -1,2 +1 @@ - SUBDIR+= smbutil diff --git a/usr.bin/Makefile.arm b/usr.bin/Makefile.arm index 8b137891791..e69de29bb2d 100644 --- a/usr.bin/Makefile.arm +++ b/usr.bin/Makefile.arm @@ -1 +0,0 @@ - diff --git a/usr.bin/Makefile.i386 b/usr.bin/Makefile.i386 index cf4d9c94d05..8763d7fe0f2 100644 --- a/usr.bin/Makefile.i386 +++ b/usr.bin/Makefile.i386 @@ -1,2 +1 @@ - SUBDIR+= smbutil diff --git a/usr.bin/Makefile.inc b/usr.bin/Makefile.inc index ff74a2dff9c..c24c4b1a950 100644 --- a/usr.bin/Makefile.inc +++ b/usr.bin/Makefile.inc @@ -1,2 +1 @@ - BINDIR?= /usr/bin diff --git a/usr.bin/Makefile.powerpc b/usr.bin/Makefile.powerpc index cf4d9c94d05..8763d7fe0f2 100644 --- a/usr.bin/Makefile.powerpc +++ b/usr.bin/Makefile.powerpc @@ -1,2 +1 @@ - SUBDIR+= smbutil diff --git a/usr.bin/addr2line/Makefile b/usr.bin/addr2line/Makefile index 1451823b1f8..65228215226 100644 --- a/usr.bin/addr2line/Makefile +++ b/usr.bin/addr2line/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/alias/Makefile b/usr.bin/alias/Makefile index 01fa422fdd2..1098c7b7ef1 100644 --- a/usr.bin/alias/Makefile +++ b/usr.bin/alias/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=generic.sh SCRIPTSNAME=alias diff --git a/usr.bin/apply/Makefile b/usr.bin/apply/Makefile index 50c224496ef..86852d41d27 100644 --- a/usr.bin/apply/Makefile +++ b/usr.bin/apply/Makefile @@ -1,4 +1,3 @@ - .include PROG= apply diff --git a/usr.bin/apply/tests/Makefile b/usr.bin/apply/tests/Makefile index 0a15f37c4ef..249b76b63fc 100644 --- a/usr.bin/apply/tests/Makefile +++ b/usr.bin/apply/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/ar/Makefile b/usr.bin/ar/Makefile index 43ef14a2884..b926e942795 100644 --- a/usr.bin/ar/Makefile +++ b/usr.bin/ar/Makefile @@ -1,4 +1,3 @@ - .include PROG= ar diff --git a/usr.bin/at/Makefile b/usr.bin/at/Makefile index 23e8e3c1da7..daf93c47298 100644 --- a/usr.bin/at/Makefile +++ b/usr.bin/at/Makefile @@ -1,4 +1,3 @@ - .include "${.CURDIR}/Makefile.inc" CONFS= atrun diff --git a/usr.bin/at/Makefile.inc b/usr.bin/at/Makefile.inc index f7ca73a9823..903b7a9c999 100644 --- a/usr.bin/at/Makefile.inc +++ b/usr.bin/at/Makefile.inc @@ -1,4 +1,3 @@ - LOCKFILE = .lockfile ATSPOOL_DIR=/var/at/spool ATJOB_DIR=/var/at/jobs diff --git a/usr.bin/awk/Makefile b/usr.bin/awk/Makefile index 199c05de520..c9d61e59414 100644 --- a/usr.bin/awk/Makefile +++ b/usr.bin/awk/Makefile @@ -1,4 +1,3 @@ - .include AWKSRC= ${SRCTOP}/contrib/one-true-awk diff --git a/usr.bin/awk/tests/Makefile b/usr.bin/awk/tests/Makefile index 5493aa743e1..f9196563341 100644 --- a/usr.bin/awk/tests/Makefile +++ b/usr.bin/awk/tests/Makefile @@ -1,4 +1,3 @@ - .include TESTS_SUBDIRS+= bugs-fixed diff --git a/usr.bin/awk/tests/bugs-fixed/Makefile b/usr.bin/awk/tests/bugs-fixed/Makefile index 190066426e6..62606964762 100644 --- a/usr.bin/awk/tests/bugs-fixed/Makefile +++ b/usr.bin/awk/tests/bugs-fixed/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/awk/${.CURDIR:T} diff --git a/usr.bin/awk/tests/netbsd/Makefile b/usr.bin/awk/tests/netbsd/Makefile index a2130512885..5357b99dd97 100644 --- a/usr.bin/awk/tests/netbsd/Makefile +++ b/usr.bin/awk/tests/netbsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/awk/${.CURDIR:T} diff --git a/usr.bin/backlight/Makefile b/usr.bin/backlight/Makefile index 218d2189de7..f1b310bb1e7 100644 --- a/usr.bin/backlight/Makefile +++ b/usr.bin/backlight/Makefile @@ -1,4 +1,3 @@ - PROG= backlight MAN= backlight.8 diff --git a/usr.bin/banner/Makefile b/usr.bin/banner/Makefile index cd51944e825..f3af9a652f5 100644 --- a/usr.bin/banner/Makefile +++ b/usr.bin/banner/Makefile @@ -1,4 +1,3 @@ - PROG= banner MAN= banner.6 diff --git a/usr.bin/basename/Makefile b/usr.bin/basename/Makefile index f1a729df2dd..fb590532152 100644 --- a/usr.bin/basename/Makefile +++ b/usr.bin/basename/Makefile @@ -1,4 +1,3 @@ - .include PROG= basename diff --git a/usr.bin/basename/tests/Makefile b/usr.bin/basename/tests/Makefile index 3bdacfad80a..a2cd60c6d0c 100644 --- a/usr.bin/basename/tests/Makefile +++ b/usr.bin/basename/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= basename_test .include diff --git a/usr.bin/beep/Makefile b/usr.bin/beep/Makefile index 6b60c7191d0..f252ab64f84 100644 --- a/usr.bin/beep/Makefile +++ b/usr.bin/beep/Makefile @@ -1,4 +1,3 @@ - PROG= beep MAN= beep.1 diff --git a/usr.bin/biff/Makefile b/usr.bin/biff/Makefile index 9e20c4580fc..6ba161554cc 100644 --- a/usr.bin/biff/Makefile +++ b/usr.bin/biff/Makefile @@ -1,4 +1,3 @@ - PROG= biff .include diff --git a/usr.bin/bintrans/Makefile b/usr.bin/bintrans/Makefile index 751e66dab55..9e5a0000b0a 100644 --- a/usr.bin/bintrans/Makefile +++ b/usr.bin/bintrans/Makefile @@ -1,4 +1,3 @@ - .include PROG= bintrans diff --git a/usr.bin/bintrans/tests/Makefile b/usr.bin/bintrans/tests/Makefile index 5e3c0457bb2..8aa936c6133 100644 --- a/usr.bin/bintrans/tests/Makefile +++ b/usr.bin/bintrans/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= bintrans_test diff --git a/usr.bin/bluetooth/Makefile.inc b/usr.bin/bluetooth/Makefile.inc index 1a5ecfe7325..de15587ee7c 100644 --- a/usr.bin/bluetooth/Makefile.inc +++ b/usr.bin/bluetooth/Makefile.inc @@ -1,3 +1,2 @@ - .include "${SRCTOP}/usr.bin/Makefile.inc" diff --git a/usr.bin/bmake/Makefile.inc b/usr.bin/bmake/Makefile.inc index d6c21bed76b..5140bd18bb3 100644 --- a/usr.bin/bmake/Makefile.inc +++ b/usr.bin/bmake/Makefile.inc @@ -1,4 +1,3 @@ - # we do not need this MK_host_egacy= no diff --git a/usr.bin/bmake/tests/Makefile b/usr.bin/bmake/tests/Makefile index 99b4f1302c1..4dabc8879b4 100644 --- a/usr.bin/bmake/tests/Makefile +++ b/usr.bin/bmake/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ${PACKAGE}FILES+= common.sh diff --git a/usr.bin/bmake/tests/Makefile.inc b/usr.bin/bmake/tests/Makefile.inc index 9ba2ea555e2..eb3565f76d5 100644 --- a/usr.bin/bmake/tests/Makefile.inc +++ b/usr.bin/bmake/tests/Makefile.inc @@ -1,2 +1 @@ - SUBDIR_PARALLEL= t diff --git a/usr.bin/bmake/tests/archives/Makefile b/usr.bin/bmake/tests/archives/Makefile index 6cbb7281142..01437afa8c3 100644 --- a/usr.bin/bmake/tests/archives/Makefile +++ b/usr.bin/bmake/tests/archives/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives TESTS_SUBDIRS= fmt_44bsd fmt_44bsd_mod fmt_oldbsd diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile index 87a871e4878..7afea8dd044 100644 --- a/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_44bsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd diff --git a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile index 2ff5d66b42e..ec8d7437ae9 100644 --- a/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_44bsd_mod/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_44bsd_mod diff --git a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile index b1f4f4fc93f..f30bfd2ed5d 100644 --- a/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile +++ b/usr.bin/bmake/tests/archives/fmt_oldbsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/archives/fmt_oldbsd diff --git a/usr.bin/bmake/tests/basic/Makefile b/usr.bin/bmake/tests/basic/Makefile index c5d6ae81c15..129ca34c06f 100644 --- a/usr.bin/bmake/tests/basic/Makefile +++ b/usr.bin/bmake/tests/basic/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic TESTS_SUBDIRS= t0 t1 t2 t3 diff --git a/usr.bin/bmake/tests/basic/t0/Makefile b/usr.bin/bmake/tests/basic/t0/Makefile index d4a2e277304..6f7cf0fec6f 100644 --- a/usr.bin/bmake/tests/basic/t0/Makefile +++ b/usr.bin/bmake/tests/basic/t0/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t0 diff --git a/usr.bin/bmake/tests/basic/t1/Makefile b/usr.bin/bmake/tests/basic/t1/Makefile index 250b3ea1bb1..921c35705f2 100644 --- a/usr.bin/bmake/tests/basic/t1/Makefile +++ b/usr.bin/bmake/tests/basic/t1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t1 diff --git a/usr.bin/bmake/tests/basic/t2/Makefile b/usr.bin/bmake/tests/basic/t2/Makefile index 22020462dbe..c75e752580b 100644 --- a/usr.bin/bmake/tests/basic/t2/Makefile +++ b/usr.bin/bmake/tests/basic/t2/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t2 diff --git a/usr.bin/bmake/tests/basic/t3/Makefile b/usr.bin/bmake/tests/basic/t3/Makefile index ed9e68a2772..292071adcbc 100644 --- a/usr.bin/bmake/tests/basic/t3/Makefile +++ b/usr.bin/bmake/tests/basic/t3/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/basic/t3 diff --git a/usr.bin/bmake/tests/execution/Makefile b/usr.bin/bmake/tests/execution/Makefile index 390ae91ed12..c979fd447b8 100644 --- a/usr.bin/bmake/tests/execution/Makefile +++ b/usr.bin/bmake/tests/execution/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution TESTS_SUBDIRS= ellipsis empty joberr plus diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile b/usr.bin/bmake/tests/execution/ellipsis/Makefile index 3e0d23356a3..b4f9a036255 100644 --- a/usr.bin/bmake/tests/execution/ellipsis/Makefile +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/ellipsis diff --git a/usr.bin/bmake/tests/execution/ellipsis/Makefile.test b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test index df42c0a516f..a208171e29a 100644 --- a/usr.bin/bmake/tests/execution/ellipsis/Makefile.test +++ b/usr.bin/bmake/tests/execution/ellipsis/Makefile.test @@ -1,4 +1,3 @@ - ELLIPSIS= ... check-ellipsis: diff --git a/usr.bin/bmake/tests/execution/empty/Makefile b/usr.bin/bmake/tests/execution/empty/Makefile index 65cb11055a6..0917b288101 100644 --- a/usr.bin/bmake/tests/execution/empty/Makefile +++ b/usr.bin/bmake/tests/execution/empty/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/empty diff --git a/usr.bin/bmake/tests/execution/empty/Makefile.test b/usr.bin/bmake/tests/execution/empty/Makefile.test index ff169c5324c..d7567955e6d 100644 --- a/usr.bin/bmake/tests/execution/empty/Makefile.test +++ b/usr.bin/bmake/tests/execution/empty/Makefile.test @@ -1,4 +1,3 @@ - EMPTY= check-empty: diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile b/usr.bin/bmake/tests/execution/joberr/Makefile index 8d80a596dda..89d93bbee65 100644 --- a/usr.bin/bmake/tests/execution/joberr/Makefile +++ b/usr.bin/bmake/tests/execution/joberr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/joberr diff --git a/usr.bin/bmake/tests/execution/joberr/Makefile.test b/usr.bin/bmake/tests/execution/joberr/Makefile.test index 74a5a2488c5..8849a3d3965 100644 --- a/usr.bin/bmake/tests/execution/joberr/Makefile.test +++ b/usr.bin/bmake/tests/execution/joberr/Makefile.test @@ -1,4 +1,3 @@ - check-joberr: .for _t in 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 @-${MAKE} -f ${MAKEFILE} -j2 do-$@ diff --git a/usr.bin/bmake/tests/execution/plus/Makefile b/usr.bin/bmake/tests/execution/plus/Makefile index 565e290a474..1e7ea12a087 100644 --- a/usr.bin/bmake/tests/execution/plus/Makefile +++ b/usr.bin/bmake/tests/execution/plus/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/execution/plus diff --git a/usr.bin/bmake/tests/execution/plus/Makefile.test b/usr.bin/bmake/tests/execution/plus/Makefile.test index 593092dd30f..d423d8a7c40 100644 --- a/usr.bin/bmake/tests/execution/plus/Makefile.test +++ b/usr.bin/bmake/tests/execution/plus/Makefile.test @@ -1,4 +1,3 @@ - check-+: @${MAKE} -f ${MAKEFILE} -j2 -n do-$@ diff --git a/usr.bin/bmake/tests/shell/Makefile b/usr.bin/bmake/tests/shell/Makefile index d844f811971..7d15b940f41 100644 --- a/usr.bin/bmake/tests/shell/Makefile +++ b/usr.bin/bmake/tests/shell/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell TESTS_SUBDIRS= builtin meta path path_select replace select diff --git a/usr.bin/bmake/tests/shell/builtin/Makefile b/usr.bin/bmake/tests/shell/builtin/Makefile index 66ab3f9dd38..802d4511e56 100644 --- a/usr.bin/bmake/tests/shell/builtin/Makefile +++ b/usr.bin/bmake/tests/shell/builtin/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/builtin diff --git a/usr.bin/bmake/tests/shell/meta/Makefile b/usr.bin/bmake/tests/shell/meta/Makefile index 9cf38507bbe..0fde362c203 100644 --- a/usr.bin/bmake/tests/shell/meta/Makefile +++ b/usr.bin/bmake/tests/shell/meta/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/meta diff --git a/usr.bin/bmake/tests/shell/path/Makefile b/usr.bin/bmake/tests/shell/path/Makefile index 6baf42b2b05..78eae358de7 100644 --- a/usr.bin/bmake/tests/shell/path/Makefile +++ b/usr.bin/bmake/tests/shell/path/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path diff --git a/usr.bin/bmake/tests/shell/path_select/Makefile b/usr.bin/bmake/tests/shell/path_select/Makefile index 5465022615d..15aa45f061a 100644 --- a/usr.bin/bmake/tests/shell/path_select/Makefile +++ b/usr.bin/bmake/tests/shell/path_select/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/path_select diff --git a/usr.bin/bmake/tests/shell/replace/Makefile b/usr.bin/bmake/tests/shell/replace/Makefile index 777770184fe..e2e7ad948db 100644 --- a/usr.bin/bmake/tests/shell/replace/Makefile +++ b/usr.bin/bmake/tests/shell/replace/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/replace diff --git a/usr.bin/bmake/tests/shell/select/Makefile b/usr.bin/bmake/tests/shell/select/Makefile index 1d90d1ebd45..851077c2363 100644 --- a/usr.bin/bmake/tests/shell/select/Makefile +++ b/usr.bin/bmake/tests/shell/select/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/shell/select diff --git a/usr.bin/bmake/tests/suffixes/Makefile b/usr.bin/bmake/tests/suffixes/Makefile index f1a50a8a8af..d8132bcca68 100644 --- a/usr.bin/bmake/tests/suffixes/Makefile +++ b/usr.bin/bmake/tests/suffixes/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes TESTS_SUBDIRS= basic src_wild1 src_wild2 diff --git a/usr.bin/bmake/tests/suffixes/basic/Makefile b/usr.bin/bmake/tests/suffixes/basic/Makefile index 4caac0c8f4e..cfdc32fd8d0 100644 --- a/usr.bin/bmake/tests/suffixes/basic/Makefile +++ b/usr.bin/bmake/tests/suffixes/basic/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/basic diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile index 2c1802671ec..b941895bf79 100644 --- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile +++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild1 diff --git a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test index bd143f315a5..08a9c3ab3cb 100644 --- a/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test +++ b/usr.bin/bmake/tests/suffixes/src_wild1/Makefile.test @@ -1,4 +1,3 @@ - test1: TEST1.b cat TEST1.a TEST2.a | diff -u - TEST1.b diff --git a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile index fa703dd7381..8f048e9b50d 100644 --- a/usr.bin/bmake/tests/suffixes/src_wild2/Makefile +++ b/usr.bin/bmake/tests/suffixes/src_wild2/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/suffixes/src_wild2 diff --git a/usr.bin/bmake/tests/syntax/Makefile b/usr.bin/bmake/tests/syntax/Makefile index cd245affa0f..bed2ece9b2a 100644 --- a/usr.bin/bmake/tests/syntax/Makefile +++ b/usr.bin/bmake/tests/syntax/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax TESTS_SUBDIRS= directive-t0 enl funny-targets semi diff --git a/usr.bin/bmake/tests/syntax/directive-t0/Makefile b/usr.bin/bmake/tests/syntax/directive-t0/Makefile index 60f33418498..62945b572d1 100644 --- a/usr.bin/bmake/tests/syntax/directive-t0/Makefile +++ b/usr.bin/bmake/tests/syntax/directive-t0/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/directive-t0 diff --git a/usr.bin/bmake/tests/syntax/enl/Makefile b/usr.bin/bmake/tests/syntax/enl/Makefile index 31314fda7a7..cab0648e3b8 100644 --- a/usr.bin/bmake/tests/syntax/enl/Makefile +++ b/usr.bin/bmake/tests/syntax/enl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/enl diff --git a/usr.bin/bmake/tests/syntax/funny-targets/Makefile b/usr.bin/bmake/tests/syntax/funny-targets/Makefile index 499d206380c..803e745c65a 100644 --- a/usr.bin/bmake/tests/syntax/funny-targets/Makefile +++ b/usr.bin/bmake/tests/syntax/funny-targets/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/funny-targets diff --git a/usr.bin/bmake/tests/syntax/semi/Makefile b/usr.bin/bmake/tests/syntax/semi/Makefile index 5f132569389..0af26aed75e 100644 --- a/usr.bin/bmake/tests/syntax/semi/Makefile +++ b/usr.bin/bmake/tests/syntax/semi/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/syntax/semi diff --git a/usr.bin/bmake/tests/sysmk/Makefile b/usr.bin/bmake/tests/sysmk/Makefile index 464bb9246a8..302e8059d0e 100644 --- a/usr.bin/bmake/tests/sysmk/Makefile +++ b/usr.bin/bmake/tests/sysmk/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk TESTS_SUBDIRS= t0 t1 t2 diff --git a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile index 2bf2389e23a..69c6ecb522f 100644 --- a/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/2/1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t0/2/Makefile b/usr.bin/bmake/tests/sysmk/t0/2/Makefile index 447cd7efad4..9fbcc952712 100644 --- a/usr.bin/bmake/tests/sysmk/t0/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/bmake/tests/sysmk/t0/Makefile b/usr.bin/bmake/tests/sysmk/t0/Makefile index 61eb371efca..0ffd2fe9edd 100644 --- a/usr.bin/bmake/tests/sysmk/t0/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0 TESTS_SUBDIRS= 2 diff --git a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile index 7a939736030..b02918923a3 100644 --- a/usr.bin/bmake/tests/sysmk/t0/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t0/mk/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t0/mk diff --git a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile index 9b9c390136c..5e448e91e48 100644 --- a/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/2/1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t1/2/Makefile b/usr.bin/bmake/tests/sysmk/t1/2/Makefile index 6d3495e9f9d..652066ddea0 100644 --- a/usr.bin/bmake/tests/sysmk/t1/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/bmake/tests/sysmk/t1/Makefile b/usr.bin/bmake/tests/sysmk/t1/Makefile index 9992c1ec7df..07a2962e6f4 100644 --- a/usr.bin/bmake/tests/sysmk/t1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1 TESTS_SUBDIRS= 2 diff --git a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile index aa2e39da116..3d9597d8580 100644 --- a/usr.bin/bmake/tests/sysmk/t1/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t1/mk/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t1/mk diff --git a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile index 362d2f58e4d..a3b7a56993b 100644 --- a/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/2/1/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2/1 diff --git a/usr.bin/bmake/tests/sysmk/t2/2/Makefile b/usr.bin/bmake/tests/sysmk/t2/2/Makefile index ba4e042e1ad..04a4f5b41bc 100644 --- a/usr.bin/bmake/tests/sysmk/t2/2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/2 TESTS_SUBDIRS= 1 diff --git a/usr.bin/bmake/tests/sysmk/t2/Makefile b/usr.bin/bmake/tests/sysmk/t2/Makefile index cabdaedc972..9d06ee857c2 100644 --- a/usr.bin/bmake/tests/sysmk/t2/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2 TESTS_SUBDIRS= 2 diff --git a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile index 64659a01724..2f08ba2cea5 100644 --- a/usr.bin/bmake/tests/sysmk/t2/mk/Makefile +++ b/usr.bin/bmake/tests/sysmk/t2/mk/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/sysmk/t2/mk diff --git a/usr.bin/bmake/tests/variables/Makefile b/usr.bin/bmake/tests/variables/Makefile index 2d5c9590d8d..f138b4b0c43 100644 --- a/usr.bin/bmake/tests/variables/Makefile +++ b/usr.bin/bmake/tests/variables/Makefile @@ -1,4 +1,3 @@ - TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables TESTS_SUBDIRS= modifier_M modifier_t opt_V t0 diff --git a/usr.bin/bmake/tests/variables/modifier_M/Makefile b/usr.bin/bmake/tests/variables/modifier_M/Makefile index 6969977ab1b..484de9de0bd 100644 --- a/usr.bin/bmake/tests/variables/modifier_M/Makefile +++ b/usr.bin/bmake/tests/variables/modifier_M/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_M diff --git a/usr.bin/bmake/tests/variables/modifier_t/Makefile b/usr.bin/bmake/tests/variables/modifier_t/Makefile index 6d1432cb517..2553e4517c4 100644 --- a/usr.bin/bmake/tests/variables/modifier_t/Makefile +++ b/usr.bin/bmake/tests/variables/modifier_t/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/modifier_t diff --git a/usr.bin/bmake/tests/variables/opt_V/Makefile b/usr.bin/bmake/tests/variables/opt_V/Makefile index 1277ee0c4b9..534b3e4246f 100644 --- a/usr.bin/bmake/tests/variables/opt_V/Makefile +++ b/usr.bin/bmake/tests/variables/opt_V/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/opt_V diff --git a/usr.bin/bmake/tests/variables/t0/Makefile b/usr.bin/bmake/tests/variables/t0/Makefile index 99b8975adfe..7cf7bd7dac9 100644 --- a/usr.bin/bmake/tests/variables/t0/Makefile +++ b/usr.bin/bmake/tests/variables/t0/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/bmake/variables/t0 diff --git a/usr.bin/brandelf/Makefile b/usr.bin/brandelf/Makefile index 919cb95ae83..8c80ff80531 100644 --- a/usr.bin/brandelf/Makefile +++ b/usr.bin/brandelf/Makefile @@ -1,4 +1,3 @@ - .include PROG= brandelf diff --git a/usr.bin/bsdcat/Makefile b/usr.bin/bsdcat/Makefile index 8e730e634ea..032207217be 100644 --- a/usr.bin/bsdcat/Makefile +++ b/usr.bin/bsdcat/Makefile @@ -1,4 +1,3 @@ - .include _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/bsdcat/tests/Makefile b/usr.bin/bsdcat/tests/Makefile index 02382137aa1..c323da34e08 100644 --- a/usr.bin/bsdcat/tests/Makefile +++ b/usr.bin/bsdcat/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/bsdiff/Makefile b/usr.bin/bsdiff/Makefile index e6cc5d28cce..ed9dd0f8db5 100644 --- a/usr.bin/bsdiff/Makefile +++ b/usr.bin/bsdiff/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bsdiff bspatch .include diff --git a/usr.bin/bsdiff/Makefile.inc b/usr.bin/bsdiff/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/usr.bin/bsdiff/Makefile.inc +++ b/usr.bin/bsdiff/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.bin/bsdiff/bsdiff/Makefile b/usr.bin/bsdiff/bsdiff/Makefile index 250fe6f5e5a..7af4fc873e1 100644 --- a/usr.bin/bsdiff/bsdiff/Makefile +++ b/usr.bin/bsdiff/bsdiff/Makefile @@ -1,4 +1,3 @@ - PROG= bsdiff # libdivsufsort configured with: diff --git a/usr.bin/bsdiff/bspatch/Makefile b/usr.bin/bsdiff/bspatch/Makefile index b034321f148..12b67fe9757 100644 --- a/usr.bin/bsdiff/bspatch/Makefile +++ b/usr.bin/bsdiff/bspatch/Makefile @@ -1,4 +1,3 @@ - PROG= bspatch LIBADD= bz2 diff --git a/usr.bin/bzip2/Makefile b/usr.bin/bzip2/Makefile index f2d20363056..99679cc00c4 100644 --- a/usr.bin/bzip2/Makefile +++ b/usr.bin/bzip2/Makefile @@ -1,4 +1,3 @@ - BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/usr.bin/bzip2recover/Makefile b/usr.bin/bzip2recover/Makefile index 0edf208aa46..2b11d3a4569 100644 --- a/usr.bin/bzip2recover/Makefile +++ b/usr.bin/bzip2recover/Makefile @@ -1,4 +1,3 @@ - BZ2DIR= ${SRCTOP}/contrib/bzip2 .PATH: ${BZ2DIR} diff --git a/usr.bin/c89/Makefile b/usr.bin/c89/Makefile index 35565c08546..325588a3d7a 100644 --- a/usr.bin/c89/Makefile +++ b/usr.bin/c89/Makefile @@ -1,4 +1,3 @@ - PROG= c89 .include diff --git a/usr.bin/c99/Makefile b/usr.bin/c99/Makefile index 3ab880777da..98be921c974 100644 --- a/usr.bin/c99/Makefile +++ b/usr.bin/c99/Makefile @@ -1,4 +1,3 @@ - PROG= c99 .include diff --git a/usr.bin/caesar/Makefile b/usr.bin/caesar/Makefile index e9b1d371a6f..e7496fbb292 100644 --- a/usr.bin/caesar/Makefile +++ b/usr.bin/caesar/Makefile @@ -1,4 +1,3 @@ - PACKAGE= games PROG= caesar diff --git a/usr.bin/calendar/Makefile b/usr.bin/calendar/Makefile index 8d5851cc089..d931f2f837d 100644 --- a/usr.bin/calendar/Makefile +++ b/usr.bin/calendar/Makefile @@ -1,4 +1,3 @@ - .include PROG= calendar diff --git a/usr.bin/calendar/tests/Makefile b/usr.bin/calendar/tests/Makefile index e24527f8ce1..24ab9572413 100644 --- a/usr.bin/calendar/tests/Makefile +++ b/usr.bin/calendar/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= comment_test cond_test legacy_test diff --git a/usr.bin/cap_mkdb/Makefile b/usr.bin/cap_mkdb/Makefile index 45d3f020504..4beb70d551b 100644 --- a/usr.bin/cap_mkdb/Makefile +++ b/usr.bin/cap_mkdb/Makefile @@ -1,4 +1,3 @@ - PROG= cap_mkdb .include diff --git a/usr.bin/chat/Makefile b/usr.bin/chat/Makefile index 36d33fc34a1..dfe76f71aba 100644 --- a/usr.bin/chat/Makefile +++ b/usr.bin/chat/Makefile @@ -1,4 +1,3 @@ - # I once used this extensively, but no longer have a modem. Feel free # to ask me questions about it, but I disclaim ownership now. -Peter diff --git a/usr.bin/chkey/Makefile b/usr.bin/chkey/Makefile index 7ab2ec431b7..4b734787c0a 100644 --- a/usr.bin/chkey/Makefile +++ b/usr.bin/chkey/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/newkey diff --git a/usr.bin/chpass/Makefile b/usr.bin/chpass/Makefile index a8ab10a19ce..0bf39deeab8 100644 --- a/usr.bin/chpass/Makefile +++ b/usr.bin/chpass/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/lib/libc/gen diff --git a/usr.bin/cksum/Makefile b/usr.bin/cksum/Makefile index a6f35aca0b8..c8d34f7fe5d 100644 --- a/usr.bin/cksum/Makefile +++ b/usr.bin/cksum/Makefile @@ -1,4 +1,3 @@ - PROG= cksum SRCS= cksum.c crc.c print.c sum1.c sum2.c crc32.c LINKS= ${BINDIR}/cksum ${BINDIR}/sum diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index 30ec1ab65e0..a0cc015590f 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -1,4 +1,3 @@ - .include .if ${MK_CLANG} != "no" diff --git a/usr.bin/clang/Makefile.inc b/usr.bin/clang/Makefile.inc index 99e993b57cb..bf9fad4032e 100644 --- a/usr.bin/clang/Makefile.inc +++ b/usr.bin/clang/Makefile.inc @@ -1,4 +1,3 @@ - .include MK_PIE:= no # Explicit libXXX.a references diff --git a/usr.bin/clang/bugpoint/Makefile b/usr.bin/clang/bugpoint/Makefile index 909254c4492..700cc6a3c78 100644 --- a/usr.bin/clang/bugpoint/Makefile +++ b/usr.bin/clang/bugpoint/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= bugpoint SRCDIR= llvm/tools/bugpoint diff --git a/usr.bin/clang/clang-format/Makefile b/usr.bin/clang/clang-format/Makefile index 1595c750683..8b69ba5294c 100644 --- a/usr.bin/clang/clang-format/Makefile +++ b/usr.bin/clang/clang-format/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= clang-format MAN= diff --git a/usr.bin/clang/clang-tblgen/Makefile b/usr.bin/clang/clang-tblgen/Makefile index 8fab4c4a17e..5963da3a2e8 100644 --- a/usr.bin/clang/clang-tblgen/Makefile +++ b/usr.bin/clang/clang-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= clang-tblgen MAN= diff --git a/usr.bin/clang/clang/Makefile b/usr.bin/clang/clang/Makefile index a271a8e9e4e..50806483b39 100644 --- a/usr.bin/clang/clang/Makefile +++ b/usr.bin/clang/clang/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= clang diff --git a/usr.bin/clang/llc/Makefile b/usr.bin/clang/llc/Makefile index c154974715a..ed5c8090792 100644 --- a/usr.bin/clang/llc/Makefile +++ b/usr.bin/clang/llc/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llc SRCDIR= llvm/tools/llc diff --git a/usr.bin/clang/lld/Makefile b/usr.bin/clang/lld/Makefile index 8fbc41ee992..1c99bd71606 100644 --- a/usr.bin/clang/lld/Makefile +++ b/usr.bin/clang/lld/Makefile @@ -1,4 +1,3 @@ - .include LLVM_BASE= ${SRCTOP}/contrib/llvm-project diff --git a/usr.bin/clang/lldb-server/Makefile b/usr.bin/clang/lldb-server/Makefile index 3a16c470fe2..b4d6131d81a 100644 --- a/usr.bin/clang/lldb-server/Makefile +++ b/usr.bin/clang/lldb-server/Makefile @@ -1,4 +1,3 @@ - .include "${SRCTOP}/lib/clang/lldb.pre.mk" PACKAGE= lldb diff --git a/usr.bin/clang/lldb-tblgen/Makefile b/usr.bin/clang/lldb-tblgen/Makefile index 49e6a61f841..2a069939e19 100644 --- a/usr.bin/clang/lldb-tblgen/Makefile +++ b/usr.bin/clang/lldb-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= lldb-tblgen MAN= diff --git a/usr.bin/clang/lldb/Makefile b/usr.bin/clang/lldb/Makefile index f9c09c8d697..4f01b1d8f0e 100644 --- a/usr.bin/clang/lldb/Makefile +++ b/usr.bin/clang/lldb/Makefile @@ -1,4 +1,3 @@ - .include "${SRCTOP}/lib/clang/lldb.pre.mk" PACKAGE= lldb diff --git a/usr.bin/clang/lli/Makefile b/usr.bin/clang/lli/Makefile index 6fe2b673ee3..eed2d8b874b 100644 --- a/usr.bin/clang/lli/Makefile +++ b/usr.bin/clang/lli/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= lli SRCDIR= llvm/tools/lli diff --git a/usr.bin/clang/llvm-ar/Makefile b/usr.bin/clang/llvm-ar/Makefile index 0414542fa5f..fd12b1ddef5 100644 --- a/usr.bin/clang/llvm-ar/Makefile +++ b/usr.bin/clang/llvm-ar/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-ar diff --git a/usr.bin/clang/llvm-as/Makefile b/usr.bin/clang/llvm-as/Makefile index d96120311da..e6a6edfdb86 100644 --- a/usr.bin/clang/llvm-as/Makefile +++ b/usr.bin/clang/llvm-as/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-as SRCDIR= llvm/tools/llvm-as diff --git a/usr.bin/clang/llvm-bcanalyzer/Makefile b/usr.bin/clang/llvm-bcanalyzer/Makefile index e17ddedaf8a..2c796a362f5 100644 --- a/usr.bin/clang/llvm-bcanalyzer/Makefile +++ b/usr.bin/clang/llvm-bcanalyzer/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-bcanalyzer SRCDIR= llvm/tools/llvm-bcanalyzer diff --git a/usr.bin/clang/llvm-cov/Makefile b/usr.bin/clang/llvm-cov/Makefile index b0d0d43cffb..3eb14eb3713 100644 --- a/usr.bin/clang/llvm-cov/Makefile +++ b/usr.bin/clang/llvm-cov/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-cov diff --git a/usr.bin/clang/llvm-cxxdump/Makefile b/usr.bin/clang/llvm-cxxdump/Makefile index 13098a0c40c..40fccfefdaf 100644 --- a/usr.bin/clang/llvm-cxxdump/Makefile +++ b/usr.bin/clang/llvm-cxxdump/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-cxxdump MAN= diff --git a/usr.bin/clang/llvm-cxxfilt/Makefile b/usr.bin/clang/llvm-cxxfilt/Makefile index 05d29f9fab4..f9621da8da8 100644 --- a/usr.bin/clang/llvm-cxxfilt/Makefile +++ b/usr.bin/clang/llvm-cxxfilt/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-cxxfilt diff --git a/usr.bin/clang/llvm-diff/Makefile b/usr.bin/clang/llvm-diff/Makefile index b7180b97b4e..90eddc9551d 100644 --- a/usr.bin/clang/llvm-diff/Makefile +++ b/usr.bin/clang/llvm-diff/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-diff SRCDIR= llvm/tools/llvm-diff diff --git a/usr.bin/clang/llvm-dis/Makefile b/usr.bin/clang/llvm-dis/Makefile index dc8b796d366..a290c4647c3 100644 --- a/usr.bin/clang/llvm-dis/Makefile +++ b/usr.bin/clang/llvm-dis/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dis SRCDIR= llvm/tools/llvm-dis diff --git a/usr.bin/clang/llvm-dwarfdump/Makefile b/usr.bin/clang/llvm-dwarfdump/Makefile index ac330d00e31..cdbf9822b2a 100644 --- a/usr.bin/clang/llvm-dwarfdump/Makefile +++ b/usr.bin/clang/llvm-dwarfdump/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dwarfdump SRCDIR= llvm/tools/llvm-dwarfdump diff --git a/usr.bin/clang/llvm-dwarfutil/Makefile b/usr.bin/clang/llvm-dwarfutil/Makefile index e97e37dda06..884ce922492 100644 --- a/usr.bin/clang/llvm-dwarfutil/Makefile +++ b/usr.bin/clang/llvm-dwarfutil/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dwarfutil SRCDIR= llvm/tools/llvm-dwarfutil diff --git a/usr.bin/clang/llvm-dwp/Makefile b/usr.bin/clang/llvm-dwp/Makefile index fb1bc133803..1d66929143e 100644 --- a/usr.bin/clang/llvm-dwp/Makefile +++ b/usr.bin/clang/llvm-dwp/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-dwp MAN= diff --git a/usr.bin/clang/llvm-extract/Makefile b/usr.bin/clang/llvm-extract/Makefile index 780c2ee0bd1..898414d0fca 100644 --- a/usr.bin/clang/llvm-extract/Makefile +++ b/usr.bin/clang/llvm-extract/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-extract SRCDIR= llvm/tools/llvm-extract diff --git a/usr.bin/clang/llvm-link/Makefile b/usr.bin/clang/llvm-link/Makefile index 7d736049275..a83de498fd3 100644 --- a/usr.bin/clang/llvm-link/Makefile +++ b/usr.bin/clang/llvm-link/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-link SRCDIR= llvm/tools/llvm-link diff --git a/usr.bin/clang/llvm-lto/Makefile b/usr.bin/clang/llvm-lto/Makefile index 3209016e849..8793b8e6a67 100644 --- a/usr.bin/clang/llvm-lto/Makefile +++ b/usr.bin/clang/llvm-lto/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-lto MAN= diff --git a/usr.bin/clang/llvm-lto2/Makefile b/usr.bin/clang/llvm-lto2/Makefile index 354b1df5b97..68c16d42205 100644 --- a/usr.bin/clang/llvm-lto2/Makefile +++ b/usr.bin/clang/llvm-lto2/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-lto2 MAN= diff --git a/usr.bin/clang/llvm-mc/Makefile b/usr.bin/clang/llvm-mc/Makefile index 8970f497159..876720b09b7 100644 --- a/usr.bin/clang/llvm-mc/Makefile +++ b/usr.bin/clang/llvm-mc/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-mc MAN= diff --git a/usr.bin/clang/llvm-mca/Makefile b/usr.bin/clang/llvm-mca/Makefile index 1966418965f..274b7a43e5f 100644 --- a/usr.bin/clang/llvm-mca/Makefile +++ b/usr.bin/clang/llvm-mca/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-mca SRCDIR= llvm/tools/llvm-mca diff --git a/usr.bin/clang/llvm-min-tblgen/Makefile b/usr.bin/clang/llvm-min-tblgen/Makefile index bf8c2f3730f..702184a813c 100644 --- a/usr.bin/clang/llvm-min-tblgen/Makefile +++ b/usr.bin/clang/llvm-min-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-min-tblgen MAN= diff --git a/usr.bin/clang/llvm-modextract/Makefile b/usr.bin/clang/llvm-modextract/Makefile index fe17ff12717..6e9a79a1649 100644 --- a/usr.bin/clang/llvm-modextract/Makefile +++ b/usr.bin/clang/llvm-modextract/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-modextract MAN= diff --git a/usr.bin/clang/llvm-nm/Makefile b/usr.bin/clang/llvm-nm/Makefile index 7b3c3cf03de..825faf74719 100644 --- a/usr.bin/clang/llvm-nm/Makefile +++ b/usr.bin/clang/llvm-nm/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-nm diff --git a/usr.bin/clang/llvm-objcopy/Makefile b/usr.bin/clang/llvm-objcopy/Makefile index 224ebbf528b..fcf59e4b4bc 100644 --- a/usr.bin/clang/llvm-objcopy/Makefile +++ b/usr.bin/clang/llvm-objcopy/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-objcopy diff --git a/usr.bin/clang/llvm-objdump/Makefile b/usr.bin/clang/llvm-objdump/Makefile index 416eb083850..ad1c7beee95 100644 --- a/usr.bin/clang/llvm-objdump/Makefile +++ b/usr.bin/clang/llvm-objdump/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-objdump diff --git a/usr.bin/clang/llvm-pdbutil/Makefile b/usr.bin/clang/llvm-pdbutil/Makefile index aac625fd947..ddbfc91e0b5 100644 --- a/usr.bin/clang/llvm-pdbutil/Makefile +++ b/usr.bin/clang/llvm-pdbutil/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-pdbutil SRCDIR= llvm/tools/llvm-pdbutil diff --git a/usr.bin/clang/llvm-profdata/Makefile b/usr.bin/clang/llvm-profdata/Makefile index 30145cb6315..aba60836da5 100644 --- a/usr.bin/clang/llvm-profdata/Makefile +++ b/usr.bin/clang/llvm-profdata/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-profdata SRCDIR= llvm/tools/llvm-profdata diff --git a/usr.bin/clang/llvm-readobj/Makefile b/usr.bin/clang/llvm-readobj/Makefile index 6d48eebadb4..f532358ea79 100644 --- a/usr.bin/clang/llvm-readobj/Makefile +++ b/usr.bin/clang/llvm-readobj/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-readobj diff --git a/usr.bin/clang/llvm-rtdyld/Makefile b/usr.bin/clang/llvm-rtdyld/Makefile index 4d16b6ca4bd..66f49132417 100644 --- a/usr.bin/clang/llvm-rtdyld/Makefile +++ b/usr.bin/clang/llvm-rtdyld/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-rtdyld MAN= diff --git a/usr.bin/clang/llvm-size/Makefile b/usr.bin/clang/llvm-size/Makefile index cc9f52554bd..2860a006953 100644 --- a/usr.bin/clang/llvm-size/Makefile +++ b/usr.bin/clang/llvm-size/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-size diff --git a/usr.bin/clang/llvm-strings/Makefile b/usr.bin/clang/llvm-strings/Makefile index 78fc8c2922b..f01a012b0cb 100644 --- a/usr.bin/clang/llvm-strings/Makefile +++ b/usr.bin/clang/llvm-strings/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-strings diff --git a/usr.bin/clang/llvm-symbolizer/Makefile b/usr.bin/clang/llvm-symbolizer/Makefile index 53134cc3972..c45300c92a9 100644 --- a/usr.bin/clang/llvm-symbolizer/Makefile +++ b/usr.bin/clang/llvm-symbolizer/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= llvm-symbolizer diff --git a/usr.bin/clang/llvm-tblgen/Makefile b/usr.bin/clang/llvm-tblgen/Makefile index b38a73eb54b..4461fa02083 100644 --- a/usr.bin/clang/llvm-tblgen/Makefile +++ b/usr.bin/clang/llvm-tblgen/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-tblgen MAN= diff --git a/usr.bin/clang/llvm-xray/Makefile b/usr.bin/clang/llvm-xray/Makefile index 423b69b9bb9..43f596b32c0 100644 --- a/usr.bin/clang/llvm-xray/Makefile +++ b/usr.bin/clang/llvm-xray/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= llvm-xray MAN= diff --git a/usr.bin/clang/opt/Makefile b/usr.bin/clang/opt/Makefile index 5c48b802379..b3fdad82ecd 100644 --- a/usr.bin/clang/opt/Makefile +++ b/usr.bin/clang/opt/Makefile @@ -1,4 +1,3 @@ - PROG_CXX= opt SRCDIR= llvm/tools/opt diff --git a/usr.bin/cmp/Makefile b/usr.bin/cmp/Makefile index 09ad93d95cc..6f4720226a3 100644 --- a/usr.bin/cmp/Makefile +++ b/usr.bin/cmp/Makefile @@ -1,4 +1,3 @@ - .include PROG= cmp diff --git a/usr.bin/cmp/tests/Makefile b/usr.bin/cmp/tests/Makefile index 6f00ecddb05..8524fbaee43 100644 --- a/usr.bin/cmp/tests/Makefile +++ b/usr.bin/cmp/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/usr.bin/col/Makefile b/usr.bin/col/Makefile index e154dab740d..ce4cc73337a 100644 --- a/usr.bin/col/Makefile +++ b/usr.bin/col/Makefile @@ -1,4 +1,3 @@ - .include PROG= col diff --git a/usr.bin/col/tests/Makefile b/usr.bin/col/tests/Makefile index 61f394c1e12..c51bd57a565 100644 --- a/usr.bin/col/tests/Makefile +++ b/usr.bin/col/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= col_test diff --git a/usr.bin/colrm/Makefile b/usr.bin/colrm/Makefile index 43048657706..0da3b5a30c3 100644 --- a/usr.bin/colrm/Makefile +++ b/usr.bin/colrm/Makefile @@ -1,4 +1,3 @@ - PROG= colrm .include diff --git a/usr.bin/column/Makefile b/usr.bin/column/Makefile index 27c3bbe291a..b0b88c086b4 100644 --- a/usr.bin/column/Makefile +++ b/usr.bin/column/Makefile @@ -1,4 +1,3 @@ - PROG= column .include diff --git a/usr.bin/comm/Makefile b/usr.bin/comm/Makefile index e48ec9341eb..03eabaf8704 100644 --- a/usr.bin/comm/Makefile +++ b/usr.bin/comm/Makefile @@ -1,4 +1,3 @@ - .include PROG= comm diff --git a/usr.bin/comm/tests/Makefile b/usr.bin/comm/tests/Makefile index 12c3d26d2d5..85ba59ad4cc 100644 --- a/usr.bin/comm/tests/Makefile +++ b/usr.bin/comm/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/compile_et/Makefile b/usr.bin/compile_et/Makefile index e95f9d36391..6305bfe3ddf 100644 --- a/usr.bin/compile_et/Makefile +++ b/usr.bin/compile_et/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/com_err PACKAGE= kerberos diff --git a/usr.bin/compress/Makefile b/usr.bin/compress/Makefile index 8ea375b51f9..1c62ad96a74 100644 --- a/usr.bin/compress/Makefile +++ b/usr.bin/compress/Makefile @@ -1,4 +1,3 @@ - .include PROG= compress diff --git a/usr.bin/compress/tests/Makefile b/usr.bin/compress/tests/Makefile index 570a42f820e..a981110d298 100644 --- a/usr.bin/compress/tests/Makefile +++ b/usr.bin/compress/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= compress_test diff --git a/usr.bin/cpio/Makefile b/usr.bin/cpio/Makefile index b52c9645ebb..46fe36d8c18 100644 --- a/usr.bin/cpio/Makefile +++ b/usr.bin/cpio/Makefile @@ -1,4 +1,3 @@ - .include _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/cpio/tests/Makefile b/usr.bin/cpio/tests/Makefile index a44abfbee84..385112c1a9a 100644 --- a/usr.bin/cpio/tests/Makefile +++ b/usr.bin/cpio/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/csplit/Makefile b/usr.bin/csplit/Makefile index c258d2f859b..4b577b7edf6 100644 --- a/usr.bin/csplit/Makefile +++ b/usr.bin/csplit/Makefile @@ -1,4 +1,3 @@ - .include PROG= csplit diff --git a/usr.bin/csplit/tests/Makefile b/usr.bin/csplit/tests/Makefile index 751ade1e3be..498f68544f6 100644 --- a/usr.bin/csplit/tests/Makefile +++ b/usr.bin/csplit/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= csplit_test diff --git a/usr.bin/ctags/Makefile b/usr.bin/ctags/Makefile index fcc5e158116..a0d0c852291 100644 --- a/usr.bin/ctags/Makefile +++ b/usr.bin/ctags/Makefile @@ -1,4 +1,3 @@ - PROG= ctags SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c CFLAGS+=-I${.CURDIR} diff --git a/usr.bin/ctlstat/Makefile b/usr.bin/ctlstat/Makefile index 876f0114eea..aa7c6f2a264 100644 --- a/usr.bin/ctlstat/Makefile +++ b/usr.bin/ctlstat/Makefile @@ -1,4 +1,3 @@ - PROG= ctlstat MAN= ctlstat.8 SDIR= ${SRCTOP}/sys diff --git a/usr.bin/cut/Makefile b/usr.bin/cut/Makefile index c5e221107a1..bdb5040c21d 100644 --- a/usr.bin/cut/Makefile +++ b/usr.bin/cut/Makefile @@ -1,4 +1,3 @@ - .include PROG= cut diff --git a/usr.bin/cut/tests/Makefile b/usr.bin/cut/tests/Makefile index 598f45e0910..bd02245ced1 100644 --- a/usr.bin/cut/tests/Makefile +++ b/usr.bin/cut/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= cut2_test diff --git a/usr.bin/cxxfilt/Makefile b/usr.bin/cxxfilt/Makefile index 7df2d50104a..fe7fe2d579e 100644 --- a/usr.bin/cxxfilt/Makefile +++ b/usr.bin/cxxfilt/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/dc/tests/Makefile b/usr.bin/dc/tests/Makefile index b990337293f..ac2204e3cba 100644 --- a/usr.bin/dc/tests/Makefile +++ b/usr.bin/dc/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= inout diff --git a/usr.bin/diff/tests/Makefile b/usr.bin/diff/tests/Makefile index 9f3d2991841..242e7626024 100644 --- a/usr.bin/diff/tests/Makefile +++ b/usr.bin/diff/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= diff_test diff --git a/usr.bin/diff3/Makefile b/usr.bin/diff3/Makefile index 1546547dda4..828743d092c 100644 --- a/usr.bin/diff3/Makefile +++ b/usr.bin/diff3/Makefile @@ -1,4 +1,3 @@ - .include PROG= diff3 diff --git a/usr.bin/diff3/tests/Makefile b/usr.bin/diff3/tests/Makefile index 3b720586d14..864f27beede 100644 --- a/usr.bin/diff3/tests/Makefile +++ b/usr.bin/diff3/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= diff3_test diff --git a/usr.bin/dirname/Makefile b/usr.bin/dirname/Makefile index cc420f8ad59..cc7d1a1b16b 100644 --- a/usr.bin/dirname/Makefile +++ b/usr.bin/dirname/Makefile @@ -1,4 +1,3 @@ - .include PROG= dirname diff --git a/usr.bin/dirname/tests/Makefile b/usr.bin/dirname/tests/Makefile index 3d5f97adca7..d254264c899 100644 --- a/usr.bin/dirname/tests/Makefile +++ b/usr.bin/dirname/tests/Makefile @@ -1,4 +1,3 @@ - NETBSD_ATF_TESTS_SH= dirname_test .include diff --git a/usr.bin/dpv/Makefile b/usr.bin/dpv/Makefile index 4aa3a09ae2b..104c865626b 100644 --- a/usr.bin/dpv/Makefile +++ b/usr.bin/dpv/Makefile @@ -1,4 +1,3 @@ - PACKAGE= dpv PROG= dpv diff --git a/usr.bin/drill/Makefile b/usr.bin/drill/Makefile index 9abc05a84d7..0b321765c05 100644 --- a/usr.bin/drill/Makefile +++ b/usr.bin/drill/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns diff --git a/usr.bin/du/Makefile b/usr.bin/du/Makefile index 7fb61d0423d..b12a0544799 100644 --- a/usr.bin/du/Makefile +++ b/usr.bin/du/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/du/tests/Makefile b/usr.bin/du/tests/Makefile index aadebdf5745..678bd616c72 100644 --- a/usr.bin/du/tests/Makefile +++ b/usr.bin/du/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= du_test .include diff --git a/usr.bin/ee/Makefile b/usr.bin/ee/Makefile index 4ffe57c5f29..5f83bf775e4 100644 --- a/usr.bin/ee/Makefile +++ b/usr.bin/ee/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ee CFLAGS+= -DHAS_NCURSES -DHAS_UNISTD -DHAS_STDARG -DHAS_STDLIB \ diff --git a/usr.bin/elfctl/Makefile b/usr.bin/elfctl/Makefile index 57d95899ac9..82d5f3e7c4f 100644 --- a/usr.bin/elfctl/Makefile +++ b/usr.bin/elfctl/Makefile @@ -1,4 +1,3 @@ - ELFTCDIR= ${SRCTOP}/contrib/elftoolchain PROG= elfctl diff --git a/usr.bin/elfdump/Makefile b/usr.bin/elfdump/Makefile index 12d0f5eb7f7..5b48a8b6174 100644 --- a/usr.bin/elfdump/Makefile +++ b/usr.bin/elfdump/Makefile @@ -1,4 +1,3 @@ - PROG= elfdump .include diff --git a/usr.bin/enigma/Makefile b/usr.bin/enigma/Makefile index a43702f2106..d3625d18354 100644 --- a/usr.bin/enigma/Makefile +++ b/usr.bin/enigma/Makefile @@ -1,4 +1,3 @@ - PROG= enigma LINKS= ${BINDIR}/enigma ${BINDIR}/crypt diff --git a/usr.bin/env/Makefile b/usr.bin/env/Makefile index 05899ad4295..81f18e58f80 100644 --- a/usr.bin/env/Makefile +++ b/usr.bin/env/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= env SRCS= env.c envopts.c diff --git a/usr.bin/etdump/Makefile b/usr.bin/etdump/Makefile index 974345967f5..8c451bf2c57 100644 --- a/usr.bin/etdump/Makefile +++ b/usr.bin/etdump/Makefile @@ -1,4 +1,3 @@ - PROG= etdump MAKEFS_SRC= ${SRCTOP}/usr.sbin/makefs diff --git a/usr.bin/expand/Makefile b/usr.bin/expand/Makefile index 25f2e1f9014..bba5bd3e506 100644 --- a/usr.bin/expand/Makefile +++ b/usr.bin/expand/Makefile @@ -1,4 +1,3 @@ - PROG= expand MLINKS= expand.1 unexpand.1 diff --git a/usr.bin/factor/Makefile b/usr.bin/factor/Makefile index 96d9ae4026a..a0109462fcb 100644 --- a/usr.bin/factor/Makefile +++ b/usr.bin/factor/Makefile @@ -1,4 +1,3 @@ - .include PROG= factor diff --git a/usr.bin/false/Makefile b/usr.bin/false/Makefile index 2a6e7e62bb8..79221864a4a 100644 --- a/usr.bin/false/Makefile +++ b/usr.bin/false/Makefile @@ -1,4 +1,3 @@ - PROG= false .include diff --git a/usr.bin/fetch/Makefile b/usr.bin/fetch/Makefile index 9035c6fe16e..a4d50107532 100644 --- a/usr.bin/fetch/Makefile +++ b/usr.bin/fetch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= fetch PROG= fetch LIBADD= fetch diff --git a/usr.bin/file2c/Makefile b/usr.bin/file2c/Makefile index c09447f938e..b71834e1003 100644 --- a/usr.bin/file2c/Makefile +++ b/usr.bin/file2c/Makefile @@ -1,4 +1,3 @@ - .include PROG= file2c diff --git a/usr.bin/file2c/tests/Makefile b/usr.bin/file2c/tests/Makefile index 4370cdbca70..f54e3c5cf27 100644 --- a/usr.bin/file2c/tests/Makefile +++ b/usr.bin/file2c/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/find/Makefile b/usr.bin/find/Makefile index 3a1387c20c1..904c0862083 100644 --- a/usr.bin/find/Makefile +++ b/usr.bin/find/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/find/tests/Makefile b/usr.bin/find/tests/Makefile index 0ebeff9143f..be688347c11 100644 --- a/usr.bin/find/tests/Makefile +++ b/usr.bin/find/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= find_test .include diff --git a/usr.bin/finger/Makefile b/usr.bin/finger/Makefile index 6eb114df249..638a603f9ed 100644 --- a/usr.bin/finger/Makefile +++ b/usr.bin/finger/Makefile @@ -1,4 +1,3 @@ - PROG= finger SRCS= finger.c lprint.c net.c sprint.c util.c MAN= finger.1 finger.conf.5 diff --git a/usr.bin/fmt/Makefile b/usr.bin/fmt/Makefile index 3ad2c94384f..48f96db9ad4 100644 --- a/usr.bin/fmt/Makefile +++ b/usr.bin/fmt/Makefile @@ -1,4 +1,3 @@ - PROG= fmt .include diff --git a/usr.bin/fold/Makefile b/usr.bin/fold/Makefile index 38f75e1a6cb..e7509f024c5 100644 --- a/usr.bin/fold/Makefile +++ b/usr.bin/fold/Makefile @@ -1,4 +1,3 @@ - .include PROG= fold diff --git a/usr.bin/fold/tests/Makefile b/usr.bin/fold/tests/Makefile index e6bf71e8bee..13965aabd0b 100644 --- a/usr.bin/fold/tests/Makefile +++ b/usr.bin/fold/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= fold_test .include diff --git a/usr.bin/fortune/Makefile b/usr.bin/fortune/Makefile index 210747dd3c9..0499a0fa1da 100644 --- a/usr.bin/fortune/Makefile +++ b/usr.bin/fortune/Makefile @@ -1,4 +1,3 @@ - SUBDIR= fortune strfile datfiles unstr SUBDIR_DEPEND_datfiles= strfile diff --git a/usr.bin/fortune/Makefile.inc b/usr.bin/fortune/Makefile.inc index 70a36f8c98c..cc361d4cf07 100644 --- a/usr.bin/fortune/Makefile.inc +++ b/usr.bin/fortune/Makefile.inc @@ -1,4 +1,3 @@ - FORTUNE_SRC= ${SRCTOP}/usr.bin/fortune FORTUNE_OBJ= ${OBJTOP}/usr.bin/fortune diff --git a/usr.bin/fortune/datfiles/Makefile b/usr.bin/fortune/datfiles/Makefile index f035d30be1a..7bf545e298d 100644 --- a/usr.bin/fortune/datfiles/Makefile +++ b/usr.bin/fortune/datfiles/Makefile @@ -1,4 +1,3 @@ - DB= freebsd-tips BLDS= ${DB:S/$/.dat/} diff --git a/usr.bin/fortune/fortune/Makefile b/usr.bin/fortune/fortune/Makefile index c4c013cfc53..c33a68f2295 100644 --- a/usr.bin/fortune/fortune/Makefile +++ b/usr.bin/fortune/fortune/Makefile @@ -1,4 +1,3 @@ - PROG= fortune MAN= fortune.6 CFLAGS+=-DDEBUG -I${FORTUNE_SRC}/strfile diff --git a/usr.bin/fortune/strfile/Makefile b/usr.bin/fortune/strfile/Makefile index 56e8fca4fc6..8434ead23bd 100644 --- a/usr.bin/fortune/strfile/Makefile +++ b/usr.bin/fortune/strfile/Makefile @@ -1,4 +1,3 @@ - PROG= strfile MAN= strfile.8 MLINKS= strfile.8 unstr.8 diff --git a/usr.bin/fortune/unstr/Makefile b/usr.bin/fortune/unstr/Makefile index d10682cbc15..ed1f1b7790a 100644 --- a/usr.bin/fortune/unstr/Makefile +++ b/usr.bin/fortune/unstr/Makefile @@ -1,4 +1,3 @@ - PROG= unstr MAN= CFLAGS+= -I${FORTUNE_SRC}/strfile diff --git a/usr.bin/from/Makefile b/usr.bin/from/Makefile index 1f21a84f0d4..c27be3f50a2 100644 --- a/usr.bin/from/Makefile +++ b/usr.bin/from/Makefile @@ -1,4 +1,3 @@ - PROG= from .include diff --git a/usr.bin/fstat/Makefile b/usr.bin/fstat/Makefile index d0153afe493..fa51a92eb52 100644 --- a/usr.bin/fstat/Makefile +++ b/usr.bin/fstat/Makefile @@ -1,4 +1,3 @@ - PROG= fstat SRCS= fstat.c fuser.c main.c LINKS= ${BINDIR}/fstat ${BINDIR}/fuser diff --git a/usr.bin/fsync/Makefile b/usr.bin/fsync/Makefile index 08d509c13b9..79c1b457900 100644 --- a/usr.bin/fsync/Makefile +++ b/usr.bin/fsync/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= fsync diff --git a/usr.bin/gcore/Makefile b/usr.bin/gcore/Makefile index 9ca1d5a3f61..398f7d2a36d 100644 --- a/usr.bin/gcore/Makefile +++ b/usr.bin/gcore/Makefile @@ -1,4 +1,3 @@ - PROG= gcore SRCS= elfcore.c gcore.c LIBADD= sbuf util diff --git a/usr.bin/gencat/Makefile b/usr.bin/gencat/Makefile index b30c2917206..3fabbff02c4 100644 --- a/usr.bin/gencat/Makefile +++ b/usr.bin/gencat/Makefile @@ -1,4 +1,3 @@ - PROG= gencat .include diff --git a/usr.bin/getconf/Makefile b/usr.bin/getconf/Makefile index c7968477eae..e2ec0543634 100644 --- a/usr.bin/getconf/Makefile +++ b/usr.bin/getconf/Makefile @@ -1,4 +1,3 @@ - .include PROG= getconf diff --git a/usr.bin/getconf/tests/Makefile b/usr.bin/getconf/tests/Makefile index f434667b96d..e29a1876a82 100644 --- a/usr.bin/getconf/tests/Makefile +++ b/usr.bin/getconf/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= getconf_test PROGS+= arch_type diff --git a/usr.bin/getent/Makefile b/usr.bin/getent/Makefile index 2745b738764..f6df3865276 100644 --- a/usr.bin/getent/Makefile +++ b/usr.bin/getent/Makefile @@ -1,4 +1,3 @@ - PROG= getent .include diff --git a/usr.bin/gh-bc/Makefile b/usr.bin/gh-bc/Makefile index e78ab4b2994..0fdc687c0e5 100644 --- a/usr.bin/gh-bc/Makefile +++ b/usr.bin/gh-bc/Makefile @@ -1,4 +1,3 @@ - .include PROG= gh-bc diff --git a/usr.bin/gh-bc/tests/Makefile b/usr.bin/gh-bc/tests/Makefile index 15b5a78c1a9..464ae4b5d3c 100644 --- a/usr.bin/gh-bc/tests/Makefile +++ b/usr.bin/gh-bc/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/usr.bin/gprof/Makefile b/usr.bin/gprof/Makefile index c71f56dd050..e486dd8ce6d 100644 --- a/usr.bin/gprof/Makefile +++ b/usr.bin/gprof/Makefile @@ -1,4 +1,3 @@ - PROG= gprof SRCS= gprof.c arcs.c dfn.c elf.c lookup.c hertz.c \ printgprof.c printlist.c kernel.c diff --git a/usr.bin/grdc/Makefile b/usr.bin/grdc/Makefile index 0487e6fcd5b..de541283e3a 100644 --- a/usr.bin/grdc/Makefile +++ b/usr.bin/grdc/Makefile @@ -1,4 +1,3 @@ - PACKAGE= games PROG= grdc diff --git a/usr.bin/grep/tests/Makefile b/usr.bin/grep/tests/Makefile index eb8e867c675..b3c79657e53 100644 --- a/usr.bin/grep/tests/Makefile +++ b/usr.bin/grep/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= grep_freebsd_test diff --git a/usr.bin/gzip/tests/Makefile b/usr.bin/gzip/tests/Makefile index c38e9e79866..96783eec23e 100644 --- a/usr.bin/gzip/tests/Makefile +++ b/usr.bin/gzip/tests/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= tests diff --git a/usr.bin/head/Makefile b/usr.bin/head/Makefile index 70ee3447cc6..aaf41e24baa 100644 --- a/usr.bin/head/Makefile +++ b/usr.bin/head/Makefile @@ -1,4 +1,3 @@ - .include PROG= head diff --git a/usr.bin/head/tests/Makefile b/usr.bin/head/tests/Makefile index a2e5f879827..0ca086db415 100644 --- a/usr.bin/head/tests/Makefile +++ b/usr.bin/head/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= head_test diff --git a/usr.bin/hesinfo/Makefile b/usr.bin/hesinfo/Makefile index ddaeebc845b..bb95e6200d1 100644 --- a/usr.bin/hesinfo/Makefile +++ b/usr.bin/hesinfo/Makefile @@ -1,4 +1,3 @@ - PROG= hesinfo .include diff --git a/usr.bin/hexdump/Makefile b/usr.bin/hexdump/Makefile index a1af8d67343..d7a10ceb7aa 100644 --- a/usr.bin/hexdump/Makefile +++ b/usr.bin/hexdump/Makefile @@ -1,4 +1,3 @@ - .include PROG= hexdump diff --git a/usr.bin/hexdump/tests/Makefile b/usr.bin/hexdump/tests/Makefile index 8d41382140d..151407d3459 100644 --- a/usr.bin/hexdump/tests/Makefile +++ b/usr.bin/hexdump/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= hexdump_test od_test diff --git a/usr.bin/host/Makefile b/usr.bin/host/Makefile index 0b532ae1bb4..45ca3698abd 100644 --- a/usr.bin/host/Makefile +++ b/usr.bin/host/Makefile @@ -1,4 +1,3 @@ - LDNSDIR= ${SRCTOP}/contrib/ldns LDNSHOSTDIR= ${SRCTOP}/contrib/ldns-host diff --git a/usr.bin/id/Makefile b/usr.bin/id/Makefile index 6b83fa394cc..bc19e94b1f7 100644 --- a/usr.bin/id/Makefile +++ b/usr.bin/id/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/ident/Makefile b/usr.bin/ident/Makefile index b4017326ea8..8695ae3e600 100644 --- a/usr.bin/ident/Makefile +++ b/usr.bin/ident/Makefile @@ -1,4 +1,3 @@ - .include PROG= ident diff --git a/usr.bin/ident/tests/Makefile b/usr.bin/ident/tests/Makefile index 3d03ff5e42d..d7b7256f07c 100644 --- a/usr.bin/ident/tests/Makefile +++ b/usr.bin/ident/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= ident_test diff --git a/usr.bin/indent/Makefile b/usr.bin/indent/Makefile index 7691a920742..3f7ee955a22 100644 --- a/usr.bin/indent/Makefile +++ b/usr.bin/indent/Makefile @@ -1,4 +1,3 @@ - .include PROG= indent diff --git a/usr.bin/indent/tests/Makefile b/usr.bin/indent/tests/Makefile index 2369999e268..4e84917f8a4 100644 --- a/usr.bin/indent/tests/Makefile +++ b/usr.bin/indent/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ${PACKAGE}FILES+= binary.0 diff --git a/usr.bin/ipcrm/Makefile b/usr.bin/ipcrm/Makefile index cde998fad2a..797b9f3dc5a 100644 --- a/usr.bin/ipcrm/Makefile +++ b/usr.bin/ipcrm/Makefile @@ -1,4 +1,3 @@ - PROG= ipcrm SRCS= ipcrm.c ipc.c LIBADD= kvm diff --git a/usr.bin/ipcs/Makefile b/usr.bin/ipcs/Makefile index 1dc1c27b0c1..22a2543e9ed 100644 --- a/usr.bin/ipcs/Makefile +++ b/usr.bin/ipcs/Makefile @@ -1,4 +1,3 @@ - PROG= ipcs SRCS= ipcs.c ipc.c LIBADD= kvm diff --git a/usr.bin/iscsictl/Makefile b/usr.bin/iscsictl/Makefile index 473a1beee16..6c09faa3d91 100644 --- a/usr.bin/iscsictl/Makefile +++ b/usr.bin/iscsictl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= iscsi PROG= iscsictl SRCS= iscsictl.c periphs.c parse.y token.l y.tab.h diff --git a/usr.bin/join/Makefile b/usr.bin/join/Makefile index d591913c0a7..4ec29f14e3c 100644 --- a/usr.bin/join/Makefile +++ b/usr.bin/join/Makefile @@ -1,4 +1,3 @@ - .include PROG= join diff --git a/usr.bin/join/tests/Makefile b/usr.bin/join/tests/Makefile index a3b88f8b1dc..51e46dc2f18 100644 --- a/usr.bin/join/tests/Makefile +++ b/usr.bin/join/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/jot/Makefile b/usr.bin/jot/Makefile index 0990679b8b2..7c9c1a745a1 100644 --- a/usr.bin/jot/Makefile +++ b/usr.bin/jot/Makefile @@ -1,4 +1,3 @@ - .include PROG= jot diff --git a/usr.bin/jot/tests/Makefile b/usr.bin/jot/tests/Makefile index 06339a9af79..6b47c725190 100644 --- a/usr.bin/jot/tests/Makefile +++ b/usr.bin/jot/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/kdump/Makefile b/usr.bin/kdump/Makefile index b2eba487979..2c5c456a6de 100644 --- a/usr.bin/kdump/Makefile +++ b/usr.bin/kdump/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/ktrace diff --git a/usr.bin/keylogin/Makefile b/usr.bin/keylogin/Makefile index 77f589532f4..7a267e4c5a7 100644 --- a/usr.bin/keylogin/Makefile +++ b/usr.bin/keylogin/Makefile @@ -1,4 +1,3 @@ - PROG= keylogin LIBADD= rpcsvc diff --git a/usr.bin/keylogout/Makefile b/usr.bin/keylogout/Makefile index eaf78c3097d..244d6d2d0be 100644 --- a/usr.bin/keylogout/Makefile +++ b/usr.bin/keylogout/Makefile @@ -1,4 +1,3 @@ - PROG= keylogout .include diff --git a/usr.bin/killall/Makefile b/usr.bin/killall/Makefile index 2e35471d76a..4088d0a5800 100644 --- a/usr.bin/killall/Makefile +++ b/usr.bin/killall/Makefile @@ -1,4 +1,3 @@ - PROG= killall LIBADD= jail diff --git a/usr.bin/ktrace/Makefile b/usr.bin/ktrace/Makefile index a6b4b2a6f1a..6c1f454725c 100644 --- a/usr.bin/ktrace/Makefile +++ b/usr.bin/ktrace/Makefile @@ -1,4 +1,3 @@ - PROG= ktrace SRCS= ktrace.c subr.c MLINKS= ktrace.1 trace.1 diff --git a/usr.bin/ktrdump/Makefile b/usr.bin/ktrdump/Makefile index 911fa2bec1f..2bea92917d2 100644 --- a/usr.bin/ktrdump/Makefile +++ b/usr.bin/ktrdump/Makefile @@ -1,4 +1,3 @@ - PROG= ktrdump LIBADD= kvm MAN= ktrdump.8 diff --git a/usr.bin/kyua/Makefile b/usr.bin/kyua/Makefile index 953bb46589b..5160d1ed632 100644 --- a/usr.bin/kyua/Makefile +++ b/usr.bin/kyua/Makefile @@ -1,4 +1,3 @@ - .include KYUA_CONFDIR= /etc/kyua diff --git a/usr.bin/lam/Makefile b/usr.bin/lam/Makefile index 5fe50646e31..e47ea0a98ea 100644 --- a/usr.bin/lam/Makefile +++ b/usr.bin/lam/Makefile @@ -1,4 +1,3 @@ - PROG= lam .include diff --git a/usr.bin/last/Makefile b/usr.bin/last/Makefile index a429fdfe880..eb32dcfb35b 100644 --- a/usr.bin/last/Makefile +++ b/usr.bin/last/Makefile @@ -1,4 +1,3 @@ - PROG= last PACKAGE= acct LIBADD= xo diff --git a/usr.bin/lastcomm/Makefile b/usr.bin/lastcomm/Makefile index 20b737422f9..48c49cc2df3 100644 --- a/usr.bin/lastcomm/Makefile +++ b/usr.bin/lastcomm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=acct diff --git a/usr.bin/lastcomm/tests/Makefile b/usr.bin/lastcomm/tests/Makefile index fc58c772916..8a00382979b 100644 --- a/usr.bin/lastcomm/tests/Makefile +++ b/usr.bin/lastcomm/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/ldd/Makefile b/usr.bin/ldd/Makefile index 11fdf3d4195..3abaf20af1b 100644 --- a/usr.bin/ldd/Makefile +++ b/usr.bin/ldd/Makefile @@ -1,4 +1,3 @@ - PROG?= ldd SRCS= ldd.c diff --git a/usr.bin/ldd32/Makefile b/usr.bin/ldd32/Makefile index 59cfd50d615..5b028560ba6 100644 --- a/usr.bin/ldd32/Makefile +++ b/usr.bin/ldd32/Makefile @@ -1,4 +1,3 @@ - NEED_COMPAT= 32 .include diff --git a/usr.bin/leave/Makefile b/usr.bin/leave/Makefile index 507f0f0ca08..31e9b12e975 100644 --- a/usr.bin/leave/Makefile +++ b/usr.bin/leave/Makefile @@ -1,4 +1,3 @@ - PROG= leave NO_WFORMAT= diff --git a/usr.bin/less/Makefile b/usr.bin/less/Makefile index 1c142da359c..23fc6579818 100644 --- a/usr.bin/less/Makefile +++ b/usr.bin/less/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= less SRCS= main.c screen.c brac.c ch.c charset.c cmdbuf.c command.c cvt.c \ diff --git a/usr.bin/less/Makefile.common b/usr.bin/less/Makefile.common index 349f275ad78..f0fcc915008 100644 --- a/usr.bin/less/Makefile.common +++ b/usr.bin/less/Makefile.common @@ -1,4 +1,3 @@ - LSDIR= ${SRCTOP}/contrib/less .PATH: ${LSDIR} diff --git a/usr.bin/lessecho/Makefile b/usr.bin/lessecho/Makefile index 6b2ca7621d9..d8571677f0a 100644 --- a/usr.bin/lessecho/Makefile +++ b/usr.bin/lessecho/Makefile @@ -1,4 +1,3 @@ - PROG= lessecho SRCS= lessecho.c version.c CLEANFILES= lessecho.1 diff --git a/usr.bin/lesskey/Makefile b/usr.bin/lesskey/Makefile index f6bb8eac1f2..e1fd0d55713 100644 --- a/usr.bin/lesskey/Makefile +++ b/usr.bin/lesskey/Makefile @@ -1,4 +1,3 @@ - PROG= lesskey SRCS= lesskey.c lesskey_parse.c version.c xbuf.c CLEANFILES= lesskey.1 diff --git a/usr.bin/lex/lib/Makefile b/usr.bin/lex/lib/Makefile index 848c0dc8bc6..f3ea5c6a71f 100644 --- a/usr.bin/lex/lib/Makefile +++ b/usr.bin/lex/lib/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/flex/src diff --git a/usr.bin/limits/Makefile b/usr.bin/limits/Makefile index 93a4ea8450c..1c7e91de9e4 100644 --- a/usr.bin/limits/Makefile +++ b/usr.bin/limits/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/limits/tests/Makefile b/usr.bin/limits/tests/Makefile index 1d50e4bc13c..7098c21aa45 100644 --- a/usr.bin/limits/tests/Makefile +++ b/usr.bin/limits/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= limits_test .include diff --git a/usr.bin/locale/Makefile b/usr.bin/locale/Makefile index 9be90f2bb11..33b72ae07b2 100644 --- a/usr.bin/locale/Makefile +++ b/usr.bin/locale/Makefile @@ -1,4 +1,3 @@ - .include PROG= locale diff --git a/usr.bin/locale/tests/Makefile b/usr.bin/locale/tests/Makefile index ba696103e63..7b26f063260 100644 --- a/usr.bin/locale/tests/Makefile +++ b/usr.bin/locale/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= locale_test diff --git a/usr.bin/localedef/Makefile b/usr.bin/localedef/Makefile index 21b71b79501..bfc51d33c65 100644 --- a/usr.bin/localedef/Makefile +++ b/usr.bin/localedef/Makefile @@ -1,4 +1,3 @@ - PROG= localedef SRCS= charmap.c \ collate.c \ diff --git a/usr.bin/locate/Makefile b/usr.bin/locate/Makefile index a57a04dbea3..b1f74a2d443 100644 --- a/usr.bin/locate/Makefile +++ b/usr.bin/locate/Makefile @@ -1,5 +1,4 @@ - SUBDIR= bigram code locate .include diff --git a/usr.bin/locate/Makefile.inc b/usr.bin/locate/Makefile.inc index 070f751c5aa..a247370497a 100644 --- a/usr.bin/locate/Makefile.inc +++ b/usr.bin/locate/Makefile.inc @@ -1,4 +1,3 @@ - LIBEXECDIR?= /usr/libexec WARNS?= 0 diff --git a/usr.bin/locate/bigram/Makefile b/usr.bin/locate/bigram/Makefile index 158f647f31d..1cd04c88496 100644 --- a/usr.bin/locate/bigram/Makefile +++ b/usr.bin/locate/bigram/Makefile @@ -1,4 +1,3 @@ - PROG= locate.bigram MAN= BINDIR= ${LIBEXECDIR} diff --git a/usr.bin/locate/code/Makefile b/usr.bin/locate/code/Makefile index f9b88a2240b..e50f1f20293 100644 --- a/usr.bin/locate/code/Makefile +++ b/usr.bin/locate/code/Makefile @@ -1,4 +1,3 @@ - PROG= locate.code CFLAGS+=-I${.CURDIR}/../locate MAN= diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile index 815c6fe626c..64822fd2ef6 100644 --- a/usr.bin/locate/locate/Makefile +++ b/usr.bin/locate/locate/Makefile @@ -1,4 +1,3 @@ - CONFS= locate.rc PROG= locate SRCS= util.c locate.c diff --git a/usr.bin/lock/Makefile b/usr.bin/lock/Makefile index 056194415bb..48fd0ba5e1e 100644 --- a/usr.bin/lock/Makefile +++ b/usr.bin/lock/Makefile @@ -1,4 +1,3 @@ - PROG= lock BINOWN= root BINMODE=4555 diff --git a/usr.bin/lockf/Makefile b/usr.bin/lockf/Makefile index b7d916f20d1..36740dbd3a9 100644 --- a/usr.bin/lockf/Makefile +++ b/usr.bin/lockf/Makefile @@ -1,4 +1,3 @@ - .include PROG= lockf diff --git a/usr.bin/lockf/tests/Makefile b/usr.bin/lockf/tests/Makefile index 88a936cc583..a7c6f45290c 100644 --- a/usr.bin/lockf/tests/Makefile +++ b/usr.bin/lockf/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= lockf_test diff --git a/usr.bin/logger/Makefile b/usr.bin/logger/Makefile index 4ce072cbf94..85870b85a4d 100644 --- a/usr.bin/logger/Makefile +++ b/usr.bin/logger/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/login/Makefile b/usr.bin/login/Makefile index 5afcb0b3bb8..b88796e9769 100644 --- a/usr.bin/login/Makefile +++ b/usr.bin/login/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/usr.bin/logins/Makefile b/usr.bin/logins/Makefile index b264605854f..44989870b31 100644 --- a/usr.bin/logins/Makefile +++ b/usr.bin/logins/Makefile @@ -1,4 +1,3 @@ - PROG= logins .include diff --git a/usr.bin/logname/Makefile b/usr.bin/logname/Makefile index 85286a3fddf..b7422cbd53a 100644 --- a/usr.bin/logname/Makefile +++ b/usr.bin/logname/Makefile @@ -1,4 +1,3 @@ - PROG= logname .include diff --git a/usr.bin/look/Makefile b/usr.bin/look/Makefile index ddbe20b05d9..e1331bfdce0 100644 --- a/usr.bin/look/Makefile +++ b/usr.bin/look/Makefile @@ -1,4 +1,3 @@ - PROG= look .include diff --git a/usr.bin/lsvfs/Makefile b/usr.bin/lsvfs/Makefile index bea5c0ff765..70c8f642897 100644 --- a/usr.bin/lsvfs/Makefile +++ b/usr.bin/lsvfs/Makefile @@ -1,4 +1,3 @@ - PROG= lsvfs .include diff --git a/usr.bin/lzmainfo/Makefile b/usr.bin/lzmainfo/Makefile index 03c56aa0697..471d9055e8c 100644 --- a/usr.bin/lzmainfo/Makefile +++ b/usr.bin/lzmainfo/Makefile @@ -1,4 +1,3 @@ - PROG= lzmainfo XZDIR= ${SRCTOP}/contrib/xz/src diff --git a/usr.bin/m4/tests/Makefile b/usr.bin/m4/tests/Makefile index cb3ca6b7265..45245d75e85 100644 --- a/usr.bin/m4/tests/Makefile +++ b/usr.bin/m4/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile index 7a4054f6011..c20060d88eb 100644 --- a/usr.bin/mail/Makefile +++ b/usr.bin/mail/Makefile @@ -1,4 +1,3 @@ - CONFS= misc/mail.rc PROG= mail SRCS= version.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \ diff --git a/usr.bin/man/Makefile b/usr.bin/man/Makefile index 01b86169751..9c909827073 100644 --- a/usr.bin/man/Makefile +++ b/usr.bin/man/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= man.sh LINKS= ${BINDIR}/man ${BINDIR}/manpath diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile index 76c63c0f745..dcc6ea2e907 100644 --- a/usr.bin/mandoc/Makefile +++ b/usr.bin/mandoc/Makefile @@ -1,4 +1,3 @@ - .include MANDOCDIR= ${SRCTOP}/contrib/mandoc diff --git a/usr.bin/mesg/Makefile b/usr.bin/mesg/Makefile index f35bf770269..02a02d89bd3 100644 --- a/usr.bin/mesg/Makefile +++ b/usr.bin/mesg/Makefile @@ -1,4 +1,3 @@ - PROG= mesg .include diff --git a/usr.bin/mkcsmapper/Makefile b/usr.bin/mkcsmapper/Makefile index dfce9683378..d8e8dfab4f7 100644 --- a/usr.bin/mkcsmapper/Makefile +++ b/usr.bin/mkcsmapper/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv PROG= mkcsmapper diff --git a/usr.bin/mkcsmapper/Makefile.inc b/usr.bin/mkcsmapper/Makefile.inc index 5442e25b8d7..7189f83ba53 100644 --- a/usr.bin/mkcsmapper/Makefile.inc +++ b/usr.bin/mkcsmapper/Makefile.inc @@ -1,4 +1,3 @@ - .include SRCS+= lex.l yacc.y diff --git a/usr.bin/mkcsmapper_static/Makefile b/usr.bin/mkcsmapper_static/Makefile index 8b9fce51a46..777f29bd940 100644 --- a/usr.bin/mkcsmapper_static/Makefile +++ b/usr.bin/mkcsmapper_static/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkcsmapper PROG= mkcsmapper_static diff --git a/usr.bin/mkdep/Makefile b/usr.bin/mkdep/Makefile index 3cfea688be5..3a0500c9510 100644 --- a/usr.bin/mkdep/Makefile +++ b/usr.bin/mkdep/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= mkdep.gcc.sh MAN= mkdep.1 SCRIPTSNAME= mkdep diff --git a/usr.bin/mkesdb/Makefile b/usr.bin/mkesdb/Makefile index 923c3f26c01..275a8f65cb1 100644 --- a/usr.bin/mkesdb/Makefile +++ b/usr.bin/mkesdb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv PROG= mkesdb diff --git a/usr.bin/mkesdb/Makefile.inc b/usr.bin/mkesdb/Makefile.inc index 79dc1a6f573..ffc3f4505fb 100644 --- a/usr.bin/mkesdb/Makefile.inc +++ b/usr.bin/mkesdb/Makefile.inc @@ -1,4 +1,3 @@ - SRCS+= lex.l yacc.y CFLAGS+= -I${.CURDIR} -I${.CURDIR}/../mkesdb \ -I${.CURDIR}/../../lib/libc/iconv diff --git a/usr.bin/mkesdb_static/Makefile b/usr.bin/mkesdb_static/Makefile index 96711506f67..3d41dbafeac 100644 --- a/usr.bin/mkesdb_static/Makefile +++ b/usr.bin/mkesdb_static/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/iconv ${SRCTOP}/usr.bin/mkesdb PROG= mkesdb_static diff --git a/usr.bin/mkfifo/Makefile b/usr.bin/mkfifo/Makefile index a07c9fa2734..aa19b2abf75 100644 --- a/usr.bin/mkfifo/Makefile +++ b/usr.bin/mkfifo/Makefile @@ -1,4 +1,3 @@ - PROG= mkfifo .include diff --git a/usr.bin/mkimg/Makefile b/usr.bin/mkimg/Makefile index 26fd01a6d84..9e39b7abc95 100644 --- a/usr.bin/mkimg/Makefile +++ b/usr.bin/mkimg/Makefile @@ -1,4 +1,3 @@ - .include PROG= mkimg diff --git a/usr.bin/mkimg/tests/Makefile b/usr.bin/mkimg/tests/Makefile index b98fb6ddb65..0cd08b6f123 100644 --- a/usr.bin/mkimg/tests/Makefile +++ b/usr.bin/mkimg/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR} PACKAGE= tests diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile index 7291981bdf5..1a691e6d78d 100644 --- a/usr.bin/mkstr/Makefile +++ b/usr.bin/mkstr/Makefile @@ -1,4 +1,3 @@ - PROG= mkstr WARNS?= 2 diff --git a/usr.bin/mktemp/Makefile b/usr.bin/mktemp/Makefile index 713bc7f43ea..2da8049b28f 100644 --- a/usr.bin/mktemp/Makefile +++ b/usr.bin/mktemp/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/mktemp/tests/Makefile b/usr.bin/mktemp/tests/Makefile index 164586d2306..c1de03fd196 100644 --- a/usr.bin/mktemp/tests/Makefile +++ b/usr.bin/mktemp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= mktemp_test diff --git a/usr.bin/mkuzip/Makefile b/usr.bin/mkuzip/Makefile index 3cc1953f4a0..a2224f4b675 100644 --- a/usr.bin/mkuzip/Makefile +++ b/usr.bin/mkuzip/Makefile @@ -1,4 +1,3 @@ - PROG= mkuzip MAN= mkuzip.8 SRCS= mkuzip.c mkuz_blockcache.c mkuz_lzma.c mkuz_zlib.c mkuz_conveyor.c \ diff --git a/usr.bin/morse/Makefile b/usr.bin/morse/Makefile index 34a25668339..669ece99f89 100644 --- a/usr.bin/morse/Makefile +++ b/usr.bin/morse/Makefile @@ -1,4 +1,3 @@ - PROG= morse MAN= morse.6 diff --git a/usr.bin/msgs/Makefile b/usr.bin/msgs/Makefile index 10c0fd0d992..f30ced39479 100644 --- a/usr.bin/msgs/Makefile +++ b/usr.bin/msgs/Makefile @@ -1,4 +1,3 @@ - PROG= msgs LIBADD= tinfow diff --git a/usr.bin/mt/Makefile b/usr.bin/mt/Makefile index 453f7174d2a..405e195c856 100644 --- a/usr.bin/mt/Makefile +++ b/usr.bin/mt/Makefile @@ -1,4 +1,3 @@ - PROG= mt LIBADD= mt diff --git a/usr.bin/nc/Makefile b/usr.bin/nc/Makefile index d7efed2a9c5..411f558d7ba 100644 --- a/usr.bin/nc/Makefile +++ b/usr.bin/nc/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/netcat diff --git a/usr.bin/ncal/Makefile b/usr.bin/ncal/Makefile index 2b9edc9bcd8..85affcf983b 100644 --- a/usr.bin/ncal/Makefile +++ b/usr.bin/ncal/Makefile @@ -1,4 +1,3 @@ - .include PROG= ncal diff --git a/usr.bin/ncal/tests/Makefile b/usr.bin/ncal/tests/Makefile index 4afaf41c56c..96b9751c43e 100644 --- a/usr.bin/ncal/tests/Makefile +++ b/usr.bin/ncal/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 4efcfda58f7..742de485a6b 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= netstat diff --git a/usr.bin/newgrp/Makefile b/usr.bin/newgrp/Makefile index 245863d1e0c..3fcd0292909 100644 --- a/usr.bin/newgrp/Makefile +++ b/usr.bin/newgrp/Makefile @@ -1,4 +1,3 @@ - PROG= newgrp LIBADD= crypt util diff --git a/usr.bin/newkey/Makefile b/usr.bin/newkey/Makefile index fa5ecabe0dd..a081774288a 100644 --- a/usr.bin/newkey/Makefile +++ b/usr.bin/newkey/Makefile @@ -1,4 +1,3 @@ - .include PROG= newkey diff --git a/usr.bin/nfsstat/Makefile b/usr.bin/nfsstat/Makefile index 780725b3ca5..25e617bc576 100644 --- a/usr.bin/nfsstat/Makefile +++ b/usr.bin/nfsstat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfsstat diff --git a/usr.bin/nice/Makefile b/usr.bin/nice/Makefile index a22fe07526c..4098b3b39b6 100644 --- a/usr.bin/nice/Makefile +++ b/usr.bin/nice/Makefile @@ -1,4 +1,3 @@ - PROG= nice .include diff --git a/usr.bin/nl/Makefile b/usr.bin/nl/Makefile index fc793c9abf0..66a14832e2a 100644 --- a/usr.bin/nl/Makefile +++ b/usr.bin/nl/Makefile @@ -1,4 +1,3 @@ - PROG= nl .include diff --git a/usr.bin/nm/Makefile b/usr.bin/nm/Makefile index e642f61f2f3..c4c75725dd1 100644 --- a/usr.bin/nm/Makefile +++ b/usr.bin/nm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/nohup/Makefile b/usr.bin/nohup/Makefile index 7010b642064..5698f6a5b47 100644 --- a/usr.bin/nohup/Makefile +++ b/usr.bin/nohup/Makefile @@ -1,4 +1,3 @@ - PROG= nohup .include diff --git a/usr.bin/number/Makefile b/usr.bin/number/Makefile index deac71ffce0..e2af22dc369 100644 --- a/usr.bin/number/Makefile +++ b/usr.bin/number/Makefile @@ -1,4 +1,3 @@ - PROG= number MAN= number.6 diff --git a/usr.bin/objcopy/Makefile b/usr.bin/objcopy/Makefile index e7ce15286dc..101c84cc520 100644 --- a/usr.bin/objcopy/Makefile +++ b/usr.bin/objcopy/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/ofed/Makefile b/usr.bin/ofed/Makefile index a0ac9fdb2e3..59637dbe476 100644 --- a/usr.bin/ofed/Makefile +++ b/usr.bin/ofed/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= \ diff --git a/usr.bin/ofed/infiniband-diags/Makefile b/usr.bin/ofed/infiniband-diags/Makefile index 0425f628f01..c25b24d5af5 100644 --- a/usr.bin/ofed/infiniband-diags/Makefile +++ b/usr.bin/ofed/infiniband-diags/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= \ diff --git a/usr.bin/ofed/infiniband-diags/Makefile.inc b/usr.bin/ofed/infiniband-diags/Makefile.inc index 5ed5c907411..162fdade24c 100644 --- a/usr.bin/ofed/infiniband-diags/Makefile.inc +++ b/usr.bin/ofed/infiniband-diags/Makefile.inc @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/infiniband-diags .PATH: ${_spath}/src ${_spath}/man diff --git a/usr.bin/ofed/infiniband-diags/dump_fts/Makefile b/usr.bin/ofed/infiniband-diags/dump_fts/Makefile index 7ffa135de1d..a08caaa1031 100644 --- a/usr.bin/ofed/infiniband-diags/dump_fts/Makefile +++ b/usr.bin/ofed/infiniband-diags/dump_fts/Makefile @@ -1,4 +1,3 @@ - PROG= dump_fts SRCS= dump_fts.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibaddr/Makefile b/usr.bin/ofed/infiniband-diags/ibaddr/Makefile index f34b32454d7..5e797f4c0d6 100644 --- a/usr.bin/ofed/infiniband-diags/ibaddr/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibaddr/Makefile @@ -1,4 +1,3 @@ - PROG= ibaddr SRCS= ibaddr.c MAN= ibaddr.8 diff --git a/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile b/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile index 5dc24864dd3..87fc509f71a 100644 --- a/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibcacheedit/Makefile @@ -1,4 +1,3 @@ - PROG= ibcacheedit SRCS= ibcacheedit.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile b/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile index b48b937a5c9..0b53a27583f 100644 --- a/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibccconfig/Makefile @@ -1,4 +1,3 @@ - PROG= ibccconfig SRCS= ibccconfig.c MAN= ibccconfig.8 diff --git a/usr.bin/ofed/infiniband-diags/ibccquery/Makefile b/usr.bin/ofed/infiniband-diags/ibccquery/Makefile index 15bb199ac40..90ab8bc7777 100644 --- a/usr.bin/ofed/infiniband-diags/ibccquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibccquery/Makefile @@ -1,4 +1,3 @@ - PROG= ibccquery SRCS= ibccquery.c MAN= ibccquery.8 diff --git a/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile b/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile index 5079ba90400..1075e6ae37c 100644 --- a/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile +++ b/usr.bin/ofed/infiniband-diags/iblinkinfo/Makefile @@ -1,4 +1,3 @@ - PROG= iblinkinfo SRCS= iblinkinfo.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibmirror/Makefile b/usr.bin/ofed/infiniband-diags/ibmirror/Makefile index 4cbdb3cafe1..bf960827c56 100644 --- a/usr.bin/ofed/infiniband-diags/ibmirror/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibmirror/Makefile @@ -1,4 +1,3 @@ - PROG= ibmirror SRCS= ibmirror.c MAN= diff --git a/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile b/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile index cf9b3495ea0..cbb515883c2 100644 --- a/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibnetdiscover/Makefile @@ -1,4 +1,3 @@ - PROG= ibnetdiscover SRCS= ibnetdiscover.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibping/Makefile b/usr.bin/ofed/infiniband-diags/ibping/Makefile index f2c35b066b2..15a645ad075 100644 --- a/usr.bin/ofed/infiniband-diags/ibping/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibping/Makefile @@ -1,4 +1,3 @@ - PROG= ibping SRCS= ibping.c MAN= ibping.8 diff --git a/usr.bin/ofed/infiniband-diags/ibportstate/Makefile b/usr.bin/ofed/infiniband-diags/ibportstate/Makefile index b4275ed74ae..65a67dfd488 100644 --- a/usr.bin/ofed/infiniband-diags/ibportstate/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibportstate/Makefile @@ -1,4 +1,3 @@ - PROG= ibportstate SRCS= ibportstate.c MAN= ibportstate.8 diff --git a/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile b/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile index 4826141aa58..a0526b46e8f 100644 --- a/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibqueryerrors/Makefile @@ -1,4 +1,3 @@ - PROG= ibqueryerrors SRCS= ibqueryerrors.c LIBADD= ibnetdisc diff --git a/usr.bin/ofed/infiniband-diags/ibroute/Makefile b/usr.bin/ofed/infiniband-diags/ibroute/Makefile index a1a6ee66183..03cea57b8e5 100644 --- a/usr.bin/ofed/infiniband-diags/ibroute/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibroute/Makefile @@ -1,4 +1,3 @@ - PROG= ibroute SRCS= ibroute.c MAN= ibroute.8 diff --git a/usr.bin/ofed/infiniband-diags/ibstat/Makefile b/usr.bin/ofed/infiniband-diags/ibstat/Makefile index cb340997c37..2298970e42b 100644 --- a/usr.bin/ofed/infiniband-diags/ibstat/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibstat/Makefile @@ -1,4 +1,3 @@ - PROG= ibstat SRCS= ibstat.c MAN= ibstat.8 diff --git a/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile b/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile index 289c8c06ab8..a8a72420e9c 100644 --- a/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibsysstat/Makefile @@ -1,4 +1,3 @@ - PROG= ibsysstat SRCS= ibsysstat.c MAN= ibsysstat.8 diff --git a/usr.bin/ofed/infiniband-diags/ibtracert/Makefile b/usr.bin/ofed/infiniband-diags/ibtracert/Makefile index f3086e27c59..8bcd5192ade 100644 --- a/usr.bin/ofed/infiniband-diags/ibtracert/Makefile +++ b/usr.bin/ofed/infiniband-diags/ibtracert/Makefile @@ -1,4 +1,3 @@ - PROG= ibtracert SRCS= ibtracert.c MAN= ibtracert.8 diff --git a/usr.bin/ofed/infiniband-diags/perfquery/Makefile b/usr.bin/ofed/infiniband-diags/perfquery/Makefile index 37c0c9ddbbe..291cf168218 100644 --- a/usr.bin/ofed/infiniband-diags/perfquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/perfquery/Makefile @@ -1,4 +1,3 @@ - PROG= perfquery SRCS= perfquery.c MAN= perfquery.8 diff --git a/usr.bin/ofed/infiniband-diags/saquery/Makefile b/usr.bin/ofed/infiniband-diags/saquery/Makefile index dff1b9c214b..739964215bd 100644 --- a/usr.bin/ofed/infiniband-diags/saquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/saquery/Makefile @@ -1,4 +1,3 @@ - PROG= saquery SRCS= saquery.c MAN= saquery.8 diff --git a/usr.bin/ofed/infiniband-diags/sminfo/Makefile b/usr.bin/ofed/infiniband-diags/sminfo/Makefile index 3999f1f9070..be63fb69fe5 100644 --- a/usr.bin/ofed/infiniband-diags/sminfo/Makefile +++ b/usr.bin/ofed/infiniband-diags/sminfo/Makefile @@ -1,4 +1,3 @@ - PROG= sminfo SRCS= sminfo.c MAN= sminfo.8 diff --git a/usr.bin/ofed/infiniband-diags/smpdump/Makefile b/usr.bin/ofed/infiniband-diags/smpdump/Makefile index 6d73f21fd95..70fe61c0544 100644 --- a/usr.bin/ofed/infiniband-diags/smpdump/Makefile +++ b/usr.bin/ofed/infiniband-diags/smpdump/Makefile @@ -1,4 +1,3 @@ - PROG= smpdump SRCS= smpdump.c MAN= smpdump.8 diff --git a/usr.bin/ofed/infiniband-diags/smpquery/Makefile b/usr.bin/ofed/infiniband-diags/smpquery/Makefile index b467cb651a0..4c716f58387 100644 --- a/usr.bin/ofed/infiniband-diags/smpquery/Makefile +++ b/usr.bin/ofed/infiniband-diags/smpquery/Makefile @@ -1,4 +1,3 @@ - PROG= smpquery SRCS= smpquery.c MAN= smpquery.8 diff --git a/usr.bin/ofed/infiniband-diags/vendstat/Makefile b/usr.bin/ofed/infiniband-diags/vendstat/Makefile index 3b46688a652..9fea6878a25 100644 --- a/usr.bin/ofed/infiniband-diags/vendstat/Makefile +++ b/usr.bin/ofed/infiniband-diags/vendstat/Makefile @@ -1,4 +1,3 @@ - PROG= vendstat SRCS= vendstat.c MAN= vendstat.8 diff --git a/usr.bin/ofed/libibverbs/Makefile b/usr.bin/ofed/libibverbs/Makefile index a6c366ce2ae..f9aff0070f3 100644 --- a/usr.bin/ofed/libibverbs/Makefile +++ b/usr.bin/ofed/libibverbs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= FreeBSD-rdma SUBDIR= \ diff --git a/usr.bin/ofed/libibverbs/Makefile.inc b/usr.bin/ofed/libibverbs/Makefile.inc index 461075a1592..616c9bd5470 100644 --- a/usr.bin/ofed/libibverbs/Makefile.inc +++ b/usr.bin/ofed/libibverbs/Makefile.inc @@ -1,4 +1,3 @@ - _spath=${SRCTOP}/contrib/ofed/libibverbs .PATH: ${_spath}/examples ${_spath}/man diff --git a/usr.bin/ofed/libibverbs/asyncwatch/Makefile b/usr.bin/ofed/libibverbs/asyncwatch/Makefile index df9bcba2545..d7a910bf094 100644 --- a/usr.bin/ofed/libibverbs/asyncwatch/Makefile +++ b/usr.bin/ofed/libibverbs/asyncwatch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_asyncwatch MAN= ibv_asyncwatch.1 diff --git a/usr.bin/ofed/libibverbs/devices/Makefile b/usr.bin/ofed/libibverbs/devices/Makefile index f90c02cd409..977d903d80f 100644 --- a/usr.bin/ofed/libibverbs/devices/Makefile +++ b/usr.bin/ofed/libibverbs/devices/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_devices MAN= ibv_devices.1 diff --git a/usr.bin/ofed/libibverbs/devinfo/Makefile b/usr.bin/ofed/libibverbs/devinfo/Makefile index 210b01efd60..ef62919d227 100644 --- a/usr.bin/ofed/libibverbs/devinfo/Makefile +++ b/usr.bin/ofed/libibverbs/devinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_devinfo MAN= ibv_devinfo.1 diff --git a/usr.bin/ofed/libibverbs/rc_pingpong/Makefile b/usr.bin/ofed/libibverbs/rc_pingpong/Makefile index 7b6a0fa87b4..2ab8a1419b3 100644 --- a/usr.bin/ofed/libibverbs/rc_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/rc_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_rc_pingpong MAN= ibv_rc_pingpong.1 diff --git a/usr.bin/ofed/libibverbs/srq_pingpong/Makefile b/usr.bin/ofed/libibverbs/srq_pingpong/Makefile index 13b203627c1..f15b021bc6e 100644 --- a/usr.bin/ofed/libibverbs/srq_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/srq_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_srq_pingpong MAN= ibv_srq_pingpong.1 diff --git a/usr.bin/ofed/libibverbs/uc_pingpong/Makefile b/usr.bin/ofed/libibverbs/uc_pingpong/Makefile index 4a804b562ff..69a0e5f7280 100644 --- a/usr.bin/ofed/libibverbs/uc_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/uc_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_uc_pingpong MAN= ibv_uc_pingpong.1 diff --git a/usr.bin/ofed/libibverbs/ud_pingpong/Makefile b/usr.bin/ofed/libibverbs/ud_pingpong/Makefile index ba1056d7771..93265850873 100644 --- a/usr.bin/ofed/libibverbs/ud_pingpong/Makefile +++ b/usr.bin/ofed/libibverbs/ud_pingpong/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ibv_ud_pingpong MAN= ibv_ud_pingpong.1 diff --git a/usr.bin/ofed/librdmacm/Makefile b/usr.bin/ofed/librdmacm/Makefile index 2f797fafa41..da14df38fbf 100644 --- a/usr.bin/ofed/librdmacm/Makefile +++ b/usr.bin/ofed/librdmacm/Makefile @@ -1,4 +1,3 @@ - SUBDIR= ucmatose mckey rping udaddy SUBDIR_PARALLEL= diff --git a/usr.bin/ofed/librdmacm/Makefile.inc b/usr.bin/ofed/librdmacm/Makefile.inc index 39cc7562e39..74f32fe08b4 100644 --- a/usr.bin/ofed/librdmacm/Makefile.inc +++ b/usr.bin/ofed/librdmacm/Makefile.inc @@ -1,4 +1,3 @@ - _spath=${SRCTOP}/contrib/ofed/librdmacm .PATH: ${_spath}/examples ${_spath}/man diff --git a/usr.bin/ofed/librdmacm/mckey/Makefile b/usr.bin/ofed/librdmacm/mckey/Makefile index b64b23bc97d..bdae45765b3 100644 --- a/usr.bin/ofed/librdmacm/mckey/Makefile +++ b/usr.bin/ofed/librdmacm/mckey/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= mckey MAN= mckey.1 diff --git a/usr.bin/ofed/librdmacm/rping/Makefile b/usr.bin/ofed/librdmacm/rping/Makefile index 369a195bacf..3406c6c576f 100644 --- a/usr.bin/ofed/librdmacm/rping/Makefile +++ b/usr.bin/ofed/librdmacm/rping/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= rping MAN= rping.1 diff --git a/usr.bin/ofed/librdmacm/ucmatose/Makefile b/usr.bin/ofed/librdmacm/ucmatose/Makefile index ec805b13fbf..0b4791c5404 100644 --- a/usr.bin/ofed/librdmacm/ucmatose/Makefile +++ b/usr.bin/ofed/librdmacm/ucmatose/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= ucmatose MAN= ucmatose.1 diff --git a/usr.bin/ofed/librdmacm/udaddy/Makefile b/usr.bin/ofed/librdmacm/udaddy/Makefile index 2cc76858007..dc4105881d4 100644 --- a/usr.bin/ofed/librdmacm/udaddy/Makefile +++ b/usr.bin/ofed/librdmacm/udaddy/Makefile @@ -1,4 +1,3 @@ - PACKAGE= rdma PROG= udaddy MAN= udaddy.1 diff --git a/usr.bin/ofed/opensm/Makefile b/usr.bin/ofed/opensm/Makefile index 6c3a8cf8e78..442a47bb160 100644 --- a/usr.bin/ofed/opensm/Makefile +++ b/usr.bin/ofed/opensm/Makefile @@ -1,4 +1,3 @@ - _spath= ${SRCTOP}/contrib/ofed/opensm/opensm .PATH: ${_spath} ${_spath:H}/man diff --git a/usr.bin/pagesize/Makefile b/usr.bin/pagesize/Makefile index 38ab443d59a..56dc6fdb697 100644 --- a/usr.bin/pagesize/Makefile +++ b/usr.bin/pagesize/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=pagesize.sh MAN= pagesize.1 diff --git a/usr.bin/pamtest/Makefile b/usr.bin/pamtest/Makefile index 3269537e699..99ee62e03b2 100644 --- a/usr.bin/pamtest/Makefile +++ b/usr.bin/pamtest/Makefile @@ -1,4 +1,3 @@ - OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/include ${OPENPAM}/bin/pamtest diff --git a/usr.bin/passwd/Makefile b/usr.bin/passwd/Makefile index 0598454f7d8..f8734053deb 100644 --- a/usr.bin/passwd/Makefile +++ b/usr.bin/passwd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE = runtime diff --git a/usr.bin/paste/Makefile b/usr.bin/paste/Makefile index 198c8e6c565..e4f9e6d817b 100644 --- a/usr.bin/paste/Makefile +++ b/usr.bin/paste/Makefile @@ -1,4 +1,3 @@ - PROG= paste .include diff --git a/usr.bin/patch/tests/Makefile b/usr.bin/patch/tests/Makefile index 2a924b72f1a..bb113b5a260 100644 --- a/usr.bin/patch/tests/Makefile +++ b/usr.bin/patch/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= unified_patch_test diff --git a/usr.bin/pathchk/Makefile b/usr.bin/pathchk/Makefile index b15a781a1cd..a3ea46c30c5 100644 --- a/usr.bin/pathchk/Makefile +++ b/usr.bin/pathchk/Makefile @@ -1,4 +1,3 @@ - PROG= pathchk .include diff --git a/usr.bin/perror/Makefile b/usr.bin/perror/Makefile index 8fae8955f16..a83cd29dbc2 100644 --- a/usr.bin/perror/Makefile +++ b/usr.bin/perror/Makefile @@ -1,4 +1,3 @@ - PROG= perror .include diff --git a/usr.bin/pom/Makefile b/usr.bin/pom/Makefile index 4b4fb411a63..54b62eface7 100644 --- a/usr.bin/pom/Makefile +++ b/usr.bin/pom/Makefile @@ -1,4 +1,3 @@ - PACKAGE= games PROG= pom diff --git a/usr.bin/posixshmcontrol/Makefile b/usr.bin/posixshmcontrol/Makefile index 1d927667ed1..dc3d268f4a7 100644 --- a/usr.bin/posixshmcontrol/Makefile +++ b/usr.bin/posixshmcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= posixshmcontrol LIBADD= jail util diff --git a/usr.bin/pr/Makefile b/usr.bin/pr/Makefile index b033ee2d8a6..965ebc8d463 100644 --- a/usr.bin/pr/Makefile +++ b/usr.bin/pr/Makefile @@ -1,4 +1,3 @@ - .include PROG= pr diff --git a/usr.bin/pr/tests/Makefile b/usr.bin/pr/tests/Makefile index 7d68f2e9938..593e03ae117 100644 --- a/usr.bin/pr/tests/Makefile +++ b/usr.bin/pr/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= basic2_test diff --git a/usr.bin/primes/Makefile b/usr.bin/primes/Makefile index 5cf6ad650e0..d2332d6bdd6 100644 --- a/usr.bin/primes/Makefile +++ b/usr.bin/primes/Makefile @@ -1,4 +1,3 @@ - PROG= primes SRCS= pattern.c pr_tbl.c primes.c spsp.c MAN= diff --git a/usr.bin/printenv/Makefile b/usr.bin/printenv/Makefile index d8a4db8939d..0add0695a1d 100644 --- a/usr.bin/printenv/Makefile +++ b/usr.bin/printenv/Makefile @@ -1,4 +1,3 @@ - .include PROG= printenv diff --git a/usr.bin/printf/Makefile b/usr.bin/printf/Makefile index 6e9def2e11c..f6339749708 100644 --- a/usr.bin/printf/Makefile +++ b/usr.bin/printf/Makefile @@ -1,4 +1,3 @@ - .include PROG= printf diff --git a/usr.bin/printf/tests/Makefile b/usr.bin/printf/tests/Makefile index 8f2abefbfed..4577434014a 100644 --- a/usr.bin/printf/tests/Makefile +++ b/usr.bin/printf/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/proccontrol/Makefile b/usr.bin/proccontrol/Makefile index e1d7955d86a..347063b3b56 100644 --- a/usr.bin/proccontrol/Makefile +++ b/usr.bin/proccontrol/Makefile @@ -1,4 +1,3 @@ - PROG= proccontrol .include diff --git a/usr.bin/procstat/Makefile b/usr.bin/procstat/Makefile index cd62c6a9667..56847625521 100644 --- a/usr.bin/procstat/Makefile +++ b/usr.bin/procstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= procstat diff --git a/usr.bin/procstat/tests/Makefile b/usr.bin/procstat/tests/Makefile index ba083a27abf..9309bf30128 100644 --- a/usr.bin/procstat/tests/Makefile +++ b/usr.bin/procstat/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= procstat_test PROGS+= while1 diff --git a/usr.bin/protect/Makefile b/usr.bin/protect/Makefile index 5bc569d5c76..bb7f2fbe7ec 100644 --- a/usr.bin/protect/Makefile +++ b/usr.bin/protect/Makefile @@ -1,4 +1,3 @@ - PROG= protect .include diff --git a/usr.bin/quota/Makefile b/usr.bin/quota/Makefile index fc9ff8cc244..3b7a6227bc8 100644 --- a/usr.bin/quota/Makefile +++ b/usr.bin/quota/Makefile @@ -1,4 +1,3 @@ - PROG= quota BINOWN= root BINMODE=4555 diff --git a/usr.bin/random/Makefile b/usr.bin/random/Makefile index 5e24c89cd98..8d0fc2be6f0 100644 --- a/usr.bin/random/Makefile +++ b/usr.bin/random/Makefile @@ -1,4 +1,3 @@ - PROG= random MAN= random.6 SRCS= random.c randomize_fd.c diff --git a/usr.bin/rctl/Makefile b/usr.bin/rctl/Makefile index c731b14c636..d98e5c1ad9b 100644 --- a/usr.bin/rctl/Makefile +++ b/usr.bin/rctl/Makefile @@ -1,4 +1,3 @@ - PROG= rctl MAN= rctl.8 diff --git a/usr.bin/readelf/Makefile b/usr.bin/readelf/Makefile index 3ab5f6e77df..d2a386fb0d4 100644 --- a/usr.bin/readelf/Makefile +++ b/usr.bin/readelf/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/renice/Makefile b/usr.bin/renice/Makefile index 73658c35608..6b99072b24c 100644 --- a/usr.bin/renice/Makefile +++ b/usr.bin/renice/Makefile @@ -1,4 +1,3 @@ - .include PROG= renice diff --git a/usr.bin/resizewin/Makefile b/usr.bin/resizewin/Makefile index 3fc71846192..edc1914e255 100644 --- a/usr.bin/resizewin/Makefile +++ b/usr.bin/resizewin/Makefile @@ -1,4 +1,3 @@ - PROG= resizewin .include diff --git a/usr.bin/rev/Makefile b/usr.bin/rev/Makefile index 645aedd79b8..92540c11093 100644 --- a/usr.bin/rev/Makefile +++ b/usr.bin/rev/Makefile @@ -1,4 +1,3 @@ - PROG= rev .include diff --git a/usr.bin/revoke/Makefile b/usr.bin/revoke/Makefile index 574c488365f..f468f6483b5 100644 --- a/usr.bin/revoke/Makefile +++ b/usr.bin/revoke/Makefile @@ -1,4 +1,3 @@ - PROG= revoke .include diff --git a/usr.bin/rpcgen/Makefile b/usr.bin/rpcgen/Makefile index 4ae15c5ca47..aafa97fd0c3 100644 --- a/usr.bin/rpcgen/Makefile +++ b/usr.bin/rpcgen/Makefile @@ -1,4 +1,3 @@ - PROG= rpcgen SRCS= rpc_main.c rpc_clntout.c rpc_cout.c rpc_hout.c rpc_parse.c \ rpc_sample.c rpc_scan.c rpc_svcout.c rpc_tblout.c rpc_util.c diff --git a/usr.bin/rpcinfo/Makefile b/usr.bin/rpcinfo/Makefile index e44367324b3..a55485e4f71 100644 --- a/usr.bin/rpcinfo/Makefile +++ b/usr.bin/rpcinfo/Makefile @@ -1,4 +1,3 @@ - PROG= rpcinfo SRCS= rpcinfo.c MAN= rpcinfo.8 diff --git a/usr.bin/rs/Makefile b/usr.bin/rs/Makefile index 86fdfe49064..ed98f6826ce 100644 --- a/usr.bin/rs/Makefile +++ b/usr.bin/rs/Makefile @@ -1,4 +1,3 @@ - .include PROG_CXX= rs diff --git a/usr.bin/rs/tests/Makefile b/usr.bin/rs/tests/Makefile index 7717466b569..a1166069040 100644 --- a/usr.bin/rs/tests/Makefile +++ b/usr.bin/rs/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= rs_test .include diff --git a/usr.bin/rup/Makefile b/usr.bin/rup/Makefile index b9068fece39..8cc5dc0f1af 100644 --- a/usr.bin/rup/Makefile +++ b/usr.bin/rup/Makefile @@ -1,4 +1,3 @@ - PROG= rup LIBADD= rpcsvc diff --git a/usr.bin/ruptime/Makefile b/usr.bin/ruptime/Makefile index adc135153b1..5c51c068ae7 100644 --- a/usr.bin/ruptime/Makefile +++ b/usr.bin/ruptime/Makefile @@ -1,4 +1,3 @@ - PROG= ruptime PACKAGE=rcmds diff --git a/usr.bin/rusers/Makefile b/usr.bin/rusers/Makefile index a2bfbf1e7cf..f3b3a8bd7db 100644 --- a/usr.bin/rusers/Makefile +++ b/usr.bin/rusers/Makefile @@ -1,4 +1,3 @@ - PROG = rusers LIBADD= rpcsvc diff --git a/usr.bin/rwall/Makefile b/usr.bin/rwall/Makefile index de7ed99d959..88459adb760 100644 --- a/usr.bin/rwall/Makefile +++ b/usr.bin/rwall/Makefile @@ -1,4 +1,3 @@ - PROG = rwall .include diff --git a/usr.bin/rwho/Makefile b/usr.bin/rwho/Makefile index 89a5e5cf1b9..b0d2d9f7faa 100644 --- a/usr.bin/rwho/Makefile +++ b/usr.bin/rwho/Makefile @@ -1,4 +1,3 @@ - PROG= rwho PACKAGE=rcmds diff --git a/usr.bin/script/Makefile b/usr.bin/script/Makefile index e61c5d44ce8..99cb623ba5a 100644 --- a/usr.bin/script/Makefile +++ b/usr.bin/script/Makefile @@ -1,4 +1,3 @@ - PROG= script LIBADD= util diff --git a/usr.bin/sdiff/Makefile b/usr.bin/sdiff/Makefile index 23edd45cd64..03587f37309 100644 --- a/usr.bin/sdiff/Makefile +++ b/usr.bin/sdiff/Makefile @@ -1,4 +1,3 @@ - .include PROG= sdiff diff --git a/usr.bin/sdiff/tests/Makefile b/usr.bin/sdiff/tests/Makefile index 6d06996ce47..a849e4a2c0a 100644 --- a/usr.bin/sdiff/tests/Makefile +++ b/usr.bin/sdiff/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= sdiff_test diff --git a/usr.bin/sdiotool/Makefile b/usr.bin/sdiotool/Makefile index 57a28de55eb..42a237b2cd6 100644 --- a/usr.bin/sdiotool/Makefile +++ b/usr.bin/sdiotool/Makefile @@ -1,4 +1,3 @@ - PROG= sdiotool SRCS= sdiotool.c cam_sdio.c linux_sdio_compat.c diff --git a/usr.bin/sed/Makefile b/usr.bin/sed/Makefile index d9d79779ad2..9f999ae8e3e 100644 --- a/usr.bin/sed/Makefile +++ b/usr.bin/sed/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/sed/tests/Makefile b/usr.bin/sed/tests/Makefile index db3d9f01336..d072e1d65b2 100644 --- a/usr.bin/sed/tests/Makefile +++ b/usr.bin/sed/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= sed2_test diff --git a/usr.bin/sed/tests/regress.multitest.out/Makefile b/usr.bin/sed/tests/regress.multitest.out/Makefile index 316770e9d55..1636e64c7b6 100644 --- a/usr.bin/sed/tests/regress.multitest.out/Makefile +++ b/usr.bin/sed/tests/regress.multitest.out/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.bin/sed/regress.multitest.out diff --git a/usr.bin/seq/tests/Makefile b/usr.bin/seq/tests/Makefile index df1513458be..a002ff88358 100644 --- a/usr.bin/seq/tests/Makefile +++ b/usr.bin/seq/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= seq_test diff --git a/usr.bin/shar/Makefile b/usr.bin/shar/Makefile index b487cee536c..fc940c06d46 100644 --- a/usr.bin/shar/Makefile +++ b/usr.bin/shar/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=shar.sh MAN= shar.1 diff --git a/usr.bin/showmount/Makefile b/usr.bin/showmount/Makefile index d882c21b5db..55f5de99542 100644 --- a/usr.bin/showmount/Makefile +++ b/usr.bin/showmount/Makefile @@ -1,4 +1,3 @@ - PROG= showmount MAN= showmount.8 diff --git a/usr.bin/size/Makefile b/usr.bin/size/Makefile index f097e561700..3951cedbfa0 100644 --- a/usr.bin/size/Makefile +++ b/usr.bin/size/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= elftoolchain diff --git a/usr.bin/smbutil/Makefile b/usr.bin/smbutil/Makefile index 0f6d7e5e515..de80d48282e 100644 --- a/usr.bin/smbutil/Makefile +++ b/usr.bin/smbutil/Makefile @@ -1,4 +1,3 @@ - PROG= smbutil PACKAGE= smbutils SRCS= smbutil.c dumptree.c login.c lookup.c view.c print.c diff --git a/usr.bin/sockstat/Makefile b/usr.bin/sockstat/Makefile index ca31cd5d56e..188432dfc27 100644 --- a/usr.bin/sockstat/Makefile +++ b/usr.bin/sockstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= sockstat diff --git a/usr.bin/soelim/Makefile b/usr.bin/soelim/Makefile index 89c40b34113..00b694d6e0b 100644 --- a/usr.bin/soelim/Makefile +++ b/usr.bin/soelim/Makefile @@ -1,4 +1,3 @@ - .include PROG= soelim diff --git a/usr.bin/soelim/tests/Makefile b/usr.bin/soelim/tests/Makefile index c236a4c0fca..6e3b7a25ecc 100644 --- a/usr.bin/soelim/tests/Makefile +++ b/usr.bin/soelim/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= soelim_test diff --git a/usr.bin/sort/Makefile b/usr.bin/sort/Makefile index 7e65d6d5a4d..561af217af7 100644 --- a/usr.bin/sort/Makefile +++ b/usr.bin/sort/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/sort/tests/Makefile b/usr.bin/sort/tests/Makefile index 752dec06bbf..7514bf6b300 100644 --- a/usr.bin/sort/tests/Makefile +++ b/usr.bin/sort/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= sort_test diff --git a/usr.bin/split/Makefile b/usr.bin/split/Makefile index 09bf829d267..99021342ec3 100644 --- a/usr.bin/split/Makefile +++ b/usr.bin/split/Makefile @@ -1,4 +1,3 @@ - .include PROG= split diff --git a/usr.bin/split/tests/Makefile b/usr.bin/split/tests/Makefile index 34e7b977099..65f62cff26f 100644 --- a/usr.bin/split/tests/Makefile +++ b/usr.bin/split/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= split_test diff --git a/usr.bin/ssh-copy-id/Makefile b/usr.bin/ssh-copy-id/Makefile index 96631d8337a..66a742726d6 100644 --- a/usr.bin/ssh-copy-id/Makefile +++ b/usr.bin/ssh-copy-id/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= ssh-copy-id.sh MAN= ssh-copy-id.1 PACKAGE= ssh diff --git a/usr.bin/stat/Makefile b/usr.bin/stat/Makefile index d57293abbd6..1694310a7a6 100644 --- a/usr.bin/stat/Makefile +++ b/usr.bin/stat/Makefile @@ -1,4 +1,3 @@ - .include PROG= stat diff --git a/usr.bin/stat/tests/Makefile b/usr.bin/stat/tests/Makefile index 6986de3303d..d48648c5591 100644 --- a/usr.bin/stat/tests/Makefile +++ b/usr.bin/stat/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= readlink_test ATF_TESTS_SH+= stat_test diff --git a/usr.bin/stdbuf/Makefile b/usr.bin/stdbuf/Makefile index 5610012a28e..538cea76c51 100644 --- a/usr.bin/stdbuf/Makefile +++ b/usr.bin/stdbuf/Makefile @@ -1,4 +1,3 @@ - PROG= stdbuf SRCS= stdbuf.c diff --git a/usr.bin/strings/Makefile b/usr.bin/strings/Makefile index 77032ee9491..8e257281094 100644 --- a/usr.bin/strings/Makefile +++ b/usr.bin/strings/Makefile @@ -1,4 +1,3 @@ - .include ELFTCDIR= ${SRCTOP}/contrib/elftoolchain diff --git a/usr.bin/su/Makefile b/usr.bin/su/Makefile index 8079b5b2c6e..f6d95defa19 100644 --- a/usr.bin/su/Makefile +++ b/usr.bin/su/Makefile @@ -1,4 +1,3 @@ - .include PROG= su diff --git a/usr.bin/systat/Makefile b/usr.bin/systat/Makefile index 205e365d507..b3ca1a6f962 100644 --- a/usr.bin/systat/Makefile +++ b/usr.bin/systat/Makefile @@ -1,4 +1,3 @@ - .include PROG= systat diff --git a/usr.bin/tabs/Makefile b/usr.bin/tabs/Makefile index d3befd0d2d9..b80b201431c 100644 --- a/usr.bin/tabs/Makefile +++ b/usr.bin/tabs/Makefile @@ -1,4 +1,3 @@ - PROG= tabs LIBADD= tinfow diff --git a/usr.bin/tail/Makefile b/usr.bin/tail/Makefile index fbf819e0635..47c21f7f931 100644 --- a/usr.bin/tail/Makefile +++ b/usr.bin/tail/Makefile @@ -1,4 +1,3 @@ - .include PROG= tail diff --git a/usr.bin/tail/tests/Makefile b/usr.bin/tail/tests/Makefile index e0782e7dfb1..bb8fdc1016e 100644 --- a/usr.bin/tail/tests/Makefile +++ b/usr.bin/tail/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= tail_test diff --git a/usr.bin/talk/Makefile b/usr.bin/talk/Makefile index 701c81cf6a2..40dfae8a193 100644 --- a/usr.bin/talk/Makefile +++ b/usr.bin/talk/Makefile @@ -1,4 +1,3 @@ - PROG= talk SRCS= ctl.c ctl_transact.c display.c get_addrs.c get_iface.c get_names.c \ init_disp.c invite.c io.c look_up.c msgs.c talk.c diff --git a/usr.bin/tar/tests/Makefile b/usr.bin/tar/tests/Makefile index ce01f04c778..4f143993f8f 100644 --- a/usr.bin/tar/tests/Makefile +++ b/usr.bin/tar/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests WARNS?= 3 diff --git a/usr.bin/tcopy/Makefile b/usr.bin/tcopy/Makefile index c253a44cc1b..86eb0dd4216 100644 --- a/usr.bin/tcopy/Makefile +++ b/usr.bin/tcopy/Makefile @@ -1,4 +1,3 @@ - PROG= tcopy .include diff --git a/usr.bin/tee/Makefile b/usr.bin/tee/Makefile index 1984422276c..ab7b9357596 100644 --- a/usr.bin/tee/Makefile +++ b/usr.bin/tee/Makefile @@ -1,4 +1,3 @@ - PROG= tee .include diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile index 12c582ffb3d..930d70faa8b 100644 --- a/usr.bin/telnet/Makefile +++ b/usr.bin/telnet/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= telnet diff --git a/usr.bin/tests/Makefile b/usr.bin/tests/Makefile index 5010a929da8..e513e315473 100644 --- a/usr.bin/tests/Makefile +++ b/usr.bin/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .PATH: ${SRCTOP}/tests diff --git a/usr.bin/tftp/Makefile b/usr.bin/tftp/Makefile index 3b7831c0b67..952246d3fd5 100644 --- a/usr.bin/tftp/Makefile +++ b/usr.bin/tftp/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/libexec/tftpd diff --git a/usr.bin/tftp/tests/Makefile b/usr.bin/tftp/tests/Makefile index 06778e175ec..9d6d6c0bc87 100644 --- a/usr.bin/tftp/tests/Makefile +++ b/usr.bin/tftp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= tftp_test diff --git a/usr.bin/time/Makefile b/usr.bin/time/Makefile index fb357a17604..a91e94f2007 100644 --- a/usr.bin/time/Makefile +++ b/usr.bin/time/Makefile @@ -1,4 +1,3 @@ - PROG= time .include diff --git a/usr.bin/tip/Makefile b/usr.bin/tip/Makefile index 0eadb9bb00c..f33bfe16f17 100644 --- a/usr.bin/tip/Makefile +++ b/usr.bin/tip/Makefile @@ -1,4 +1,3 @@ - SUBDIR=tip .include diff --git a/usr.bin/tip/Makefile.inc b/usr.bin/tip/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/usr.bin/tip/Makefile.inc +++ b/usr.bin/tip/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.bin/top/Makefile b/usr.bin/top/Makefile index ed92d5b6f11..007c9b306d2 100644 --- a/usr.bin/top/Makefile +++ b/usr.bin/top/Makefile @@ -1,4 +1,3 @@ - .include PROG= top diff --git a/usr.bin/tr/Makefile b/usr.bin/tr/Makefile index 17b633a7827..d789e500c23 100644 --- a/usr.bin/tr/Makefile +++ b/usr.bin/tr/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/tr/tests/Makefile b/usr.bin/tr/tests/Makefile index 81d7b37e35d..ed2d548b827 100644 --- a/usr.bin/tr/tests/Makefile +++ b/usr.bin/tr/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/true/Makefile b/usr.bin/true/Makefile index 42716d310ff..1285b818d78 100644 --- a/usr.bin/true/Makefile +++ b/usr.bin/true/Makefile @@ -1,4 +1,3 @@ - PROG= true .include diff --git a/usr.bin/truncate/Makefile b/usr.bin/truncate/Makefile index f4ce511215d..0b27f0c8758 100644 --- a/usr.bin/truncate/Makefile +++ b/usr.bin/truncate/Makefile @@ -1,4 +1,3 @@ - .include PROG= truncate diff --git a/usr.bin/truncate/tests/Makefile b/usr.bin/truncate/tests/Makefile index f82d438132c..64e05e50b87 100644 --- a/usr.bin/truncate/tests/Makefile +++ b/usr.bin/truncate/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= truncate_test .include diff --git a/usr.bin/truss/Makefile b/usr.bin/truss/Makefile index da46bc122f8..a31f985cbb0 100644 --- a/usr.bin/truss/Makefile +++ b/usr.bin/truss/Makefile @@ -1,4 +1,3 @@ - PROG= truss SRCS= main.c setup.c syscalls.c diff --git a/usr.bin/tsort/Makefile b/usr.bin/tsort/Makefile index 47cd40e9851..4603b97959b 100644 --- a/usr.bin/tsort/Makefile +++ b/usr.bin/tsort/Makefile @@ -1,4 +1,3 @@ - .include PROG= tsort diff --git a/usr.bin/tty/Makefile b/usr.bin/tty/Makefile index b7b0084298a..e0e47132f82 100644 --- a/usr.bin/tty/Makefile +++ b/usr.bin/tty/Makefile @@ -1,4 +1,3 @@ - PROG= tty .include diff --git a/usr.bin/ul/Makefile b/usr.bin/ul/Makefile index a808f0f575c..48a487781b3 100644 --- a/usr.bin/ul/Makefile +++ b/usr.bin/ul/Makefile @@ -1,4 +1,3 @@ - PROG= ul LIBADD= tinfow diff --git a/usr.bin/uname/Makefile b/usr.bin/uname/Makefile index 71ddbc3b6fb..fdfce1ec197 100644 --- a/usr.bin/uname/Makefile +++ b/usr.bin/uname/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= uname diff --git a/usr.bin/unexpand/Makefile b/usr.bin/unexpand/Makefile index 659f9e8814f..ef5cf30459b 100644 --- a/usr.bin/unexpand/Makefile +++ b/usr.bin/unexpand/Makefile @@ -1,4 +1,3 @@ - PROG= unexpand MAN= diff --git a/usr.bin/unifdef/tests/Makefile b/usr.bin/unifdef/tests/Makefile index a75d405c9d3..67e98fa7048 100644 --- a/usr.bin/unifdef/tests/Makefile +++ b/usr.bin/unifdef/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= unifdef_test diff --git a/usr.bin/uniq/Makefile b/usr.bin/uniq/Makefile index 63aa1233c36..0d4d89fdaa6 100644 --- a/usr.bin/uniq/Makefile +++ b/usr.bin/uniq/Makefile @@ -1,4 +1,3 @@ - .include PROG= uniq diff --git a/usr.bin/units/Makefile b/usr.bin/units/Makefile index 9d717d12124..0f24f0a25f6 100644 --- a/usr.bin/units/Makefile +++ b/usr.bin/units/Makefile @@ -1,4 +1,3 @@ - .include PROG= units diff --git a/usr.bin/units/tests/Makefile b/usr.bin/units/tests/Makefile index 3237b967d3f..f330d0fc895 100644 --- a/usr.bin/units/tests/Makefile +++ b/usr.bin/units/tests/Makefile @@ -1,4 +1,3 @@ - .include TAP_TESTS_SH= basics_test diff --git a/usr.bin/unvis/Makefile b/usr.bin/unvis/Makefile index b805d3e0b9c..1189bd1c4ec 100644 --- a/usr.bin/unvis/Makefile +++ b/usr.bin/unvis/Makefile @@ -1,4 +1,3 @@ - PROG= unvis .PATH: ${SRCTOP}/contrib/unvis diff --git a/usr.bin/unzip/Makefile b/usr.bin/unzip/Makefile index 7193ab58b5a..2db5e9ac4c9 100644 --- a/usr.bin/unzip/Makefile +++ b/usr.bin/unzip/Makefile @@ -1,4 +1,3 @@ - .include _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/unzip/tests/Makefile b/usr.bin/unzip/tests/Makefile index 85fc4b88cd7..404a546410e 100644 --- a/usr.bin/unzip/tests/Makefile +++ b/usr.bin/unzip/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests _LIBARCHIVEDIR= ${SRCTOP}/contrib/libarchive diff --git a/usr.bin/users/Makefile b/usr.bin/users/Makefile index 04353e2b03b..dfaf41dc285 100644 --- a/usr.bin/users/Makefile +++ b/usr.bin/users/Makefile @@ -1,4 +1,3 @@ - WARNS?= 3 PROG_CXX= users PACKAGE= acct diff --git a/usr.bin/vacation/Makefile b/usr.bin/vacation/Makefile index 3503bc99cc6..db69e1d6cb8 100644 --- a/usr.bin/vacation/Makefile +++ b/usr.bin/vacation/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/vacation diff --git a/usr.bin/vgrind/Makefile b/usr.bin/vgrind/Makefile index d4730fe49fd..6ab148768aa 100644 --- a/usr.bin/vgrind/Makefile +++ b/usr.bin/vgrind/Makefile @@ -1,4 +1,3 @@ - PROG= vfontedpr SRCS= regexp.c vfontedpr.c SCRIPTS=vgrind.sh diff --git a/usr.bin/vis/Makefile b/usr.bin/vis/Makefile index d980f32bf39..ad60828bad9 100644 --- a/usr.bin/vis/Makefile +++ b/usr.bin/vis/Makefile @@ -1,4 +1,3 @@ - PROG= vis SRCS= vis.c foldit.c diff --git a/usr.bin/vmstat/Makefile b/usr.bin/vmstat/Makefile index 8322c4e4147..6efbb186f43 100644 --- a/usr.bin/vmstat/Makefile +++ b/usr.bin/vmstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= vmstat diff --git a/usr.bin/vmstat/tests/Makefile b/usr.bin/vmstat/tests/Makefile index 12ad705fa5c..67c759df386 100644 --- a/usr.bin/vmstat/tests/Makefile +++ b/usr.bin/vmstat/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests NETBSD_ATF_TESTS_SH= vmstat_test diff --git a/usr.bin/vtfontcvt/Makefile b/usr.bin/vtfontcvt/Makefile index 62b6da8163f..de011660ca2 100644 --- a/usr.bin/vtfontcvt/Makefile +++ b/usr.bin/vtfontcvt/Makefile @@ -1,4 +1,3 @@ - PROG= vtfontcvt SRCS= vtfontcvt.c lz4.c MAN8= vtfontcvt.8 diff --git a/usr.bin/w/Makefile b/usr.bin/w/Makefile index ed0a887a53f..7ebf27d40ca 100644 --- a/usr.bin/w/Makefile +++ b/usr.bin/w/Makefile @@ -1,4 +1,3 @@ - PROG= w SRCS= fmt.c pr_time.c proc_compare.c w.c MAN= w.1 uptime.1 diff --git a/usr.bin/wall/Makefile b/usr.bin/wall/Makefile index 0b3e6d55ccd..1b0df127135 100644 --- a/usr.bin/wall/Makefile +++ b/usr.bin/wall/Makefile @@ -1,4 +1,3 @@ - PROG= wall SRCS= ttymsg.c wall.c BINGRP= tty diff --git a/usr.bin/wc/Makefile b/usr.bin/wc/Makefile index 7dea1ef9788..e4fe6cb452d 100644 --- a/usr.bin/wc/Makefile +++ b/usr.bin/wc/Makefile @@ -1,4 +1,3 @@ - .include PROG= wc diff --git a/usr.bin/wc/tests/Makefile b/usr.bin/wc/tests/Makefile index 37d6b504923..18002a8d70f 100644 --- a/usr.bin/wc/tests/Makefile +++ b/usr.bin/wc/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= wc_test diff --git a/usr.bin/wg/Makefile b/usr.bin/wg/Makefile index 6627dfd69e3..4d7ffc19764 100644 --- a/usr.bin/wg/Makefile +++ b/usr.bin/wg/Makefile @@ -1,4 +1,3 @@ - PROG= wg MAN= wg.8 diff --git a/usr.bin/what/Makefile b/usr.bin/what/Makefile index 891598d8ac7..7b242889d37 100644 --- a/usr.bin/what/Makefile +++ b/usr.bin/what/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= what diff --git a/usr.bin/whereis/Makefile b/usr.bin/whereis/Makefile index 308338b2206..5803279820f 100644 --- a/usr.bin/whereis/Makefile +++ b/usr.bin/whereis/Makefile @@ -1,4 +1,3 @@ - PROG= whereis .include diff --git a/usr.bin/which/Makefile b/usr.bin/which/Makefile index 14a003ef00b..097d238dfbb 100644 --- a/usr.bin/which/Makefile +++ b/usr.bin/which/Makefile @@ -1,4 +1,3 @@ - PROG= which .include diff --git a/usr.bin/who/Makefile b/usr.bin/who/Makefile index 5bed74f3c06..77626f51824 100644 --- a/usr.bin/who/Makefile +++ b/usr.bin/who/Makefile @@ -1,4 +1,3 @@ - PROG= who PACKAGE= acct diff --git a/usr.bin/whois/Makefile b/usr.bin/whois/Makefile index 744c733b430..794d9a06ee8 100644 --- a/usr.bin/whois/Makefile +++ b/usr.bin/whois/Makefile @@ -1,4 +1,3 @@ - PROG= whois .if defined(SOCKS) diff --git a/usr.bin/write/Makefile b/usr.bin/write/Makefile index 3ccedef7fc0..d7e362cc9c8 100644 --- a/usr.bin/write/Makefile +++ b/usr.bin/write/Makefile @@ -1,4 +1,3 @@ - PROG= write BINMODE=2555 BINGRP= tty diff --git a/usr.bin/xargs/Makefile b/usr.bin/xargs/Makefile index d3ab18d4fd9..3202d0e7322 100644 --- a/usr.bin/xargs/Makefile +++ b/usr.bin/xargs/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/xargs/tests/Makefile b/usr.bin/xargs/tests/Makefile index 50545c11f90..b1e6782069d 100644 --- a/usr.bin/xargs/tests/Makefile +++ b/usr.bin/xargs/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.bin/xinstall/Makefile b/usr.bin/xinstall/Makefile index 1ae117441b7..fd95b97160f 100644 --- a/usr.bin/xinstall/Makefile +++ b/usr.bin/xinstall/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.bin/xinstall/tests/Makefile b/usr.bin/xinstall/tests/Makefile index c0ea7354b34..46b47dc97c6 100644 --- a/usr.bin/xinstall/tests/Makefile +++ b/usr.bin/xinstall/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= install_test .include diff --git a/usr.bin/xo/Makefile b/usr.bin/xo/Makefile index d0756d68f20..82c0940f490 100644 --- a/usr.bin/xo/Makefile +++ b/usr.bin/xo/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xo/tests/Makefile b/usr.bin/xo/tests/Makefile index 4cceb7ada02..6bb9d9c0029 100644 --- a/usr.bin/xo/tests/Makefile +++ b/usr.bin/xo/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests .include diff --git a/usr.bin/xohtml/Makefile b/usr.bin/xohtml/Makefile index 12a2cdebe83..7b79280f36b 100644 --- a/usr.bin/xohtml/Makefile +++ b/usr.bin/xohtml/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xolint/Makefile b/usr.bin/xolint/Makefile index c180003d8e0..2a35bc946f4 100644 --- a/usr.bin/xolint/Makefile +++ b/usr.bin/xolint/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xopo/Makefile b/usr.bin/xopo/Makefile index 70c70f61be7..6dae6ac233b 100644 --- a/usr.bin/xopo/Makefile +++ b/usr.bin/xopo/Makefile @@ -1,4 +1,3 @@ - .include LIBXOSRC= ${SRCTOP}/contrib/libxo diff --git a/usr.bin/xstr/Makefile b/usr.bin/xstr/Makefile index 777c2ca74ad..290d553a4ed 100644 --- a/usr.bin/xstr/Makefile +++ b/usr.bin/xstr/Makefile @@ -1,4 +1,3 @@ - PROG= xstr .include diff --git a/usr.bin/xzdec/Makefile b/usr.bin/xzdec/Makefile index 3425b4b6b91..361315fab8b 100644 --- a/usr.bin/xzdec/Makefile +++ b/usr.bin/xzdec/Makefile @@ -1,4 +1,3 @@ - PROG= xzdec LINKS= ${BINDIR}/xzdec ${BINDIR}/lzdec diff --git a/usr.bin/yacc/Makefile b/usr.bin/yacc/Makefile index 1204bb2d5ad..42ee10952e0 100644 --- a/usr.bin/yacc/Makefile +++ b/usr.bin/yacc/Makefile @@ -1,4 +1,3 @@ - .include BYACC_SRC= ${SRCTOP}/contrib/byacc diff --git a/usr.bin/yacc/tests/Makefile b/usr.bin/yacc/tests/Makefile index 5f105be69a0..c2832bc0685 100644 --- a/usr.bin/yacc/tests/Makefile +++ b/usr.bin/yacc/tests/Makefile @@ -1,4 +1,3 @@ - .include TEST_DIR= ${SRCTOP}/contrib/byacc/test diff --git a/usr.bin/yes/Makefile b/usr.bin/yes/Makefile index ea20842b98b..b1d4075b591 100644 --- a/usr.bin/yes/Makefile +++ b/usr.bin/yes/Makefile @@ -1,4 +1,3 @@ - PROG= yes .include diff --git a/usr.bin/ypcat/Makefile b/usr.bin/ypcat/Makefile index d6f5bf5f653..15a48cf94e9 100644 --- a/usr.bin/ypcat/Makefile +++ b/usr.bin/ypcat/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypcat diff --git a/usr.bin/ypmatch/Makefile b/usr.bin/ypmatch/Makefile index 89033086136..2d04ff96116 100644 --- a/usr.bin/ypmatch/Makefile +++ b/usr.bin/ypmatch/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypmatch diff --git a/usr.bin/ypwhich/Makefile b/usr.bin/ypwhich/Makefile index e9a219d901b..eaca41db1bf 100644 --- a/usr.bin/ypwhich/Makefile +++ b/usr.bin/ypwhich/Makefile @@ -1,4 +1,3 @@ - YPSERV=${SRCTOP}/usr.sbin/ypserv/common .PATH: ${YPSERV} diff --git a/usr.bin/zstd/Makefile b/usr.bin/zstd/Makefile index 2e5c2d3495e..dd54acbf83c 100644 --- a/usr.bin/zstd/Makefile +++ b/usr.bin/zstd/Makefile @@ -1,4 +1,3 @@ - PROG= zstd SRCS= \ benchfn.c \ diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 0aac7062146..9d6c90d0946 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= adduser \ diff --git a/usr.sbin/Makefile.amd64 b/usr.sbin/Makefile.amd64 index da4ffd2a6b0..4ee0bab60e3 100644 --- a/usr.sbin/Makefile.amd64 +++ b/usr.sbin/Makefile.amd64 @@ -1,4 +1,3 @@ - # mptable: broken (not 64 bit clean) # pnpinfo: crashes (not really useful anyway) .if ${MK_ACPI} != "no" diff --git a/usr.sbin/Makefile.i386 b/usr.sbin/Makefile.i386 index da8f18efbef..4c1418eb266 100644 --- a/usr.sbin/Makefile.i386 +++ b/usr.sbin/Makefile.i386 @@ -1,4 +1,3 @@ - .if ${MK_ACPI} != "no" SUBDIR+= acpi .endif diff --git a/usr.sbin/Makefile.inc b/usr.sbin/Makefile.inc index 523a0dd4464..1890d51e766 100644 --- a/usr.sbin/Makefile.inc +++ b/usr.sbin/Makefile.inc @@ -1,2 +1 @@ - BINDIR?= /usr/sbin diff --git a/usr.sbin/Makefile.powerpc b/usr.sbin/Makefile.powerpc index d6b05857e15..6387cd8840d 100644 --- a/usr.sbin/Makefile.powerpc +++ b/usr.sbin/Makefile.powerpc @@ -1,4 +1,3 @@ - .if ${MACHINE_ARCH} != "powerpcspe" SUBDIR+= nvram .endif diff --git a/usr.sbin/ac/Makefile b/usr.sbin/ac/Makefile index 9a90c456643..f41716d3d3b 100644 --- a/usr.sbin/ac/Makefile +++ b/usr.sbin/ac/Makefile @@ -1,4 +1,3 @@ - PROG= ac PACKAGE= acct MAN= ac.8 diff --git a/usr.sbin/accton/Makefile b/usr.sbin/accton/Makefile index 01abcda32e0..a2b74d8a37e 100644 --- a/usr.sbin/accton/Makefile +++ b/usr.sbin/accton/Makefile @@ -1,4 +1,3 @@ - PROG= accton MAN= accton.8 diff --git a/usr.sbin/acpi/acpidb/Makefile b/usr.sbin/acpi/acpidb/Makefile index dc3a871edf3..377846a016a 100644 --- a/usr.sbin/acpi/acpidb/Makefile +++ b/usr.sbin/acpi/acpidb/Makefile @@ -1,4 +1,3 @@ - PROG= acpidb SRCS= acpidb.c diff --git a/usr.sbin/acpi/acpidump/Makefile b/usr.sbin/acpi/acpidump/Makefile index d0bb14284c1..0b4dd02d920 100644 --- a/usr.sbin/acpi/acpidump/Makefile +++ b/usr.sbin/acpi/acpidump/Makefile @@ -1,4 +1,3 @@ - PROG= acpidump MAN= acpidump.8 SRCS= acpi.c acpi_user.c acpidump.c diff --git a/usr.sbin/acpi/iasl/Makefile b/usr.sbin/acpi/iasl/Makefile index 79ea48dde8e..5b163b9d888 100644 --- a/usr.sbin/acpi/iasl/Makefile +++ b/usr.sbin/acpi/iasl/Makefile @@ -1,4 +1,3 @@ - PROG= iasl # common diff --git a/usr.sbin/adduser/Makefile b/usr.sbin/adduser/Makefile index 2f18381073a..607acdade87 100644 --- a/usr.sbin/adduser/Makefile +++ b/usr.sbin/adduser/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=adduser.sh rmuser.sh MAN= adduser.conf.5 adduser.8 rmuser.8 diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile index c18a841b9c1..f6c42194401 100644 --- a/usr.sbin/apm/Makefile +++ b/usr.sbin/apm/Makefile @@ -1,4 +1,3 @@ - PROG= apm MAN= apm.8 MLINKS= apm.8 apmconf.8 diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile index 57c07bff721..bfe59cc7cd7 100644 --- a/usr.sbin/apmd/Makefile +++ b/usr.sbin/apmd/Makefile @@ -1,4 +1,3 @@ - CONFS= apmd.conf PROG= apmd MAN= apmd.8 diff --git a/usr.sbin/arp/Makefile b/usr.sbin/arp/Makefile index 0730be75b89..7b6911f8e0f 100644 --- a/usr.sbin/arp/Makefile +++ b/usr.sbin/arp/Makefile @@ -1,4 +1,3 @@ - .include PROG= arp diff --git a/usr.sbin/authpf/Makefile b/usr.sbin/authpf/Makefile index 44cd1838af7..d4035f6ff49 100644 --- a/usr.sbin/authpf/Makefile +++ b/usr.sbin/authpf/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/authpf PACKAGE=pf diff --git a/usr.sbin/autofs/Makefile b/usr.sbin/autofs/Makefile index 195281df7cf..2d0c1bcb880 100644 --- a/usr.sbin/autofs/Makefile +++ b/usr.sbin/autofs/Makefile @@ -1,4 +1,3 @@ - CONFS= auto_master PACKAGE=autofs PROG= automountd diff --git a/usr.sbin/autofs/autofs/Makefile b/usr.sbin/autofs/autofs/Makefile index d602381bbce..699c9dcde2c 100644 --- a/usr.sbin/autofs/autofs/Makefile +++ b/usr.sbin/autofs/autofs/Makefile @@ -1,4 +1,3 @@ - PACKAGE= autofs CONFS= include_ldap \ diff --git a/usr.sbin/bhyve/kbdlayout/Makefile b/usr.sbin/bhyve/kbdlayout/Makefile index ed3f3dc9fbc..2a7b3f2b39a 100644 --- a/usr.sbin/bhyve/kbdlayout/Makefile +++ b/usr.sbin/bhyve/kbdlayout/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bhyve FILESDIR= ${SHAREDIR}/bhyve/kbdlayout FILES= default \ diff --git a/usr.sbin/bhyveload/Makefile b/usr.sbin/bhyveload/Makefile index f4091f8a092..bc134fa630d 100644 --- a/usr.sbin/bhyveload/Makefile +++ b/usr.sbin/bhyveload/Makefile @@ -1,4 +1,3 @@ - PROG= bhyveload SRCS= bhyveload.c MAN= bhyveload.8 diff --git a/usr.sbin/blacklistctl/Makefile b/usr.sbin/blacklistctl/Makefile index 065c17843ce..7bdff4158bb 100644 --- a/usr.sbin/blacklistctl/Makefile +++ b/usr.sbin/blacklistctl/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist .PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port diff --git a/usr.sbin/blacklistd/Makefile b/usr.sbin/blacklistd/Makefile index 92928ca3e60..e0a3ddd8088 100644 --- a/usr.sbin/blacklistd/Makefile +++ b/usr.sbin/blacklistd/Makefile @@ -1,4 +1,3 @@ - BLOCKLIST_DIR=${SRCTOP}/contrib/blocklist .PATH: ${BLOCKLIST_DIR}/bin ${BLOCKLIST_DIR}/port diff --git a/usr.sbin/bluetooth/Makefile.inc b/usr.sbin/bluetooth/Makefile.inc index ebb2c23220d..e4fa9787eb5 100644 --- a/usr.sbin/bluetooth/Makefile.inc +++ b/usr.sbin/bluetooth/Makefile.inc @@ -1,2 +1 @@ - .include "${.CURDIR:H:H}/Makefile.inc" diff --git a/usr.sbin/bluetooth/ath3kfw/Makefile b/usr.sbin/bluetooth/ath3kfw/Makefile index 97f2f008391..39dcde33df8 100644 --- a/usr.sbin/bluetooth/ath3kfw/Makefile +++ b/usr.sbin/bluetooth/ath3kfw/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bluetooth PROG= ath3kfw MAN= ath3kfw.8 diff --git a/usr.sbin/bluetooth/bluetooth-config/Makefile b/usr.sbin/bluetooth/bluetooth-config/Makefile index 19598ebb112..435ac6546b1 100644 --- a/usr.sbin/bluetooth/bluetooth-config/Makefile +++ b/usr.sbin/bluetooth/bluetooth-config/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bluetooth SCRIPTS=bluetooth-config.sh MAN= bluetooth-config.8 diff --git a/usr.sbin/bluetooth/iwmbtfw/Makefile b/usr.sbin/bluetooth/iwmbtfw/Makefile index 0a81d7fdbc3..dde586b3aa9 100644 --- a/usr.sbin/bluetooth/iwmbtfw/Makefile +++ b/usr.sbin/bluetooth/iwmbtfw/Makefile @@ -1,4 +1,3 @@ - PACKAGE= bluetooth CONFS= iwmbtfw.conf CONFSDIR= /etc/devd diff --git a/usr.sbin/boot0cfg/Makefile b/usr.sbin/boot0cfg/Makefile index 3fa3344aeb0..df79ff7a444 100644 --- a/usr.sbin/boot0cfg/Makefile +++ b/usr.sbin/boot0cfg/Makefile @@ -1,4 +1,3 @@ - PROG= boot0cfg MAN= boot0cfg.8 diff --git a/usr.sbin/bootparamd/Makefile b/usr.sbin/bootparamd/Makefile index c4f61985a20..e89c1859a01 100644 --- a/usr.sbin/bootparamd/Makefile +++ b/usr.sbin/bootparamd/Makefile @@ -1,4 +1,3 @@ - SUBDIR= bootparamd callbootd .include diff --git a/usr.sbin/bootparamd/Makefile.inc b/usr.sbin/bootparamd/Makefile.inc index e5b8262ffd7..ec1bce43457 100644 --- a/usr.sbin/bootparamd/Makefile.inc +++ b/usr.sbin/bootparamd/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin NO_WCAST_ALIGN= diff --git a/usr.sbin/bootparamd/bootparamd/Makefile b/usr.sbin/bootparamd/bootparamd/Makefile index ca1b26b62bc..182cd0d1309 100644 --- a/usr.sbin/bootparamd/bootparamd/Makefile +++ b/usr.sbin/bootparamd/bootparamd/Makefile @@ -1,4 +1,3 @@ - .include PROG= bootparamd diff --git a/usr.sbin/bootparamd/callbootd/Makefile b/usr.sbin/bootparamd/callbootd/Makefile index f5e102a5a60..0228b3ef041 100644 --- a/usr.sbin/bootparamd/callbootd/Makefile +++ b/usr.sbin/bootparamd/callbootd/Makefile @@ -1,4 +1,3 @@ - PROG= callbootd MAN= SRCS= callbootd.c ${GENSRCS} diff --git a/usr.sbin/bsdconfig/Makefile b/usr.sbin/bsdconfig/Makefile index 0e2586d276c..5b03ebbe39f 100644 --- a/usr.sbin/bsdconfig/Makefile +++ b/usr.sbin/bsdconfig/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= console \ diff --git a/usr.sbin/bsdconfig/console/Makefile b/usr.sbin/bsdconfig/console/Makefile index dbe69e4f2a3..2e1c1ba8de1 100644 --- a/usr.sbin/bsdconfig/console/Makefile +++ b/usr.sbin/bsdconfig/console/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console diff --git a/usr.sbin/bsdconfig/console/include/Makefile b/usr.sbin/bsdconfig/console/include/Makefile index 771c54f0a8c..09c1f631fcc 100644 --- a/usr.sbin/bsdconfig/console/include/Makefile +++ b/usr.sbin/bsdconfig/console/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/080.console/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/diskmgmt/Makefile b/usr.sbin/bsdconfig/diskmgmt/Makefile index cdeafba6a55..668f3fab93a 100644 --- a/usr.sbin/bsdconfig/diskmgmt/Makefile +++ b/usr.sbin/bsdconfig/diskmgmt/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt diff --git a/usr.sbin/bsdconfig/diskmgmt/include/Makefile b/usr.sbin/bsdconfig/diskmgmt/include/Makefile index 40afa94a21d..36bbedc9e8b 100644 --- a/usr.sbin/bsdconfig/diskmgmt/include/Makefile +++ b/usr.sbin/bsdconfig/diskmgmt/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/050.diskmgmt/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/docsinstall/Makefile b/usr.sbin/bsdconfig/docsinstall/Makefile index 0a4b3a62061..e3a7ea81b04 100644 --- a/usr.sbin/bsdconfig/docsinstall/Makefile +++ b/usr.sbin/bsdconfig/docsinstall/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall diff --git a/usr.sbin/bsdconfig/docsinstall/include/Makefile b/usr.sbin/bsdconfig/docsinstall/include/Makefile index 17ee3a49149..3518ac9cdb0 100644 --- a/usr.sbin/bsdconfig/docsinstall/include/Makefile +++ b/usr.sbin/bsdconfig/docsinstall/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/020.docsinstall/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/dot/Makefile b/usr.sbin/bsdconfig/dot/Makefile index 51bca33942c..9a8ab153855 100644 --- a/usr.sbin/bsdconfig/dot/Makefile +++ b/usr.sbin/bsdconfig/dot/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/dot diff --git a/usr.sbin/bsdconfig/dot/include/Makefile b/usr.sbin/bsdconfig/dot/include/Makefile index b9ff1af38cb..629bf74c7cd 100644 --- a/usr.sbin/bsdconfig/dot/include/Makefile +++ b/usr.sbin/bsdconfig/dot/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/dot/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/examples/Makefile b/usr.sbin/bsdconfig/examples/Makefile index 8a716f9553c..3f7d638e2fa 100644 --- a/usr.sbin/bsdconfig/examples/Makefile +++ b/usr.sbin/bsdconfig/examples/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/examples/bsdconfig FILES= add_some_packages.sh browse_packages_http.sh bsdconfigrc diff --git a/usr.sbin/bsdconfig/include/Makefile b/usr.sbin/bsdconfig/include/Makefile index 00ebf0b7e37..aa35368b5b8 100644 --- a/usr.sbin/bsdconfig/include/Makefile +++ b/usr.sbin/bsdconfig/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/include FILES= bsdconfig.hlp media.hlp messages.subr network_device.hlp \ options.hlp tcp.hlp usage.hlp diff --git a/usr.sbin/bsdconfig/includes/Makefile b/usr.sbin/bsdconfig/includes/Makefile index a477fce4362..3392af7cb64 100644 --- a/usr.sbin/bsdconfig/includes/Makefile +++ b/usr.sbin/bsdconfig/includes/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/includes diff --git a/usr.sbin/bsdconfig/includes/include/Makefile b/usr.sbin/bsdconfig/includes/include/Makefile index 2a0c1d234e7..1c1aff1b2fc 100644 --- a/usr.sbin/bsdconfig/includes/include/Makefile +++ b/usr.sbin/bsdconfig/includes/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/includes/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/mouse/Makefile b/usr.sbin/bsdconfig/mouse/Makefile index e31a29b3403..4a3ddd46220 100644 --- a/usr.sbin/bsdconfig/mouse/Makefile +++ b/usr.sbin/bsdconfig/mouse/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse diff --git a/usr.sbin/bsdconfig/mouse/include/Makefile b/usr.sbin/bsdconfig/mouse/include/Makefile index 0d33ec61c8e..9b5fa8aa2c4 100644 --- a/usr.sbin/bsdconfig/mouse/include/Makefile +++ b/usr.sbin/bsdconfig/mouse/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/110.mouse/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/networking/Makefile b/usr.sbin/bsdconfig/networking/Makefile index f870d3df63a..3a51adb82fa 100644 --- a/usr.sbin/bsdconfig/networking/Makefile +++ b/usr.sbin/bsdconfig/networking/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking diff --git a/usr.sbin/bsdconfig/networking/include/Makefile b/usr.sbin/bsdconfig/networking/include/Makefile index 22fd0ea262f..52e8654d252 100644 --- a/usr.sbin/bsdconfig/networking/include/Makefile +++ b/usr.sbin/bsdconfig/networking/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/120.networking/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/networking/share/Makefile b/usr.sbin/bsdconfig/networking/share/Makefile index 8b8a4cc7192..1cd5dbb4c17 100644 --- a/usr.sbin/bsdconfig/networking/share/Makefile +++ b/usr.sbin/bsdconfig/networking/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/networking FILES= common.subr device.subr hostname.subr ipaddr.subr media.subr \ netmask.subr resolv.subr routing.subr services.subr diff --git a/usr.sbin/bsdconfig/packages/Makefile b/usr.sbin/bsdconfig/packages/Makefile index e5d4796de5f..9081b784b91 100644 --- a/usr.sbin/bsdconfig/packages/Makefile +++ b/usr.sbin/bsdconfig/packages/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages diff --git a/usr.sbin/bsdconfig/packages/include/Makefile b/usr.sbin/bsdconfig/packages/include/Makefile index 80fe431c56f..593c8eb8069 100644 --- a/usr.sbin/bsdconfig/packages/include/Makefile +++ b/usr.sbin/bsdconfig/packages/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/030.packages/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/password/Makefile b/usr.sbin/bsdconfig/password/Makefile index d31ca8a906b..ebb6ee28a70 100644 --- a/usr.sbin/bsdconfig/password/Makefile +++ b/usr.sbin/bsdconfig/password/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password diff --git a/usr.sbin/bsdconfig/password/include/Makefile b/usr.sbin/bsdconfig/password/include/Makefile index 530a41bdc32..48176127872 100644 --- a/usr.sbin/bsdconfig/password/include/Makefile +++ b/usr.sbin/bsdconfig/password/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/040.password/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/password/share/Makefile b/usr.sbin/bsdconfig/password/share/Makefile index 49edf9ae212..f21b6e8f961 100644 --- a/usr.sbin/bsdconfig/password/share/Makefile +++ b/usr.sbin/bsdconfig/password/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/password FILES= password.subr diff --git a/usr.sbin/bsdconfig/security/Makefile b/usr.sbin/bsdconfig/security/Makefile index 46742f93ba6..d8744fefb2c 100644 --- a/usr.sbin/bsdconfig/security/Makefile +++ b/usr.sbin/bsdconfig/security/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security diff --git a/usr.sbin/bsdconfig/security/include/Makefile b/usr.sbin/bsdconfig/security/include/Makefile index 55a9ec018b0..73f8bb67a65 100644 --- a/usr.sbin/bsdconfig/security/include/Makefile +++ b/usr.sbin/bsdconfig/security/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/130.security/include FILES= messages.subr securelevel.hlp diff --git a/usr.sbin/bsdconfig/share/Makefile b/usr.sbin/bsdconfig/share/Makefile index 69d045c6f1b..d485577da5d 100644 --- a/usr.sbin/bsdconfig/share/Makefile +++ b/usr.sbin/bsdconfig/share/Makefile @@ -1,4 +1,3 @@ - SUBDIR= media packages FILESDIR= ${SHAREDIR}/bsdconfig diff --git a/usr.sbin/bsdconfig/share/media/Makefile b/usr.sbin/bsdconfig/share/media/Makefile index e90b87f70cc..9e4a3793b4b 100644 --- a/usr.sbin/bsdconfig/share/media/Makefile +++ b/usr.sbin/bsdconfig/share/media/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/media FILES= any.subr cdrom.subr common.subr directory.subr dos.subr \ http.subr httpproxy.subr network.subr \ diff --git a/usr.sbin/bsdconfig/share/packages/Makefile b/usr.sbin/bsdconfig/share/packages/Makefile index c8e710902be..939938e3f61 100644 --- a/usr.sbin/bsdconfig/share/packages/Makefile +++ b/usr.sbin/bsdconfig/share/packages/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/packages FILES= categories.subr index.awk index.subr musthavepkg.subr packages.subr diff --git a/usr.sbin/bsdconfig/startup/Makefile b/usr.sbin/bsdconfig/startup/Makefile index b9fd43a101e..7090c4d3e53 100644 --- a/usr.sbin/bsdconfig/startup/Makefile +++ b/usr.sbin/bsdconfig/startup/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup diff --git a/usr.sbin/bsdconfig/startup/include/Makefile b/usr.sbin/bsdconfig/startup/include/Makefile index 7edef4f2406..55a2b021c56 100644 --- a/usr.sbin/bsdconfig/startup/include/Makefile +++ b/usr.sbin/bsdconfig/startup/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/140.startup/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/startup/share/Makefile b/usr.sbin/bsdconfig/startup/share/Makefile index b58fbf2f53a..9f65a585e8f 100644 --- a/usr.sbin/bsdconfig/startup/share/Makefile +++ b/usr.sbin/bsdconfig/startup/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/startup FILES= rcconf.subr rcedit.subr rcvar.subr diff --git a/usr.sbin/bsdconfig/timezone/Makefile b/usr.sbin/bsdconfig/timezone/Makefile index 4d01453e4ce..eb1cbb931f6 100644 --- a/usr.sbin/bsdconfig/timezone/Makefile +++ b/usr.sbin/bsdconfig/timezone/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone diff --git a/usr.sbin/bsdconfig/timezone/include/Makefile b/usr.sbin/bsdconfig/timezone/include/Makefile index 1137f01da10..45bf7595557 100644 --- a/usr.sbin/bsdconfig/timezone/include/Makefile +++ b/usr.sbin/bsdconfig/timezone/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/090.timezone/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/timezone/share/Makefile b/usr.sbin/bsdconfig/timezone/share/Makefile index 1a9557a1c10..8a4ba14b3a8 100644 --- a/usr.sbin/bsdconfig/timezone/share/Makefile +++ b/usr.sbin/bsdconfig/timezone/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/timezone FILES= continents.subr countries.subr iso3166.subr menus.subr \ zones.subr diff --git a/usr.sbin/bsdconfig/ttys/Makefile b/usr.sbin/bsdconfig/ttys/Makefile index c9e1081c99e..6bae46540dc 100644 --- a/usr.sbin/bsdconfig/ttys/Makefile +++ b/usr.sbin/bsdconfig/ttys/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys diff --git a/usr.sbin/bsdconfig/ttys/include/Makefile b/usr.sbin/bsdconfig/ttys/include/Makefile index df8b5c26268..60f7201b10c 100644 --- a/usr.sbin/bsdconfig/ttys/include/Makefile +++ b/usr.sbin/bsdconfig/ttys/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/150.ttys/include FILES= messages.subr diff --git a/usr.sbin/bsdconfig/usermgmt/Makefile b/usr.sbin/bsdconfig/usermgmt/Makefile index 2408331a508..47865d1c021 100644 --- a/usr.sbin/bsdconfig/usermgmt/Makefile +++ b/usr.sbin/bsdconfig/usermgmt/Makefile @@ -1,4 +1,3 @@ - SUBDIR= include share FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt diff --git a/usr.sbin/bsdconfig/usermgmt/include/Makefile b/usr.sbin/bsdconfig/usermgmt/include/Makefile index be07c74cb89..5725bfde360 100644 --- a/usr.sbin/bsdconfig/usermgmt/include/Makefile +++ b/usr.sbin/bsdconfig/usermgmt/include/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${LIBEXECDIR}/bsdconfig/070.usermgmt/include FILES= messages.subr usermgmt.hlp diff --git a/usr.sbin/bsdconfig/usermgmt/share/Makefile b/usr.sbin/bsdconfig/usermgmt/share/Makefile index 62230e9a0d2..6c111d5a1ba 100644 --- a/usr.sbin/bsdconfig/usermgmt/share/Makefile +++ b/usr.sbin/bsdconfig/usermgmt/share/Makefile @@ -1,4 +1,3 @@ - FILESDIR= ${SHAREDIR}/bsdconfig/usermgmt FILES= group.subr group_input.subr user.subr user_input.subr diff --git a/usr.sbin/bsdinstall/Makefile b/usr.sbin/bsdinstall/Makefile index ec7ff2aebaf..c9ba7cb52cd 100644 --- a/usr.sbin/bsdinstall/Makefile +++ b/usr.sbin/bsdinstall/Makefile @@ -1,4 +1,3 @@ - SUBDIR= distextract distfetch include partedit runconsoles scripts SUBDIR_PARALLEL= SUBDIR_DEPEND_distextract = include diff --git a/usr.sbin/bsdinstall/distextract/Makefile b/usr.sbin/bsdinstall/distextract/Makefile index 6813c9a7939..d29b0deba02 100644 --- a/usr.sbin/bsdinstall/distextract/Makefile +++ b/usr.sbin/bsdinstall/distextract/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distextract LIBADD= archive bsddialog m diff --git a/usr.sbin/bsdinstall/distfetch/Makefile b/usr.sbin/bsdinstall/distfetch/Makefile index 8a901173459..3f63e87856c 100644 --- a/usr.sbin/bsdinstall/distfetch/Makefile +++ b/usr.sbin/bsdinstall/distfetch/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/bsdinstall PROG= distfetch LIBADD= fetch bsddialog diff --git a/usr.sbin/bsdinstall/partedit/Makefile b/usr.sbin/bsdinstall/partedit/Makefile index 397e404a126..7c784addaec 100644 --- a/usr.sbin/bsdinstall/partedit/Makefile +++ b/usr.sbin/bsdinstall/partedit/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/bsdinstall PROG= partedit LINKS= ${BINDIR}/partedit ${BINDIR}/autopart \ diff --git a/usr.sbin/bsdinstall/scripts/Makefile b/usr.sbin/bsdinstall/scripts/Makefile index e4ef00ecba5..0ac51112010 100644 --- a/usr.sbin/bsdinstall/scripts/Makefile +++ b/usr.sbin/bsdinstall/scripts/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=auto \ adduser \ bootconfig \ diff --git a/usr.sbin/bsnmpd/Makefile b/usr.sbin/bsnmpd/Makefile index 0ce03a3a4dc..fce332458db 100644 --- a/usr.sbin/bsnmpd/Makefile +++ b/usr.sbin/bsnmpd/Makefile @@ -1,4 +1,3 @@ - SUBDIR= gensnmptree \ bsnmpd \ modules \ diff --git a/usr.sbin/bsnmpd/Makefile.inc b/usr.sbin/bsnmpd/Makefile.inc index 62cabd43957..876d6f891e7 100644 --- a/usr.sbin/bsnmpd/Makefile.inc +++ b/usr.sbin/bsnmpd/Makefile.inc @@ -1,3 +1,2 @@ - PACKAGE= bsnmp .include "../Makefile.inc" diff --git a/usr.sbin/bsnmpd/modules/Makefile b/usr.sbin/bsnmpd/modules/Makefile index ac1d4ecc647..25017057f15 100644 --- a/usr.sbin/bsnmpd/modules/Makefile +++ b/usr.sbin/bsnmpd/modules/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/bsnmp/snmpd diff --git a/usr.sbin/bsnmpd/modules/Makefile.inc b/usr.sbin/bsnmpd/modules/Makefile.inc index abdd059b368..e7f9156f0e7 100644 --- a/usr.sbin/bsnmpd/modules/Makefile.inc +++ b/usr.sbin/bsnmpd/modules/Makefile.inc @@ -1,4 +1,3 @@ - SHLIB_MAJOR= 6 PACKAGE= bsnmp diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile index 9fabe06d3f4..ddaa6ef13e6 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hast/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_hast/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/sbin/hastd diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile index d6eb9caab74..b388adc0885 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/Makefile @@ -1,4 +1,3 @@ - .include MOD= lm75 diff --git a/usr.sbin/btxld/Makefile b/usr.sbin/btxld/Makefile index ec28d20b49d..3b754647da4 100644 --- a/usr.sbin/btxld/Makefile +++ b/usr.sbin/btxld/Makefile @@ -1,4 +1,3 @@ - PROG= btxld MAN= btxld.8 SRCS= btxld.c elfh.c diff --git a/usr.sbin/camdd/Makefile b/usr.sbin/camdd/Makefile index 3762762ad52..8640c96d2de 100644 --- a/usr.sbin/camdd/Makefile +++ b/usr.sbin/camdd/Makefile @@ -1,4 +1,3 @@ - PROG= camdd SRCS= camdd.c SDIR= ${SRCTOP}/sys diff --git a/usr.sbin/cdcontrol/Makefile b/usr.sbin/cdcontrol/Makefile index 8bbd515f468..f95e59e51c4 100644 --- a/usr.sbin/cdcontrol/Makefile +++ b/usr.sbin/cdcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= cdcontrol LIBADD= edit diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile index 69894f8a823..88c024daf7e 100644 --- a/usr.sbin/certctl/Makefile +++ b/usr.sbin/certctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= certctl SCRIPTS=certctl.sh MAN= certctl.8 diff --git a/usr.sbin/chkgrp/Makefile b/usr.sbin/chkgrp/Makefile index a079ddb7b18..41ff5ecfa3b 100644 --- a/usr.sbin/chkgrp/Makefile +++ b/usr.sbin/chkgrp/Makefile @@ -1,4 +1,3 @@ - PROG= chkgrp MAN= chkgrp.8 diff --git a/usr.sbin/chown/Makefile b/usr.sbin/chown/Makefile index 705e20fa655..3e6ce8bfbd8 100644 --- a/usr.sbin/chown/Makefile +++ b/usr.sbin/chown/Makefile @@ -1,4 +1,3 @@ - .include PROG= chown diff --git a/usr.sbin/chown/tests/Makefile b/usr.sbin/chown/tests/Makefile index f0c8eb8a318..c4b17dfe6e2 100644 --- a/usr.sbin/chown/tests/Makefile +++ b/usr.sbin/chown/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH+= chown_test .include diff --git a/usr.sbin/chroot/Makefile b/usr.sbin/chroot/Makefile index 7935fa4b568..f4c0c2b9561 100644 --- a/usr.sbin/chroot/Makefile +++ b/usr.sbin/chroot/Makefile @@ -1,4 +1,3 @@ - PROG= chroot MAN= chroot.8 diff --git a/usr.sbin/ckdist/Makefile b/usr.sbin/ckdist/Makefile index 14ed52e5f27..c574ed86132 100644 --- a/usr.sbin/ckdist/Makefile +++ b/usr.sbin/ckdist/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/usr.bin/cksum PROG= ckdist diff --git a/usr.sbin/clear_locks/Makefile b/usr.sbin/clear_locks/Makefile index 93eb95d8cad..505b61fccd6 100644 --- a/usr.sbin/clear_locks/Makefile +++ b/usr.sbin/clear_locks/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= clear_locks diff --git a/usr.sbin/config/Makefile b/usr.sbin/config/Makefile index 5b10ac40df7..93011f40458 100644 --- a/usr.sbin/config/Makefile +++ b/usr.sbin/config/Makefile @@ -1,4 +1,3 @@ - SRCDIR:=${.PARSEDIR:tA} PROG_CXX= config diff --git a/usr.sbin/cpucontrol/Makefile b/usr.sbin/cpucontrol/Makefile index a468ca59b46..875c1eec412 100644 --- a/usr.sbin/cpucontrol/Makefile +++ b/usr.sbin/cpucontrol/Makefile @@ -1,4 +1,3 @@ - PROG= cpucontrol MAN= cpucontrol.8 SRCS= cpucontrol.c intel.c amd.c amd10h.c via.c ucode_subr.c diff --git a/usr.sbin/crashinfo/Makefile b/usr.sbin/crashinfo/Makefile index f65bed15487..859fa8ff608 100644 --- a/usr.sbin/crashinfo/Makefile +++ b/usr.sbin/crashinfo/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= crashinfo.sh MAN= crashinfo.8 diff --git a/usr.sbin/cron/Makefile b/usr.sbin/cron/Makefile index e24c33cb1a8..1131cff7b17 100644 --- a/usr.sbin/cron/Makefile +++ b/usr.sbin/cron/Makefile @@ -1,4 +1,3 @@ - SUBDIR= lib cron crontab .include diff --git a/usr.sbin/cron/Makefile.inc b/usr.sbin/cron/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/usr.sbin/cron/Makefile.inc +++ b/usr.sbin/cron/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.sbin/cron/cron/Makefile b/usr.sbin/cron/cron/Makefile index 206f001b838..c86f4fc56b7 100644 --- a/usr.sbin/cron/cron/Makefile +++ b/usr.sbin/cron/cron/Makefile @@ -1,4 +1,3 @@ - PACKAGE=cron CONFS= crontab PROG= cron diff --git a/usr.sbin/cron/crontab/Makefile b/usr.sbin/cron/crontab/Makefile index 5fbd2b44b2f..8c60575e7d7 100644 --- a/usr.sbin/cron/crontab/Makefile +++ b/usr.sbin/cron/crontab/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/bin PACKAGE=cron diff --git a/usr.sbin/cron/lib/Makefile b/usr.sbin/cron/lib/Makefile index cf41f2e72d2..475683cc7a6 100644 --- a/usr.sbin/cron/lib/Makefile +++ b/usr.sbin/cron/lib/Makefile @@ -1,4 +1,3 @@ - LIB= cron INTERNALLIB= SRCS= entry.c env.c misc.c diff --git a/usr.sbin/crunch/Makefile b/usr.sbin/crunch/Makefile index 79c2ab096bb..e3d1c9d73b1 100644 --- a/usr.sbin/crunch/Makefile +++ b/usr.sbin/crunch/Makefile @@ -1,4 +1,3 @@ - SUBDIR= crunchgen crunchide .include diff --git a/usr.sbin/crunch/Makefile.inc b/usr.sbin/crunch/Makefile.inc index 880f05576e1..da421050521 100644 --- a/usr.sbin/crunch/Makefile.inc +++ b/usr.sbin/crunch/Makefile.inc @@ -1,3 +1,2 @@ - # modify to taste BINDIR?= /usr/bin diff --git a/usr.sbin/crunch/crunchgen/Makefile b/usr.sbin/crunch/crunchgen/Makefile index 93d067461d7..4b2c34375f5 100644 --- a/usr.sbin/crunch/crunchgen/Makefile +++ b/usr.sbin/crunch/crunchgen/Makefile @@ -1,4 +1,3 @@ - PROG= crunchgen SRCS= crunchgen.c crunched_skel.c CLEANFILES+= crunched_skel.c diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile index 6467e951e0c..40dc1d3673c 100644 --- a/usr.sbin/crunch/crunchide/Makefile +++ b/usr.sbin/crunch/crunchide/Makefile @@ -1,4 +1,3 @@ - PROG= crunchide SRCS= crunchide.c exec_elf32.c exec_elf64.c diff --git a/usr.sbin/crunch/examples/Makefile b/usr.sbin/crunch/examples/Makefile index baef8f899cf..24c15143891 100644 --- a/usr.sbin/crunch/examples/Makefile +++ b/usr.sbin/crunch/examples/Makefile @@ -1,4 +1,3 @@ - CRUNCHED= fixit # below is boiler-plate to make $(CRUNCHED) from $(CRUNCHED).conf diff --git a/usr.sbin/ctladm/Makefile b/usr.sbin/ctladm/Makefile index b563891672b..7d2ec477a4f 100644 --- a/usr.sbin/ctladm/Makefile +++ b/usr.sbin/ctladm/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= iscsi diff --git a/usr.sbin/ctladm/tests/Makefile b/usr.sbin/ctladm/tests/Makefile index 825e38e6c6e..fd71da5aec4 100644 --- a/usr.sbin/ctladm/tests/Makefile +++ b/usr.sbin/ctladm/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= port diff --git a/usr.sbin/ctld/Makefile b/usr.sbin/ctld/Makefile index b14daccff25..d6bef1032c5 100644 --- a/usr.sbin/ctld/Makefile +++ b/usr.sbin/ctld/Makefile @@ -1,4 +1,3 @@ - .include CFLAGS+=-I${SRCTOP}/contrib/libucl/include diff --git a/usr.sbin/cxgbetool/Makefile b/usr.sbin/cxgbetool/Makefile index 356e93c910a..cc5290b8aaf 100644 --- a/usr.sbin/cxgbetool/Makefile +++ b/usr.sbin/cxgbetool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= cxgbe-tools PROG= cxgbetool MAN= cxgbetool.8 diff --git a/usr.sbin/daemon/Makefile b/usr.sbin/daemon/Makefile index f839079be4e..46500e5d2a3 100644 --- a/usr.sbin/daemon/Makefile +++ b/usr.sbin/daemon/Makefile @@ -1,4 +1,3 @@ - PROG= daemon MAN= daemon.8 diff --git a/usr.sbin/daemon/tests/Makefile b/usr.sbin/daemon/tests/Makefile index c5c6470416d..2c0312e7679 100644 --- a/usr.sbin/daemon/tests/Makefile +++ b/usr.sbin/daemon/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= daemon_test diff --git a/usr.sbin/dconschat/Makefile b/usr.sbin/dconschat/Makefile index f5f7795f284..70f59d7a5d3 100644 --- a/usr.sbin/dconschat/Makefile +++ b/usr.sbin/dconschat/Makefile @@ -1,4 +1,3 @@ - PROG= dconschat MAN= dconschat.8 diff --git a/usr.sbin/devctl/Makefile b/usr.sbin/devctl/Makefile index cf52a863229..376e05f5c0f 100644 --- a/usr.sbin/devctl/Makefile +++ b/usr.sbin/devctl/Makefile @@ -1,4 +1,3 @@ - PROG= devctl MAN= devctl.8 diff --git a/usr.sbin/devinfo/Makefile b/usr.sbin/devinfo/Makefile index 35444d5d5e6..f6506c176c9 100644 --- a/usr.sbin/devinfo/Makefile +++ b/usr.sbin/devinfo/Makefile @@ -1,4 +1,3 @@ - PACKAGE= devmatch PROG= devinfo MAN= devinfo.8 diff --git a/usr.sbin/diskinfo/Makefile b/usr.sbin/diskinfo/Makefile index d6e2b3c3a94..c8eb9f45f3b 100644 --- a/usr.sbin/diskinfo/Makefile +++ b/usr.sbin/diskinfo/Makefile @@ -1,4 +1,3 @@ - PROG= diskinfo MAN= diskinfo.8 diff --git a/usr.sbin/editmap/Makefile b/usr.sbin/editmap/Makefile index 0935595fd2c..e4300016aa1 100644 --- a/usr.sbin/editmap/Makefile +++ b/usr.sbin/editmap/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/editmap diff --git a/usr.sbin/edquota/Makefile b/usr.sbin/edquota/Makefile index 3e9d0ede672..518cd7f8e4e 100644 --- a/usr.sbin/edquota/Makefile +++ b/usr.sbin/edquota/Makefile @@ -1,4 +1,3 @@ - PROG= edquota MAN= edquota.8 diff --git a/usr.sbin/efidp/Makefile b/usr.sbin/efidp/Makefile index a1edd8ac5e5..bbadb6c50bb 100644 --- a/usr.sbin/efidp/Makefile +++ b/usr.sbin/efidp/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efidp diff --git a/usr.sbin/efitable/Makefile b/usr.sbin/efitable/Makefile index 81777bf7388..e9dd84fedd0 100644 --- a/usr.sbin/efitable/Makefile +++ b/usr.sbin/efitable/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efitable diff --git a/usr.sbin/efivar/Makefile b/usr.sbin/efivar/Makefile index 2e794e13968..dd655f6b953 100644 --- a/usr.sbin/efivar/Makefile +++ b/usr.sbin/efivar/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efivar diff --git a/usr.sbin/efiwake/Makefile b/usr.sbin/efiwake/Makefile index 0e6da280205..710890c5031 100644 --- a/usr.sbin/efiwake/Makefile +++ b/usr.sbin/efiwake/Makefile @@ -1,4 +1,3 @@ - PACKAGE= efi-tools PROG= efiwake diff --git a/usr.sbin/etcupdate/Makefile b/usr.sbin/etcupdate/Makefile index f2b6bd9ab37..df1fcbeaf12 100644 --- a/usr.sbin/etcupdate/Makefile +++ b/usr.sbin/etcupdate/Makefile @@ -1,4 +1,3 @@ - .include SCRIPTS=etcupdate.sh diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile index 77cd0b87a21..ba0b6223576 100644 --- a/usr.sbin/etcupdate/tests/Makefile +++ b/usr.sbin/etcupdate/tests/Makefile @@ -1,4 +1,3 @@ - PLAIN_TESTS_SH= .for test in always_test \ conflicts_test \ diff --git a/usr.sbin/extattr/Makefile b/usr.sbin/extattr/Makefile index 61171ef385d..b2951dabf93 100644 --- a/usr.sbin/extattr/Makefile +++ b/usr.sbin/extattr/Makefile @@ -1,4 +1,3 @@ - PROG= rmextattr MAN= rmextattr.8 diff --git a/usr.sbin/extattr/tests/Makefile b/usr.sbin/extattr/tests/Makefile index 3e3218032d0..a39bf21c786 100644 --- a/usr.sbin/extattr/tests/Makefile +++ b/usr.sbin/extattr/tests/Makefile @@ -1,4 +1,3 @@ - ATF_TESTS_SH= extattr_test .include diff --git a/usr.sbin/extattrctl/Makefile b/usr.sbin/extattrctl/Makefile index 9365aff8923..9d6ecde2b17 100644 --- a/usr.sbin/extattrctl/Makefile +++ b/usr.sbin/extattrctl/Makefile @@ -1,4 +1,3 @@ - PROG= extattrctl MAN= extattrctl.8 diff --git a/usr.sbin/fdcontrol/Makefile b/usr.sbin/fdcontrol/Makefile index f3d7cc2af36..daaae25815a 100644 --- a/usr.sbin/fdcontrol/Makefile +++ b/usr.sbin/fdcontrol/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/fdread PROG= fdcontrol diff --git a/usr.sbin/fdformat/Makefile b/usr.sbin/fdformat/Makefile index f2cd4e4841e..2b6891027b2 100644 --- a/usr.sbin/fdformat/Makefile +++ b/usr.sbin/fdformat/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/fdread PROG= fdformat diff --git a/usr.sbin/fdread/Makefile b/usr.sbin/fdread/Makefile index 4b7570868cc..eb205604cde 100644 --- a/usr.sbin/fdread/Makefile +++ b/usr.sbin/fdread/Makefile @@ -1,4 +1,3 @@ - PROG= fdread SRCS= fdread.c fdutil.c diff --git a/usr.sbin/fifolog/Makefile b/usr.sbin/fifolog/Makefile index 779fec1860d..b906d5a9dbd 100644 --- a/usr.sbin/fifolog/Makefile +++ b/usr.sbin/fifolog/Makefile @@ -1,4 +1,3 @@ - SUBDIR= lib .WAIT \ fifolog_create fifolog_writer fifolog_reader SUBDIR_PARALLEL= diff --git a/usr.sbin/fifolog/Makefile.inc b/usr.sbin/fifolog/Makefile.inc index d3b5cbd3a79..01b5f23410c 100644 --- a/usr.sbin/fifolog/Makefile.inc +++ b/usr.sbin/fifolog/Makefile.inc @@ -1,2 +1 @@ - .include "../Makefile.inc" diff --git a/usr.sbin/fifolog/fifolog_create/Makefile b/usr.sbin/fifolog/fifolog_create/Makefile index 79dfedbcb83..0fe8f02bc70 100644 --- a/usr.sbin/fifolog/fifolog_create/Makefile +++ b/usr.sbin/fifolog/fifolog_create/Makefile @@ -1,4 +1,3 @@ - PROG= fifolog_create CFLAGS+= -I${.CURDIR:H}/lib diff --git a/usr.sbin/fifolog/fifolog_reader/Makefile b/usr.sbin/fifolog/fifolog_reader/Makefile index fd3e09aed91..7d5ca0fe81e 100644 --- a/usr.sbin/fifolog/fifolog_reader/Makefile +++ b/usr.sbin/fifolog/fifolog_reader/Makefile @@ -1,4 +1,3 @@ - PROG= fifolog_reader CFLAGS+= -I${.CURDIR:H}/lib diff --git a/usr.sbin/fifolog/fifolog_writer/Makefile b/usr.sbin/fifolog/fifolog_writer/Makefile index ade8308db41..1d5db922283 100644 --- a/usr.sbin/fifolog/fifolog_writer/Makefile +++ b/usr.sbin/fifolog/fifolog_writer/Makefile @@ -1,4 +1,3 @@ - PROG= fifolog_writer CFLAGS+= -I${.CURDIR:H}/lib diff --git a/usr.sbin/fifolog/lib/Makefile b/usr.sbin/fifolog/lib/Makefile index 831285df8fa..e4aa62fb680 100644 --- a/usr.sbin/fifolog/lib/Makefile +++ b/usr.sbin/fifolog/lib/Makefile @@ -1,4 +1,3 @@ - LIB= fifolog INTERNALLIB= # API not published or supported. diff --git a/usr.sbin/freebsd-update/Makefile b/usr.sbin/freebsd-update/Makefile index 14e522adb1a..ebdf1e17d34 100644 --- a/usr.sbin/freebsd-update/Makefile +++ b/usr.sbin/freebsd-update/Makefile @@ -1,4 +1,3 @@ - CONFS= freebsd-update.conf SCRIPTS=freebsd-update.sh MAN= freebsd-update.8 diff --git a/usr.sbin/fstyp/Makefile b/usr.sbin/fstyp/Makefile index 0ec14daeb77..20f71aab44c 100644 --- a/usr.sbin/fstyp/Makefile +++ b/usr.sbin/fstyp/Makefile @@ -1,4 +1,3 @@ - .include PROG= fstyp diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile index 99e7d4e2c51..9f40e86ed8b 100644 --- a/usr.sbin/fstyp/tests/Makefile +++ b/usr.sbin/fstyp/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH= fstyp_test diff --git a/usr.sbin/ftp-proxy/Makefile b/usr.sbin/ftp-proxy/Makefile index dc7ad709644..b6568ccb976 100644 --- a/usr.sbin/ftp-proxy/Makefile +++ b/usr.sbin/ftp-proxy/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pf/ftp-proxy PACKAGE= pf diff --git a/usr.sbin/fwcontrol/Makefile b/usr.sbin/fwcontrol/Makefile index ae87135af91..e2201c2fcb7 100644 --- a/usr.sbin/fwcontrol/Makefile +++ b/usr.sbin/fwcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= fwcontrol SRCS= fwcontrol.c fwcrom.c fwdv.c fwmpegts.c MAN= fwcontrol.8 diff --git a/usr.sbin/getfmac/Makefile b/usr.sbin/getfmac/Makefile index d01845caf2f..6971eda404c 100644 --- a/usr.sbin/getfmac/Makefile +++ b/usr.sbin/getfmac/Makefile @@ -1,4 +1,3 @@ - PROG= getfmac MAN= getfmac.8 diff --git a/usr.sbin/getpmac/Makefile b/usr.sbin/getpmac/Makefile index b8da866b212..ada82bf1ceb 100644 --- a/usr.sbin/getpmac/Makefile +++ b/usr.sbin/getpmac/Makefile @@ -1,4 +1,3 @@ - PROG= getpmac MAN= getpmac.8 diff --git a/usr.sbin/gpioctl/Makefile b/usr.sbin/gpioctl/Makefile index dead7a46e20..85bc18fde4d 100644 --- a/usr.sbin/gpioctl/Makefile +++ b/usr.sbin/gpioctl/Makefile @@ -1,4 +1,3 @@ - PROG= gpioctl MAN= gpioctl.8 diff --git a/usr.sbin/gssd/Makefile b/usr.sbin/gssd/Makefile index 9621363296b..e30463ddf50 100644 --- a/usr.sbin/gssd/Makefile +++ b/usr.sbin/gssd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= kerberos diff --git a/usr.sbin/gstat/Makefile b/usr.sbin/gstat/Makefile index 033ebb157f6..03cdf56162a 100644 --- a/usr.sbin/gstat/Makefile +++ b/usr.sbin/gstat/Makefile @@ -1,4 +1,3 @@ - PROG= gstat MAN= gstat.8 LIBADD= devstat geom edit tinfow ncursesw diff --git a/usr.sbin/hyperv/Makefile b/usr.sbin/hyperv/Makefile index f5a4cbd4810..7caa880598b 100644 --- a/usr.sbin/hyperv/Makefile +++ b/usr.sbin/hyperv/Makefile @@ -1,4 +1,3 @@ - .include SUBDIR= \ diff --git a/usr.sbin/hyperv/Makefile.inc b/usr.sbin/hyperv/Makefile.inc index ceaf3870d9b..d79234b3f2c 100644 --- a/usr.sbin/hyperv/Makefile.inc +++ b/usr.sbin/hyperv/Makefile.inc @@ -1,3 +1,2 @@ - CFLAGS.gcc+= -Wno-uninitialized .include "../Makefile.inc" diff --git a/usr.sbin/hyperv/tools/Makefile.inc b/usr.sbin/hyperv/tools/Makefile.inc index 1dc11073a2f..9420227ff26 100644 --- a/usr.sbin/hyperv/tools/Makefile.inc +++ b/usr.sbin/hyperv/tools/Makefile.inc @@ -1,3 +1,2 @@ - CFLAGS.gcc+= -Wno-uninitialized .include "../../Makefile.inc" diff --git a/usr.sbin/hyperv/tools/kvp/Makefile b/usr.sbin/hyperv/tools/kvp/Makefile index a74af47c3f4..98cb23392cc 100644 --- a/usr.sbin/hyperv/tools/kvp/Makefile +++ b/usr.sbin/hyperv/tools/kvp/Makefile @@ -1,4 +1,3 @@ - .include HV_KVP_DAEMON_DISTDIR?= ${SRCTOP}/contrib/hyperv/tools diff --git a/usr.sbin/i2c/Makefile b/usr.sbin/i2c/Makefile index 37bff6c4231..1302fd74869 100644 --- a/usr.sbin/i2c/Makefile +++ b/usr.sbin/i2c/Makefile @@ -1,4 +1,3 @@ - PROG= i2c MAN= i2c.8 diff --git a/usr.sbin/ifmcstat/Makefile b/usr.sbin/ifmcstat/Makefile index faf6908e920..6a312fb977f 100644 --- a/usr.sbin/ifmcstat/Makefile +++ b/usr.sbin/ifmcstat/Makefile @@ -1,4 +1,3 @@ - .include PROG= ifmcstat diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index c62efc8dabb..a5a080f6053 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -1,4 +1,3 @@ - .include CONFS= inetd.conf diff --git a/usr.sbin/iostat/Makefile b/usr.sbin/iostat/Makefile index fa9640267d3..7ea659db5e1 100644 --- a/usr.sbin/iostat/Makefile +++ b/usr.sbin/iostat/Makefile @@ -1,4 +1,3 @@ - PROG= iostat MAN= iostat.8 diff --git a/usr.sbin/iovctl/Makefile b/usr.sbin/iovctl/Makefile index 599fc41785e..3298a6a2121 100644 --- a/usr.sbin/iovctl/Makefile +++ b/usr.sbin/iovctl/Makefile @@ -1,4 +1,3 @@ - PROG= iovctl SRCS= iovctl.c parse.c validate.c LIBADD= nv ucl m diff --git a/usr.sbin/ip6addrctl/Makefile b/usr.sbin/ip6addrctl/Makefile index 6fc277d39e6..ba38dc1162d 100644 --- a/usr.sbin/ip6addrctl/Makefile +++ b/usr.sbin/ip6addrctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= ip6addrctl MAN= ip6addrctl.8 diff --git a/usr.sbin/iscsid/Makefile b/usr.sbin/iscsid/Makefile index a4fbcb36865..4403e796f89 100644 --- a/usr.sbin/iscsid/Makefile +++ b/usr.sbin/iscsid/Makefile @@ -1,4 +1,3 @@ - PACKAGE= iscsi PROG= iscsid SRCS= discovery.c iscsid.c login.c diff --git a/usr.sbin/jail/Makefile b/usr.sbin/jail/Makefile index 60234c8255d..babe7b9459c 100644 --- a/usr.sbin/jail/Makefile +++ b/usr.sbin/jail/Makefile @@ -1,4 +1,3 @@ - .include PROG= jail diff --git a/usr.sbin/jail/tests/Makefile b/usr.sbin/jail/tests/Makefile index 66f52faebaa..6a64557cafa 100644 --- a/usr.sbin/jail/tests/Makefile +++ b/usr.sbin/jail/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests ATF_TESTS_SH+= jail_basic_test diff --git a/usr.sbin/jexec/Makefile b/usr.sbin/jexec/Makefile index 89445c600a8..2f32dc94540 100644 --- a/usr.sbin/jexec/Makefile +++ b/usr.sbin/jexec/Makefile @@ -1,4 +1,3 @@ - PROG= jexec MAN= jexec.8 LIBADD= jail util diff --git a/usr.sbin/jls/Makefile b/usr.sbin/jls/Makefile index ffe5704859e..ee9665356c7 100644 --- a/usr.sbin/jls/Makefile +++ b/usr.sbin/jls/Makefile @@ -1,4 +1,3 @@ - .include PROG= jls diff --git a/usr.sbin/kbdcontrol/Makefile b/usr.sbin/kbdcontrol/Makefile index 982fa42e156..737cd018739 100644 --- a/usr.sbin/kbdcontrol/Makefile +++ b/usr.sbin/kbdcontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= kbdcontrol MAN= kbdcontrol.1 kbdmap.5 diff --git a/usr.sbin/kbdmap/Makefile b/usr.sbin/kbdmap/Makefile index d1957485830..0b79de96238 100644 --- a/usr.sbin/kbdmap/Makefile +++ b/usr.sbin/kbdmap/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= kbdmap CFLAGS+= -I${SRCTOP}/contrib/bsddialog/lib diff --git a/usr.sbin/keyserv/Makefile b/usr.sbin/keyserv/Makefile index 18eee070160..dccc73251d4 100644 --- a/usr.sbin/keyserv/Makefile +++ b/usr.sbin/keyserv/Makefile @@ -1,4 +1,3 @@ - PROG= keyserv MAN= keyserv.8 SRCS= keyserv.c setkey.c crypt_svc.c crypt_server.c crypt.h diff --git a/usr.sbin/kldxref/Makefile b/usr.sbin/kldxref/Makefile index 7b392e02093..fc9b0b4215f 100644 --- a/usr.sbin/kldxref/Makefile +++ b/usr.sbin/kldxref/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= kldxref MAN= kldxref.8 diff --git a/usr.sbin/lastlogin/Makefile b/usr.sbin/lastlogin/Makefile index b595837075e..929012823ca 100644 --- a/usr.sbin/lastlogin/Makefile +++ b/usr.sbin/lastlogin/Makefile @@ -1,4 +1,3 @@ - PROG= lastlogin PACKAGE= acct MAN= lastlogin.8 diff --git a/usr.sbin/lpr/Makefile b/usr.sbin/lpr/Makefile index a36ad649501..84b07538e0d 100644 --- a/usr.sbin/lpr/Makefile +++ b/usr.sbin/lpr/Makefile @@ -1,4 +1,3 @@ - SUBDIR= common_source .WAIT \ chkprintcap lp lpc lpd lpq lpr lprm lptest pac \ filters filters.ru diff --git a/usr.sbin/lpr/Makefile.inc b/usr.sbin/lpr/Makefile.inc index 20800c3bb08..d72fbaacf63 100644 --- a/usr.sbin/lpr/Makefile.inc +++ b/usr.sbin/lpr/Makefile.inc @@ -1,4 +1,3 @@ - .include .if ${MK_INET6_SUPPORT} != "no" diff --git a/usr.sbin/lpr/chkprintcap/Makefile b/usr.sbin/lpr/chkprintcap/Makefile index 600b7123742..91f4c180f25 100644 --- a/usr.sbin/lpr/chkprintcap/Makefile +++ b/usr.sbin/lpr/chkprintcap/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source PACKAGE=lp diff --git a/usr.sbin/lpr/common_source/Makefile b/usr.sbin/lpr/common_source/Makefile index 1d3a10a60ae..a5d901a2d16 100644 --- a/usr.sbin/lpr/common_source/Makefile +++ b/usr.sbin/lpr/common_source/Makefile @@ -1,4 +1,3 @@ - # # Library of internal routines for the print spooler suite. # Originally these were compiled separately into each program, diff --git a/usr.sbin/lpr/filters.ru/Makefile b/usr.sbin/lpr/filters.ru/Makefile index 05971920182..c100352d8af 100644 --- a/usr.sbin/lpr/filters.ru/Makefile +++ b/usr.sbin/lpr/filters.ru/Makefile @@ -1,4 +1,3 @@ - SUBDIR= koi2alt koi2855 PACKAGE=lp diff --git a/usr.sbin/lpr/filters.ru/Makefile.inc b/usr.sbin/lpr/filters.ru/Makefile.inc index ee7dbae5aef..2a311e5201d 100644 --- a/usr.sbin/lpr/filters.ru/Makefile.inc +++ b/usr.sbin/lpr/filters.ru/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR= /usr/libexec/lpr/ru WARNS?= 3 diff --git a/usr.sbin/lpr/filters.ru/koi2855/Makefile b/usr.sbin/lpr/filters.ru/koi2855/Makefile index 53d6a5bd986..d551cce6909 100644 --- a/usr.sbin/lpr/filters.ru/koi2855/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2855/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lp PROG= koi2855 MAN= diff --git a/usr.sbin/lpr/filters.ru/koi2alt/Makefile b/usr.sbin/lpr/filters.ru/koi2alt/Makefile index 6b005afac0a..5b3bfab3e93 100644 --- a/usr.sbin/lpr/filters.ru/koi2alt/Makefile +++ b/usr.sbin/lpr/filters.ru/koi2alt/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lp PROG= koi2alt MAN= diff --git a/usr.sbin/lpr/filters/Makefile b/usr.sbin/lpr/filters/Makefile index b3d7cbab9c5..3cca478a0e9 100644 --- a/usr.sbin/lpr/filters/Makefile +++ b/usr.sbin/lpr/filters/Makefile @@ -1,4 +1,3 @@ - BINDIR= ${LIBEXECDIR}/lpr PACKAGE=lp diff --git a/usr.sbin/lpr/lp/Makefile b/usr.sbin/lpr/lp/Makefile index 59562bdc6f1..3edd8023c89 100644 --- a/usr.sbin/lpr/lp/Makefile +++ b/usr.sbin/lpr/lp/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/bin PACKAGE=lp diff --git a/usr.sbin/lpr/lpc/Makefile b/usr.sbin/lpr/lpc/Makefile index ccc7fb503ee..ca9dd2531fb 100644 --- a/usr.sbin/lpr/lpc/Makefile +++ b/usr.sbin/lpr/lpc/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source PACKAGE=lp diff --git a/usr.sbin/lpr/lpd/Makefile b/usr.sbin/lpr/lpd/Makefile index c4f4f5e0e56..199f03ed16a 100644 --- a/usr.sbin/lpr/lpd/Makefile +++ b/usr.sbin/lpr/lpd/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lp CONFS= hosts.lpd printcap PROG= lpd diff --git a/usr.sbin/lpr/lpq/Makefile b/usr.sbin/lpr/lpq/Makefile index d8fe64de2c8..2e29a038620 100644 --- a/usr.sbin/lpr/lpq/Makefile +++ b/usr.sbin/lpr/lpq/Makefile @@ -1,4 +1,3 @@ - BINDIR= /usr/bin PACKAGE=lp diff --git a/usr.sbin/lpr/lpr/Makefile b/usr.sbin/lpr/lpr/Makefile index 84f965b728b..2c3b14874e7 100644 --- a/usr.sbin/lpr/lpr/Makefile +++ b/usr.sbin/lpr/lpr/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin diff --git a/usr.sbin/lpr/lprm/Makefile b/usr.sbin/lpr/lprm/Makefile index 1fac5ce7347..49682eb8870 100644 --- a/usr.sbin/lpr/lprm/Makefile +++ b/usr.sbin/lpr/lprm/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source BINDIR= /usr/bin diff --git a/usr.sbin/lpr/lptest/Makefile b/usr.sbin/lpr/lptest/Makefile index a4883638904..cc2243d46ec 100644 --- a/usr.sbin/lpr/lptest/Makefile +++ b/usr.sbin/lpr/lptest/Makefile @@ -1,4 +1,3 @@ - PACKAGE=lp PROG= lptest diff --git a/usr.sbin/lpr/pac/Makefile b/usr.sbin/lpr/pac/Makefile index eb40bfa7a4d..96a3b3c8723 100644 --- a/usr.sbin/lpr/pac/Makefile +++ b/usr.sbin/lpr/pac/Makefile @@ -1,4 +1,3 @@ - .PATH: ${.CURDIR:H}/common_source PACKAGE=lp diff --git a/usr.sbin/lptcontrol/Makefile b/usr.sbin/lptcontrol/Makefile index 2a34ba9d638..64a2fba46dc 100644 --- a/usr.sbin/lptcontrol/Makefile +++ b/usr.sbin/lptcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= lptcontrol MAN= lptcontrol.8 diff --git a/usr.sbin/mailstats/Makefile b/usr.sbin/mailstats/Makefile index 2da9169090f..0de1fb10dcc 100644 --- a/usr.sbin/mailstats/Makefile +++ b/usr.sbin/mailstats/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/mailstats diff --git a/usr.sbin/mailwrapper/Makefile b/usr.sbin/mailwrapper/Makefile index 237be9d6e1b..c1b395c81e4 100644 --- a/usr.sbin/mailwrapper/Makefile +++ b/usr.sbin/mailwrapper/Makefile @@ -1,4 +1,3 @@ - .include .if ${MK_MAILWRAPPER} != "no" diff --git a/usr.sbin/makefs/Makefile b/usr.sbin/makefs/Makefile index c0f4469d29f..75733714fcc 100644 --- a/usr.sbin/makefs/Makefile +++ b/usr.sbin/makefs/Makefile @@ -1,4 +1,3 @@ - SRCDIR:=${.PARSEDIR:tA} .include diff --git a/usr.sbin/makefs/tests/Makefile b/usr.sbin/makefs/tests/Makefile index 98cc89031c6..39844827f99 100644 --- a/usr.sbin/makefs/tests/Makefile +++ b/usr.sbin/makefs/tests/Makefile @@ -1,4 +1,3 @@ - .include ATF_TESTS_SH+= makefs_cd9660_tests diff --git a/usr.sbin/makemap/Makefile b/usr.sbin/makemap/Makefile index 8d558a7b679..25b4b629f87 100644 --- a/usr.sbin/makemap/Makefile +++ b/usr.sbin/makemap/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR=${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/makemap diff --git a/usr.sbin/manctl/Makefile b/usr.sbin/manctl/Makefile index e550b78644d..286d7204528 100644 --- a/usr.sbin/manctl/Makefile +++ b/usr.sbin/manctl/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=manctl.sh MAN= manctl.8 diff --git a/usr.sbin/memcontrol/Makefile b/usr.sbin/memcontrol/Makefile index 6010a24ad08..bbc685e2184 100644 --- a/usr.sbin/memcontrol/Makefile +++ b/usr.sbin/memcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= memcontrol MAN= memcontrol.8 diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index 9dd7e2193db..2edda1b9bc0 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=mergemaster.sh MAN= mergemaster.8 diff --git a/usr.sbin/mixer/Makefile b/usr.sbin/mixer/Makefile index 0dab386e087..7789a28e99a 100644 --- a/usr.sbin/mixer/Makefile +++ b/usr.sbin/mixer/Makefile @@ -1,4 +1,3 @@ - .include PROG= mixer diff --git a/usr.sbin/mlx5tool/Makefile b/usr.sbin/mlx5tool/Makefile index b6896b270b8..778ebad657e 100644 --- a/usr.sbin/mlx5tool/Makefile +++ b/usr.sbin/mlx5tool/Makefile @@ -1,4 +1,3 @@ - PACKAGE= mlx-tools PROG= mlx5tool diff --git a/usr.sbin/mlxcontrol/Makefile b/usr.sbin/mlxcontrol/Makefile index d18ed4ac77a..e9832876da3 100644 --- a/usr.sbin/mlxcontrol/Makefile +++ b/usr.sbin/mlxcontrol/Makefile @@ -1,4 +1,3 @@ - PROG= mlxcontrol MAN= mlxcontrol.8 SRCS= command.c config.c interface.c util.c diff --git a/usr.sbin/mount_smbfs/Makefile b/usr.sbin/mount_smbfs/Makefile index 1ba3430551d..8bd1b0f34d9 100644 --- a/usr.sbin/mount_smbfs/Makefile +++ b/usr.sbin/mount_smbfs/Makefile @@ -1,4 +1,3 @@ - PROG= mount_smbfs PACKAGE= smbutils SRCS= mount_smbfs.c getmntopts.c diff --git a/usr.sbin/mountd/Makefile b/usr.sbin/mountd/Makefile index 980842b93b1..e63b03bbfe4 100644 --- a/usr.sbin/mountd/Makefile +++ b/usr.sbin/mountd/Makefile @@ -1,4 +1,3 @@ - PROG= mountd SRCS= mountd.c getmntopts.c MAN= exports.5 netgroup.5 mountd.8 diff --git a/usr.sbin/moused/Makefile b/usr.sbin/moused/Makefile index 030fefbaa31..2a7aa048454 100644 --- a/usr.sbin/moused/Makefile +++ b/usr.sbin/moused/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= moused MAN= moused.8 diff --git a/usr.sbin/mptable/Makefile b/usr.sbin/mptable/Makefile index 08a0bc1024e..ca93525cfd0 100644 --- a/usr.sbin/mptable/Makefile +++ b/usr.sbin/mptable/Makefile @@ -1,4 +1,3 @@ - PROG= mptable .include diff --git a/usr.sbin/mptutil/Makefile b/usr.sbin/mptutil/Makefile index 6d7e79338f6..1d1e904b827 100644 --- a/usr.sbin/mptutil/Makefile +++ b/usr.sbin/mptutil/Makefile @@ -1,4 +1,3 @@ - PROG= mptutil SRCS= mptutil.c mpt_cam.c mpt_cmd.c mpt_config.c mpt_drive.c mpt_evt.c \ mpt_show.c mpt_volume.c diff --git a/usr.sbin/mtest/Makefile b/usr.sbin/mtest/Makefile index 9efd1e8d716..6d503c173fa 100644 --- a/usr.sbin/mtest/Makefile +++ b/usr.sbin/mtest/Makefile @@ -1,4 +1,3 @@ - .include PROG= mtest diff --git a/usr.sbin/newsyslog/Makefile b/usr.sbin/newsyslog/Makefile index b2e945b6215..0afbe3b814a 100644 --- a/usr.sbin/newsyslog/Makefile +++ b/usr.sbin/newsyslog/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= newsyslog diff --git a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile index e0451c228f5..8ef3af253a5 100644 --- a/usr.sbin/newsyslog/newsyslog.conf.d/Makefile +++ b/usr.sbin/newsyslog/newsyslog.conf.d/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= newsyslog diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile index 3adc1eec5d4..6c282f8f58b 100644 --- a/usr.sbin/newsyslog/tests/Makefile +++ b/usr.sbin/newsyslog/tests/Makefile @@ -1,4 +1,3 @@ - TAP_TESTS_SH= legacy_test .include diff --git a/usr.sbin/nfscbd/Makefile b/usr.sbin/nfscbd/Makefile index 5703601b9ac..c511e118b02 100644 --- a/usr.sbin/nfscbd/Makefile +++ b/usr.sbin/nfscbd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfscbd diff --git a/usr.sbin/nfsd/Makefile b/usr.sbin/nfsd/Makefile index 424d35872da..d7ca8c380c4 100644 --- a/usr.sbin/nfsd/Makefile +++ b/usr.sbin/nfsd/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfsd diff --git a/usr.sbin/nfsdumpstate/Makefile b/usr.sbin/nfsdumpstate/Makefile index c5542596563..636adaf783e 100644 --- a/usr.sbin/nfsdumpstate/Makefile +++ b/usr.sbin/nfsdumpstate/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= nfs diff --git a/usr.sbin/nfsrevoke/Makefile b/usr.sbin/nfsrevoke/Makefile index f4c1146e208..3f21cf287a8 100644 --- a/usr.sbin/nfsrevoke/Makefile +++ b/usr.sbin/nfsrevoke/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= nfsrevoke diff --git a/usr.sbin/nfsuserd/Makefile b/usr.sbin/nfsuserd/Makefile index be27b4d044c..bf94096c660 100644 --- a/usr.sbin/nfsuserd/Makefile +++ b/usr.sbin/nfsuserd/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= nfs diff --git a/usr.sbin/nmtree/Makefile b/usr.sbin/nmtree/Makefile index 45610b0b296..dd04c084e1a 100644 --- a/usr.sbin/nmtree/Makefile +++ b/usr.sbin/nmtree/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/mtree diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile index 2a5e2e2d92a..d884df11e1f 100644 --- a/usr.sbin/nmtree/tests/Makefile +++ b/usr.sbin/nmtree/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree diff --git a/usr.sbin/nologin/Makefile b/usr.sbin/nologin/Makefile index 79fa75d34a7..7e3e40babda 100644 --- a/usr.sbin/nologin/Makefile +++ b/usr.sbin/nologin/Makefile @@ -1,4 +1,3 @@ - PROG= nologin MAN= nologin.5 nologin.8 diff --git a/usr.sbin/nscd/Makefile b/usr.sbin/nscd/Makefile index 105801a7b9a..85bea62cef4 100644 --- a/usr.sbin/nscd/Makefile +++ b/usr.sbin/nscd/Makefile @@ -1,4 +1,3 @@ - CONFS= nscd.conf PROG= nscd MAN= nscd.conf.5 nscd.8 diff --git a/usr.sbin/nscd/agents/Makefile.inc b/usr.sbin/nscd/agents/Makefile.inc index 243f00c5b99..81c603407c8 100644 --- a/usr.sbin/nscd/agents/Makefile.inc +++ b/usr.sbin/nscd/agents/Makefile.inc @@ -1,2 +1 @@ - SRCS += passwd.c group.c services.c diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index a4174bb9939..5801d91aac4 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -1,4 +1,3 @@ - .include DEFS_LOCAL= -DPARSE -DHAVE_CONFIG_H diff --git a/usr.sbin/ntp/doc/Makefile b/usr.sbin/ntp/doc/Makefile index e87f4f73434..2da65eccc1f 100644 --- a/usr.sbin/ntp/doc/Makefile +++ b/usr.sbin/ntp/doc/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=ntp diff --git a/usr.sbin/ntp/doc/drivers/Makefile b/usr.sbin/ntp/doc/drivers/Makefile index 304d212b116..6186e15eaba 100644 --- a/usr.sbin/ntp/doc/drivers/Makefile +++ b/usr.sbin/ntp/doc/drivers/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/doc/drivers/icons/Makefile b/usr.sbin/ntp/doc/drivers/icons/Makefile index 6c78893bfb5..dbaaff0da9c 100644 --- a/usr.sbin/ntp/doc/drivers/icons/Makefile +++ b/usr.sbin/ntp/doc/drivers/icons/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/doc/drivers/scripts/Makefile b/usr.sbin/ntp/doc/drivers/scripts/Makefile index 633c90fdc3e..a49f9d3388a 100644 --- a/usr.sbin/ntp/doc/drivers/scripts/Makefile +++ b/usr.sbin/ntp/doc/drivers/scripts/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/doc/hints/Makefile b/usr.sbin/ntp/doc/hints/Makefile index aa3f25a5a26..5bd25363ea0 100644 --- a/usr.sbin/ntp/doc/hints/Makefile +++ b/usr.sbin/ntp/doc/hints/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/doc/icons/Makefile b/usr.sbin/ntp/doc/icons/Makefile index d6c026341e0..6f34ea8c384 100644 --- a/usr.sbin/ntp/doc/icons/Makefile +++ b/usr.sbin/ntp/doc/icons/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/doc/pic/Makefile b/usr.sbin/ntp/doc/pic/Makefile index 1c1ede47ac0..2ebf72fe2f0 100644 --- a/usr.sbin/ntp/doc/pic/Makefile +++ b/usr.sbin/ntp/doc/pic/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/doc/scripts/Makefile b/usr.sbin/ntp/doc/scripts/Makefile index c0f57e97a16..19c2d775bc4 100644 --- a/usr.sbin/ntp/doc/scripts/Makefile +++ b/usr.sbin/ntp/doc/scripts/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ntp diff --git a/usr.sbin/ntp/libntp/Makefile b/usr.sbin/ntp/libntp/Makefile index f9234eae6b0..2fe143281d3 100644 --- a/usr.sbin/ntp/libntp/Makefile +++ b/usr.sbin/ntp/libntp/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/libntp \ ${SRCTOP}/contrib/ntp/libntp/lib/isc \ ${SRCTOP}/contrib/ntp/libntp/lib/isc/nls \ diff --git a/usr.sbin/ntp/libntpevent/Makefile b/usr.sbin/ntp/libntpevent/Makefile index e36b2f51e49..06b7edb875e 100644 --- a/usr.sbin/ntp/libntpevent/Makefile +++ b/usr.sbin/ntp/libntpevent/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/libevent diff --git a/usr.sbin/ntp/libopts/Makefile b/usr.sbin/ntp/libopts/Makefile index 97ae9fc4635..720478c36b5 100644 --- a/usr.sbin/ntp/libopts/Makefile +++ b/usr.sbin/ntp/libopts/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/sntp/libopts PACKAGE=ntp diff --git a/usr.sbin/ntp/libparse/Makefile b/usr.sbin/ntp/libparse/Makefile index f79e2c76184..9b96f073177 100644 --- a/usr.sbin/ntp/libparse/Makefile +++ b/usr.sbin/ntp/libparse/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/libparse PACKAGE=ntp diff --git a/usr.sbin/ntp/ntp-keygen/Makefile b/usr.sbin/ntp/ntp-keygen/Makefile index a667e218a21..7f147c6f2fa 100644 --- a/usr.sbin/ntp/ntp-keygen/Makefile +++ b/usr.sbin/ntp/ntp-keygen/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntpd/Makefile b/usr.sbin/ntp/ntpd/Makefile index bb7f6aeaed5..33d3598f985 100644 --- a/usr.sbin/ntp/ntpd/Makefile +++ b/usr.sbin/ntp/ntpd/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntpdate/Makefile b/usr.sbin/ntp/ntpdate/Makefile index 439a4decc67..8e53ced468b 100644 --- a/usr.sbin/ntp/ntpdate/Makefile +++ b/usr.sbin/ntp/ntpdate/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/ntp/ntpdate diff --git a/usr.sbin/ntp/ntpdc/Makefile b/usr.sbin/ntp/ntpdc/Makefile index d666b460fdc..a239476a50b 100644 --- a/usr.sbin/ntp/ntpdc/Makefile +++ b/usr.sbin/ntp/ntpdc/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntpq/Makefile b/usr.sbin/ntp/ntpq/Makefile index 5b994c4fee5..5fa67278216 100644 --- a/usr.sbin/ntp/ntpq/Makefile +++ b/usr.sbin/ntp/ntpq/Makefile @@ -1,4 +1,3 @@ - MAN= .include diff --git a/usr.sbin/ntp/ntptime/Makefile b/usr.sbin/ntp/ntptime/Makefile index 821e4e5d5cc..a736681d2be 100644 --- a/usr.sbin/ntp/ntptime/Makefile +++ b/usr.sbin/ntp/ntptime/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/ntp/util PACKAGE=ntp diff --git a/usr.sbin/ntp/sntp/Makefile b/usr.sbin/ntp/sntp/Makefile index a29a0c97b9d..628ef77d6e4 100644 --- a/usr.sbin/ntp/sntp/Makefile +++ b/usr.sbin/ntp/sntp/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/ntp/sntp diff --git a/usr.sbin/nvram/Makefile b/usr.sbin/nvram/Makefile index 66ae0529452..7d27790ed13 100644 --- a/usr.sbin/nvram/Makefile +++ b/usr.sbin/nvram/Makefile @@ -1,4 +1,3 @@ - PROG= nvram MAN= nvram.8 MANSUBDIR= /powerpc diff --git a/usr.sbin/ofwdump/Makefile b/usr.sbin/ofwdump/Makefile index cd867da9d0f..0565d3af904 100644 --- a/usr.sbin/ofwdump/Makefile +++ b/usr.sbin/ofwdump/Makefile @@ -1,4 +1,3 @@ - PROG= ofwdump MAN= ofwdump.8 SRCS= ofwdump.c ofw_util.c diff --git a/usr.sbin/periodic/Makefile b/usr.sbin/periodic/Makefile index f991bbd6ae1..c71dad51baf 100644 --- a/usr.sbin/periodic/Makefile +++ b/usr.sbin/periodic/Makefile @@ -1,4 +1,3 @@ - PACKAGE= periodic CONFS= periodic.conf diff --git a/usr.sbin/periodic/etc/Makefile b/usr.sbin/periodic/etc/Makefile index 6678f16a49d..b93d2515ccb 100644 --- a/usr.sbin/periodic/etc/Makefile +++ b/usr.sbin/periodic/etc/Makefile @@ -1,4 +1,3 @@ - SUBDIR= daily security weekly monthly SUBDIR_PARALLEL= diff --git a/usr.sbin/periodic/etc/Makefile.inc b/usr.sbin/periodic/etc/Makefile.inc index dcd34a07dee..4eb9943df8d 100644 --- a/usr.sbin/periodic/etc/Makefile.inc +++ b/usr.sbin/periodic/etc/Makefile.inc @@ -1,4 +1,3 @@ - CONFMODE= 755 CONFDIR= ETC_PERIODIC_${.CURDIR:T:U} ETC_PERIODIC_${.CURDIR:T:U}= /etc/periodic/${.CURDIR:T} diff --git a/usr.sbin/periodic/etc/daily/Makefile b/usr.sbin/periodic/etc/daily/Makefile index fa3291d097f..d1b000df01e 100644 --- a/usr.sbin/periodic/etc/daily/Makefile +++ b/usr.sbin/periodic/etc/daily/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/periodic/etc/monthly/Makefile b/usr.sbin/periodic/etc/monthly/Makefile index 8de5d5d81c0..a158426c68b 100644 --- a/usr.sbin/periodic/etc/monthly/Makefile +++ b/usr.sbin/periodic/etc/monthly/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/periodic/etc/security/Makefile b/usr.sbin/periodic/etc/security/Makefile index f70aa23a144..4c6b39d9062 100644 --- a/usr.sbin/periodic/etc/security/Makefile +++ b/usr.sbin/periodic/etc/security/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/periodic/etc/weekly/Makefile b/usr.sbin/periodic/etc/weekly/Makefile index 4d21c098dd1..d194a988acf 100644 --- a/usr.sbin/periodic/etc/weekly/Makefile +++ b/usr.sbin/periodic/etc/weekly/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= periodic diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile index 3e0e047382c..27d60738000 100644 --- a/usr.sbin/pkg/Makefile +++ b/usr.sbin/pkg/Makefile @@ -1,4 +1,3 @@ - PACKAGE= pkg-bootstrap _BRANCH!= ${MAKE} -C ${SRCTOP}/release -V BRANCH diff --git a/usr.sbin/pmcstudy/Makefile b/usr.sbin/pmcstudy/Makefile index af3fab50b95..ca0efde8d61 100644 --- a/usr.sbin/pmcstudy/Makefile +++ b/usr.sbin/pmcstudy/Makefile @@ -1,4 +1,3 @@ - PROG= pmcstudy MAN= pmcstudy.8 SRCS= pmcstudy.c eval_expr.c diff --git a/usr.sbin/pnfsdscopymr/Makefile b/usr.sbin/pnfsdscopymr/Makefile index dcce66b0b6a..831d37e3483 100644 --- a/usr.sbin/pnfsdscopymr/Makefile +++ b/usr.sbin/pnfsdscopymr/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= pnfsdscopymr diff --git a/usr.sbin/pnfsdsfile/Makefile b/usr.sbin/pnfsdsfile/Makefile index 55af5d58816..054ea0808b3 100644 --- a/usr.sbin/pnfsdsfile/Makefile +++ b/usr.sbin/pnfsdsfile/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= pnfsdsfile diff --git a/usr.sbin/pnfsdskill/Makefile b/usr.sbin/pnfsdskill/Makefile index c7f74773f9e..032f3c9212a 100644 --- a/usr.sbin/pnfsdskill/Makefile +++ b/usr.sbin/pnfsdskill/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= pnfsdskill diff --git a/usr.sbin/pnpinfo/Makefile b/usr.sbin/pnpinfo/Makefile index 3a857983549..4abc092302a 100644 --- a/usr.sbin/pnpinfo/Makefile +++ b/usr.sbin/pnpinfo/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/pnpinfo PROG= pnpinfo diff --git a/usr.sbin/powerd/Makefile b/usr.sbin/powerd/Makefile index 323a85e821a..8a700b014e4 100644 --- a/usr.sbin/powerd/Makefile +++ b/usr.sbin/powerd/Makefile @@ -1,4 +1,3 @@ - PROG= powerd MAN= powerd.8 diff --git a/usr.sbin/ppp/Makefile b/usr.sbin/ppp/Makefile index d729d8adc74..59a835b3ebb 100644 --- a/usr.sbin/ppp/Makefile +++ b/usr.sbin/ppp/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= ppp diff --git a/usr.sbin/pppctl/Makefile b/usr.sbin/pppctl/Makefile index 2c0204c2663..d04e7f022f5 100644 --- a/usr.sbin/pppctl/Makefile +++ b/usr.sbin/pppctl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= ppp PROG= pppctl MAN= pppctl.8 diff --git a/usr.sbin/praliases/Makefile b/usr.sbin/praliases/Makefile index ef2682a8729..6d02f88a419 100644 --- a/usr.sbin/praliases/Makefile +++ b/usr.sbin/praliases/Makefile @@ -1,4 +1,3 @@ - SENDMAIL_DIR= ${SRCTOP}/contrib/sendmail .PATH: ${SENDMAIL_DIR}/praliases diff --git a/usr.sbin/praudit/tests/Makefile b/usr.sbin/praudit/tests/Makefile index 89cd1e462be..3b0cd7bd6c4 100644 --- a/usr.sbin/praudit/tests/Makefile +++ b/usr.sbin/praudit/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TESTSDIR= ${TESTSBASE}/usr.sbin/praudit diff --git a/usr.sbin/prometheus_sysctl_exporter/Makefile b/usr.sbin/prometheus_sysctl_exporter/Makefile index 20eabbb7dbc..1b16f049bae 100644 --- a/usr.sbin/prometheus_sysctl_exporter/Makefile +++ b/usr.sbin/prometheus_sysctl_exporter/Makefile @@ -1,4 +1,3 @@ - PROG= prometheus_sysctl_exporter MAN= prometheus_sysctl_exporter.8 diff --git a/usr.sbin/pstat/Makefile b/usr.sbin/pstat/Makefile index 62d07c92a3c..9a19914c130 100644 --- a/usr.sbin/pstat/Makefile +++ b/usr.sbin/pstat/Makefile @@ -1,4 +1,3 @@ - PROG= pstat LINKS= ${BINDIR}/pstat ${BINDIR}/swapinfo MAN= pstat.8 diff --git a/usr.sbin/pw/Makefile b/usr.sbin/pw/Makefile index a1e0167e04d..cd93a227fa6 100644 --- a/usr.sbin/pw/Makefile +++ b/usr.sbin/pw/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime PROG= pw MAN= pw.conf.5 pw.8 diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile index 4704adbf995..910a563d680 100644 --- a/usr.sbin/pw/tests/Makefile +++ b/usr.sbin/pw/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests BINDIR= ${TESTSDIR} diff --git a/usr.sbin/pwd_mkdb/Makefile b/usr.sbin/pwd_mkdb/Makefile index e9a4aa09d91..708d32d231e 100644 --- a/usr.sbin/pwd_mkdb/Makefile +++ b/usr.sbin/pwd_mkdb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/lib/libc/gen # for pw_scan.c PACKAGE= runtime diff --git a/usr.sbin/pwm/Makefile b/usr.sbin/pwm/Makefile index 044b1b1b72f..17ec1dbfbb4 100644 --- a/usr.sbin/pwm/Makefile +++ b/usr.sbin/pwm/Makefile @@ -1,4 +1,3 @@ - PROG= pwm MAN= pwm.8 diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index b18c3712644..ed8360ae938 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,4 +1,3 @@ - PROG= quot MAN= quot.8 LIBADD= ufs diff --git a/usr.sbin/quotaon/Makefile b/usr.sbin/quotaon/Makefile index 41464cbf071..9e4ef6e5953 100644 --- a/usr.sbin/quotaon/Makefile +++ b/usr.sbin/quotaon/Makefile @@ -1,4 +1,3 @@ - PROG= quotaon LINKS= ${BINDIR}/quotaon ${BINDIR}/quotaoff MAN= quotaon.8 diff --git a/usr.sbin/rarpd/Makefile b/usr.sbin/rarpd/Makefile index 93974cd1161..3cca5747981 100644 --- a/usr.sbin/rarpd/Makefile +++ b/usr.sbin/rarpd/Makefile @@ -1,4 +1,3 @@ - PROG= rarpd MAN= rarpd.8 diff --git a/usr.sbin/repquota/Makefile b/usr.sbin/repquota/Makefile index feb2a13410e..be1b323b04a 100644 --- a/usr.sbin/repquota/Makefile +++ b/usr.sbin/repquota/Makefile @@ -1,4 +1,3 @@ - PROG= repquota MAN= repquota.8 LIBADD= util diff --git a/usr.sbin/rip6query/Makefile b/usr.sbin/rip6query/Makefile index 7f954ca5567..e12637e1e1e 100644 --- a/usr.sbin/rip6query/Makefile +++ b/usr.sbin/rip6query/Makefile @@ -1,4 +1,3 @@ - PROG= rip6query MAN= rip6query.8 diff --git a/usr.sbin/rmt/Makefile b/usr.sbin/rmt/Makefile index 6bd58fae3af..2279aafd98f 100644 --- a/usr.sbin/rmt/Makefile +++ b/usr.sbin/rmt/Makefile @@ -1,4 +1,3 @@ - PROG= rmt MAN= rmt.8 diff --git a/usr.sbin/route6d/Makefile b/usr.sbin/route6d/Makefile index 03e54ad34e8..059d329f5f0 100644 --- a/usr.sbin/route6d/Makefile +++ b/usr.sbin/route6d/Makefile @@ -1,4 +1,3 @@ - PROG= route6d MAN= route6d.8 diff --git a/usr.sbin/rpc.statd/Makefile b/usr.sbin/rpc.statd/Makefile index 161eebe9dc7..044ad3602a2 100644 --- a/usr.sbin/rpc.statd/Makefile +++ b/usr.sbin/rpc.statd/Makefile @@ -1,4 +1,3 @@ - PROG= rpc.statd MAN= rpc.statd.8 SRCS= file.c sm_inter_svc.c sm_inter.h statd.c procs.c diff --git a/usr.sbin/rpc.tlsclntd/Makefile b/usr.sbin/rpc.tlsclntd/Makefile index 2dbde13463c..ac3d25dc66c 100644 --- a/usr.sbin/rpc.tlsclntd/Makefile +++ b/usr.sbin/rpc.tlsclntd/Makefile @@ -1,4 +1,3 @@ - .include PROG= rpc.tlsclntd diff --git a/usr.sbin/rpc.tlsservd/Makefile b/usr.sbin/rpc.tlsservd/Makefile index fb73d2edf7a..52de80f0c78 100644 --- a/usr.sbin/rpc.tlsservd/Makefile +++ b/usr.sbin/rpc.tlsservd/Makefile @@ -1,4 +1,3 @@ - .include PROG= rpc.tlsservd diff --git a/usr.sbin/rpc.umntall/Makefile b/usr.sbin/rpc.umntall/Makefile index a8cd0b47872..d9143020bc0 100644 --- a/usr.sbin/rpc.umntall/Makefile +++ b/usr.sbin/rpc.umntall/Makefile @@ -1,4 +1,3 @@ - PACKAGE= nfs PROG= rpc.umntall diff --git a/usr.sbin/rpc.yppasswdd/Makefile b/usr.sbin/rpc.yppasswdd/Makefile index 4b539f66fa8..b3f6b762d8e 100644 --- a/usr.sbin/rpc.yppasswdd/Makefile +++ b/usr.sbin/rpc.yppasswdd/Makefile @@ -1,4 +1,3 @@ - RPCDIR= ${DESTDIR}/usr/include/rpcsvc .PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/usr.bin/chpass \ diff --git a/usr.sbin/rpc.ypupdated/Makefile b/usr.sbin/rpc.ypupdated/Makefile index 1c35f377002..78ee19fc7a6 100644 --- a/usr.sbin/rpc.ypupdated/Makefile +++ b/usr.sbin/rpc.ypupdated/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr PACKAGE=yp diff --git a/usr.sbin/rpc.ypxfrd/Makefile b/usr.sbin/rpc.ypxfrd/Makefile index a761275b637..2e0decd7a76 100644 --- a/usr.sbin/rpc.ypxfrd/Makefile +++ b/usr.sbin/rpc.ypxfrd/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/usr.sbin/ypserv PACKAGE=yp diff --git a/usr.sbin/rpcbind/tests/Makefile b/usr.sbin/rpcbind/tests/Makefile index f5647c99748..f37d0433abc 100644 --- a/usr.sbin/rpcbind/tests/Makefile +++ b/usr.sbin/rpcbind/tests/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${.CURDIR}/.. diff --git a/usr.sbin/rtprio/Makefile b/usr.sbin/rtprio/Makefile index c9c72a9b4e0..e970bd10c54 100644 --- a/usr.sbin/rtprio/Makefile +++ b/usr.sbin/rtprio/Makefile @@ -1,4 +1,3 @@ - PROG= rtprio LINKS= ${BINDIR}/rtprio ${BINDIR}/idprio MLINKS= rtprio.1 idprio.1 diff --git a/usr.sbin/rwhod/Makefile b/usr.sbin/rwhod/Makefile index 3196179da14..65dbd3b390d 100644 --- a/usr.sbin/rwhod/Makefile +++ b/usr.sbin/rwhod/Makefile @@ -1,4 +1,3 @@ - PROG= rwhod MAN= rwhod.8 diff --git a/usr.sbin/sa/Makefile b/usr.sbin/sa/Makefile index 2b7aa79154d..84bd7f996bb 100644 --- a/usr.sbin/sa/Makefile +++ b/usr.sbin/sa/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/lastcomm diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile index c049ae25368..b10191a2e46 100644 --- a/usr.sbin/sa/tests/Makefile +++ b/usr.sbin/sa/tests/Makefile @@ -1,4 +1,3 @@ - PACKAGE= tests TAP_TESTS_SH= legacy_test diff --git a/usr.sbin/sendmail/Makefile b/usr.sbin/sendmail/Makefile index b062d417a04..178b35bf785 100644 --- a/usr.sbin/sendmail/Makefile +++ b/usr.sbin/sendmail/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE=sendmail diff --git a/usr.sbin/service/Makefile b/usr.sbin/service/Makefile index 95244ab6968..66bf0deb760 100644 --- a/usr.sbin/service/Makefile +++ b/usr.sbin/service/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime SCRIPTS=service.sh MAN= service.8 diff --git a/usr.sbin/services_mkdb/Makefile b/usr.sbin/services_mkdb/Makefile index 8d8e0f1c062..c1c7ca0bfcf 100644 --- a/usr.sbin/services_mkdb/Makefile +++ b/usr.sbin/services_mkdb/Makefile @@ -1,4 +1,3 @@ - PACKAGE= runtime CONFS= services diff --git a/usr.sbin/sesutil/Makefile b/usr.sbin/sesutil/Makefile index 4e8e08eabd1..cb408ed82af 100644 --- a/usr.sbin/sesutil/Makefile +++ b/usr.sbin/sesutil/Makefile @@ -1,4 +1,3 @@ - PROG= sesutil SRCS= sesutil.c eltsub.c MAN= sesutil.8 diff --git a/usr.sbin/setfib/Makefile b/usr.sbin/setfib/Makefile index 45d4667e6a9..c69d133d6a8 100644 --- a/usr.sbin/setfib/Makefile +++ b/usr.sbin/setfib/Makefile @@ -1,4 +1,3 @@ - PROG= setfib .include diff --git a/usr.sbin/setfmac/Makefile b/usr.sbin/setfmac/Makefile index fc2d9fc9917..7115a9ba710 100644 --- a/usr.sbin/setfmac/Makefile +++ b/usr.sbin/setfmac/Makefile @@ -1,4 +1,3 @@ - PROG= setfmac LINKS= ${BINDIR}/setfmac ${BINDIR}/setfsmac MAN= setfmac.8 setfsmac.8 diff --git a/usr.sbin/setpmac/Makefile b/usr.sbin/setpmac/Makefile index 4f134b8e23c..d18c606bd10 100644 --- a/usr.sbin/setpmac/Makefile +++ b/usr.sbin/setpmac/Makefile @@ -1,4 +1,3 @@ - PROG= setpmac MAN= setpmac.8 diff --git a/usr.sbin/spi/Makefile b/usr.sbin/spi/Makefile index 17d651ce80e..73f5af6fc3c 100644 --- a/usr.sbin/spi/Makefile +++ b/usr.sbin/spi/Makefile @@ -1,4 +1,3 @@ - #.include PROG= spi diff --git a/usr.sbin/spkrtest/Makefile b/usr.sbin/spkrtest/Makefile index 1a67586a360..137c626ebca 100644 --- a/usr.sbin/spkrtest/Makefile +++ b/usr.sbin/spkrtest/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=spkrtest.sh MAN= spkrtest.8 diff --git a/usr.sbin/spray/Makefile b/usr.sbin/spray/Makefile index 4342c9658f9..7a7d82fc27b 100644 --- a/usr.sbin/spray/Makefile +++ b/usr.sbin/spray/Makefile @@ -1,4 +1,3 @@ - PROG= spray MAN= spray.8 diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile index 492b5529fc8..bc4a3436719 100644 --- a/usr.sbin/syslogd/Makefile +++ b/usr.sbin/syslogd/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/usr.bin/wall diff --git a/usr.sbin/sysrc/Makefile b/usr.sbin/sysrc/Makefile index 831ce5d135b..0f2f98e8b0e 100644 --- a/usr.sbin/sysrc/Makefile +++ b/usr.sbin/sysrc/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= sysrc MAN= sysrc.8 diff --git a/usr.sbin/tcpdchk/Makefile b/usr.sbin/tcpdchk/Makefile index 93fc23169ea..c07f7f8b6b0 100644 --- a/usr.sbin/tcpdchk/Makefile +++ b/usr.sbin/tcpdchk/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/usr.sbin/tcpdmatch/Makefile b/usr.sbin/tcpdmatch/Makefile index e12bde64c49..f57350cb762 100644 --- a/usr.sbin/tcpdmatch/Makefile +++ b/usr.sbin/tcpdmatch/Makefile @@ -1,4 +1,3 @@ - .include .PATH: ${SRCTOP}/contrib/tcp_wrappers diff --git a/usr.sbin/tcpdump/Makefile b/usr.sbin/tcpdump/Makefile index dd899258eba..69b7bb109c1 100644 --- a/usr.sbin/tcpdump/Makefile +++ b/usr.sbin/tcpdump/Makefile @@ -1,4 +1,3 @@ - SUBDIR= tcpdump .include diff --git a/usr.sbin/tcpdump/Makefile.inc b/usr.sbin/tcpdump/Makefile.inc index c5de27435b8..abbdc366c6a 100644 --- a/usr.sbin/tcpdump/Makefile.inc +++ b/usr.sbin/tcpdump/Makefile.inc @@ -1,4 +1,3 @@ - BINDIR?= /usr/sbin WARNS?= 3 diff --git a/usr.sbin/tcpdump/tcpdump/Makefile b/usr.sbin/tcpdump/tcpdump/Makefile index ff0106d2933..bfbe750c25b 100644 --- a/usr.sbin/tcpdump/tcpdump/Makefile +++ b/usr.sbin/tcpdump/tcpdump/Makefile @@ -1,4 +1,3 @@ - .include TCPDUMP_DISTDIR?= ${SRCTOP}/contrib/tcpdump diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile index b8996030aaf..29b1b564bec 100644 --- a/usr.sbin/tests/Makefile +++ b/usr.sbin/tests/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/tests KYUAFILE= yes diff --git a/usr.sbin/traceroute/Makefile b/usr.sbin/traceroute/Makefile index 45a80174f5a..62d82a47d95 100644 --- a/usr.sbin/traceroute/Makefile +++ b/usr.sbin/traceroute/Makefile @@ -1,4 +1,3 @@ - .include PACKAGE= runtime diff --git a/usr.sbin/trim/Makefile b/usr.sbin/trim/Makefile index cb609121be7..1263c0c6819 100644 --- a/usr.sbin/trim/Makefile +++ b/usr.sbin/trim/Makefile @@ -1,4 +1,3 @@ - PROG= trim MAN= trim.8 LIBADD= util diff --git a/usr.sbin/tzsetup/Makefile b/usr.sbin/tzsetup/Makefile index 2522fb06c22..f20834baf25 100644 --- a/usr.sbin/tzsetup/Makefile +++ b/usr.sbin/tzsetup/Makefile @@ -1,4 +1,3 @@ - .include PROG= tzsetup diff --git a/usr.sbin/uathload/Makefile b/usr.sbin/uathload/Makefile index a3895d2019c..11194b081ec 100644 --- a/usr.sbin/uathload/Makefile +++ b/usr.sbin/uathload/Makefile @@ -1,4 +1,3 @@ - PROG= uathload MAN= uathload.8 diff --git a/usr.sbin/uefisign/Makefile b/usr.sbin/uefisign/Makefile index 8c6314fe0f3..b389af5cac4 100644 --- a/usr.sbin/uefisign/Makefile +++ b/usr.sbin/uefisign/Makefile @@ -1,4 +1,3 @@ - PROG= uefisign SRCS= uefisign.c child.c pe.c MAN= uefisign.8 diff --git a/usr.sbin/ugidfw/Makefile b/usr.sbin/ugidfw/Makefile index 959e4d4c1aa..b223a03c4b1 100644 --- a/usr.sbin/ugidfw/Makefile +++ b/usr.sbin/ugidfw/Makefile @@ -1,4 +1,3 @@ - PROG= ugidfw MAN= ugidfw.8 diff --git a/usr.sbin/uhsoctl/Makefile b/usr.sbin/uhsoctl/Makefile index 9d731bbf09d..a899b257be4 100644 --- a/usr.sbin/uhsoctl/Makefile +++ b/usr.sbin/uhsoctl/Makefile @@ -1,4 +1,3 @@ - PROG= uhsoctl MAN= uhsoctl.1 WARNS?= 1 diff --git a/usr.sbin/unbound/Makefile b/usr.sbin/unbound/Makefile index a4fbd0b4a67..6f0c9cc155f 100644 --- a/usr.sbin/unbound/Makefile +++ b/usr.sbin/unbound/Makefile @@ -1,4 +1,3 @@ - SUBDIR= daemon anchor checkconf control SUBDIR+= setup SUBDIR_PARALLEL= diff --git a/usr.sbin/unbound/Makefile.inc b/usr.sbin/unbound/Makefile.inc index 8e4e8818522..a28e388e47c 100644 --- a/usr.sbin/unbound/Makefile.inc +++ b/usr.sbin/unbound/Makefile.inc @@ -1,4 +1,3 @@ - MK_WERROR= no NO_WTHREAD_SAFETY= true PACKAGE= unbound diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile index 91ae1090415..3f94473ed1f 100644 --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile index c8d8397225b..319fc14ca9e 100644 --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile index ad5f7eb21f0..ff09f12caa2 100644 --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile index 28b451aa506..b43d381fa23 100644 --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -1,4 +1,3 @@ - # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound diff --git a/usr.sbin/unbound/setup/Makefile b/usr.sbin/unbound/setup/Makefile index b7b811238b9..e7c8ea914d6 100644 --- a/usr.sbin/unbound/setup/Makefile +++ b/usr.sbin/unbound/setup/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= local-unbound-setup.sh MAN= # diff --git a/usr.sbin/usbdump/Makefile b/usr.sbin/usbdump/Makefile index fd57c087c99..617da33d5c9 100644 --- a/usr.sbin/usbdump/Makefile +++ b/usr.sbin/usbdump/Makefile @@ -1,4 +1,3 @@ - PROG= usbdump SRCS= usbdump.c MAN= usbdump.8 diff --git a/usr.sbin/utx/Makefile b/usr.sbin/utx/Makefile index 98ba06acb92..5b2812e87f6 100644 --- a/usr.sbin/utx/Makefile +++ b/usr.sbin/utx/Makefile @@ -1,4 +1,3 @@ - PACKAGE= acct PROG= utx diff --git a/usr.sbin/valectl/Makefile b/usr.sbin/valectl/Makefile index 5ecc5fac7ca..c9f1288c76d 100644 --- a/usr.sbin/valectl/Makefile +++ b/usr.sbin/valectl/Makefile @@ -1,4 +1,3 @@ - PACKAGE= netmap PROG= valectl MAN= valectl.8 diff --git a/usr.sbin/vidcontrol/Makefile b/usr.sbin/vidcontrol/Makefile index 47a8e01362f..9fe0a6ce8ea 100644 --- a/usr.sbin/vidcontrol/Makefile +++ b/usr.sbin/vidcontrol/Makefile @@ -1,4 +1,3 @@ - PACKAGE= console-tools PROG= vidcontrol SRCS= vidcontrol.c decode.c diff --git a/usr.sbin/vigr/Makefile b/usr.sbin/vigr/Makefile index 575b2aa5e39..94c19c8bf73 100644 --- a/usr.sbin/vigr/Makefile +++ b/usr.sbin/vigr/Makefile @@ -1,4 +1,3 @@ - SCRIPTS= vigr MAN= vigr.8 CLEANFILES= vigr diff --git a/usr.sbin/vipw/Makefile b/usr.sbin/vipw/Makefile index 17ffd4859bf..a58f407fa87 100644 --- a/usr.sbin/vipw/Makefile +++ b/usr.sbin/vipw/Makefile @@ -1,4 +1,3 @@ - PROG= vipw MAN= vipw.8 diff --git a/usr.sbin/wake/Makefile b/usr.sbin/wake/Makefile index 5da46d9880f..f96467ca259 100644 --- a/usr.sbin/wake/Makefile +++ b/usr.sbin/wake/Makefile @@ -1,4 +1,3 @@ - PROG= wake MAN= wake.8 diff --git a/usr.sbin/watch/Makefile b/usr.sbin/watch/Makefile index 9bf1f685712..33ce10b3759 100644 --- a/usr.sbin/watch/Makefile +++ b/usr.sbin/watch/Makefile @@ -1,4 +1,3 @@ - PROG= watch MAN= watch.8 diff --git a/usr.sbin/watchdogd/Makefile b/usr.sbin/watchdogd/Makefile index 1ba414f7984..66a377bc351 100644 --- a/usr.sbin/watchdogd/Makefile +++ b/usr.sbin/watchdogd/Makefile @@ -1,4 +1,3 @@ - PROG= watchdogd LINKS= ${BINDIR}/watchdogd ${BINDIR}/watchdog MAN= watchdogd.8 watchdog.8 diff --git a/usr.sbin/wlandebug/Makefile b/usr.sbin/wlandebug/Makefile index fe694847cf7..43fdfe56522 100644 --- a/usr.sbin/wlandebug/Makefile +++ b/usr.sbin/wlandebug/Makefile @@ -1,4 +1,3 @@ - PROG= wlandebug MAN= wlandebug.8 diff --git a/usr.sbin/wpa/Makefile b/usr.sbin/wpa/Makefile index 426c6aabab2..9869d6edffe 100644 --- a/usr.sbin/wpa/Makefile +++ b/usr.sbin/wpa/Makefile @@ -1,4 +1,3 @@ - SUBDIR= src .WAIT \ wpa_supplicant \ wpa_cli \ diff --git a/usr.sbin/wpa/Makefile.crypto b/usr.sbin/wpa/Makefile.crypto index 7208a4b4fab..d4b5ea25cbb 100644 --- a/usr.sbin/wpa/Makefile.crypto +++ b/usr.sbin/wpa/Makefile.crypto @@ -1,4 +1,3 @@ - .if ${MK_OPENSSL} != "no" LIBADD+= ssl crypto CFLAGS+= -DCONFIG_SHA256 diff --git a/usr.sbin/wpa/Makefile.inc b/usr.sbin/wpa/Makefile.inc index ce4f1ec38b4..7aa0ae90333 100644 --- a/usr.sbin/wpa/Makefile.inc +++ b/usr.sbin/wpa/Makefile.inc @@ -1,4 +1,3 @@ - .include BINDIR?= /usr/sbin diff --git a/usr.sbin/wpa/hostapd/Makefile b/usr.sbin/wpa/hostapd/Makefile index 04176419084..1f89fb72e18 100644 --- a/usr.sbin/wpa/hostapd/Makefile +++ b/usr.sbin/wpa/hostapd/Makefile @@ -1,4 +1,3 @@ - .include .include "../Makefile.inc" diff --git a/usr.sbin/wpa/hostapd_cli/Makefile b/usr.sbin/wpa/hostapd_cli/Makefile index 4c66c2078f4..7d63c39a7cd 100644 --- a/usr.sbin/wpa/hostapd_cli/Makefile +++ b/usr.sbin/wpa/hostapd_cli/Makefile @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .include "../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_cli/Makefile b/usr.sbin/wpa/wpa_cli/Makefile index be5896e74d6..7d7207197ce 100644 --- a/usr.sbin/wpa/wpa_cli/Makefile +++ b/usr.sbin/wpa/wpa_cli/Makefile @@ -1,4 +1,3 @@ - .include .include "../Makefile.inc" diff --git a/usr.sbin/wpa/wpa_passphrase/Makefile b/usr.sbin/wpa/wpa_passphrase/Makefile index eeb71a31ec9..21eec1a7884 100644 --- a/usr.sbin/wpa/wpa_passphrase/Makefile +++ b/usr.sbin/wpa/wpa_passphrase/Makefile @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .include "../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_priv/Makefile b/usr.sbin/wpa/wpa_priv/Makefile index 4ed75bd2251..465956c2958 100644 --- a/usr.sbin/wpa/wpa_priv/Makefile +++ b/usr.sbin/wpa/wpa_priv/Makefile @@ -1,4 +1,3 @@ - .include "../Makefile.inc" .include "../Makefile.crypto" diff --git a/usr.sbin/wpa/wpa_supplicant/Makefile b/usr.sbin/wpa/wpa_supplicant/Makefile index d82d18ac025..e31dcea8dc7 100644 --- a/usr.sbin/wpa/wpa_supplicant/Makefile +++ b/usr.sbin/wpa/wpa_supplicant/Makefile @@ -1,4 +1,3 @@ - .include .include "../Makefile.inc" diff --git a/usr.sbin/yp_mkdb/Makefile b/usr.sbin/yp_mkdb/Makefile index a556510b8b4..090509f2673 100644 --- a/usr.sbin/yp_mkdb/Makefile +++ b/usr.sbin/yp_mkdb/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/libexec/ypxfr ${SRCTOP}/usr.sbin/ypserv PACKAGE= yp diff --git a/usr.sbin/ypbind/Makefile b/usr.sbin/ypbind/Makefile index 27e041ebce5..cf25eea6501 100644 --- a/usr.sbin/ypbind/Makefile +++ b/usr.sbin/ypbind/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypbind MAN= ypbind.8 diff --git a/usr.sbin/yppoll/Makefile b/usr.sbin/yppoll/Makefile index aa8879d777f..215602e5812 100644 --- a/usr.sbin/yppoll/Makefile +++ b/usr.sbin/yppoll/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= yppoll MAN= yppoll.8 diff --git a/usr.sbin/yppush/Makefile b/usr.sbin/yppush/Makefile index 9dfdd6d7ab6..c849d5e08a6 100644 --- a/usr.sbin/yppush/Makefile +++ b/usr.sbin/yppush/Makefile @@ -1,4 +1,3 @@ - RPCDIR= ${SRCTOP}/include/rpcsvc .PATH: ${RPCDIR} ${SRCTOP}/usr.sbin/ypserv ${SRCTOP}/libexec/ypxfr diff --git a/usr.sbin/ypserv/Makefile b/usr.sbin/ypserv/Makefile index 18869d5c334..ba7eb1f8626 100644 --- a/usr.sbin/ypserv/Makefile +++ b/usr.sbin/ypserv/Makefile @@ -1,4 +1,3 @@ - .include RPCDIR= ${SRCTOP}/include/rpcsvc diff --git a/usr.sbin/ypset/Makefile b/usr.sbin/ypset/Makefile index 38f64551643..d945f278426 100644 --- a/usr.sbin/ypset/Makefile +++ b/usr.sbin/ypset/Makefile @@ -1,4 +1,3 @@ - PACKAGE= yp PROG= ypset MAN= ypset.8 diff --git a/usr.sbin/zdump/Makefile b/usr.sbin/zdump/Makefile index 6b18107c2f7..356411af704 100644 --- a/usr.sbin/zdump/Makefile +++ b/usr.sbin/zdump/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/tzcode PROG= zdump diff --git a/usr.sbin/zic/Makefile b/usr.sbin/zic/Makefile index fdfe6870583..73875386c79 100644 --- a/usr.sbin/zic/Makefile +++ b/usr.sbin/zic/Makefile @@ -1,4 +1,3 @@ - .PATH: ${SRCTOP}/contrib/tzcode PROG= zic diff --git a/usr.sbin/zonectl/Makefile b/usr.sbin/zonectl/Makefile index 9c86470f785..69915ec4916 100644 --- a/usr.sbin/zonectl/Makefile +++ b/usr.sbin/zonectl/Makefile @@ -1,4 +1,3 @@ - PROG= zonectl SRCS= zonectl.c SDIR= ${SRCTOP}/sys diff --git a/usr.sbin/zzz/Makefile b/usr.sbin/zzz/Makefile index 85191008a0b..4d1a2dd9dc3 100644 --- a/usr.sbin/zzz/Makefile +++ b/usr.sbin/zzz/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=zzz.sh MAN= zzz.8