diff --git a/Makefile.libcompat b/Makefile.libcompat index a957c47598e6d4..7054cf9ee0bb88 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 bf352b4d78da49..3c37336b25e68e 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 8f9ef366e9a470..f154d70ab9d5f1 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 97b19e701e4fba..e8b5ac7c0706f5 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 83f93f5fc2dbdb..2f48c7d4e0cf89 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 fd19a4e4f848e3..f0ced5d381dc31 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 eb2f870fd6aa5d..cd83b67852adcd 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 0783e1d8372ded..817c200a1c818a 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 e6de3a834c45bb..6ad01ed4b7164f 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 ebd96181cee4f9..a27b7c3aec4808 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 6da92d982f6340..ae8770154408f4 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 36cf247ceae191..3fa9ae8f06853a 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 6e88614a6a6ee3..d6f58db629016a 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 85c269aa10b1e2..6f2e7b7cf90051 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 02675a3dc8a5f1..98625c4b1b3476 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 fde8e08db42a37..1f8462aef5fa90 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 e0d924f6d13fbf..70ce32336f91c7 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 6584f8901cfcdc..d00b17c6df54db 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 7f68f14eccd60c..e0fdcfe8bbf1ee 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 385e459f81cbfa..e730e0a44a638a 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 1725e32671a324..18fa46816770b3 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 776979f04e478a..cad48082f186ae 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 4a339d0302910f..bd89a3d1d7c702 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 5386ec5386847a..7239e82631b0f5 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 8f32a5ea560fb5..27f7438ba7d092 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 6efe04a196c2a8..2ce39610e0945b 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 803c0cb2f07add..6bc37f05b3fdb5 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 5727aab93da255..b5bc75c61e7798 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 4023586d2aa73d..44054b8a44a7b9 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 141aa57aab5bd2..0220ac3ba45984 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 5da5c54adfad4a..13ae71b73143aa 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 b9aa06775e7f16..574ab0d71a457c 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 f7121982a7b89a..e750910cc91de0 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 8bf3cfb0e081b6..0550f769e6f7f6 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 64ac0d723529b4..d6b025b660bf7f 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 2413f572874f6f..6dbba5dba4535b 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 1785fa6c5149a9..0e8da4c0981da9 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 6b40986ce3a938..abcfe61c7da6f7 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 622e59c57d10ba..1ebe2e3f7c9da0 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 d92b08724561f2..aaf165521304b2 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 23183e4e66b7c9..a25b6a796ed052 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 de3d5481fd40e0..99e6534034dc3d 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 8e916ae47b3894..4e355ccfe78701 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 b46f7c19f6a086..f6065e1d5b9fed 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 bda6bff8a66b36..e5868f95f46629 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 777254eb548a0c..dac3bee2247cf7 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 7ff149da0ab1a5..4145756fd3aa69 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 1d0b26eb66d43a..c9cd44596dfeb0 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 319d89ff71178c..c51640af3b6f51 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 b8be667b83a083..00c885b2949b60 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 5b9d615caf80d3..128077aa16a098 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 d2043ecad269d5..087dbf40c3bd79 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 ea28b9d39bd89d..c97779911e6c85 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 c3ed122791b52b..ac959b17c6390b 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 27e4f7143de5ee..26b1ccbef4ee56 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 2b4f88db989c72..53cb97db939355 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 d38fd49e14eeab..af4b36991569ea 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 6c892026ec75fc..e1d0601e57ac96 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 0d6722b1d65a70..50352c91b6f03e 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 812edafa7ca8ce..afeb604710e40b 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 0d72e148da2c2f..6b5b9a2280221b 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 8cece2dbc31292..d0310fc4bead98 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 0f15dd5a4b9d99..1712dc1ecef6f5 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 d0fb28137ce40e..1b81c938f8b311 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 8da077108aeccd..dd3460afcbe82e 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 4cdebcb5054c6f..da1cccbb7f2e4a 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 232ae04c0cb5fb..3aaebb69301104 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 b8996030aafc86..29b1b564becac3 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 fa6741afb1dc27..0b06ca57c847f2 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 7a2fd60db43633..bf5dddd77baaa2 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 234ee20300eb99..8d389e7659a7f0 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 c83acca43119bc..ab0d9896d2ec4e 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 f07baf295b89b6..63768ae44a7d8e 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 e6a0763544f799..892798be347d58 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 3e83ba423f35f5..ebcc06f3e956b1 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 b9023202f0fb97..4a7a8350cac8f8 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 5b47d42d75757a..c816f07df223aa 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 3b91a97bc3ee5c..10854482cd2166 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 d5c857bc06a030..d086fffb07bcd0 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 1dbe4ace88edcf..b1d926d65368a8 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 196f96b1fcf84e..c969b209a7851d 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 a93ffcbd00debe..9ae081b7a96e20 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 6c43e1750c3cbd..efeba68e4f03dd 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 6e85a8f82e9a7f..94b29c9ae72d4f 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 1330ba0d94bd11..f955e306c62cdb 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 333c581ccb9080..5470785041035f 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 c05fe0c1c12b94..0b31fcb04b0727 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 9797f004d10f6f..4cd978e99a7dcb 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 9579fb7dcf181f..5f5dbfb6f108cd 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 149c14919028c0..95038f4e5638b0 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 83f08960d53352..4d9794c32dda0e 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 b8996030aafc86..29b1b564becac3 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 b0e1448c64551f..80862bbf8e7dfa 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 9f2b933fcf060b..12d1247d4e9c69 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 b8996030aafc86..29b1b564becac3 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 a47302c709d584..b6ecfbe33ba301 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 5a47890e58f451..ffe180ae1f9ced 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 2e291b9425ed7f..4fdb0cba9ba6b5 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 a1fc04899b6e8d..6e10ede77d07a0 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 13d88fef184da0..5b30adf4863a04 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 b8996030aafc86..29b1b564becac3 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 ccf441cbabeb5f..571d1c59a54496 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 78a3af23f3cc46..b87015c546ca7c 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 5dd38fbb5329d0..cd9f850f480ced 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 101282261dd0e4..d86ddbcd635f08 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 60ae9a0033b7e5..23ded7458bedef 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 e7ad35ab097df7..4cd9511f911c16 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 b8996030aafc86..29b1b564becac3 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 71cd4776d339bf..395ba395a84b92 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 4444973b2211ac..96a46cdf1cf9f6 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 2913349eccc122..dec4eb9ab3985f 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 824497940b20d6..88bcfc3ccf7215 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 9eb4872b69d5b1..ab4c4cb6741ce5 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 e75484c6dc59be..0d3f9b56b28c2b 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 bd50df9e3c4cfc..064ac9b23e4aa3 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 b3bf139feaef28..b7f43ffd23bf13 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 5c01baa093b732..b660f1cc6638a8 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 0a1ad0b81da06a..c72b55cc49033a 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 c7391dec24167c..7aa8600bf70252 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 049692a46cd5b9..100a66fa744c9a 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 9f694cabf99ab0..a7c3aac9c6f528 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 9501fd7f3cc24a..4150a33adde9fd 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 e146e744e844d1..a50774d560393f 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 185f57d8cfe2cd..a0bfd3c5cd398f 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 e8df567eb2053e..72ea5be686fbe6 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 e0e3f40ccda9a9..c87a37ef1504d3 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 e83fae8f305c93..3e35c5c5b8f7b8 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 b8996030aafc86..29b1b564becac3 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 e41f4afce82f1d..22ab4421b30aa2 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 93426c0320afe5..2f8134098b358e 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 c1ed4bba928987..72bda687c2daf2 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 a4613e4cb1e88a..fdda8011b21da3 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 b2fa0e98b7e5dc..a7c08fa818d59c 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 6177c61221eba0..e202668e0c3ad7 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 9588f085df0f50..fb7d40c21eea42 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 1eaa560ff88485..09f83086b1ea87 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 639136f79c3fe8..3d06e813f28b07 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 f2b37fb02817ca..fdcad75911c887 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/etc/gss/Makefile b/etc/gss/Makefile index d57a8b914b424d..301a8e074e8c5a 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 5135bf326e652c..17e96519a49155 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 6a264d80e6a69e..301faa1c867016 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 0c24247f892575..6ceebdef9d59a3 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 0b5e328601f2a3..1f92672b49b18b 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 d3b5cbd3a79bf6..01b5f23410c841 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 4b18683e853da2..0b32a75e4a236a 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 b8996030aafc86..29b1b564becac3 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 b8996030aafc86..29b1b564becac3 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 84fe2f2f3b803d..e12fc0ccc4038d 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 78a3af23f3cc46..b87015c546ca7c 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 8cf4976eee0e43..a4a109e112f222 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 9d325c4418cad6..4d7bb8a82e1cbe 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 b8996030aafc86..29b1b564becac3 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 25bf83516844e0..ba589cc192fd83 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 c0b18ae7a64694..fb6cd7ee7dab18 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 bdcbbae48a3595..9817add2e9f1cd 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 0c8434ee347382..b6e3ab53adb4f4 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 8ede7636f50e55..bc2b7456142267 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 d862483ef4eb89..fc2569c36502b4 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 72707a36f9413e..39cd3307afd5af 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 4cb7e6dca4ef88..71bd19c0b895db 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 73395b86c8146c..7b63da16e3605e 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 6d0bed2058ecec..7c74af1e974253 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 095c7089dc8529..58fde4ded38210 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 2a47f35a12d632..630cb11ad6ca9a 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 591efcaff1dc45..8698c5c2e3e16a 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 c6d92389db23d0..421c3fecce7c1a 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 27e246e1bee39b..be18779a047e60 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 99c637ee3c3ee8..e3cb2fc6c7704c 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 a8b5846128f443..8eb2b2b3756aa6 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 582298b0e772ea..e689ac06a601c0 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 f669be55b1ccc0..f68a3d498d208c 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 e74e442b636b25..0e82a79d9a8a35 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 76e93499147008..dee95b0c8b4b30 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 df5c9b99f1a004..9905668c529ace 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 28d9ca50822c4f..ba83533bd84e81 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 19c508c9c4fe40..58355fd6d81013 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 160643e36b25fb..edc14556dc5905 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 ca6d090e64f082..2299beed67a16c 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 771a7c70d06d30..159e16089294d4 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 52f025bc50ab30..d7fe0a00165999 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 542ea662515ce7..2ce6947dce7d06 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 0d3c4875a7f947..543331d5029b4c 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 7f4404e6b98d68..068f9e01f1f19b 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 d7d5d76352b028..521e3b294709b7 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 ff46512216f4d7..96ac9205d040bf 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 2811e2d9363a31..20619c070aa8ee 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 c4bddbd07c9624..640de69120a11c 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 a927d82d37cdce..748183eb09b903 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 4578266fe78e54..b228b653b02157 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 2b3267a09c12b9..f62e39a920f424 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 41fde9115c0020..587f850d5953f8 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 85b2e7a4f46a9d..81d3a878064867 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 edd2a5ad4316a9..29ddabb812691e 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 c7ba44e7bf707e..ceb79bc7949938 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 17a8fa731aeda4..8b09c0eea5cc63 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 f4f908e3d6d84b..95c6103d2f75bb 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 78a3af23f3cc46..b87015c546ca7c 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 39ba5a43f9d707..cdeed7da2f6262 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 19957373e6aa55..a6c6cd9104a466 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 82fe68d50befe5..749e20c8cc29d5 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 be3ff31455af1b..e7292e7cd7216a 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 6ce10a5357a4b5..18e54db392b939 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 e03dc848ef4a17..98db4f6a77d81b 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 73ec415aa53d07..3ff90ff1e1d97d 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 8dbd733aa908ee..b305f442f78ff1 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 4e231e33b9be6e..dde1366dfcd685 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 cdb4c7b3424ace..5f9d46502b8350 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 80be56620d826a..d3d6a485f463f5 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 5481ba169c5193..46729aec0f126a 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 b0d20ac1146e52..d8da1baadf39db 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 a6ad2cc5857061..45166de3e48e46 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 a6d9043c1b914b..55f42db74e844a 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 e8cb00c77eef88..2e470cb5d7f143 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 c93093eeb24bf6..26d8961e6b026a 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 46fe55b4913bb7..3a3e719751c4d5 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 d2495e22de2782..d19ea22b6db2f0 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 dc6a605e017c88..e4e7964cd009bc 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 0f4d1be2a7bd3a..f2e2ce691cacd8 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 a3a0bf2929db5d..a79222791c41a1 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 5696fa4aa59313..ee5419ae0f9382 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 d3b5cbd3a79bf6..01b5f23410c841 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 570e9845a14a26..dc052c19df6700 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 d3b5cbd3a79bf6..01b5f23410c841 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 63e7489e57201c..4b95f8dbd6637b 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 692761e886b3c5..bb4b9697d8450c 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 4cba59485f3141..c81c18a91f0024 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 d3b5cbd3a79bf6..01b5f23410c841 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 fb014b3497ad62..5123f6f4d79697 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 3c4e525aa46ffe..500ff0f20c3bdf 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 a1999e236ceca6..b0b04f5fe9884b 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 adbf15828f80a1..52093dd7cb263f 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 37da7ac759b1da..3678060fdec0d7 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 16683a039b284d..e3197c7822a9e6 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 3dc82612089d9d..3c92e4599eca7b 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 22faa7b98aebd0..c55dae8896ac4c 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 fdf30bfba12d58..68740883f7fac1 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 528551aab852d8..6c9becbd4b6fb6 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 aeae260bf185db..ae40dc75d89f8e 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 1f8a403eb2c5bd..1e7a17bd35e978 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 0ea681ced6b44f..24abd0b47585bb 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 8dd4084f86337c..80ae5484d6624e 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 96b361b0656c4b..5f5de9f9c61a02 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 0ea681ced6b44f..24abd0b47585bb 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 5e0cc7ff6ed5c9..b6928446d0059e 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 763cebbaa48322..97df3f389115e7 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 96b361b0656c4b..5f5de9f9c61a02 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 3f95193420eae0..946d293973db58 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 9904a82f1baf2c..2cb85b8d5d430c 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 12926d5e38a60d..52179057b2a3c6 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 6975e64c5dfe5f..2f2b8c90ac29ba 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 1ceeb385b5e940..e9e57201cb9afd 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 ced5bbb4e9357b..13a9b837684eba 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 b5c0356001dba3..204bef0c7d100a 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 c3f87641c8eff3..e76c49c93a1a92 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 c7649c724c0a43..2b9b6c777cbb95 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 8352b4f2c5ab9f..a6274d43e7e13f 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 a924bf71c297d0..1852e35be15f82 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 3f2e2b5410503b..35163127538de0 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 db3f667a0977f7..850a237d68279d 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 f8801db9c61c14..e30eeb247569b8 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 1bc31a5f66b28f..f4a0e6f5ad9f2c 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 b3e23df9176810..7d5282ff762a7d 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 d281b3c40e76f2..ed35777cf47983 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 fd7608accc9e41..2e86b099fea87a 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 24caa75636e334..b60e355bed6593 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 550d1969ee45f6..805ac93dfcbd63 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 939f56e9567eae..d7d1329697bad5 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 00840df1da23e0..a8f0c6ac5f7f3c 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 9d804fd437a25f..338a305b7ab959 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 b4843bd50345d4..f6e5e5ef92fa1a 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 b67b9c8b6b6f0d..47981da7df9d9a 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 9168ecf3046624..a63568ae35ef43 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 9f2deca840e8a8..7dfe3be205ae1e 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 c8f728904f2439..e596e83ec1868c 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 7b56a6c216d1b1..2cbc40829d13da 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 f40428f77542b2..231d7545f364f4 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 b896c789a8bc0f..b6f8b69e356a01 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 22f1f73840102b..f77e46b3451abf 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 4978aa7af4a69b..34b87a054269ff 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 22f1f73840102b..f77e46b3451abf 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 fbfcfb5e1b3c09..6475fd2e0430db 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 22f1f73840102b..f77e46b3451abf 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 0aea71a41b75ac..1a4eb5d7139342 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 22f1f73840102b..f77e46b3451abf 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 8e3299029da092..886b1a2fe49daf 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 03ee799eb61108..9691aaa93ded4a 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 5df1f48c0e4a83..4935671006302b 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 7523b585ac2c3e..1b191924fb9d99 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 0000167dfe70bd..5834ca7889853a 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 3124042f8b957b..de9bc2f4a78a20 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 0d3cd3619c6dd9..78819cb9cfac6a 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 349900a9c53a3b..a8e0c74301e002 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 02fd37c62a1c63..c847f55e8e0003 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 d3b5cbd3a79bf6..01b5f23410c841 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 7a2004ed43fd0e..e6fed2355d820d 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 f7d4c3e8e8b424..cf2ce73397c6f5 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 4be1feb6e745e2..9d1c9bac3ff0ee 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 8795962cc42f27..4762582b944109 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 84dac1758aa24e..4e90d1aeea0a47 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 e954208c256f44..0400cbeb53a833 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 5176d49b7afc04..7c8b0487530a88 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 7db0d8597600fd..ad32569d0c07b5 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 a120ac2f1c7866..5d914c6f79aa20 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 0fbda73b3950bb..9fa766b7d7d380 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 099efed52d9f44..10bcabea7324fa 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 7a16bc486d7093..20a4e1ddfeb73d 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 1fa57f37259630..2c649bb80e9eb3 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 453630d038cda6..75365bb98be76c 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 c171e141f0db06..827ce82d130423 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 a58881ff2ac90e..99f61c67f08579 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 9d85d1eff82c17..bfd9edb9614c13 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 6c7bb3c551447f..baadcfd0f95ccf 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 46fa76adb28be6..403c11cce586a7 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 5dc4e084dd00cd..7b25928ba611b2 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 80478f392410a9..ea77a5f420d314 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 5296221044498b..fdd5484ec075d2 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 832ec15487b8c2..f7ea21b1a085c9 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 ea93913e358579..aec8ebc5a97a9d 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 ddc34e8756c9a8..733bb894690041 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 c70e57498771eb..ae059e53144c8e 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 4f4fb3d199bf0d..1efdb0e9f8beb3 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 583418c4620ef0..aaffcb0481f1dc 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 f0abf7ce8254ad..568f8eb4afa758 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 08158f1d8e630e..ef9ff746060f5a 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 3a76c1de4e7d61..dfb83da20a1f21 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 9f0d10f70c9c53..fc886645b0c880 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 cf214d7f562722..e4c2350a731818 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 b0fcd0d4af8b42..288fb04e5926c2 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 44c4d16275e94a..fb1cf23146772e 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 0597b4e602909f..7447ec41ca8736 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 369985d55ed231..0d58e60796a15c 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 c3045ca980b206..312fd0467078e4 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 526d70cc236404..e9c9795add3daf 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 0a4da32314bfdc..b3cb3c412f100e 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 0e1c295a61a624..b8930e951e1302 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 5a7bc9fab1500d..ce0ddfc46162e5 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 2f034e7d476a7b..8111b0d2434519 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 92db74d48888ad..f70dc5692f8e12 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 79ecb759754794..5268afe685f5db 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 1c4eb2a9981f96..e3d36c0a1adeae 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 072bcb2ace0bec..21e1af04fd8d14 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 391b81be4d68f0..bbb4320a5b057d 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 1e23f1a6fc94b9..08c2763c8f0d23 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 9cc1b654726132..8175bfef677241 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 11b3da0a1b45b1..30729e96ef162d 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 ad00b38a1baf47..33caafc5c10a1e 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 e7bf932c1ffeae..346fb93017a6e5 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 f91cccbc1713cd..c60371e2ca9358 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 cd4ccaefac9253..558cf7be577126 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 0b738ef7e2393d..934998cdd09234 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 80ac23a9947cc3..1d1fadd2133048 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 d0d78197ca63e9..70aa9ea5d9c32f 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 efdc778e899961..502f3dc231bf8c 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 4aac4e3a6e684c..734afe95f24378 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 26265df5fbd20c..c48ff05ae552a9 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 d1918ff027c389..c9d7c9d71676c7 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 6962e107ed4d2c..0b587957448042 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 efdc778e899961..502f3dc231bf8c 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 d70c2596f3f7b7..680b58ab222629 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 7bcbe4655059aa..9cb440158029c8 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 9fa541ab4cd076..89468f1317f63d 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 ea5e1927a9c215..be900e94243522 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 71bb6a42bbd1b5..443e029946bfd1 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 274f780755a7b2..021b7390ca5483 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 52497254ac862a..a3d76c0ea7952a 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 5e273d5d5a21fb..bea82445304dd2 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 f32bcde5ba5e2c..c5ded194c78a46 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 7f72fb619004df..76a79a9f578b04 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 98ff48bde5c853..43710d39aca271 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 d71ddad1f5f4b5..c1d8b01c1abde7 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 617295b8b14503..f1f33bd2bafc78 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 edffdc98b35e72..87f2b8320d2570 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 5f563dc8e3cd6e..7bf911d1cb4734 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 7a13fdf501c5cc..df428876708b37 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 009b7d1c5239e0..d09d87b7cd8b11 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 fd4ab284ebe302..dc2dc5a925b996 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 0c5a1674237de2..3ceadfb8868cf3 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 03e89571aacd11..70905cc58d24bf 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 6e90f22b98f566..0a49683ea3d12d 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 c9c9fba7d53cbb..5d98aa31a86a2e 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 df85dd463937b3..790af8c6312c0e 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 00f681c0751f6f..65675d94c59cca 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 1af987faa15e9a..aca7ae47be18a9 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 f1c00f7ea5c9c8..25c659d5668562 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 8c908ce40c6f25..621af96eb95480 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 309a5c82c462b0..8ea8550dfba091 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 0f5b56505134ae..644d5a6d64a266 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 f0822601e34b94..6dca927c4fb7be 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 860e530389df73..cf1a204cfb4ada 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 1db3a3c9d571d4..3602e81e5be1e2 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 c71a83eede61bb..f46076619352e0 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 380b3b5110498c..89d341ff400a52 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 4900f0067ce09e..76879b805035c9 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 ac6d3bc55be0f0..9e0230a70f54e9 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 dc0fbb4c90aaf3..6d53493f56f5de 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 2e08d6899d638d..5efd8b29a6bd1d 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 bae78739708d2a..89296c64369504 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 79ec9a4039e558..2d2dda2f854f91 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 d9c8b0a6083d07..d887bf81626274 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 7449ef52fa613c..c2ff1ffb001482 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 bbbd09d1e262b1..559ed5ed044e20 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 887a29d51f09dd..7aeac84090e75e 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 0f6cf561a7c628..840dc3b8c2916c 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 3fbd06f1b6a681..a17d3436f9999d 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 aac15461b84b12..e28e7ef08ea6cf 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 f3f43a90d4bc37..c2f7b75bc8789d 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 f762332b0c73ae..a1726638fdc902 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 48577bb7fb5f54..3cb476e67e280d 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 ce6bfb94116003..0a1074d4613d92 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 ca5f4a2b36065b..00bd221feb27a8 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 8d7e49bf94af2e..4db26f665f198c 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 f51531d12b226f..c86b199f879bf5 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 d3b5cbd3a79bf6..01b5f23410c841 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 eec1ac9d7d70e6..4b11c97d29e559 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 b11586df6a85da..c7306581a8036a 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 31febd0809626d..2c52d0887a480d 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 46059698aa072f..02f02cceab8e9c 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 0f722e3979f936..a921dfa87e7c21 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 18074380b7f098..f57d58972c52ce 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 365d5bb63e9d5c..1ba35a674a05c3 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 7b0b98f869bff4..5798d738544094 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 653aa21c9b322e..853052e78d047b 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 a2f90206488f7e..bc5e04578323de 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 4e0e6db6f86d65..a1e97845c736cd 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 dcda3ad948289a..79df81416d4555 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 73da70acaeb633..522313df4ffc42 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 82001851362143..85bb0d28c3896f 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 4c20f697019f1c..88979d8bed237b 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 b8996030aafc86..29b1b564becac3 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 b8996030aafc86..29b1b564becac3 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 c9d86c0b95add9..ddc064562fc533 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 79ccd288a84551..7d9ad9191b74b7 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 4be3c667462f97..e351d6ebef9d8a 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 ce99dfa2d50c6d..1f2fade866aca9 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 630b2d4ea065d0..b87d7a0bb1ad6d 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 c26690aedfb176..804e6ffd43dbc4 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 ed70c7c3dc34bd..198a61bfbb6ad9 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 099ef64b37e231..158228051d9f85 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 5fdbb9fd6cc313..d101ff0296c409 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 66a5d2c88e8d72..0ac9a46c7a963c 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 558d7cfb6982d6..c0f0b3d3694e17 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 73e69616d8a1c9..00287482f3f277 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 52f8425e429a23..bb58f71bf68567 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 088f0f2e79abd4..7f88a585dea2b9 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 ab881db3da76bc..7fe850fca57d98 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 18afe7e474f1e1..1c1911f2236f4d 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 59ad2120111f4b..3e024e7c6c79de 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 ac4e9d66d33200..d03b640b025d0e 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 bbf4a665c37f20..8c99724ec3db2c 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 63ed5eb22c5f58..7124ab7c968257 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 010763a9e25a08..775152fc77abd6 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 906156a482041d..573688dfac1ea6 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 b556699c91150a..a95ee30701d8fa 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 5edbad5df89fc8..9a56a189688942 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 6b4964715b5a9f..935c03d2005f3c 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 bfca7e1bd693fb..f533df169ab0cd 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 f5421f59679b3f..8e4d97497b8515 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 43bfd97b0dec0c..50822c79d15507 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 4e609b7777995b..0aa0dbb602ee59 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 91abbb7436671d..a2a0afb5895ef8 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 72b715bbf83b7d..2bfd26bae968ad 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 884941b3a1398c..2612568a9da76e 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 f894d68e64786a..3543ce5728d74f 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 8e97c95f95f2bf..f64fafe3c8cbf8 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 4e1993428d8080..6e32151aeb1209 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 619c15a9285ee1..32cede96df4e4a 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 a8019b46828434..a77fff5c6108ef 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 e11e7a61af2d92..41e17f7de0bed1 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 0f3caef96b8707..1531717d2fefd9 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 3432e244a5d1d7..d958dec85990f0 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 80b3e8620042d2..31f1186fa31be7 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 0f771e64745867..b717846de0a51b 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 9704405a8a3675..c15ce2798a9127 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 6ca16cc03c16f6..9e48707bc44486 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 3b44ca15bc3686..3010a5be58949f 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 5dbf25cf4e17e8..281074e34a67e3 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 08c8604e74c5d1..92ba6b671488a0 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 44234db1b19a6d..37767cb5ec893a 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 350abdf7dfd320..66a1d61c7016f3 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 ceac35b518d977..ace27ce69b8f53 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 75e7d743a7209e..af59ee7aaa6530 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 fdf5a67d8045dc..992fc930ee9f96 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 e75261fffa81e8..ac8a056d25b586 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 f19ec87572de6c..42f822e97ba080 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 87ae164faffad1..000abc4f5eeb75 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 f236c203678a43..ebc0f9d03334ec 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 fd09592edda30e..ace1b5ca73f14e 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 5e9401f4a8dde9..b0f54fe2c88b89 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 a7fecc8acbdc2b..a357d00b5d8c04 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 7c821c9aaf50f4..2173f6de00e7b1 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 f998f3db26cf03..109aa9f901047b 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 422e6c9862124c..f666cb7bbac08d 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 8f7bb07fa8fb0c..e700f8b7ef4de9 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 4294d4dbffbf32..11ae1809bb3b6d 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 9811e59761e13b..52344d5a8377f0 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 729c973a0d6ab7..ba2ccb0dd2703b 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 65e4be5f71e21a..bcdae77adbdc60 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 7033fb22a1ef3e..88fe285d97a254 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 19aa59181fe6ae..969e001fc2e393 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 cb7c4c6692638c..ec9c85cce4d8b9 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 7300f6fb1c3afe..67fc707ab3080d 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 d7e24bd24ca30c..ca2bd7cc89c4d6 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 bb5b5a790eaf9b..c0b3b7a776f79a 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 49c63f14f41f0e..1ab46cf162ca11 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 3740eff8b75f33..6695d1c1c96923 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 fd7c22617efa30..e0891e957af14f 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 36390b58066436..823260aca5be20 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 bc64c58d160585..931d7c0943e258 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 8ffd114fe8607e..2765525f4cec36 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 e33dea95e67af6..55e17d3b2fba05 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 6bdb202bec1df6..e8e0651dc0d6a7 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 07cdfd0417d997..68809f32da0575 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 eef14e89e1617d..2c7bc157c82760 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 687e3586b8b074..f359f9215a2895 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 775896c1fcdd99..94a1173010a4e6 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 c3c94c690565b6..5b422032767091 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 68ee26076f6b53..71519aa7f70d21 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 c15174b3972665..1fb4a9b85e7736 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 656cf7850f2e50..abb6ecd13ad438 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 e656ddd9bb4537..9f8ac443a8fc9c 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 bafcd5b46c19f9..4c2ed2f7f9c704 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 e60b322e2228db..4deeaf3a952002 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 0b0896fad43d07..dd6a481d1a150c 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 3f8a4dad4a6511..a0bb37a85fb8bf 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 532d4bd64bbe09..3ef85cee79c093 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 bb7ad32f42e643..4d66ca659376b7 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 92c5469a2c8534..44382a92340808 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 c89b74b1228314..1639caf20d6b20 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 c9bf45e02050d8..f4225df297d66c 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 fc377e38ce8318..2e6563a8307721 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 2be8a207a219f1..6c14c7d21077e0 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 24fd62e58873d0..675ed476c51d2e 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 d6d648ef1e32a7..aae0b795c2166c 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 955ee5224198f5..dc701f9210776c 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 ca4f3cc1744316..206f8fa40a090a 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 58aae0053be9a1..532d0a51b58ea3 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 1902d10789b5d1..c2327a2860cd23 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 e92b752309b594..07d37c8b17a8ce 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 dca723748174bd..0395b3a8f35587 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 c168513b98ee47..7128b513afbc41 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 60d27529dd1909..91ce72928a667e 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 af94a24599abcd..4cd25fe5dfa531 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 2a470e0850bf95..df3948987da6b4 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 d2cc192f35995b..5dccf590ee4ea7 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 5d39b84a11c363..2d6d5b47b0bd21 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 1289999a62fe39..92b4bffdfecf72 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 24684b9194300b..d301d7850b4452 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 34993a428fbd43..8728b0c1c76da3 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 04846e847467ed..35f9588b608009 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 c21a8dfba2afe9..3f7fc7e1e54377 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 ae00bdc4ba907a..7850071882555c 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 d3b5cbd3a79bf6..01b5f23410c841 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 8e1d7c4d91c79d..9467cc63488426 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 0c8d1b63488be4..d1b15b47eb83ad 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 3fa6f985c694d5..9efe8918492c2b 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 555559b9db58a9..beffa476ca9835 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 9c4a1aac89e863..7c6820f70a456d 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 eca805e7dae934..9b04340c8eb0c7 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 94c933af64cbe0..bdd01c91adab3d 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 57caa2bb81ab69..b851485a9239de 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 1be361d603c35c..abbd439fb9e394 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 7a30d55bec7cfd..a79a32f57157ce 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 bf800265031a61..cc0fef31be438f 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 07b93f67fed664..512ca678cac390 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 3ae4d5e69a529f..85167e57abf207 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 b09e44edc1b079..b9d986cdc6b35b 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 907c8e8f753376..7397d0fc1144ff 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 0d9a01a8036957..3a216d205fe399 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 70e10bb4f984bb..b3de2b6ce5b91f 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 b6485bbc2b0cd0..448abad59192c1 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 f8fa30e39603d6..777f2a65e671df 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 fef1466299e7f4..898af78d6101ce 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 5ef7959c1d4532..ef526ff8656dcd 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 bb2c939c5cf70f..73ba8951a797af 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 1a95c4b49844ae..c481839ee3244a 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 209f969b6c3ddc..8bad8722a5b912 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 d25745b57f76ee..77a4770ff2f7c1 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 aa0ed7b4e18a8c..102c6745c59321 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 72ebd988df160c..49d024052420c4 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 ccff95af741d36..b01877bb8bb81c 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 e87ea8ac25ded4..69e63af4e2727e 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 d3c69a7dc8b706..88ccecdeba29aa 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 8b137891791fe9..e69de29bb2d1d6 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 7043b2e7c62d40..98d7b2ac7bd3e9 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 d882ccfd877c79..aadf0a4d80ca52 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 acc565056f4a53..3427f67025b20b 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 c2052e82c0ed92..0dac101f7186fe 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 c75322d6be95d0..c7442284bd5199 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 8b2d835531d68e..faef7051f46ea9 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 98ec1f6993b6a3..d4ee3e599df44b 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 42d76c6061d2bc..12c742e6b87198 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 e5a0b2e6cb2129..bf3ecd04699e9e 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 5c073ef1d6a882..22138a09a9fa42 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 5031470a4efd02..cdc965c2076360 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 eb5907ac183a47..8178d33b7ba8ab 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 d29045d78a1007..cdcf3466aec875 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 154605142074a2..9cef42a7cf58fd 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 051dce64628691..97172d0e8637fc 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 8b70fbed97b87e..1b479d065d9014 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 b828e64c8143ea..442883a6199833 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 f51ec506da4591..5b40d1e26880bc 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 74af945b724421..a53dbea685a6b2 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 81d6e0a051d6f2..7522328b0818ef 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 bb53c79cd05c45..93f72ee440f8b1 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 74d18d4b77eea7..899e301f4608bb 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 080b6247fee8ae..0e25f01d48812e 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 82463110f1bbb3..fcc744878220ea 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 6a99005f670118..dcdc2495d6900c 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 a52552766e3681..6e3ddb351dd346 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 d0f22572b36d91..73feb52de6a2b2 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 c1088659f2b05e..35747abb7087e7 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 e83e57a743acef..6262cfd6981ea8 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 ccea2ad82fc3cb..d2a3ebffadb32d 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 b6b416138a180e..862a6aba0bb717 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 666f8a74396fca..f2ed84e2e38f2a 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 0c163e05e07f80..aaa3be9f3c0fc5 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 840a41e80224c0..0864da644bdfad 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 e1a3dbf61e4931..ad3f20f5f72c39 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 808b311059793b..93b07bf9b7d6bd 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 54044119a907bb..55b24cd3bc97c8 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 ea3ecabf95bbcd..a16e93adc14966 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 069272ab810491..1b911c451c0189 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 c0e333afc5d7b8..e900bc2b9a3f9e 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 a7ed635a4881f0..dc6271de734d37 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 7d184308fea0c1..da831be6ebba3f 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 d684811a311bf4..ba8c2e8adf119f 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 0a1e40096d90e7..985efda634f16e 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 47470132a2b69b..d471189cb7c92d 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 3097ac846c463f..7d12e5cfa388ee 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 6a5f6a50bbb788..d336c40363d24f 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 09571f159dcafc..cd4dccb991688d 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 57959a1cd0270c..38700bb7b9ee7e 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 8ba51f034aaa2b..11179a758609f6 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 cb37008f585104..37b79d56513c53 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 baa50ff8cab7cb..8082a866e9fb37 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 b8996030aafc86..29b1b564becac3 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 ee76f0719dfab1..8cf92479878542 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 d3b5cbd3a79bf6..01b5f23410c841 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 90d3fce7ea4247..e98f82d941cd8c 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 b3c336b7c56dfb..d358ed403a4710 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 b8996030aafc86..29b1b564becac3 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 ce3e1eeb2f4d58..7c44a8ae3d8bb8 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 c0eb2548905224..50fd3b5c982b7f 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 88e1d3cf4e2380..338eb907e37d03 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 848577f178be15..3f349abbde223e 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 5c9281f41d5623..6150359b2c0b2f 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 2a24ef6b787d62..e4eb86c4b0391c 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 0b74fcb42e22e1..26f669e2e0b657 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 0b38c5dca6b5ad..5f7deeea0b051a 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 5a170379e326de..296cb504bab107 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 7a58b2265a5a07..e324ca993711bd 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 2cbd1491200913..a040fa57f7d741 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 1661a3a1512f85..18668bee6aa005 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 eacb74582d03b8..ed0f91c7942073 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 8a2b211cf7c924..d41469068c3bf6 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 14d7b80b78e67d..765036623d49a1 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 e9ff69a27838e8..c872abd74b9cce 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 e16288dabbcc01..ef231fa634db83 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 b9127fba779a76..b1b88c4c1b6cbd 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 f204de7397d6d7..7df1ecee327891 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 48115d873fe3e7..9a5aa11424ae24 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 331f0edf44bc85..69a643a248ef3b 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 2b3978416e5fe2..d764028e57681a 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 df3d003aaf504f..f232a73b8b87ff 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 49eade455d3bb9..1be4bd27c2c0c4 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 586d971ae40450..49d155c969b543 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 ff011754764068..38a9646166d037 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 8d0269b74a1f9c..ed4b25615b09bd 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 864448ad782aae..0dbd2b8aa93560 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 9bc8509b37e35b..c1036df29a0e37 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 9710db4988905a..b92dedb0285fd6 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 9bc8509b37e35b..c1036df29a0e37 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 592bac9ef4ddd8..64133672489480 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 e380e9850fc128..c4b3baab4cb821 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 dfba72a51ce7b2..01cf8363423964 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 9324b6f25efe98..5b8e47e122916e 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 0b000d1b836563..0e3fa37acf8a67 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 66728c01dc9ba8..913564e9ad0f53 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 2b5cf5342092b8..f353a248b1b8e3 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 bcc55d945c7e34..7054a846449d84 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 aa4875b6748d9b..8069229dedd8c0 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 16659993dd4b08..9854223d6f7873 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 0c541606411fa9..5d7e9726b78638 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 2f4f62131d7db5..345937df2dfe8d 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 f39a0b2ca57978..2cdafd5216e0e0 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 408db9c397440a..bb8f09ca13acce 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 b8996030aafc86..29b1b564becac3 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 88029fae413adc..9b28b2d8aa4bb7 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 e804ff4d0f35f0..1cea8178ae0750 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 938d2129d9883f..661120335aceca 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 12d4985373438d..61a88fb6269297 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 e0feee7a80f166..e93df9a8b5ec50 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 e16f74080abfd4..cdd545a12a40c7 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 c3604c6e22ad58..4474a0af050f41 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -1,4 +1,3 @@ - .include .include diff --git a/sbin/Makefile b/sbin/Makefile index 303e29e9e1248e..790112b05f6f9a 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 4904b2ebfe8726..a7cb39976324b8 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 4904b2ebfe8726..a7cb39976324b8 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 4904b2ebfe8726..a7cb39976324b8 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 a9e857c046de2d..7034747d22e718 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 4904b2ebfe8726..a7cb39976324b8 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 1fa9b74b90bcba..54980c3a57fbc2 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 531f54cca18d6e..c11426c57e451c 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 5da29657bea131..3a35a5263a6938 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 9bfa0fad657361..d2be16efa54434 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 64703f656a8985..2b0c2c9dbc1456 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 6a27bb7e7cf402..8972945ed072f9 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 ac3eda4cd59715..51f4e9a914dcd7 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 809f1060d18394..6c868dcfb1aee0 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 072edf04a5c4fe..33665536167c75 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 d8d67602c3ef29..8d527ad5259af9 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 885766f5cfc697..97421fe5cd3c70 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 09a8ed5898e1c7..4ff0187a5a2295 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 7a51f488ac68fe..fba7176d5ae163 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 dc823abcaf18f0..0a20cee8241ccc 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 bc0b2a7cba551a..20da7231206f5e 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 7d4359d4b76261..2cca8635fa1338 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 d1863f2b448c31..b0bd864fd09d36 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 d982e5bc033e5e..6f0dbf3f478f4b 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 b416eb1cd588e3..1e7fa4f150d305 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 346951f12b3cfe..03a72bcba41f61 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 6312f07b09d3bf..00f9c308932360 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 322dfa33043caa..85cea684a883cc 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 59805dbbf3d6e5..7b0f0ed822bf87 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 b311a9e8e8fb6f..078503d3ae6796 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 9aa1d5115505ae..753e0bd0ddbb38 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 d3b5cbd3a79bf6..01b5f23410c841 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 5591b2a3a8ba75..9ea38ceb87d4ea 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 2939e4de49ebf7..629d6aded3086f 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 ec1302bf9cda15..eb9ff9a675ce08 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 270eb46ce958b0..a23b430f58fabe 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 8ffabc694c3151..7e70669645147a 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 3f42f6ecdda786..36152dc835a62b 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 64f35483c5d70e..8a79320fb66582 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 e5701fbcdbba80..2553e61b5e9eef 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 9b29983afc7cc1..ff545f60308565 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 965608065291d1..124a9f77dede3c 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 32cead444f7749..1b0a18d3d9c315 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 39bdc3674b2b46..cb3a3df50e0c48 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 981be4acd99ed5..00cabf50cd8961 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 56eb92edec0978..09bf881deca399 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 7d03f282f67290..795e89e0a14f9a 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 3ff410e8f22561..d446ab9d22be2e 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 11506d8a85e83a..257e3b9997771f 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 e4015e34c4e31d..869a399bd44f91 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 d9b267a58580c5..8ed864ee926768 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 fc655c5423d7df..f866891c4c97c9 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 1169e7dcade56f..1f62d796076e3f 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 8971e014faeff1..bdd56876dadd0c 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 a800ec86b0cfad..bfbe70130de7ac 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 2ed58431fc03f2..621be3937ec0ee 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 f91e84323b047d..ed87ff84876b53 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 236e8433fd439f..03c4da684ebaa0 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 5e102d635e9333..bd835df0daec49 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 674536a33d74d3..a3841f8f0dd054 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 592ceaa152c25a..0665dfcc20a3f2 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 ce2c8d0cd97dd7..2182f31ca247bf 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 b11bf0a25fa5af..591fd6adcc2212 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 ad5a27f7d76d77..9b5c9b9e593df5 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 ae9cde8080a4c9..3a8f9cd45cb40a 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 741cbed1dd5e25..0c173bf1b68783 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 2af94bff3a977a..3e61a9f680e068 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 591ee9a9e240c5..12e87308ed1369 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 bf165eb28ffedd..c41c051fc31514 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 a548429b03c6c0..2096386a378481 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 39e3fd708bc712..b8d54c780bfac4 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 b8070d90257ec1..1138e819055f4b 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 f4efc649067561..a3ea6a6a6750cc 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 c75b1075c4e0b1..974c7de3362b0a 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 8934e138b49d00..bef6878b7f2519 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 f89b8dc84ab6cf..70d1ba40a1e296 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 f949af97945434..d88927501437a9 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 3191980c5623b0..9e4eafa0feec0d 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 353a2d14150866..750dd07cbeb4e6 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 9a71b2b2a802c4..8f8185d5f7ad78 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 eebe8819339ed1..5754dbd743b8eb 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 c9108f702f29fd..08ca9a7af81bcf 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 db41a445903f87..ed5f527581458a 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 c676a42f62b8fb..27cf512d81c5ff 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 fb67b5ea649052..d5efad642bfd07 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 17077a4f825f85..7b4a636843e0be 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 35cf8cc020f496..dd20f7b7a37a50 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 a710629cb24242..b4e3f115b245d1 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 3bdf53c15a7cc8..0520b1d634cf1e 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 d737e4f04723a5..edaac8679459c6 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 5e7a2fea15bf01..27805d30779425 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 e0a8d118656f93..41bc736ecc6ebb 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 e381ee4118a867..328153a2b0ba2a 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 915ad0d1ad63f0..99fc7e190bfd40 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 b0a0670e46290f..43b9c0d8d82150 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 23e5ecb79143bb..9d634d7c48b8df 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 d3b5cbd3a79bf6..01b5f23410c841 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 fe10df45930919..8d22ab21b6da89 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 3271570b352139..6c5d6e4487e2e3 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 27808aed58570c..ef87c9668dd775 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 e1e590307c6dbf..cd47d8b28295a1 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 c3f117dcff1fd0..b209b2448241f5 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 b8996030aafc86..29b1b564becac3 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 2a1f7888531127..e236525557e195 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 7b440db82af1b2..d97283d70c2153 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 78f7059109fbd4..6b6007c4bb3d9c 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 f23953bb71ad18..268ece6847f43f 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 c951f3d3524f47..a0f42faa062b97 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 4390d4890b92fc..cd337a74a75a30 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 700e6ff3048c76..88e28778968891 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 20d0ccfcbe2303..b2fe43fcb802ba 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 e5341c97800890..19d7359ddcb95d 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 b4b586fa6585dd..195fef28501c62 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 9f5c8f24396355..ac01b9fd6829b3 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 dc701d90451e97..a6ca46ecd37299 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 b109fd7f7f4f49..afcc2a48660c4a 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 d95f08e27256f4..16a2c15bc962bc 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 80587f47c48fcc..945d93599f06b3 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 13d5f4849cbc25..3da129023c7ffb 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 184b6aaef2f248..2162dbf94b68b7 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 a8b6f84a70ba2d..a69e6074cc2e57 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 bd837dbb55968b..cee699eaccf6f2 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 9dc8cd4eafecd3..60dfa9c77c2035 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 2f9e5b40fe3e4b..0e01eb3b8ef2a3 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 0c7027bff89b25..92bc102c06e96b 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 8843cb9717c989..0f4889f3ff81a1 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 a285d0b1148b0c..f90c873072ea7a 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 e6738be94f652b..aca21d318812dd 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 21a57f6b368f7f..9d8a64ee0ab43a 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 b8996030aafc86..29b1b564becac3 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 6d0be7b50dfde8..cf265c72bddd2b 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 e5beeed87caccb..8998b613dda373 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 852055bfe625b7..40d86926d1bbe4 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 e5aa05f40f1d63..6027b164a35f25 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 2e04a0ed1fc243..4bc3a814ab8e94 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 b8996030aafc86..29b1b564becac3 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 b8996030aafc86..29b1b564becac3 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 55abbdb5c3e880..30f8767aa4e9fa 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 78a3af23f3cc46..b87015c546ca7c 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 464189e798217a..0653e6875188b8 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 bb2623062333f3..dbc896286dd366 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 72229d100c4590..841c89b71c6702 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 43ee63c567e738..ec709c7210899d 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 83813452e69adc..bc5985a7325e80 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 6595ad3db13220..149dc6936659eb 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 b71c07a91b90a0..b842841f765f8b 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 1d1f5e5e872395..7c3eb68ea083c0 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 b8996030aafc86..29b1b564becac3 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 c0521b95cdb45a..50b863096138c3 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 5c01baa093b732..b660f1cc6638a8 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 c15bd773c77a44..323fe4b8c99f0e 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 b8996030aafc86..29b1b564becac3 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 5546f3e90c1bb0..a94fe6334709bc 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 121787f4b10bd6..31d47bde05d9d2 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 dd310b699dd5aa..5d608056f73377 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 62b3a719fe57c1..cf3335267446f7 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 7e8c830d19446c..3fb23e269ae2e4 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 29a321f55c30c7..c2b04c972bf1fa 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 75c12e2ba0e7ff..6324dd59ef75b3 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 8e674019e9a2b9..9467a4ece9a7b9 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 245d40118ac0cd..3064611d04b28c 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 bd0e97a04a8e88..866af4017e4f07 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 fccf2bda0c0caa..9f842cb8b24786 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 93c0ddf055611a..8c3a73fd88c1d2 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 631d3465434134..87956f8e7a30d5 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 d706f3a3b8803a..7542e0d6356dde 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 29baf84d1d48bf..b23d3ab9260cb9 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 2a6fd6ae619259..14aa123011c3e5 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 829b77a117abad..8fde27acf11793 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 9cd2f210cd952d..ba789f4afd9889 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 271180abb82747..3c702b2aeaaa0e 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 9f25cb6db89435..acc2048503f892 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 8cffb984f88000..a486124fac51fb 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 c4075606b261f4..454fff5ee5a9b8 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 114134a59589e4..656e3cd89c2c97 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 dd6c009d47ea40..0c909ea95845fe 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 4226f134917a9c..3c45b04b08d643 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 3476ab194d5c72..d250599299081f 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 d91fd40baaa57f..f353016251b55e 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 a4f9954d6abab6..6dbc8c67ab2b25 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 8925f01cb450c3..755264466aa382 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 531de11faf3d84..6a4d1342162de1 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 902c3d1855e481..a2a2b355ef6e0a 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 8eaf0ec10083cc..d38189a350dc89 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 02833db4692ecd..a2e7479bbd2a60 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 a4463fa6567612..d7bfd45ae36e0f 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 b7770a4c1fb293..1e5d3c677dbfdc 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 c6c881ab8f6642..4aa334a84a9f95 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 69b12e8d31ff06..297c2e63a5e227 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 9039377ea8f234..aeb736aedb04fb 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 a9115a0902897c..eea45d3049777c 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 4a1f10394d7e81..966bed693ba1f3 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 d72bde8b35f4c1..ea4ba64282fed3 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 462b3178587874..781cbb0c6ced8a 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 23698f35b656b4..ff7f26e13747f8 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 1f248858c057f9..d47473ba0a3ddc 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 05d283217bdc24..066a930a2ea3bd 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 f26c47c6d6df3b..c752d8279c98ed 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 4ba3bf5d44b7f5..baf34752ea100d 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 653a382ebbab80..067b258a1a9fe8 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 f1a004c4a574e2..5a893108c02d14 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 49a9239dbef644..b4525b58c7b437 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 e2deaa0edd4949..5edb44e847c9e6 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 6334e077f2f0d9..cdfbe9d4a4d5aa 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 aa06a588d2cb4b..c1c1720b74e5bf 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 93fa759ed346c9..15ff1bb0222125 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 778650d1f4c2ab..b1ca61764f90d0 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 06f1a06071378e..c13d726185224d 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 be4ea12d94310d..60351b562bb34f 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 da2ec7424c8692..7c8eb7f50779e6 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 a946ad81be7d19..59cf82cd2cf486 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 ade471b8d654f0..e9f7ac58710b81 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 18b13a175c9459..fa7cf0f830df0b 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 d5375598b989c6..a15d81d5b868af 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 1d2ffa321343d0..a92ce0bd3bbb55 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 53eedc4058c764..ba0eb96de955bc 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 1f7ff654b5016d..a78b1204ca4721 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 eee720bac9a263..e8498e8ccc90a5 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 05972254c5d985..beb0b147771a87 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 60c4f72ee923fa..14a57395090efc 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 800331f7eb139b..c529682d6f3331 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 bd8c1e1e3431ea..294e37666112a6 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 f9845389a6c40e..95aafe8851fa06 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 73ac03c794ecb9..4a850d9f21aa82 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 ddb52f6f701d66..15e6aaca95399c 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 5009150bc849b8..a8592b1e77e6c5 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 f41e46a8b60a42..b5732c65513116 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 5a64f267bb4570..c5dd0a9aac67eb 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 8e5d815dbe3e64..23d10e55316477 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 1d05d7c0f8c84d..fe2d338a961e9d 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 9a18829d24c2c3..e6aa1e72e54692 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 ba422c8442e9a3..9896d75fb41989 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 1c1b09d2add7a9..0fa6960311d464 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 e2a12e50fed6fa..16482e203b72cb 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 72be559f2100d8..b7281ebcdc8639 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 3746784bbdb5e4..a8de9a151e0ac6 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 5bea230c3ce0f5..c7a03af2c7aa81 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 a50b225f66b759..1945542dc28234 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 e3a00289cd6c39..547eb25bd81719 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 0481c80e38f719..a0d7fe6cb2e4c0 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 5360967a70041b..d2b140dc44bc58 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 7f298c60a6554e..16d98b85506f38 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 d2052ccce9447c..860f1199707df2 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 8d1adca5b9f37b..3a0b41aee33924 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 13d60978e868dd..9c74916dd6b4da 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 91ce0eb8807277..23d02a2002deb8 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 fcbb6160bb0085..c7d1c54b1d1982 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 b1b8b57449f1c3..ec4d4be3dd2fef 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 706cb2dcbae9a1..8c7662243b3cf7 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 0dffd9c8e7b041..e47eb3f339b317 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 b4b144a7669d26..5e31deaa17eb62 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 b296849991249b..ce4f77d41d894c 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 1e0e3ff3ca93b4..b57d2bf326b4f5 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 7cbaa79ceda673..dfdf602a4689e9 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 c391da795e89ae..c9011bb2dba36c 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 efae887771e24b..4270f388bd1b88 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 262f1ac3825a0f..9c0524c00b2c50 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 ebfa7eaa47ea51..8bb99eb795b958 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 a687980e7808ef..96712dee88e360 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 4ea4f9c79bb875..3107fa346c6547 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 1e2c076591bf45..42dd2ca58513f0 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 e38305148005cc..cd235434db79fe 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 0a0fd500724f4f..a8a6e12e7013fd 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 8f257929d60f99..6aea074e2544be 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 ecaa1b5b903745..4530e341aa3730 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 7614767b6e0a9e..72c2e546d3f9c0 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 462324309f6a87..40f4e7041b1a19 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 86d3f680504558..af906b3093587c 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 798a0ab4f505ca..9bbbbed5020b7a 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 8db77ae0711b30..e072ef592aa00e 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 b51ccc176268d1..f4bab152d8cb87 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 2fd0001910782b..665bcf389da1e5 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 15044f1c9a4dab..cb550d1d71ff87 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 cf91101a27f056..51e560e199a533 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 04f05920c9a438..e5ab6597ead2c5 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 5c8dced71743ec..1d8586e48f9f9a 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 35555988b6a275..6f95a27ac3031e 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 69424a4be27117..36d945d64a60ae 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 a0161f8f490092..aca11eeb583fee 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 e2a41559410b09..b5d49d0dffb98a 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 f84f0797a62cce..ad9b3a01828ce0 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 dbc133cc985b56..1762bf17b50df6 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 465cc85a3feb5e..553bedddeea1a9 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 b97fae54a03d33..9c94781169f8d8 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 b83399b2917dec..67cca438a46d92 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 1e2c22e97d8e2e..bd6bdfe4ba05c9 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 35eec7b2c6cecf..9880b7b2f5e401 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 bd560db25c7da8..d92a359ec367c4 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 096dc2ede002de..85b39a9c72ead7 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 4835486036abb3..95469fd68ddf33 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 31de6284f9138d..44d116aa4724cd 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 fa0c97066ddaa7..0cd718b6ad2e3f 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 6e1e93019cadc1..95efeec23a7643 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 023cbf26e01cec..29be45a8dafd9e 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 2bff5fcb6398c8..aa1920937826d6 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 0b22547cec2f5d..07cde30e3d52b7 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 8dfd012c9103bb..e1b6614b568457 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 a8aaa08c47d314..139834abcd2b16 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 b7e94fd1629341..8da31ed32be4c6 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 a2339005212615..fe751908471617 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 3bddf790b801f2..34ad41fd520afb 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 b8996030aafc86..29b1b564becac3 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 f8cb183c032379..d09a7d33db34ca 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 91465c65776663..51c237e7ac8f48 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 a5a1ef981a97b8..01f56a235e5e67 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 bcfd6abaa4e176..52b7c616c8b76e 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 d4b37ce991aa28..824dda827e445d 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 97d47d3a150fb5..7e8c05a3bc763d 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 6d0d7a09672a3d..225113384b134d 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 82b3f0def223af..48e5136ec33f3f 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 391de6abc6d4e1..5d55c4e4a16f9b 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 c378e5b10dfe0b..eb7a92885d7760 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 ae382b9af694c4..f3ee630a9c13c6 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 5177ea688ed10f..c6ef92b26838d0 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 a27eb5d97484a3..3a13ca24f36976 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 607c30f10cf715..8641ecf457abb6 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 518d7a75dc68d2..bbb380f521848f 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 7bc0184e2062d4..8ce57280d61515 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 946ea0937de0ae..057cb15fb7ff94 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 00658b3b8636e6..25ff8fa9ce594c 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 5761c8062117b4..3d07122530e78a 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 d19a23af0e9eb4..9474767cf2f252 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 c25f63c0b3b7ec..e7f7fd8b7f4fbc 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 3ca07866843772..2361952ccc5d9c 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 6866e742290a39..628aab34c0b8e7 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 ac873c1a30338b..2e10a6595ed232 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 b0090be108aa00..f585d8a2098aae 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 c231b51cac8a38..4851e0b8f97f7e 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 88e7d0f91046ef..3ac1b0bac95113 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 0fcee14fcdf5e4..d362863a097062 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 e323a2cef9cd3b..a08e956ef4f9c2 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 bfd566dfa45c1f..e9c6b2281e3725 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 1725a11ec32861..3c883a7d93d1ec 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 6d6a05cf228f66..313bb8030f3e2f 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 8ab9e72c548875..c055927ae59faf 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 d3b5cbd3a79bf6..01b5f23410c841 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 bfb9edcd1d310d..6812115213d9d5 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 83eaf7d2beb733..ef3a04bf12f19d 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 11d8e05b7f66ed..ae7ebc331189ea 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 7923e258fb66d9..c66ff68105c1eb 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 cce5e2e88d5d0d..b91875d242f52e 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 03f8919128864f..0d9fa8b043df32 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 12be31b52bc4b2..7973f8029aa077 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 8608c369a118d8..038557c6a8268a 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 3ca07866843772..2361952ccc5d9c 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 6866e742290a39..628aab34c0b8e7 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 ac873c1a30338b..2e10a6595ed232 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 ce38590bf85980..f9dd023ea9b964 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 30a5e37b0e4473..80b79f7b8c8814 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 b2ecedd459400e..a303aff413a84b 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 dcfac140231a7f..b619b84c368e06 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 44d2faf36e5fee..d1e7d124dfa6aa 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 c6cb47fbbba2aa..d354e1bc7e6086 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 b0d89bec4f02a2..ce7eb89fe494ef 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 1093e454385b66..292fff71a956ed 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 79d52023d633e5..3d4c70dcfc1060 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 15ec82626b8dc0..7c94c2184eb25a 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 4c62c79e01f668..7dea1efd005181 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 4462a803beef21..3cec7ae3b05009 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 2f58c1ee617cc2..1075c2e831c78b 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 4ac319c6f9eb91..c6403f324ba78c 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 d3b5cbd3a79bf6..01b5f23410c841 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 11b9e356219bdd..e67414584bc82a 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 80ebaf486296eb..552e828b76146f 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 791cfcb47bfe3c..becca47944dae2 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 226cfc2f736988..555eef94f1cc61 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 8b851e5788bc2c..30144ea5fc22db 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 dd71908f8572a8..f783c93eedeac9 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 d3b5cbd3a79bf6..01b5f23410c841 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 0ccec7e8f93225..9e097ac64261a9 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 4674672bbec59a..a1ba1b4d700e2f 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 a1b91b4d075da2..1f8b1df64cbd7c 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 4027a9a1539548..ae8fc762c86936 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 f3702606fc6af9..e62c085b4a5c3f 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 759b12977d1aad..98d95eaf9b753d 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 fb51acef7c678b..af6871622caf29 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 2cfe5224884940..79228b435ca39d 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 3d0a0e637f21a0..c4c1421b0e5bcf 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 64445045e6aabc..cd132cd3ebd955 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 b70c22b39b8e9f..126d346a0ba91c 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 88d6e2aa9211b7..324943623a23fb 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 44d91532b47b48..a2cd780f750050 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 6f771855ea5404..99eb23c033cf7d 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 9aa907fd12d5e8..7f51725400c663 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 fd0468739432c2..a0cb93ec26d8ad 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 d3b5cbd3a79bf6..01b5f23410c841 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 f3d08520a27116..c234bead7d1b6d 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 fd0468739432c2..a0cb93ec26d8ad 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 d3b5cbd3a79bf6..01b5f23410c841 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 f3d08520a27116..c234bead7d1b6d 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 fd0468739432c2..a0cb93ec26d8ad 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 8a1744220474b5..9b9a00046664ce 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 8d553b25c656e6..f5ff7c61e0ebff 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 b6da59fd35c2ce..841faf19f9e2fe 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 be7539e9eae1ce..19c34f81851e3f 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 d6f8b49f655cf6..9491a25bfa1bd9 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 549619098e7848..5d5f00ae02982f 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 d3b5cbd3a79bf6..01b5f23410c841 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 b6ff82211308b7..96cc7cb0ec7958 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 22815f9b4e56f4..1d174573e7b016 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 d3b5cbd3a79bf6..01b5f23410c841 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 cf661c61d5a408..c0046292cace73 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 10e7e6fa850dae..6c0d216c136744 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 c7c780843fe754..7fcefcc695654a 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 dc491a81974761..2c5988b585aa1c 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 f45b2f057f0a41..07fa15319b677a 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 ae12090d11a92b..1ddb8c1558fbec 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 f9333de37375fc..397832f9b89ba3 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 ee921a23aeb73f..918f5128e5c4d1 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 d3b5cbd3a79bf6..01b5f23410c841 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 234fc11c33558b..15a560c36d15fd 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 0e831bf05e4736..c202ef8f07079a 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 f9856e1295d2ee..81ab3b98bd00de 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 8053f9891e65eb..e154efb69d13d2 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 3cfc3b51a21ebf..c435fab4a173d7 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 0d1a03c30b6bb8..9ab3dadf24a1b2 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 9e815ccc9e80ca..ac7428ac452459 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 60a04cecb57f60..9062374b25f4db 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 109fc30ba1d541..088b265d784240 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 b1c93c3d4be198..b30738cb0ca72a 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 2f6190e1524fe6..f60ff2e55d6c0d 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 78c20b705cb9b1..a553612c245a18 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 850be463e0763f..55ba2f844b4f11 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 b3af05552f8fdc..346fb491adc78a 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 1d5931cfcc9b0b..94e9393279ee81 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 b9e1e6bf16b6dd..49024ff58e6502 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 2ae256e40e8944..4219182f03fec5 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 e1e895222b2cfe..7a78e5de92f0e8 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 c5ce53d2ef137f..d27a78b7e43716 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 b7d8aadc4fc068..d79c18397dc82e 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 720a7709a31d04..6e69a6db223878 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 d3b5cbd3a79bf6..01b5f23410c841 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 1ced6c0503973c..3741d4fb666f8e 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 d3b5cbd3a79bf6..01b5f23410c841 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 0d33d08e6e1e81..875d2687851298 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 5b4059f2ceff21..dd5da761dd66a9 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 cf68651e792c86..c62b69eff9c9c5 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 d1e744e3583e92..77b815421e1df4 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 49aa0247cd4388..d89d3ea4d30f34 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 beed313e4953c0..0a9853ec70481b 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 450ba717829b8b..25a2a69cfac18c 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 8aac8f5ebe8a43..dca08d5d7c6371 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 89f5ec687170a8..325dc839dce31a 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 0eaa9befd88e20..ea41747339e048 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 edbaf33f1a0a38..7d3dad68acb910 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 3bab8c70e41709..412880ce4b6317 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 1552d420af8767..911e6406d94717 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 589303de4caafa..7a07d48cc20af6 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 41d98909583ec2..b0b0abbd8e446c 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 4eee884b3b07f2..28b7b71ac1f625 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 9fabb2aeaf407c..35cffe0934f7a8 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 93d26d73beef5c..89b528f1cac0ae 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 f825cd059bd4f1..1ac18e65c513e8 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 78166c67c775be..29857e6a6a9cc8 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 91762bf883daa8..54bc51fe7fd797 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 f41b8ac5c2b558..86947458010658 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 04b2b7b1135d71..726e758f5d1977 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 cd5f6b99dcb449..e88d47bad683f4 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 ec5e69f73eb6d6..0231cda2897787 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 75139fff2bb0be..af66edc69658cd 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 3a5e1a35b2a4cf..dc6dfb133de51b 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 70d8ed845900e2..f1b4a981ad2409 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 3a9ad0dd123f1e..70a4f8e29b7404 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 d3b5cbd3a79bf6..01b5f23410c841 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 f4eff60f7b86b9..85964afa1f586a 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 7aab7b999be6b2..b15dad0a649866 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 dfabcf765a16bf..c9d8920023f4e7 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 d3b5cbd3a79bf6..01b5f23410c841 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 c17c84e6496cde..e34f1163bb2db9 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 d3b5cbd3a79bf6..01b5f23410c841 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 23ced8d7473b39..0ad0650d0ae85a 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 971d626dc12c2a..eeb2e1f7eb82a2 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 eff9a378b1306d..58b4e6ee7975ef 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 6bd4a306f6dd0d..ffc779cf3fa381 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 7c9cec4c3ee898..1c8753479fabb2 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 c0dae4ce614381..edb5c20f585690 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 7a39455ba1d17d..225318e3b466e2 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 a889fc8ea47fdc..e889527bd87758 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 4734ccff6d7efb..12a86fc1d9afa1 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 e1a17c373b64d2..2f434ddb80ba32 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 71ee58d6e89e38..6b9f4c0a543555 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 9fccff59228785..df98955ff4b6ad 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 54934f6d11c380..56c339e2607fc7 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 3e486b1637e345..ed599f1afbd97e 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 b317e950a22b27..7d6e1cb5d68164 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 b4b720cfea1384..1ee823eb6958d3 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 d6296769f63f51..b96d0e3e80f382 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 76662f0a81c918..1da7e531583c92 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 3bb7248468f374..858d8afb54d844 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 16252fff28613a..ba9efca9b32cbd 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 04a76295277fd8..1827dca23d7668 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 318b49fe43a113..eb02bda1699fb8 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 162b22d33074b4..fb610117dfa5b5 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 284e1b1874054b..5400cfa7723d38 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 3fbd3a7db707d7..92ab40a925952a 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 bc5c5b1299f3da..f28e50572a2d5c 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 088e4383b9e01a..2a096ccb0b03a5 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 6cab3317c1e2ee..c042fe026b980c 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 48c45d785ada4a..905203f1aa910c 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 06ae3cfc5668d3..6c245a2b7dc86d 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 16f3364ef8e42f..4aa615d8145462 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 99458b2bec7be5..2f3b820de23a10 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 4ded89da977bbe..49e6c455c38119 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 032d33210079a0..f07379a2a04776 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 c329aa3c6e985c..351424441e552e 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 c771985ecde43a..19fd6a89a16b50 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 c4745f17b74e63..9a0d68519a980d 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 958502b29c0e6e..29fa7cd61cd71f 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 610d735f723db4..ba7b711b3bc04b 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 96275c7d5ee8b4..962743c076713b 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 a27d30f506775d..350ac6721c9bbd 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 93e53415df0d31..9c7f86eca22cc1 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 572fab726664ba..aa933129a9f6c9 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 ccf978edf515d6..eaaa62e49e429f 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 a8863c2e67e70c..85d4bff8dedecf 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 de08d7c500c49e..d90f3b91d8604c 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 79b339bb3d4424..71e3835101897a 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 6fbf77bc903f2b..42500927648862 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 4385b5498ad8b9..37c7b35db7e9e5 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 70b2965ece5198..7e6d73a63fa9bd 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 a25a761410316f..6b5c3fa79d87e4 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 566b245dca2cd1..41783c54e8a93b 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 a87a0de5185a3e..d7111b2451a1a7 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 d7a85043539f81..385c42f12bd6d0 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 45d47573456237..6e0098414ef450 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 156a273e01b207..a715d428cbde18 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 c3e59aef331ee6..2ec1c49621c11c 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 8da536709e7d2b..828f309dcc0070 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 0f682432d26d27..b8e6304da9c197 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 6599126e0b8d03..28d662c6d1f80a 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 a084ae4f6e0eb9..7ef327b50293e7 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 ae3fe500a27866..d1df7f60761fa2 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 0475f768a5457a..12506b20a719a0 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 d6ec03807b6f8a..7b1ee5a1a8ce39 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 87f36414a2e215..6929ea55bc8bdc 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 c31c2a3bfe993a..d268f0b58a9113 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 d1563bcafd34f9..e39e859b933f95 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 9a4f27e829a2df..1e6f97cf8ce22c 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 c795803a08f35c..d71d2ba0cc849e 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 4d653868403857..f896e27c09f28e 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 2f8ff9167b7548..287db3565c0d4f 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 8c4dbcdb2830f2..6983da86bd9eed 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 b2025106248eda..81b50a7111d112 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 a77c8c95695624..3873009ada49ef 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 05dc943bace95b..3b083a326150c3 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 4a6e302b60c7c0..35823e959159dd 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 6b88f1a6c02a1c..9a417f72fc27bc 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 59f66aeff3cc1b..95700b23c72fc9 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 a6e9ef9ae822b4..9a2f30d094a4b9 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 9fb94ddc9bcad5..86fd89feb4b20b 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 144d8f8531dba1..2989ad580b97cb 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 08644a5d8058ff..736bd75e3f2dcb 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 602fae4ff2a9be..b97e3179c6c42a 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 eb2171f6ea8052..dade268baea224 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 6e87566b07e8f8..7238ec6b423a8d 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 9416cdec5ce39c..83a861bf9d45ad 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 e45f76fdf917c9..3ca6edff82a265 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 cd9f0f415ce7f8..ff68fac78915d0 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 3145c0646a9055..f2248e5d1c1c2f 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 55b0a1ef1c3fa1..de15963f108460 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 818ffa472ec095..a0566e5fc9bdad 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 3cc672b62c3bce..9a67f517fc5cc2 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 fd3c99a9407a2a..c23cf4c476ce64 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 22e85a70afac93..205c4ef08795d0 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 5c1570b69e86e4..6b58ac097378d4 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 24e58828a8b77a..11b254c3d7bde9 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 53e5f1792ad580..765a8477f3f2a1 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 70f12982162c35..dacb44710fb408 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 ecbb0f4a21bbd2..8228a0f0c98fe7 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 271ac07cfbbb9b..af0cace6c5a9d0 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 370ee316098d9e..97898091fcec65 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 b193ee0e3e43ab..7cb53c4c788e2b 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 b622d628eacdf9..d4e8b57aac67fc 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 ee6627c5e72ebc..e8db8a77f35353 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 ab16dd031244af..dff3ca03db8acb 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 c9376a4b206d42..06023e79dea229 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 acdc7c0c967b43..204b40ab674c59 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 2970e42a58f55a..82b6482a7ad24c 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 6c7599eae45f5e..4ff023e6bca525 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 a4315ca16ddc4f..da08f80b0a2941 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 2993f5de0ef682..2befdcb7dd8d63 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 bcf8d262dc451c..aad7cb07a31f57 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 b54c5171616b91..e4259b69292582 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 64d16faf789322..c0d16756e86d7c 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 49183bd3a8ded8..bd66013885dba0 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 210a6eed545414..b8c67212d7444c 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 0b0b20e29b1fc9..1e831c8984431a 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 1b131cc4d16219..716e935cdc465b 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 6745cffcfb2468..29536b25c19510 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 75de4cc58172cd..7dbbef513db043 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 72bf600ac44475..6cea0ced85a4d9 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 e620fdeb7fa896..7d1996ba510fe0 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 26c23854b984d1..97d24e044de109 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 d5254f528eea88..492a59a71e3330 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 d3b5cbd3a79bf6..01b5f23410c841 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 7eb04113b8a531..153e6f05c3342f 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 0e05a7d3548994..1b911050d2937a 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 063dc2f0d502e8..b56bdb8d1c7021 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 c4fb487c309305..f27d37d9f68a52 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 ff14615bd541da..ab85d97f025feb 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 949bc3e6cf242c..71fe5064c8f4d7 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 25d937df931690..94e36584484407 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 eb8e22b48870eb..33f329dee9f850 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 56dd7c8a04f9d6..f4220616baf559 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 682505c401bab5..3c852cf7a3f0df 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 3f8963b3f38ac2..43dd4be031c7fc 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 820ff4f7bd5330..00bae15d6f608e 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 fac165c688ba8e..fa7e8f94425ab6 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 24be5b1b82d726..f696a190fdeb12 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 d3b5cbd3a79bf6..01b5f23410c841 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 73bb7665d745e3..a8b20fdb2102c8 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 ada4b9259c0d98..4e8af6f5857155 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 603f7d81cb1944..e322da86f67f76 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 68907218fdae9a..88f13bbde33d38 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 520d0ad783c6db..189102a547d08c 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 3d084790eb7ce6..3946e855487955 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 b8bd96d3b2423b..69c76dbf9115d0 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 37ee312f849e57..e867d6ae0b936a 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 0d0ee72e8d8739..66661692a90181 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 a46e0ceebf3862..fcf8dc7d697d6c 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 f5df29d8f29a3c..c1fb3fcfb3b47c 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 a45f5d33063105..a6dd25191d45da 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 2436fc81e268df..ebc2f9e8b7ebea 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 f9a6076f184b40..80802c500c1043 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 2922e575ac0ed0..1df21acd5f75fd 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 63c8a4813bd94a..558056d2a99491 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 c4848ffd3c004e..f316c3eec03134 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 cbc9707544449f..947eca3b2036fd 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 0183caa98e5929..bdc4a9ab18c283 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 dcf3a83f4039bb..a9bab9fd5fd573 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 b0c6664a33c6e3..1c71b0b6a22453 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 65bd41b9269827..9ef0fbce93fef1 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 8581b689aacfc7..11f1e3ac9727b8 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 618dfba4387a58..bb22968aae0dd2 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 4ae94ca09bd53f..d7be4d8a645206 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 3ca2f4ce151e34..3dfde4a9fc8d37 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 958da0c9d2146b..953436484d32ba 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 d66ac02a13d45c..ba40c497736def 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 2e19affd247ac8..8ffcf4493cc1da 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 c43d896d539956..06c23835f72cd6 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 09853747adb0bf..c2a21e6d9aea5f 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 8a138e0fea7187..395916b2c645cf 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 f2331d7db72802..56c3267d8684b5 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 50b51f497d85ec..803a43c961074e 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 32ab19a954f6f0..86475e06ad25d5 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 d012a3f495697c..d020ba08a22b82 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 3af829d1e97119..a9d6dadbdbc60f 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 e9104b27e37788..26f98d7eb575bb 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 c3aa91acff4dd8..f92f17deb5c3bf 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 f682a39925eb06..9be54e725d4584 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 6148cf9e193e7c..996b8770e53ff4 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 5dc4040783ef14..42b5d69dda9e94 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 573757cad525f5..0c6e9c1b1ec257 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 a96fdd44b3113c..0f46acba198c6e 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 ed008b43565ed6..e1db07a9c3f837 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 4e0dd5d0c4ccbe..68984958895eba 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 c3b39e7b7a5860..1b8baf36ec8093 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 bb12c8a16971da..0b00f16ca98ccb 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 1570a6cfadc985..3cc846292e6763 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 8c36def0c97d89..a425cc39768a66 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 ca28125f3c1a92..09249b24a2b6d7 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 4b9c179641de49..170564a730ace0 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 22c8c46490c782..f714ec3756afc1 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 d00b8dd35dcbf9..b168a044775e93 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 1dad0d7b6b6c9b..37b398de1f4fbb 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 ae785de5e093fe..be0a905aab8098 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 9802a8af02c930..3c96db8e3d620a 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 353b59af9e5e74..42b314e1f156b9 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 9863f4db46caa7..5cd9535585d305 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 6c976e9303f173..6561327abfcaa5 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 d3b5cbd3a79bf6..01b5f23410c841 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 d02cb704146cad..bcc7c52ef08733 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 ce96c9d5ac8ebb..2faf6d51a2bab2 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 d3b5cbd3a79bf6..01b5f23410c841 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 5c09fbf1db51fc..6afa48d70a6941 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 d04ea542cd3738..ef1bccf91aeaed 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 2c3dd2a2e6b633..db68b51286a9c8 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 02ea3694fc89af..735a222bea8db7 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 3601f737628c8a..7141216d5879b8 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 25fa1965f46329..d51628546e9c71 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 294f7e05ecddc4..f9f25569cc6a2c 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 ac00cfad17bce7..6daeb9e0ef801d 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 20f39f4b5ad226..b74bc2d55f3830 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 5ad838650224aa..658c980faa1d07 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 fc42100b8cfdca..e4599dea9d54ac 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 9a6c5bda1c1694..910edf720d8795 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 f69e270f855c79..e14a9359b69eac 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 363aa412cbdc5e..7ca283e72473f5 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 a9616765b7a50d..daa19a0842aa54 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 c160e317c36d41..25ccce37a75f7c 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 4c6a7241bf76e5..7365ef4edf1add 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 e049139c20cf7a..1c2ded0389ecc0 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 e641908876108c..e0377ccd6c7fe0 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 b66bb5a5f8c4a9..bf6c539abef197 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 4fac1ac0fef9f3..b96b631902f855 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 34ca739a06a8e1..788d106064f153 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 e0b7e4049de0e6..71c120253cee87 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 11df1b902e7e29..13a6376427163b 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 96c0257ca89d3e..cf0d8006a79ee9 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 ca70677c453d8f..06a8a5664b907e 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 320f6ed6704ea2..60a9c218cbeb38 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 be0b409eeff28a..8ce41388dc28da 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 15d4034aec91c7..6df941e4798c9d 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 c4342b5819aad1..adef7594eaa8d4 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 e197793e5d8630..e06b96e438980a 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 7c26dd89e20eb2..be886cb3d38bd5 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 b8bbad587bcde8..7bd267797b52af 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 3fd5838d5ad4b3..bcfbcd5949813f 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 b70802b43bcce5..58d620312b3ebd 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 3501909f6ea4dd..d7f7dc04fdc44f 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 53290fb8cce3be..b3b357d6b33cbf 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 8f17f3dc3ae158..ee2e788272c52a 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 a474da20685e08..035d6de652e075 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 7d3f8ac47aa62b..32ff79c9e03ec1 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 a2b30582cabbbb..b630fd17c1f9f4 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 e12ddeece2ecd1..9fd63d731a35a2 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 99cf77514267e7..57b6a3ba55e158 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 530d576ba80555..e22d607eaaad7a 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 9c4d6518d59695..381a68f0dd5afb 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 d572c79d544aac..92e929b9048dd6 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 54f82489416407..91f20193d87821 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 e0ef344a828315..bacf95365c829c 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 5a136c180f2a3f..3c3bbc37eff5cc 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 4e67e16a10b8fc..fee7a2fbab7f0b 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 0835d1a383a835..6fb47110c33f63 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 53b9ab146dadd8..8879be2e5912dc 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 5a72f3951d868f..32f1b6dedc0545 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 be57d3114d319a..449d869d6a2186 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 bb4be21c712653..86b8c849a1e83d 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 fb13f7af32f4d3..efcd6952a8ac1f 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 44643e5f0979a5..9f50708a14d760 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 ac191c1432929b..01e3164b12719e 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 7952fa836a8ec9..6a570f3b0c64e5 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 c9b045cf7341f7..21fdbd2b7664c2 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 6cac98219a4730..7545f8507fa618 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 22ca9a144c1daf..8a23a4bbed8fda 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 a9eb44e2527898..3077f4289d5a42 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 60d38d4d185546..a9be25cf2db4e2 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 5d30b5fdad913a..a4a5706cfd5827 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 54cdbee3242e60..229da5f6592d2f 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 a77f79dfeaa909..fbe9d8d0f82e58 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 5d7ad5c6786eec..0fd16a8614c04f 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 1c0d5c1accf072..3208ea2c075253 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 b089d587489fdc..82297b3d6e99b1 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 5dc6cd65076e27..e79814e7898171 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 ef6ca0854764fc..7923798d66b764 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 ec97b0a6edec4e..8f2205b8b11c55 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 ed0f1f1643e727..d9102ee8557546 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 9772c1ed0ea5ad..3516893ea183a6 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 2c1364539d9889..1da154894dd896 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 981d1559fcee81..c319ec81348ec3 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 d2f32538b68ba2..6c5fc140f36c4c 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 35723925d121a5..7d16c17f0b264c 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 0ebc25f95be07e..bace25d532406d 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 4beffc8426cc8f..bb67bf74085788 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 7b49d72027e4a4..2d5dac192969dd 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 d2473573ee2bb4..ddf7bd56e20b23 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 41c4d52853144c..9419100cc01c49 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 50e918db80458c..bab62d7fdc8330 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 b505e7d62b65c8..09d3cf9c1da9b4 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 8979508375a421..1e2d73ca7a1cab 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 b91464b894d0ba..076d5a19c1d681 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 59ff2c4face30d..47cbe06967b4db 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 2e7fcd9e45adb1..368d6575f8e479 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 75788b756ffae8..77f06ff61ede8d 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 39179ab231e309..29230eb22b6642 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 c80f32d19da424..7ec5d455932ca6 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 d0db499e6fdeb9..615199ec97a3e3 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 d203b8f464cb2f..05bc1c8e1f8579 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 02a5959387d037..f6ee5495d8a8af 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 3994161da39cad..54f49a08f7cc1d 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 6d5ab036cd3492..52343aa6fb4bb3 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 6452289898fa32..278929d5b933c8 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 ad4e76706620b2..008439f94ab919 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 91dc7f33b07f34..9c8e8e23abcee7 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 256e08282ad78c..72864caedeae3d 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 756fb2f73af7dd..dcecb2072d0c7e 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 ea3e8878380946..1fe51a087f587c 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 69d537c89754a2..22817a0705378d 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 2e98c2148a79a9..8f5ab6a15110cb 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 befd607a269e51..d18dca802cba93 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 42d7c508dd1b03..3058f7e26d2e92 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 37af2799e1eb2a..30d1788fa0bf2d 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 0b3efe221d08be..d0e9113028be07 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 5f238c8aa619b9..344c76d69db063 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 03b5d5d142d2dd..4475367933e56b 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 37ae25a4a83675..b33ac5a53f7bde 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 e781e790a04883..d991ff20e0993f 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 ac8b13cd1777f0..2876476060bc6e 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 15389b3c3e2f37..dc3f899e52ceec 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 bd9cd507702165..3d8ab9d436ae16 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 d15ee36436790b..387813717cd59e 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 ac0f398a10d60d..b4198a3068b98b 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 645e3c94684a10..b6949c29c30d12 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 4a078a28c3b2ef..e44c7c406e8271 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 8b1f4692271bd1..4fc1b42284d146 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 4106eedfa339f3..5c1d26d1e8c955 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 56b5cbde6c26c0..bf14a597c5b444 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 f89756193b8945..c75525c620e90c 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 a13ba593b628e7..49eae25d5e5d45 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 ae908c41376a9c..4c056fcfd3c464 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 372a04314cf72c..1ffc42d0ea13f1 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 3bb0931b524898..032c3a9d2171d4 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 1dcb4141475529..83a7b625d64a45 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 a115c4a807bb12..07b8334c56994e 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 1ff62d2ab3bf68..9101f0f816ee3c 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 42701d1d58d9ba..cc507306a32e91 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 2ee4ff4292bc3d..3b325c827295b6 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 5d22c2343030a8..56b8b1d43e5117 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 e3f8af5cbcf264..d2a5097a723f82 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 9be31560cccaf9..5ccdb7aacd667d 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 3ba360d4040de7..d09a6243b534c4 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 1a4930c5e774fd..1ad04a45556c58 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 d78dce7be8a7a5..3c921ba9729d7f 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 a8693d2b6d61fa..63985872500258 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 5a219ffa5c6d07..4cd2f02f6b28a9 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 487009a027a836..bb2d6a11cec508 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 24a3943934a639..883033887bf893 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 4107d5a69a2833..af9231d91f3941 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 71a93d240db453..0727fc8ca556e2 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 24f6cf7cf9cfa4..05b3c8af05385f 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 72a676886b03c8..f761c8dc60f6bd 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 c11fa66fe9c2c9..d2faaee47bbf92 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 f3bad9ecbf2f39..0c430782c3c718 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 7c79e86c3f9da5..821e096a00ae38 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 c4616797b01885..ae220149f2d920 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 76164ed97f89e8..c38b6d88b68184 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 61375d6708aa77..5e7ceb639b9080 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 d9020b807d435c..e7c0891d1d4317 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 742a96ca65c9a2..5ccae842acb17a 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 2c71371b88f98f..ad9f36e054e338 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 32f000734c9a35..cfb644402819e5 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 e2616e2cfd5aab..1b4431ac11cd98 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 414b579e06d8a0..1390357137c54a 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 a3eb812fd6e618..f060a3039b4358 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 a540e9a7401528..60e94586c0ac00 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 173ba679bfcf34..fc8fc1ac8364c6 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 d149cf254b6096..007e17c4a1812b 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 168d1a3fc623d0..a49207b7812307 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 bf5f5fec89d452..ccf9a092c49e39 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 264eb7b9f44345..3d4f1a8c2cc04c 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 a5fe6d6d7843f6..2b572d867aa5c3 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 2f84b2fecd7227..a91c45755d0d45 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 4364a4fc660ec4..908247b957dcaa 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 45869c039454fc..d1ae05c2143da3 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 02fd37c62a1c63..c847f55e8e0003 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 e72e8e0e1290ee..61ada50950d1e8 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 a2c945965ca244..04b32bc8bb2281 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 86228d56da8ff8..241a3ecbdf2db1 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 77f54c6e393d69..8fa8571d477357 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 b3297081b2d7d3..62810462495473 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 b2bd99ca88cca0..002011076ed7c5 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 3de4a9a1e0afcd..abb12a65760f43 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 379cc180d53988..f0bc0299ed7636 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 d62ba63b2f040b..8507770c435287 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 e0a7e7747c5caa..ebf88604716f5d 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 0100bd707cfe3e..4958de835b9c1c 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 aabaa311ac455b..cef5d82de9170b 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 542a2fb7b6da63..0933208d60fa2d 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 df282d7eef3145..ccb1818d85cea8 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 a9741d13cfee5e..4b354efa3beb06 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 37ba17e09e9d54..eb4e17ec706bc4 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 beed5ec59c4b00..d558319f3ba25c 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 374bc32215a29f..f9f4c791e9d10a 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 3f8b5e04ec3ed3..f2819292bfa485 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 74b5a9c90faa93..43a97ac3d499bd 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 21a85dc1960124..a7982f8239d4f3 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 5921ac70dcbcb9..9dec5ab707bf91 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 b7f8806352b02e..75759973b920cd 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 17059e1450810a..012741fe01a3c9 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 9172d35ddf1300..8f4be7a59559a9 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 7169ba30420501..ca70a3ace5deb5 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 9a015aaff12cff..6079b4d298c92f 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 edd4ff70717a00..ffde3db439b340 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 26fae45e6cdc94..25bd4a710cab42 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 5e2ba518865460..0d3c78d90cc6f2 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 e2ab1da0a2ef1c..c1b4eb8c3fc71a 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 adf50d946c63db..76d89005c6d0bc 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 19b9a2fbd842d5..3b0b2fdc6df207 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 a96aa12c08bb16..4a89b8fad0d1a7 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 82cf468fec50fd..ec1d7816055edd 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 a8c16f179b8f18..768a0df3a04f3a 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 c09b0ac29548b7..d745fa17dde25c 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 55ecabbac7351b..a1c621baafe373 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 f201ea696d3767..d1c02401a62991 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 628d30aa06426e..95cd346eee1386 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 6b37c209e9c7cf..c603963ea8cb10 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 2473e3715bd205..2b0586c44717fd 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 6decada89386d7..fee29b333a2981 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 6ba998923d0d6a..4e9be89e857336 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 a7541ab85e2fde..41626370f21062 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 f685ea699a3bb6..026e69043c534b 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 c3f8111dd60fdb..e2b273b07f1d1e 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 e45ac034a1abbe..53197d42b06cbe 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 2413959cc67f78..353d92a51167d4 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 0f19a48f733256..709feca9045537 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 b626eba0a102d4..690b0bfb9564d1 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 0aeea797444ae6..a5354808bc46e3 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 4fdeaf88024e4c..32daec4b49f6dd 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 1c44ed920d1be0..81d2e86afc7f1a 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 f2ca7bb7e1b30e..caf8000da6dc9d 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 af844fbe1a2b1a..d097b885ad4508 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 9a6b5251ceed0d..a519039cf87c9b 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 b929c6b84ad156..dbc804ba30fb03 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 794e7ba3d1808d..b520eb62643edb 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 7bf6442b3122c3..3064e4e2fccde2 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 4e898a85b70ab9..6a49d142a5d7c3 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 95d6e10a6991c3..fbc9265c91273f 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 f1aa69f1bc8e94..da5fe91338849d 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 9e915fc5f965e4..88068b7bb188a3 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 8d5b17dbac1afd..049c919949f670 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 0fb5f0c26fb10c..d3f201997a2d2d 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 512a885a55c082..b3d014f408b653 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 c4b9c046d09844..913ccc0eb42293 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 358adf109d18ba..b897429dee1819 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 b1b079b41adca2..4b17d1bd5433fe 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 9870ff5f4e60cc..d6ce84100025f6 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 28752de996f0d6..2aef89175d638f 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 90b88931bf0d92..08255305133d39 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 668d372737490b..998931256e28a9 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 f3d192fbcc2507..c270c41f5da0ff 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 b48a11f1f899b1..aaaea9222d25c0 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 266a476b6b733b..8235c5e1a6d082 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 635b15c2d61e9a..eb22487ecf3c45 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 d3b5cbd3a79bf6..01b5f23410c841 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 77ed20d85ce9d0..57a8afc76ff79b 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 b3ca9ab9d3b466..baf316e87c8194 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 4b41bce3bc58aa..4e2b1f547a4051 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 b6f505fc8b8d24..157df926d06b32 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 5c7b4fe46b34a2..eac59c8fbbe36a 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 7bfa7b1c063063..0fecfee3028ed2 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 e7897492fa2cf8..4d0645faaa95d5 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 d95bf3d2d66ec3..ec35e2c8a63cbd 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 5829c1609b3296..1d4af5d307b0f4 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 7aa3009ee8c750..55468f920d1ab1 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 bdc23e7039ea10..34163090ee2285 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 5e05eb1cc6209e..395fdbd7b3e37e 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 7ff128ef6bc7a3..c2c78073c4bdee 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 c52a66dc0c2a59..28830b7f04625e 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 4569cfddfbe5cc..fd65b622494508 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 07596a73114cce..2c61c6035f6630 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 ebbae47cf0abd2..619b925b2f9bc8 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 68b5d1a7c1ebd5..04e644d7131b76 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 a4c95fdbb97e63..1d51bf5ec3fcbc 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 d675a8b84441c3..e5cc44da6d3cca 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 603a6b05bee16d..d7d289e99f836b 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 cdc19325d09676..84cf9b5cc1ec09 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 3ed465b2dd2f17..443e5b2d3a9beb 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 2f6708de374780..135ac8eca7f3cb 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 619b5b432ad7e9..26e2e5d14e24dc 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 c7361ac97aebc4..2450875e923014 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 6394d0fba75366..82cf5def65b7ff 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 7f03ba5a2b4fef..317b14d3fbd491 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 5ec7717e3f129d..6861ace2868589 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 310b9e3611bdd4..20cbe1d02c6a27 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 04bbf910eea000..02c0acb808de6b 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 ea8d1ed2b35572..ac746a87fcef93 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 be9b985409b6e3..cffedc9539cf8e 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 d9d2fc8523efe2..81e5e4b37c64f7 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 a1374f3d0f7c16..421a98b5faddeb 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 fb99668e2d120e..3657bf64bb71eb 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 97f54fff3688a3..45bc0678cc9212 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 59693dbec299bc..d69f1f5daedd75 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 688eeeb17e7a21..f28b02d7a0ece6 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 08075af35fc73d..2785da7ea0cebf 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 5fa4b1cfc7c8db..a4c554f467095a 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 47af0b4ff21eab..5692bb4361bf71 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 3f5d1aef3f87d2..e9644106773ee6 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 2a1c49024fb0c0..08b2d61859e945 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 043c1d287a751d..81beca9adf16ba 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 9b7003bdea69a1..9d7cf19b925e60 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 5f6ab7b244b035..1cba445eb9782f 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 24abff9eccc72a..a855f71ec19e96 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 8898dbb4629cf8..c607684258ba40 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 42702d0c685d82..98f52057e45e62 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 edaebe26ff9ac7..7a92742d6b365a 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 8c0c322429b885..5e5d9c16dc8dcd 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 f55b73d06f5a14..4535be9f596d54 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 d3acbc16beea06..0b06fddcfeebd3 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 cd563b3ed1dd83..d83863486cbc7a 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 498dd15a0328ef..76fefe3e63be7e 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 fbfbd1b5d58e82..d1b4896dfbfcd5 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 6c6d2df47808c5..918bb19fbe13e3 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 5c98574c0711af..ba8f672d4abb7e 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 167282c99ff75b..2515ddb1d5fed8 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 fe224a7c81244f..f9c137ed69c95a 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 60f71e7b217c6e..51a9e3a11ed6f6 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 eb69b508f86ef0..10cffb2fd0a3c3 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 6158943139cf4d..4a12730f3610a9 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 8352a6c16cef68..f7da8c3cbcb3d3 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 fc2cdbf4ba85b5..aecd3a9f0448a6 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 dab5d4c64d8d6c..e54f2beef56d5f 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 d3b5cbd3a79bf6..01b5f23410c841 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 06e3b66e3e1037..c2f724a54d9f17 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 37ce59ea9c25f9..eef4d8c5683ef3 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 8537acae9b3f39..3142dbdaebb934 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 5875e6e57dd903..213d6f17580cc6 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 59979e4b11a3be..11ad95e68e0d4e 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 65708288a523c1..0ee750b6d929c7 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 fd9ea1b51dd829..ab417090643baf 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 52c01d1859c929..cb92b8912c866e 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 2fd5f4a356f6af..77387e1a26cadd 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 63f8c8f50ee302..fc708d42263b30 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 cfd48bee5ff9aa..afa4fe074700a4 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 9b18a0be3908fd..bee79714584288 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 b15ba296a1330d..635ebe513f308a 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 3c0acecdf32787..5c5f0051ee0207 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 3ba120f515020f..a5c589cc7ae339 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 950566d8146b3b..a0509e84bc5ed8 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 d8284907ce4f89..04e16214886084 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 4b26a3414c78e8..156b1ab36dd5ef 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 e8c74240cb1b84..b474ee6c3517ae 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 5cf040ba5450d5..f5b29d817300cd 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 3f5ba22d61b464..906b41278662cf 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 660d98d26ae3b0..7890f8bc8b3cbf 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 576d3b6c41f6a3..e4b01e03013377 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 9fee45718f8f10..fadf41f4495201 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 854085d6452e2e..0cddaa4ab30e73 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 2add4bfe048c1e..a67c53b790e289 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 5643ed40cb9208..845e7403e460fa 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 47e8a7915eafb7..ba132e671b63fe 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 81ddf6e71bf5d2..0e9b3e6b365895 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 601bfcab51eb23..7fa7a8bb8fb9dd 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 6923d8d631c62b..7967efc2085720 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 e615ec36482973..f0f0d61539b62e 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 cb0f1349264440..5adb33f9250764 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 a5529531d14a04..5147f55080a0c2 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 6cf48cb40546c2..fbbb4a027437eb 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 b5641675db38c5..d8f28683fa8197 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 3cf847e1d1ccb8..5c6e40ec15c8a8 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 70526cdaf2c245..3c083bfdd37474 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 052886cc3c2a71..1c78bd4e412ec2 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 5cf75b0c719eea..95d0607e41f4a6 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 da4233b7c79ee3..b0e6b59b708e54 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 1b92f28e024ec6..928c80fbff9529 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 50a14fce3d2141..e60918ea845739 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 875dbb2628d670..d71aaa7d86695a 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 709ef82cd72591..1b428c30a3fb46 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 5fad1210b57f84..06676b5a0fa491 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 f1061a4aa15109..d03b5c7d05a6b7 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 9f81912a762d52..f13924e1aa5be5 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 7732d9d868ff28..62340479737dc3 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 910468870e78d1..876e8145759bd9 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 b051945017e551..1479e43b70725b 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 07a128a9968c22..9afdd2084ecbc1 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 2d6650238c22d4..ce2144121e889a 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 a599f13095e572..16899b8a8c496d 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 f747612c752635..a8eedea81d982d 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 4d3ed50d557dab..6d030b069b2a03 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 df896ca7dcc668..985f8439ddbb51 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 8b6ddb2a119d3d..6f253e75723875 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 15412322d52777..bbe6013b3617b7 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 98349e9b7ca620..799425ae357622 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 84a2e1c69c68f9..6c62a3cac07bbf 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 30cfd185c7635b..89676d44336fc3 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 cb69e8a17850c1..5d37b3b44654fe 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 c874a7b9356888..b018cb3f16d507 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 153b41332aa32a..2b2716e3e8f0e5 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 5f43f4ed289acd..3d69f087ca12db 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 cd9e5b774224c4..c4bb5064e56294 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 4e91d7572ab0f1..626f195dbf1fa6 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 cbd58d891a6e0f..2e3104573cd5eb 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 597471eccefe46..b6f6efeb579142 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 b062991930563a..4a804941ac30b9 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 7f5bcb78a84583..a6f1016404ded5 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 1d3a88e09ebc8a..506d1c9be5c44b 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 e4d2a44d827e4d..78a51995493f37 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 d4032dfab29b77..6d1a776da26774 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 504fa6d2e2998e..3c82e731856e89 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 366918d3ab56ba..4f68431903c6df 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 5bb038bf542f18..e18c5db9ba062e 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 0027fbaa373419..026fc174836f29 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 3ef619d9999d11..c54acdab419a4f 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 1f7b477d9b6831..370baf75007aa4 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 703343eb1b4125..c796fb0701c511 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 d963b8e10e6f93..06a2160b31b831 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 41314d322c9d3a..57058d7bbb1b01 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 d3b5cbd3a79bf6..01b5f23410c841 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 2391d1c5a8a401..9b157f0c76ab2d 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 980084ed099d81..2dc6b1e6944de3 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 76c00494bd80a3..459880df8c7550 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 a81692cb1838c8..f4b4d6f5d6a0e7 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 7a500dd7e05dcf..65380f7bdc5fba 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 ece46bf80fe9c3..925700cded080d 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 d521d3240ff569..0a9f529eb7626a 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 0cc2a3da16a6fb..52ca5b5fcaaa7c 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 12df61b69d0c95..cbc2bf2801150c 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 ce35900039c22e..3ba4eb77803435 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 4ab78cee3bb38b..c0cdbadd464880 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 c2c0e171a47dc8..5328f1fcd71a6e 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 179352c39ae208..262131c587dd6e 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 5f08e6d3566b87..2f7a47df5aafab 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 826eaf9522b348..af706bcab024a2 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 f1dbe405410a55..0eec98fc53e158 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 c7be05fce73710..f923634ea5c047 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 b68e872cbf6ee2..927d9ad58ef02b 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 db6c21035ff0fe..efdc26ca2081eb 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 7a8befaba6f152..4e64894daf6fe1 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 a429db8d29e2dd..f2824626e2a284 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 bf9bc86dc1064c..c279a418cb4f76 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 4aaf1bd1d9033f..375373a1525933 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 a246f23afffb63..ed40adb3c67e7b 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 07832592c83abf..2af4e67ac3343c 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 acf83ce7814cb0..a9629518354b3f 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 53d1763d0cd5f2..88ab043c5c7bd4 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 1c36857155039f..f31a751b3f296c 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 91b3312c2301e2..8a25744cafae55 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 494ff6dc2dcf6d..1c174b8dfbda5f 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 a6e27b79a339c1..53ca181ebd1ea7 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 0c52f1f760c008..a7aabc7c227950 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 834fbdb2717b01..18ddb8be87280e 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 e23d7dd214bf9a..c8aee6c2ef72f6 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 8af6313e578f2c..050bd543eb0c27 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 d3b5cbd3a79bf6..01b5f23410c841 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 8bb4e09590e5ee..f89523532a3f4e 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 e29d24ab69a4e5..ff5e1af789e792 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 552d84f2c91e8a..adab90f2f4f796 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 31bdb03fde2e2b..329efbe27f9561 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 f10e26a71532b1..f463c51829cc4e 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 1936c86395bae8..e9f6dbb2473adc 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 a3ca47eee71596..822082082683d5 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 83c2e34bfcb732..77466d84d6ef56 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 d3b5cbd3a79bf6..01b5f23410c841 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 263f2940f69bc8..73ca08641cc5d7 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 763d895cb32b64..cb2286a5b3f7d1 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 296fc734513a89..5f7fa4a3bf785f 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 6f2b2fbac27f06..23af4562921a92 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 e04df9da9fe7ac..1aafeecf6ae9f5 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 83c5cd60a04d91..5003196ffd6a58 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 be5db35f864a5e..4b55b41d26d1f3 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 0a3e9c6c2af788..0dc144ec472ba2 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 dd47c7e1e21453..2de97f2ad4bb33 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 8041246c12605e..e68b44dbd9beb9 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 23bd60b6b626b6..b07c02123b03c2 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 25ece2cb02fef7..9ad996afbc5a53 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 e3970032de2568..b1237c2fdf77b4 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 fc9e27c8173264..c9dd5ecac33292 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 d3b5cbd3a79bf6..01b5f23410c841 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 c31e6952472200..3b2fdda1a2940c 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 516d275f41e573..f5a6e6aab54cef 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 6add9050736a68..757c0c94dba413 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 1510d2ea58b50a..b882037afc90db 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 15a71e9fe25c0d..560688cf66c885 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 7481a0a3a4b4b7..ed06d043822291 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 8ad6340acdf37b..7d6198396911e4 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 7a778c487cf516..984ccf94046926 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 90cb4103c75981..00764c1f8e3941 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 372c2dcad86b4b..d929649d40fe04 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 56cd28e1dbfb83..ec79f2a9ffa1af 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 38ffc2d49dd155..5d20a349e705a0 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 2543659e4a054e..d4e3fbead470f6 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 d8d7e7b417c6c6..e8ea071965fd9c 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 490c84368c1090..f3021f619845b5 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 45e7c6cca18648..da8653d67de298 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 13dd047c0ba668..9d2af27dbfa8bc 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 225f6b09ac68a5..f8f360aee4dfd4 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 623151c580a314..66ade2a5bb33d6 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 b3edfe7f5dd2d5..69299f0ee19a7e 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 ae7bccda3ae2d4..968bc27f6c5d37 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 cc1ad19068c764..5c38e2246e8e0e 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 72b882efadbeac..5ddefb712b9dce 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 7985ea81663d2f..5acc40d5b1cc2b 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 d9258591a2a725..8dc0fb84cbb4f0 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 ae154d51f9791e..3f69e6414d35af 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 cdeeb8f7333338..be9c4ce883a042 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 6369337268bebf..58d026b7129a97 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 04d167486fb28b..e49167ddfda275 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 6bc0a99f25092b..4440cbd90a51af 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 e7fb87517b3414..5425fd7489b124 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 4db4b167915e31..2d719135ffab2c 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 0ff0fce8a43505..100fe5df67eeb9 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 89c1baf9cdea22..13ea006e166cae 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 910385d1314b76..f0994bb8416f61 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 b20fa8f14297af..72cf1d814908dc 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 453177fe199c0c..2916e0b5c9871a 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 9f539d20a13853..83555cee68d34a 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 f6b3655366eecc..fcc12fb07c272d 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 fb8efb69ca1422..89996d6a528784 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 c9f2f40730ec0e..906317f55e8ec3 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 96155753f1debb..fc9340e9cd8612 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 60951e886ce5c4..451a44a54816c2 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 45accc068cc836..84b27417fbbd03 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 79e206c8ef08a2..7b975bfebe813c 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 e7397f8d8402e3..a3581b7a79a52d 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 b51fe40a3b152f..90df4b25df906a 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 899a9dfb5789ff..37032516f3ca9c 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 8ba2cd029854c1..37cd29e6fdd8e1 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 3f81ba16cff230..c6ffaaa2c302f9 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 980243faea4e99..cd441957a3574a 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 3dc09ebf829e6a..1b750d1bbb4f33 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 053d4a7aa9e67e..c464a3f8fc0cb4 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 d9f578c8ad01f6..ecfbb7c046a17d 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 1233e8216b4e67..d0a761a8109f77 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 168966aa0d81d7..bb8541e79bbbdf 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 13503fff695d45..4ad964d095fd7d 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 a00d61b5f23d52..5115ef73bc6e0d 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 df3f86611d94fb..88f3ec505ce7d2 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 2888597dde8d40..b173faa1b34ee9 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 4d3e75803282e1..f995b9747b1d3f 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 6d5cb21147fc7d..cb1530d1036dca 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 d292618f5fcc30..d827f451a67e31 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 60638d514db097..f13108abb5ccb9 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 0ad01b627b1583..a157695915a358 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 c3708b27750451..225d8e0293b204 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 44274237aac9f9..86212b5dcc4d92 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 74f82c998d7dec..dfe8ffc0ad9ca1 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 fae30d8ad885f0..8951123635c3af 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 654f0044a8fc73..d45488dcb34698 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 7f4f76fa2112c3..4790ad1fd70d02 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 b547e423e14791..8b43e59b1ecaf6 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 55ffc7d92a632f..11103550426dc7 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 6f4785d35856aa..4c776a658515be 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 e6253c7f03164a..a1fd2aabc6c6e5 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 22fc9698c4dfe9..6a30d2e35e8912 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 5173461eae714d..dbe8b961ea8d15 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 4c6bd8bc275fa0..f3ed985e14b90e 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 d3ddeb5c1b80f7..d22118bdfad8a6 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 d3b5cbd3a79bf6..01b5f23410c841 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 7b094a258fa09d..98fd61e7b38e47 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 d3b5cbd3a79bf6..01b5f23410c841 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 19e6d638291fe9..a381e9bd2ab850 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 d3b5cbd3a79bf6..01b5f23410c841 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 a54437970d5984..899433463e739a 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 052532a532f450..aa9c2f08980f78 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 5a4e8b865e1820..da8fc1d6435f07 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 ac02e1c9099e3b..792c380c725e2f 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 d3b5cbd3a79bf6..01b5f23410c841 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 54aa2f7ff52fa4..06771ad0970731 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 d3b5cbd3a79bf6..01b5f23410c841 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 5ffafd8f7ecb4b..b98e8d3c269ff4 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 d3b5cbd3a79bf6..01b5f23410c841 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 286b072dfcd9c9..e0c30675fc280b 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 1a9e17ffa122d4..4f8e2cb94d4632 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 f2a6736ad994f5..70e52a1101f7fa 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 d3b5cbd3a79bf6..01b5f23410c841 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 f6733e3228b4fc..378531b68cc16f 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 d3b5cbd3a79bf6..01b5f23410c841 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 d3b5cbd3a79bf6..01b5f23410c841 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 41042893cb794b..85d8f2a3f462d6 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 d3b5cbd3a79bf6..01b5f23410c841 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 13227c60e0ceff..1aee166af71c30 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 d3b5cbd3a79bf6..01b5f23410c841 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 33ca85f86e69d4..18884960156973 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 d3b5cbd3a79bf6..01b5f23410c841 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 6bbeb95c64744c..0208e9f08bf3ac 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 d3b5cbd3a79bf6..01b5f23410c841 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 09de4a621e5d6e..86ee91f874ec02 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 d3b5cbd3a79bf6..01b5f23410c841 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 5af2280ec05340..8e1b0282be4865 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 d3b5cbd3a79bf6..01b5f23410c841 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 034e2a2ea08fda..4a6d72f914e3f5 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 d3b5cbd3a79bf6..01b5f23410c841 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 203e446dca50a0..d3c97fc56b4035 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 d3b5cbd3a79bf6..01b5f23410c841 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 f6bfb82ddd9c91..fd7ba71219bc95 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 d3b5cbd3a79bf6..01b5f23410c841 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 a56f022ecdd722..dd56515a53acbb 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 09c0fbc62a2e53..e8dd7793f1697f 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 c826809a3055ec..dc84ddc609920b 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 b0c1fbcdc77f41..d78ac932e0dd9f 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 03efce15f85620..cec69b26e14987 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 c8b1e7d81c1b0c..185bc9e7c11253 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 5a88e0f9ea1ef0..869fae2e963b35 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 20ea4f181c7c09..7167f77ff471b2 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 03efce15f85620..cec69b26e14987 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 e8db261edaec8d..0080e8dd5b5aee 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 b0bddb044268fa..5cddb28c27a67d 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 c9068d0a804414..d6d9c2874d0951 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 20832301f0447e..189535ee74ca32 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 81cb4fa1ceeee5..6d37cfa080562b 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 80c72ea5ec4294..6049a70fc6133a 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 18097f9b261722..f215f7438e78a9 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 3dfb86b1bd5bb6..98db25e396d38c 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 81e81cb2e0c7cb..c7712a7d0a88aa 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 efaae7bfc2c51f..f007e78992fccf 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 069272ab810491..1b911c451c0189 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 062a007a409622..95cbc40972e592 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 30bfd2183a4d8a..bbb54429ec2cb1 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 f942fa2ace467e..1332371f7570c8 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 ca54995a53a063..5a00bc05746beb 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 315123c59bbd25..f89f32c149f3bc 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 f59b0826198905..53e2224e1d8c51 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 1955009834fe54..df46dedcc8ec94 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 60bfda066a1534..09b55f1681aaf7 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 a95d1a286df5c9..881d6cdedb7a78 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 33b97022fc4f37..05b2f480e00685 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 33ae1fcdbdc40b..7bf850245a8412 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 814b790f15856f..e123a67e482bd9 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 ea8808442e1eb9..017e2c312ac65b 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 6bb2031caf6b3d..f608eca9abf227 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 0a46a9e0b4c30d..6f048fd37e7a91 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 0aff64173c45fc..8e8777ff42af4d 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 d2e61fdc8aae23..2b6288c76ba84a 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 2763a53db4ee7a..140e5634d23f73 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 0949c040825753..3b532596cee19d 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 4d06e3e082a866..b5b68263d8a5e5 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 94929d25dcf426..53c59cf0bd9967 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 ae621146fef3fa..91b14e1aeaddfe 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 b71daeb935180e..066039a3fa04ae 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 6794da9b054feb..431ab61354b40f 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 eb1b17251ae6fd..07f9e88fe96356 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 f8426d398d79b5..d288ea35914b7f 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 6b505a3bee2a62..ff100e37f330f2 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 10e68def5db21e..69300727fd9e99 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 29b992e97c2ca1..1027523ddcd6e2 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 f1a7f4a4e7fa13..7cad43c9d7961d 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 930191f2b7bb64..ba37c8fc0f6253 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 e5d0ac041940e2..eeaceb593ef76d 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 a26461b6210443..0b01b8f05abab4 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 fbbdb8c3dcf578..1d09a43ee977f2 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 ed89d7ca995ff5..27986f8207fd83 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 24ad0b17f737b5..d094cf65cbfdf1 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 a4027230078931..de2992fe86b3a6 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 a331da6db05f4e..73026cf21ada27 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 a1be860244a786..90ceee214b00f2 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 7e4d63ea4c0c5c..353b8d22be793b 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 0d1f98cab00995..68265a18bbd07a 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 5e87a94da1b772..fb15c0421a31bb 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 b24ce38a35679a..7066d97f02bcf0 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 f2e930ad2fc12d..c1341eaeec6711 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 a946dd6ceeba26..508bfef28e4c94 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 4f7e6e1a1054b3..13235edd1f47cc 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 e1b55de436d8ef..22728ca40310e1 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 28ee77f2de353a..73d3cb438b87ca 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 1de45591b8016e..39fdf272482fe2 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 00302f3833ef4c..dfe0a7c265d52f 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 fed1bd5a1094bb..5c855230c0d742 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 0477b0d99a64a8..4e8936cdb3b1b7 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 74b7a66e5e727c..4340af728892fd 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 583d490387abd7..f6365bbb46d51c 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 a31ad913b50cfa..2380e3be9e4382 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 667d4133ae772c..947337d5836786 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 85ff511360a9cd..d22caa7382c53e 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 5443ff4dec0da4..14185efb74da28 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 4de5d3857568d4..4c66f6d8343a9e 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 d9f524c75d853f..b50c82ccc1b433 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 3ad018047e6e23..3ed64fc3460e34 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 752ff9695a4920..d7cf76d4517c7f 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 5fb0be8493091f..c25841283c2086 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 4734f61096cf31..6902f8c270be6c 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 33dfcfad177b2c..2a8efb84b07928 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 9537fb62fde459..31fdf1fc9b39f4 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 1eebf5ef0a31e9..06ee0c68c435e7 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 8cd1babd3ecd78..8a8175abbaea1a 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 3da1b0f4174b72..2264668f14bd28 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 9371186866b011..02a7aa3a1ac46d 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 b337fd541ed2ec..8dc20cb7b3bdf4 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 e81bcb332628bb..cd26031d634d7b 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 eb26734de6a5c4..81405a420e9850 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 523e83904d37ec..c531c390e4fec3 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 b169b19e6e1317..e18bf056e290c6 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 4a5fdcbaae5493..12cb14f3a26449 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 8bbdc98f20a651..fd9aab99f35564 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 dae2827fe2f291..68c9977d34b75e 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 aeeecf79170a26..494b84b8e155bd 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 fbbdc22506a0b1..6b00ecf96c1ab1 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 8409af69bf5872..b81bf3fa49a9fe 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 c15cdb402e5663..0ffdee46247ae5 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 69aac3b4adba3a..db55c267416544 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 a66642a57d8566..5f0e68a5ccd515 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 040f9ebd46e087..34350e28a80049 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 45ddce8deec3b4..6c04aac0f5fbc2 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 36784d03ae8247..beae44a4a50337 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 cef8705f12e7b7..30345b04cc78a1 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 3b9caf86c0596f..0b86cf46eaf5f4 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 0c04cf3284b3a9..983cc768a3386a 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 ce111219676d43..9aafbf7593743b 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 e172a1f6ac6083..f818166cdaa8f6 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 781146bd2418bb..cda06d9c96c826 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 c82ea9ab2927b2..b4ddcc9b3256ff 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 2d459ea74c9e16..708b53ed90e759 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 ae8f222f16a5e6..504f6210f6a833 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 69167acfc30c5f..0cdbca1395f3c5 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 04275f3b23550f..369dde3ba7adeb 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 f65ecc1251a6ed..f831ac5dc6997c 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 df147d10832058..c606a58e3b40ac 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 f62ad46f377706..fd179e27e715e0 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 783456d96634f6..98c8e085408dc7 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 01002157235841..6a200b0c12b038 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 6ec2a4f0b15c9e..678678ced1dd4e 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 2b550b166a1ffc..e14bf45865808f 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 ae7858b9772d15..69d11aa3003471 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 7a88513edc1c83..a1f76ef79d72c7 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 7d3f29a7359eea..e34e24b409069d 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 387e799de35e34..db30bfc9f6ec0a 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 a317d61aa37aa4..6f37d7060abfb7 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 d06e7a613aea59..4b27462d1c0b29 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 deeb1b027b33b1..a0c4899ae1064c 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 3f35f6b3ee8db8..ffcc0f79e88cf4 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 d6cb44734f17d0..4282538eecbc30 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 19d944278c66e3..5f29f33a9b3562 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 50d1f728638f94..21acc05d844612 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 bd3847db678ed9..71c8f330b15674 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 383fd17a5ba08e..269aa9d52f9ab9 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 31834de1624670..e1a35422410eee 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 0220ac0431e9ed..7f870e3701fbb5 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 e8a28789a7a303..342925246aeeed 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 766e9ee452a61d..6d4c859288d9bf 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 010606bfeba02b..f80d1b271b852f 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 f0fd2cc5955fa4..e36a97d2335a07 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 d3b5cbd3a79bf6..01b5f23410c841 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 f45f2f93e1c0bd..86d942bea4725a 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 106b28c7c463d0..ce4ca959838cbf 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 7e6e7cd2bb65cc..78257e180cf9cf 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 b640b0b468599e..3cf3a15273ace9 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 03efce15f85620..cec69b26e14987 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 335c7632c6e548..d5457b64bd2a74 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 d8faff182ac49a..e1a28f39d5d244 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 a51c983f5cf69f..5ebc1d9304e0c0 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 fdef410ab97460..635288cc3d539b 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 9a2a9a29ec38ef..1246015e8fc48c 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 a3347e0cdb65dc..e2cb249bcf56d2 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 6ca33655c80598..0d7d86224437d2 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 97b9cd34b8f02d..8f398a0f5fecc4 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 7615142f605fb7..500c14cca51aa9 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 7615142f605fb7..500c14cca51aa9 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 0b9182b0808c3e..113e044b449bbc 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 d3b5cbd3a79bf6..01b5f23410c841 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 6f1181fe6d8a53..779be0ae591d29 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 77221b2d2dfa61..afa537031c3965 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 e9bc0b048c5b18..e8fa05ee8e0e3d 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 d3b5cbd3a79bf6..01b5f23410c841 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 797ff98f87a376..31eee2bd7c40d8 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 4c38ce1d6c7ffb..3447d00122f5f4 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 d3b5cbd3a79bf6..01b5f23410c841 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 f5b07db386c230..69cd27c0e3210a 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 4a5dfaa015c3b0..e083f6c1a69ca0 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 47993fe54c54c3..c9fb6bbaae3e09 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 05b5fc97c244a8..743c82ecc9540c 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 c98e4e2a2eafc7..c725d23f15d1c4 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 2240570ff46aa1..f0eb4928ec7f0f 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 fb3281028aff81..7e12dae6a4faf6 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 20d904511538ae..43bef996fae7bf 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 82e84859ecbc0f..78df34af46dd01 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 d1661060368b45..3fca0522e5337f 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 af5c0f75e8ba57..bb10297e0cc3fa 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 c28826711cb890..c6060a790cc3f9 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 c52149674cebd6..c07ef866386751 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 8c3ae26284ec66..ee00d042162003 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 bdbb9078cfc27e..b449902aabc2bd 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 0003aac28779fc..320e61f3fb83cf 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 71f26979415a51..c3e77415e9959b 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 5d4e9dbcff5f32..6bcf48432d3088 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 8be069349aa25b..a9c06ef2a93bec 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 9ad68c2ac6f320..f8a6f1cd6b8d7c 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 03efce15f85620..cec69b26e14987 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 30c4713da177e3..95e6d953d146ac 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 c2b5c3d166d5a9..abe854eb8c3541 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 d3b5cbd3a79bf6..01b5f23410c841 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 308e86e9f53381..e0dd497b68078c 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 a3e600f4d232d9..441bec65a35719 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 1012341c82a4f8..8138a674f052ec 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 2f34254237640d..30aeb30cb5258b 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 a67a50ede7b2e7..28ff001d69587b 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 7a890e96aef494..a94c3281a01fee 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 a3e600f4d232d9..441bec65a35719 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 a3e600f4d232d9..441bec65a35719 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 edfa0847268a3d..03f178034e859c 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 e4c656242d0ac4..12f54ba412d9b2 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 913c0d5d2a49ec..b6a4c06c28a434 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 19ecd8b0743a2c..974f7f74182515 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 a3e600f4d232d9..441bec65a35719 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 2f34254237640d..30aeb30cb5258b 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 308e86e9f53381..e0dd497b68078c 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 7dd5b6a02b200b..16b90be6d6d82b 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 d7b46cd1386750..9b87860fba58e0 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 e9c9bfef7dbdb3..8d9cd552d9d2b7 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 9670ec52674b88..e25282b2c70a2c 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 d63610ed272abc..8be4b8666fdf04 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 c0b8ef095bce3e..bd159c2fde7565 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 4279e4f48b8f63..06ffcf4d4b4a35 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 042b3aaee274c9..42a17aa54b5a38 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 008b66647077fa..a164ddf54cbd28 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 e60c8694d56d40..9e9d203f108b67 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 c0b82b307d5d15..c12c8245595868 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 72d78d7b658837..3c51dae472ef50 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 75c251a2b27266..f5b867d5093971 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 405d579fb633d5..cbef4a9f36eabd 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 d9efa7e4f8ab3d..74e28ad1c9f51c 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 b8a5c7780948e1..43246f3ceebf95 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 afad8d17b9229e..4bd8b964f90c8c 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 050fa3730fd40b..91444122731820 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 95ea368ffd70b1..5f75db0103a5f1 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 af885574a3d37b..06fc95199ab6b9 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 e56b9d2b1c15b8..23e5b00c152d72 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 3b3959c318e769..4ab0e2b5906124 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 24ca74c8489c13..b8642a70af4e4d 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 c337eec72a794f..9e4f8b4a55bcda 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 6e9053aa22cf6c..36739c42ed15b5 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 4c6d3ac16fef53..e5d835cb276331 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 154b61fa280c8a..7bb25728d9ff30 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 0f88a27c4e8a26..a02f2cbd57108a 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 86a3c48ba15089..7f5a4075213636 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 96b1c6ebdff2cc..f102e7dd64377f 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 ad0fa68320b880..a079cd6fcf4e40 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 0f5e8e81d32f63..78f6dd970cf5ac 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 a9d9687c81194f..fd1a7e82101904 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 bbb6a14819c1ce..a03de0e9bcd46a 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 4b998ee52580d3..0a5473ee9b9193 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 ef7f98e03c8b7c..603ceb0d61b7ba 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 ea6d0c7fb86481..d0bbc93a2a26f5 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 0e843bcf4b0c81..aebd7e1b81e2ac 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 8b3998599be633..582658663d3f2e 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 125fdcf1767d72..8ed2dabb423028 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 33f6d812d73423..9b070b75cfb666 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 ce523f2cdb7356..77d295ceb7c761 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 3c309a81872a8b..298e41836f240d 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 7873ffc17e7a4a..e6295bc1eea7b2 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 e16ccb434e2090..dd742a45401b2a 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 d8170303d42bb4..97cedfc3f9d156 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 64e10b153ec19e..221b27d0dbf486 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 50f602f243a55c..08640d862ce41e 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 d86a3029bd8adf..ad401e9df1cd41 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 23480a3a2ca27d..88a14afb91d84c 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 7ac697d75d32c1..3cba327d2bd341 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 4c3c96ebccfd1d..c731d428f7c163 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 f42c89aa765397..97b2b655321131 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 c321daa3c8af47..6d785a140dcb33 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 0c234ff29d6d08..b5e7034792b4ab 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 1de91196d13b0a..2054d64afa4540 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 d5d87822a91025..3e8227a1c952de 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 04b151a138fe59..1a27b8adfe78a3 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 650baa65563ca5..31dbd470d7d562 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 fe2d71ecd7764d..a7e56e1bd50679 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 60ece71252a4e5..6697fd9eaf99c1 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 4f1b9a5fb2dd71..59f52230e0e5d2 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 05c7724af8250e..0fdc274edbed85 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 87f46c1f303203..e319e4f786754b 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 041aea2000e608..984791c299b638 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 2913e8870e8ead..a35b2305815ce4 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 28e4585370554d..9efd0c2eec2ae1 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 6f278fab171ebd..9eea81bb59e8ec 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 24efd15aebd21a..c7414442582e4a 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 3ebdb1c4fac05a..e67350d9ff1486 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 3c13ea53d068dd..e9e5a2fa2e5556 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 666f6c1ab8d012..31120210ee2aec 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 c7c8e69fef6e27..3670514e6c4214 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 8ba9ee40826f10..72090d725e7537 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 776723eadadaf5..0e5c32e67b92e8 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 b4fa340ed0df44..ca151dc7af4883 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 b3caf4996c46b1..24ca702e0a9413 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 81791f4b521220..c9f98fca8710e1 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 fb1a25429f8254..1e7b53d40379c5 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 0a62bf25a0dc57..61612323e98ed9 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 a7f52e47d1fb46..b41cb474f94a63 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 4ceb95dd16b567..2f270d05cfa2e0 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 96cd680987c2fd..063e3dec7d8df9 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 adf4da1cb6b76c..18195384ad9c70 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 634be2ad58ea96..05ecfc735c6271 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 fd0f5edfd0b86c..8560de58cc9ac9 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 044520a6b73e9a..782808823efea3 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 4695889067eb19..ef00223e4c254f 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 f6f54d48f1b120..b87343ecdd0003 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 a1de5f3cb9c4e6..c1a7c4de03aedc 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 890875b1abba9b..1f8b5d8f03fd39 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 2a4e6bd61ceaee..06f1fbe82e2388 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 f848a58f14466c..e1edd843bd5912 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 47f03ac48a1fb3..c3bcf832ff3308 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 cc1583aa7a238c..6421c072c5b900 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 4bc4422ae333c2..8d256534447b9d 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 5452b20686f9dd..0d152df97c9402 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 3feb4845cee9db..a90b2fea69187c 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 55c939a32e8429..6e15a6fa74e41f 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 5dc332c9d0e3ca..6052bd3604f81b 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 ab79bacdb9c1ef..66362a70c12e0a 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 bdbc46c5ad5773..b07506d9838b23 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 02db4c8d82dedd..5e870a0d19d250 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 91a017f393ba0a..056a1fc31d6ca9 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 b2c9c7a91c376e..ebc329a343bb76 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 e8f78e2e7f716c..81dc44d8ef703a 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 2e58b42c09454a..e134d92ea665db 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 a275cc638b66d5..4fd25a7f4ad307 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 a8817c3728400a..fe0de78b40a000 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 b55c90e832baaf..2967029e79259b 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 9acbb961830f0a..b1dc9ec037d9b2 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 33dd5b0fe3bae1..dd4526d7ab4621 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 19fde77051c592..705d318948b0c1 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 9073e1dc2c86d9..1c4aa6558f43b0 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 200dbba6052fc5..7948141c0e00c6 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 3df47a96efa83a..c57f7e8c83bf6b 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 ebb126388cfcf4..c85903d423bd4c 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 2bf0d969b1ca69..a75e7fba878698 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 bc6fdd7dd246b7..7338a6b8a2208f 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 a615a3c3f1ec5f..ea79e5734b294c 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 e8f27327e7067c..c8bb2f4446e7ad 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 ba233de9aafacf..af1325af55f997 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 b50c63891e203c..f05e11fc5d0b4e 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 ef129fa5ecf8f0..f03223cfc43734 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 aede5d191135ad..e82c3f81fcc81a 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 6ed6f9d455f4d5..cfa6c8d5a3df89 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 6af0225d5f3c9e..dc273a35a79a26 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 0b1604a0239a3c..542a1401e13a25 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 96a49433a698ef..cd2eb507326b5e 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 eb8d42c840280e..07e48492dfc2aa 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 8248b193f36ecb..3bc6d38a59450c 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 0311d4a673f5d9..ef683994335b1b 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 0c2b74967b9f6b..0c90fe355793ac 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 125fa6a839e287..68fd0881fd65a6 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 dcf5cddfd84be4..296a178bda3ff9 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 967a5850ccfd51..5c6f5eee36e31c 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 ce21555fedcf65..b8f8348cc708d0 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 ffbc4b49f736fa..0b54c9c6d79258 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 2181072927b739..9ef73583bcbe24 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 0d346eb6eb2e37..e6fadef710a9bf 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 413ac2a3c1cbf9..0642ccf2d945a7 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 f8932cfb77de1c..299bf470471771 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 25fe89a51668d8..15374b3558a6cf 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 6adaa3456bf963..d1d1f640553ca5 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 9b0c60733563d4..3e95a642ca5f11 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 b822022defd245..b5aa64fe8b762e 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 61a61d79445e52..52d355050955bd 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 50601d250de57a..7822cb5b0e937d 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 f10ec3a03e35a3..cb8fcaf9fa81c0 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 42a72a901ada5a..0e3c3c78fe08dc 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 948299d6c434e6..34ec4aa669ef9b 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 ccf1617c64b2ea..c5cf15a2bce412 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 fe332e3c048f3f..cfa275f5d5efd3 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 851921a54e9380..c8f46841889228 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 218d77cf5211ab..fffe06d26f75fd 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 460c8beded1ebd..61eca34b4d5681 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 6ffc0bedbfc9a8..0616e599ecfbff 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 84e11395e76695..bfae20586df5e5 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 f3a00af70d81e9..fc0f2287871820 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 cbbfdeb73617d1..8ec0d0cf5a6951 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 af1833f9ea1171..74d8c7df80bee5 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 1b77b68b4eda69..a6f740d8c611db 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 216d3bfa2d86a7..b4b32899cd2619 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 ad553e006d2d52..b8d5da3340b2d8 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 04a165de9bc507..8cc9184a005a8e 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 d5596cc580bfd9..69c06542d367ce 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 178470c5ca2f7e..f561227d5d196f 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 d5ed3ebae4c9e7..623efd4a85651f 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 d413af5fdb2a21..3dadccf97b8bed 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 2146da5a9e3361..190cc4fd8741d7 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 9d4a2395c2dd7b..a95727443d2d80 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 0bc0729de5a44c..d9a22f0110ed2e 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 8badc634353abb..563e8b0f1c5989 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 ec94e0dc988908..f5411a28d9ef80 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 40177a533c2e0f..34b045cb52c3ad 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 0c2bb0f42b2380..50a599e848f6b9 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 c072ef10e3b8b5..5923248ad2eb87 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 dec8e84e1255e0..f3b6f718d44e69 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 4948d818f466bb..b133375f5a4d05 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 28a13096f45094..0cace0f00bc7b7 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 0a2ab16381c7d5..1e993cc07c2153 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 59704fbd89de8e..cf63a151e33165 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 cfdea3e09753f2..588199f2ae6246 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 5282df918de69f..18bd38009e4c5f 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 7b624d7e4e741f..15665e63e2ef3d 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 3686c823d89cc4..a038ba496b8611 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 79ee56b8f7cfbd..a25d418f26496e 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 1564bd5a41ecf6..1d02a57656a017 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 c86b2ee41bc16c..493068e67eefda 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 67634bf343f609..e89e95afe4adf8 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 3c1cca48f90349..3fa9dd50c555eb 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 df60b2d9ce8cd6..e291511839c611 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 9ef5a3a752da8d..34a790be3f8c90 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 6af16f2f9e619c..e28b6ee2ad7e2c 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 6417cdc826fb8d..dc0bf23f863f7c 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 36b4e702439725..cbbb9d30d96098 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 a205258710a01f..fe2b7b22b111b2 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 232da97d255519..d5942c588a1598 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 8bf88e27430d2d..631fb8178175b6 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 a3a6dc410af119..33d3b73442e8a7 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 796b9c5c9c3f99..00bb882cc6005d 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 2dec25afb9a299..e00cdad8ea528d 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 0bb9f733d227b7..a7987d9e6df658 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 c494c7375a49e7..c5acc6e2803619 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 190bb4ecee3d98..28d9493643f931 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 97ac4cdb32ce4a..29c128b6a8684b 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 a52562abfd6013..0536413b26f04a 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 3044eff66c36fe..f9758be0ef15b2 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 374a2196df117a..96e3d7eabe37a8 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 e34cb2e325a191..24768af795e13a 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 41c1c643754b02..4510ccc6ae76f1 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 9cc83c77d04df3..9d66f6d643682a 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 cc8f0ab7860641..458e39aab6c70a 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 a9d5c1563797ff..039dd8ed2f8752 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 cf4d9c94d0582f..8763d7fe0f2cb2 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 8b137891791fe9..e69de29bb2d1d6 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 cf4d9c94d0582f..8763d7fe0f2cb2 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 ff74a2dff9c30a..c24c4b1a950fd5 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 cf4d9c94d0582f..8763d7fe0f2cb2 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 1451823b1f8810..652282152269ba 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 01fa422fdd27c7..1098c7b7ef1fe4 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 50c224496ef78e..86852d41d27995 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 0a15f37c4efbce..249b76b63fce50 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 43ef14a2884f81..b926e942795e56 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 23e8e3c1da7643..daf93c47298279 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 f7ca73a982308e..903b7a9c999751 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 199c05de5206eb..c9d61e59414627 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 5493aa743e1fa9..f9196563341a15 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 190066426e6230..626069647624b3 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 a21305128857d3..5357b99dd972bd 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 218d2189de79b7..f1b310bb1e7798 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 cd51944e825b94..f3af9a652f5680 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 f1a729df2ddcd0..fb590532152a5b 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 3bdacfad80a1b5..a2cd60c6d0ce2a 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 6b60c7191d099c..f252ab64f843f8 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 9e20c4580fc63e..6ba161554ccc57 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 751e66dab55d1b..9e5a0000b0a14d 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 5e3c0457bb2812..8aa936c6133408 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 1a5ecfe73253c1..de15587ee7cd63 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 d6c21bed76b134..5140bd18bb3791 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 99b4f1302c1e7d..4dabc8879b4e1a 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 9ba2ea555e248b..eb3565f76d52c0 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 6cbb728114232a..01437afa8c3c64 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 87a871e48789c5..7afea8dd044b29 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 2ff5d66b42e3a3..ec8d7437ae9e4a 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 b1f4f4fc93f9b9..f30bfd2ed5d7d0 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 c5d6ae81c15384..129ca34c06f986 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 d4a2e277304e96..6f7cf0fec6f560 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 250b3ea1bb199d..921c35705f2f38 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 22020462dbe959..c75e752580bb80 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 ed9e68a2772737..292071adcbc7d0 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 390ae91ed1271c..c979fd447b8cec 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 3e0d23356a3ad6..b4f9a03625562a 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 df42c0a516f6f7..a208171e29ade6 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 65cb11055a6ba3..0917b288101197 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 ff169c5324c35d..d7567955e6d94a 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 8d80a596dda840..89d93bbee65f24 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 74a5a2488c54a4..8849a3d39651e1 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 565e290a474738..1e7ea12a087d0a 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 593092dd30fd57..d423d8a7c405c5 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 d844f81197194d..7d15b940f412c6 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 66ab3f9dd38aa6..802d4511e56d20 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 9cf38507bbe5c1..0fde362c203c4f 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 6baf42b2b0586a..78eae358de7f78 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 5465022615d55a..15aa45f061a9a3 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 777770184fe34e..e2e7ad948db261 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 1d90d1ebd451e3..851077c236352b 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 f1a50a8a8afde4..d8132bcca68506 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 4caac0c8f4e608..cfdc32fd8d0079 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 2c1802671ecf19..b941895bf79852 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 bd143f315a54cc..08a9c3ab3cb476 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 fa703dd7381907..8f048e9b50d614 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 cd245affa0f927..bed2ece9b2a775 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 60f33418498412..62945b572d1405 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 31314fda7a7b4a..cab0648e3b8726 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 499d206380cd55..803e745c65a851 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 5f132569389216..0af26aed75e62f 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 464bb9246a8dfa..302e8059d0e660 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 2bf2389e23ae72..69c6ecb522fa86 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 447cd7efad49dc..9fbcc9527124a3 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 61eb371efca5ff..0ffd2fe9edd61d 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 7a939736030405..b02918923a3aba 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 9b9c390136ce7a..5e448e91e48c40 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 6d3495e9f9dc83..652066ddea0efd 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 9992c1ec7df182..07a2962e6f498a 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 aa2e39da1167f2..3d9597d8580e08 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 362d2f58e4df01..a3b7a56993b5b3 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 ba4e042e1ad3a7..04a4f5b41bc259 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 cabdaedc9726b0..9d06ee857c2118 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 64659a017245f4..2f08ba2cea584d 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 2d5c9590d8d65a..f138b4b0c4362c 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 6969977ab1bce1..484de9de0bdc2f 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 6d1432cb517cc1..2553e4517c4bac 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 1277ee0c4b9789..534b3e4246f655 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 99b8975adfe0b7..7cf7bd7dac9aa1 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 919cb95ae831dd..8c80ff805311bb 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 8e730e634ea69f..032207217be693 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 02382137aa16f0..c323da34e0808d 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 e6cc5d28cce68e..ed9dd0f8db5aac 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 d3b5cbd3a79bf6..01b5f23410c841 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 250fe6f5e5ab4d..7af4fc873e1385 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 b034321f148781..12b67fe975773b 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 f2d20363056043..99679cc00c44b8 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 0edf208aa46355..2b11d3a4569497 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 35565c08546a45..325588a3d7a827 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 3ab880777dab1f..98be921c974c57 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 e9b1d371a6f0bd..e7496fbb292534 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 8d5851cc089e64..d931f2f837da17 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 e24527f8ce16cf..24ab9572413ac8 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 45d3f0205045a1..4beb70d551bd48 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 36d33fc34a1aed..dfe76f71aba75d 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 7ab2ec431b76b5..4b734787c0a323 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 a8ab10a19cebdd..0bf39deeab880d 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 a6f35aca0b840c..c8d34f7fe5d5a2 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 30ec1ab65e0f5e..a0cc015590f0f4 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 99e993b57cb2fa..bf9fad4032e22b 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 909254c4492823..700cc6a3c78ac4 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 1595c75068323c..8b69ba5294cf55 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 8fab4c4a17e386..5963da3a2e83b6 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 a271a8e9e4e301..50806483b39ebd 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 c154974715a960..ed5c80907920c1 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 8fbc41ee992a7c..1c99bd716069c3 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 3a16c470fe2bdd..b4d6131d81abe1 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 49e6a61f841d7f..2a069939e195b1 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 f9c09c8d697b47..4f01b1d8f0e031 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 6fe2b673ee3ca6..eed2d8b874b56d 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 0414542fa5facc..fd12b1ddef5710 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 d96120311da5a3..e6a6edfdb864f2 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 e17ddedaf8adb4..2c796a362f5702 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 b0d0d43cffb611..3eb14eb371391f 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 13098a0c40cd5f..40fccfefdafe2c 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 05d29f9fab4236..f9621da8da896b 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 b7180b97b4e440..90eddc9551d96d 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 dc8b796d366bc9..a290c4647c31c1 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 ac330d00e317d2..cdbf9822b2acd3 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 e97e37dda06255..884ce922492e52 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 fb1bc133803421..1d66929143e199 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 780c2ee0bd1694..898414d0fca16b 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 7d736049275a5e..a83de498fd3226 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 3209016e849276..8793b8e6a67491 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 354b1df5b974b2..68c16d422051e1 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 8970f4971593e3..876720b09b7003 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 1966418965f83e..274b7a43e5fec4 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 bf8c2f3730f81a..702184a813c57d 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 fe17ff12717aac..6e9a79a164959f 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 7b3c3cf03debf4..825faf74719b0a 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 224ebbf528bc03..fcf59e4b4bcad2 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 416eb083850f7f..ad1c7beee95f38 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 aac625fd947511..ddbfc91e0b55fd 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 30145cb6315937..aba60836da5dd5 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 6d48eebadb4891..f532358ea79e1c 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 4d16b6ca4bd02c..66f49132417291 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 cc9f52554bdd53..2860a0069538bc 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 78fc8c2922b02c..f01a012b0cb965 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 53134cc3972c63..c45300c92a908e 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 b38a73eb54b67c..4461fa02083fac 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 423b69b9bb990f..43f596b32c0b59 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 5c48b8023794df..b3fdad82ecdb74 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 09ad93d95cc83e..6f4720226a3e4b 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 6f00ecddb05c39..8524fbaee43ca8 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 e154dab740d303..ce4cc73337a64c 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 61f394c1e128c7..c51bd57a565180 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 43048657706e34..0da3b5a30c376d 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 27c3bbe291a5de..b0b88c086b41f6 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 e48ec9341eb8c2..03eabaf8704bee 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 12c3d26d2d5668..85ba59ad4ccbbe 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 e95f9d363915cb..6305bfe3ddfd29 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 8ea375b51f9a5d..1c62ad96a74e1c 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 570a42f820e6d9..a981110d29810a 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 b52c9645ebb54f..46fe36d8c18ea2 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 a44abfbee84689..385112c1a9a229 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 c258d2f859b2c0..4b577b7edf6f39 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 751ade1e3be7bf..498f68544f6ecb 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 fcc5e1581166f9..a0d0c8522914b9 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 876f0114eeafdb..aa7c6f2a26415a 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 c5e221107a1874..bdb5040c21d83a 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 598f45e0910654..bd02245ced1f0c 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 7df2d50104a7e3..fe7fe2d579e568 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 b990337293f3c7..ac2204e3cba7a1 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 9f3d299184140c..242e76260249fd 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 1546547dda4cdf..828743d092c771 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 3b720586d148be..864f27beede875 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 cc420f8ad599a1..cc7d1a1b16b99b 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 3d5f97adca759d..d254264c899095 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 4aa3a09ae2bed8..104c865626b937 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 9abc05a84d7a30..0b321765c05450 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 7fb61d0423df0c..b12a05447999a1 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 aadebdf574586f..678bd616c7299b 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 4ffe57c5f29ce0..5f83bf775e4df7 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 57d95899ac9747..82d5f3e7c4fb10 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 12d0f5eb7f7b5e..5b48a8b6174d7a 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 a43702f210675a..d3625d18354c67 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 05899ad4295d6f..81f18e58f80e8c 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 974345967f5880..8c451bf2c574f6 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 25f2e1f9014e54..bba5bd3e50655f 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 96d9ae4026aa59..a0109462fcb3ff 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 2a6e7e62bb80b6..79221864a4aa0f 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 9035c6fe16e851..a4d50107532444 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 c09447f938e31d..b71834e10035f2 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 4370cdbca705ee..f54e3c5cf275f4 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 3a1387c20c1660..904c0862083330 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 0ebeff9143fadf..be688347c11b5e 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 6eb114df24905a..638a603f9ed6d2 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 3ad2c94384fb54..48f96db9ad42cb 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 38f75e1a6cb2b3..e7509f024c53b3 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 e6bf71e8bee625..13965aabd0ba12 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 210747dd3c9ae8..0499a0fa1da38e 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 70a36f8c98c5a2..cc361d4cf070e5 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 f035d30be1aa17..7bf545e298d77b 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 c4c013cfc532b6..c33a68f2295e8e 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 56e8fca4fc6599..8434ead23bd2b3 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 d10682cbc159f9..ed1f1b7790a71e 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 1f21a84f0d4e56..c27be3f50a2519 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 d0153afe49365f..fa51a92eb52f7f 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 08d509c13b91cb..79c1b45790052d 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 9ca1d5a3f61b79..398f7d2a36d64a 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 b30c2917206da9..3fabbff02c4023 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 c7968477eae377..e2ec0543634ba9 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 f434667b96de7b..e29a1876a82651 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 2745b738764485..f6df3865276602 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 e78ab4b2994bcf..0fdc687c0e50b5 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 15b5a78c1a9b60..464ae4b5d3c3f8 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 c71f56dd050341..e486dd8ce6d9db 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 0487e6fcd5bc86..de541283e3a4cb 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 eb8e867c675cff..b3c79657e53c9e 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 c38e9e798669c2..96783eec23ea24 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 70ee3447cc6033..aaf41e24baa1ce 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 a2e5f879827b57..0ca086db4151ed 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 ddaeebc845b530..bb95e6200d1c53 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 a1af8d673435d4..d7a10ceb7aa762 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 8d41382140d033..151407d3459c7b 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 0b532ae1bb4214..45ca3698abd540 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 6b83fa394cc04a..bc19e94b1f7646 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 b4017326ea8b21..8695ae3e600306 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 3d03ff5e42d016..d7b7256f07c006 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 7691a920742215..3f7ee955a2284a 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 2369999e268dd4..4e84917f8a406c 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 cde998fad2aea9..797b9f3dc5a99d 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 1dc1c27b0c16c3..22a2543e9edaeb 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 473a1beee16996..6c09faa3d91577 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 d591913c0a7cbd..4ec29f14e3c994 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 a3b88f8b1dcb04..51e46dc2f189bd 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 0990679b8b2cde..7c9c1a745a1209 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 06339a9af799af..6b47c725190439 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 b2eba487979e3e..2c5c456a6de53f 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 77f589532f4ba9..7a267e4c5a72d2 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 eaf78c3097d8fc..244d6d2d0be73c 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 2e35471d76a78f..4088d0a580053e 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 a6b4b2a6f1affb..6c1f454725c2e2 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 911fa2bec1f1c7..2bea92917d2b35 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 953bb46589b192..5160d1ed63284a 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 5fe50646e31045..e47ea0a98eaab5 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 a429fdfe88059f..eb32dcfb35b728 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 20b737422f902d..48c49cc2df3d36 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 fc58c7729161ed..8a00382979b1c4 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 11fdf3d4195478..3abaf20af1b351 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 59cfd50d6152b2..5b028560ba6b09 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 507f0f0ca08ec1..31e9b12e975dd7 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 1c142da359c227..23fc6579818b86 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 349f275ad7853b..f0fcc915008747 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 6b2ca7621d9072..d8571677f0ac5d 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 f6bb8eac1f2bc6..e1fd0d55713646 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 848c0dc8bc694c..f3ea5c6a71ff76 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 93a4ea8450cd83..1c7e91de9e49a6 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 1d50e4bc13c942..7098c21aa45474 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 9be90f2bb11f25..33b72ae07b2ced 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 ba696103e6334b..7b26f0632607eb 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 21b71b79501312..bfc51d33c6538f 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 a57a04dbea3c81..b1f74a2d443dcc 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 070f751c5aa4cc..a247370497a922 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 158f647f31d279..1cd04c88496a0a 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 f9b88a2240b437..e50f1f202937c7 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 815c6fe626cb92..64822fd2ef636d 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 056194415bb924..48fd0ba5e1ed91 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 b7d916f20d1302..36740dbd3a9505 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 88a936cc583dd5..a7c6f45290c931 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 4ce072cbf94038..85870b85a4dc48 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 5afcb0b3bb8546..b88796e9769162 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 b264605854f34a..44989870b3194c 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 85286a3fddf4b4..b7422cbd53aeb7 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 ddbe20b05d9092..e1331bfdce0ded 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 bea5c0ff76522d..70c8f642897aab 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 03c56aa069766b..471d9055e8c7c0 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 cb3ca6b726525f..45245d75e85d07 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 7a4054f6011012..c20060d88ebf4e 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 01b8616975107c..9c909827073526 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 76c63c0f745a3a..dcc6ea2e90737b 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 f35bf7702695ed..02a02d89bd362b 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 dfce9683378826..d8e8dfab4f7d17 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 5442e25b8d73a0..7189f83ba5349a 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 8b9fce51a46c83..777f29bd94037e 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 3cfea688be56b4..3a0500c9510cc9 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 923c3f26c01908..275a8f65cb1a2b 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 79dc1a6f573270..ffc3f4505fb231 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 96711506f67d07..3d41dbafeac520 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 a07c9fa273460e..aa19b2abf75871 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 26fd01a6d84535..9e39b7abc95603 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 b98fb6ddb65ad3..0cd08b6f123044 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 7291981bdf51dd..1a691e6d78d53e 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 713bc7f43ea3ad..2da8049b28f787 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 164586d23063ca..c1de03fd196354 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 3cc1953f4a0a92..a2224f4b6758fa 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 34a25668339190..669ece99f8988f 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 10c0fd0d992842..f30ced39479719 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 453f7174d2a032..405e195c856b68 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 d7efed2a9c538b..411f558d7ba381 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 2b9edc9bcd86cf..85affcf983b56b 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 4afaf41c56c87f..96b9751c43e1b0 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 4efcfda58f7946..742de485a6b53d 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 245863d1e0c0eb..3fcd0292909af9 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 fa5ecabe0ddfc3..a081774288acca 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 780725b3ca5374..25e617bc576f1a 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 a22fe07526c2f1..4098b3b39b6f45 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 fc793c9abf0fe6..66a14832e2a35e 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 e642f61f2f3b89..c4c75725dd1ca0 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 7010b642064129..5698f6a5b47459 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 deac71ffce000e..e2af22dc369758 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 e7ce15286dcfa6..101c84cc520635 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 a0ac9fdb2e38ac..59637dbe4760cb 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 0425f628f01d03..c25b24d5af5266 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 5ed5c90741143f..162fdade24cae1 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 7ffa135de1d149..a08caaa10319ba 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 f34b32454d72ba..5e797f4c0d68cc 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 5dc24864dd343c..87fc509f71aadd 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 b48b937a5c91f4..0b53a27583fbe1 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 15bb199ac405bc..90ab8bc777771a 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 5079ba90400e20..1075e6ae37ce87 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 4cbdb3cafe1b58..bf960827c56fa2 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 cf9b3495ea0b6c..cbb515883c27b7 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 f2c35b066b2206..15a645ad0752d8 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 b4275ed74aef8c..65a67dfd488086 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 4826141aa58ba8..a0526b46e8f5fa 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 a1a6ee66183469..03cea57b8e5ee7 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 cb340997c37f49..2298970e42b977 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 289c8c06ab86a9..a8a72420e9c1b9 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 f3086e27c59ad2..8bcd5192ade391 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 37c0c9ddbbe8ed..291cf168218df5 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 dff1b9c214b96e..739964215bdc90 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 3999f1f9070232..be63fb69fe5c1a 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 6d73f21fd959ac..70fe61c05448c4 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 b467cb651a0864..4c716f58387ac7 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 3b46688a652070..9fea6878a25fe5 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 a6c366ce2ae080..f9aff0070f361b 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 461075a1592ea9..616c9bd54707a8 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 df9bcba2545461..d7a910bf0944a9 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 f90c02cd4099bb..977d903d80fe82 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 210b01efd6067c..ef62919d2279cd 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 7b6a0fa87b4d1f..2ab8a1419b3913 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 13b203627c1030..f15b021bc6e45d 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 4a804b562ffb83..69a0e5f7280832 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 ba1056d77717f5..93265850873596 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 2f797fafa4156a..da14df38fbf2b9 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 39cc7562e3969a..74f32fe08b425a 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 b64b23bc97dafb..bdae45765b3f0b 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 369a195bacf827..3406c6c576f529 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 ec805b13fbf10f..0b4791c5404a5c 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 2cc768580071bf..dc4105881d4a6c 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 6c3a8cf8e78992..442a47bb160d17 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 38ab443d59a0b2..56dc6fdb697c10 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 3269537e699b95..99ee62e03b22d7 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 0598454f7d84a1..f8734053deb080 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 198c8e6c5653f1..e4f9e6d817b552 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 2a924b72f1a09c..bb113b5a260fe4 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 b15a781a1cd1e9..a3ea46c30c5f10 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 8fae8955f16ec0..a83cd29dbc22df 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 4b4fb411a635b7..54b62eface7431 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 1d927667ed1867..dc3d268f4a7470 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 b033ee2d8a6286..965ebc8d463723 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 7d68f2e9938cd5..593e03ae11765c 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 5cf6ad650e0182..d2332d6bdd6bb9 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 d8a4db8939d81a..0add0695a1d7eb 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 6e9def2e11c48a..f6339749708b65 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 8f2abefbfed3cf..4577434014ad18 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 e1d7955d86a814..347063b3b565a4 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 cd62c6a9667422..56847625521f5f 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 ba083a27abf83e..9309bf30128c8f 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 5bc569d5c76990..bb7f2fbe7ec223 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 fc9ff8cc244b4d..3b7a6227bc86f5 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 5e24c89cd9822a..8d0fc2be6f0991 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 c731b14c636602..d98e5c1ad9b036 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 3ab5f6e77dfcb3..d2a386fb0d40ea 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 73658c356089f5..6b99072b24c7f3 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 3fc71846192ba1..edc1914e25535d 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 645aedd79b819c..92540c1109387c 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 574c488365f96e..f468f6483b511f 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 4ae15c5ca4775c..aafa97fd0c3d0b 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 e44367324b3aae..a55485e4f7185e 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 86fdfe49064b03..ed98f6826ce47a 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 7717466b56932d..a1166069040148 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 b9068fece39b17..8cc5dc0f1af085 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 adc135153b1c1d..5c51c068ae734c 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 a2bfbf1e7cf943..f3b3a8bd7db02f 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 de7ed99d95988c..88459adb760f36 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 89a5e5cf1b986a..b0d2d9f7faa177 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 e61c5d44ce82e2..99cb623ba5a9f7 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 23edd45cd643e0..03587f3730984a 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 6d06996ce47f7d..a849e4a2c0a088 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 57a28de55eb7ee..42a237b2cd6c9d 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 d9d79779ad2fec..9f999ae8e3e12b 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 db3d9f0133644d..d072e1d65b238a 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 316770e9d55b57..1636e64c7b67de 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 df1513458beb00..a002ff8835811f 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 b487cee536c8f6..fc940c06d46326 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 d882c21b5db191..55f5de99542236 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 f097e5617009c0..3951cedbfa05f5 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 0f6d7e5e515340..de80d48282ea74 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 ca31cd5d56ee85..188432dfc27ef7 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 89c40b34113fbf..00b694d6e0b603 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 c236a4c0fcadbb..6e3b7a25ecc7b6 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 7e65d6d5a4de15..561af217af7970 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 752dec06bbff27..7514bf6b300ff7 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 09bf829d2674d6..99021342ec3256 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 34e7b97709939a..65f62cff26f141 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 96631d8337a8e9..66a742726d6e6e 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 d57293abbd645f..1694310a7a6ba5 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 6986de3303d53a..d48648c55916a5 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 5610012a28e98d..538cea76c519ca 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 77032ee9491695..8e257281094756 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 8079b5b2c6ec59..f6d95defa195b6 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 205e365d507b05..b3ca1a6f962c6c 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 d3befd0d2d9ed1..b80b201431c00a 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 fbf819e063569f..47c21f7f9318bd 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 e0782e7dfb1b5e..bb8fdc1016e2b0 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 701c81cf6a2b67..40dfae8a193206 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 ce01f04c778950..4f143993f8f1b4 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 c253a44cc1beb4..86eb0dd42165a2 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 1984422276ca38..ab7b935759679e 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 12c582ffb3d9f4..930d70faa8ba76 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 5010a929da84fc..e513e315473c17 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 3b7831c0b6745c..952246d3fd5d57 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 06778e175ec613..9d6d6c0bc874f7 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 fb357a17604092..a91e94f200703f 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 0eadb9bb00c2c7..f33bfe16f17e58 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 d3b5cbd3a79bf6..01b5f23410c841 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 ed92d5b6f11387..007c9b306d2335 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 17b633a7827bc3..d789e500c23740 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 81d7b37e35deca..ed2d548b82775a 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 42716d310fffe2..1285b818d78eab 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 f4ce511215d714..0b27f0c87588c7 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 f82d438132cf45..64e05e50b87f33 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 da46bc122f8a60..a31f985cbb0173 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 47cd40e9851f43..4603b97959bcc4 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 b7b0084298a973..e0e47132f825db 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 a808f0f575c807..48a487781b331c 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 71ddbc3b6fb57f..fdfce1ec1974da 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 659f9e8814fcdd..ef5cf30459b238 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 a75d405c9d3aa5..67e98fa7048094 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 63aa1233c36ed2..0d4d89fdaa6b4c 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 9d717d12124080..0f24f0a25f64ba 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 3237b967d3f57d..f330d0fc89507f 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 b805d3e0b9c7a7..1189bd1c4eccd6 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 7193ab58b5a388..2db5e9ac4c9902 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 85fc4b88cd78a0..404a546410e4ee 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 04353e2b03bc93..dfaf41dc2857c2 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 3503bc99cc66cb..db69e1d6cb8024 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 d4730fe49fde0d..6ab148768aa69a 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 d980f32bf397ef..ad60828bad900e 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 8322c4e41475a1..6efbb186f43afe 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 12ad705fa5ce3c..67c759df3864de 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 62b6da8163f16c..de011660ca28e3 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 ed0a887a53fcaa..7ebf27d40ca56b 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 0b3e6d55ccde28..1b0df12713541b 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 7dea1ef9788a6f..e4fe6cb452d6ae 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 37d6b504923a06..18002a8d70f4f1 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 6627dfd69e303a..4d7ffc19764cf5 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 891598d8ac7e59..7b242889d37156 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 308338b2206615..5803279820fe7a 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 14a003ef00bc4b..097d238dfbb696 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 5bed74f3c0669d..77626f51824a54 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 744c733b430e8b..794d9a06ee894c 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 3ccedef7fc04c9..d7e362cc9c8fc1 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 d3ab18d4fd9a00..3202d0e7322a62 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 50545c11f90ec1..b1e6782069debd 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 1ae117441b7b26..fd95b97160fe5e 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 c0ea7354b34017..46b47dc97c65bd 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 d0756d68f20e00..82c0940f490fd9 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 4cceb7ada02ced..6bb9d9c00292a4 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 12a2cdebe83e6b..7b79280f36b39a 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 c180003d8e0857..2a35bc946f491a 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 70c70f61be7997..6dae6ac233b805 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 777c2ca74ad8a6..290d553a4ed677 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 3425b4b6b91856..361315fab8b914 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 1204bb2d5add6e..42ee10952e06dd 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 5f105be69a02b4..c2832bc068534f 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 ea20842b98bf49..b1d4075b591793 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 d6f5bf5f65381f..15a48cf94e9a78 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 89033086136ffc..2d04ff96116c69 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 e9a219d901b26b..eaca41db1bf906 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 2e5c2d3495ed14..dd54acbf83cd73 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 0aac7062146d25..9d6c90d094619a 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 da4ffd2a6b00c7..4ee0bab60e35f2 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 da8f18efbef2f5..4c1418eb26609a 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 523a0dd446432f..1890d51e76698d 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 d6b05857e1529f..6387cd8840d6a9 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 9a90c456643357..f41716d3d3bfa6 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 01abcda32e0264..a2b74d8a37ed1d 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 dc3a871edf3ff2..377846a016aeb7 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 d0bb14284c1a37..0b4dd02d920c71 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 79ea48dde8ef7e..5b163b9d888583 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 2f18381073a0fa..607acdade87487 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 c18a841b9c168d..f6c42194401f7c 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 57c07bff721d3f..bfe59cc7cd7d4f 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 0730be75b89497..7b6911f8e0f47f 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 44cd1838af7fc9..d4035f6ff4939f 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 195281df7cf291..2d0c1bcb8806f0 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 d602381bbced1a..699c9dcde2cd2a 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 ed3f3dc9fbc439..2a7b3f2b39a5e6 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 f4091f8a092d64..bc134fa630d5e6 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 065c17843cee5a..7bdff4158bb44e 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 92928ca3e60f2f..e0a3ddd8088153 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 ebb2c23220d8ec..e4fa9787eb5f36 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 97f2f00839146d..39dcde33df80b5 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 19598ebb112cca..435ac6546b192e 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 0a81d7fdbc32be..dde586b3aa99b7 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 3fa3344aeb0e1d..df79ff7a444fd4 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 c4f61985a2098a..e89c1859a015f9 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 e5b8262ffd7d8a..ec1bce43457739 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 ca1b26b62bc648..182cd0d1309767 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 f5e102a5a60ba4..0228b3ef041a9d 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 0e2586d276cb74..5b03ebbe39f97a 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 dbe69e4f2a3b0f..2e1c1ba8de1b5d 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 771c54f0a8cfd4..09c1f631fcc592 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 cdeafba6a559b3..668f3fab93a04d 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 40afa94a21d3e9..36bbedc9e8b4de 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 0a4b3a62061ce4..e3a7ea81b04534 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 17ee3a4914976a..3518ac9cdb0685 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 51bca33942ca0f..9a8ab1538550ba 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 b9ff1af38cb6b6..629bf74c7cd4b7 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 8a716f9553ce87..3f7d638e2fa54c 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 00ebf0b7e37ec9..aa35368b5b84bb 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 a477fce4362f9b..3392af7cb64af6 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 2a0c1d234e76e3..1c1aff1b2fc352 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 e31a29b34032d4..4a3ddd46220c9a 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 0d33ec61c8ed64..9b5fa8aa2c44db 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 f870d3df63a58c..3a51adb82fa9e4 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 22fd0ea262f39e..52e8654d252711 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 8b8a4cc71929d6..1cd5dbb4c17f89 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 e5d4796de5fa3e..9081b784b9124e 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 80fe431c56f358..593c8eb80695fd 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 d31ca8a906beb2..ebb6ee28a705d4 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 530a41bdc326ec..481761278729f0 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 49edf9ae212eb0..f21b6e8f961d89 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 46742f93ba6711..d8744fefb2c54e 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 55a9ec018b0016..73f8bb67a65db1 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 69d045c6f1bc6c..d485577da5dafc 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 e90b87f70cc25e..9e4a3793b4b21e 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 c8e710902bec7d..939938e3f61a43 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 b9fd43a101e2ea..7090c4d3e537fe 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 7edef4f2406f5c..55a2b021c56800 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 b58fbf2f53a8cc..9f65a585e8f957 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 4d01453e4ce707..eb1cbb931f6a08 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 1137f01da1093d..45bf75955579b3 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 1a9557a1c1017a..8a4ba14b3a8f40 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 c9e1081c99e0dc..6bae46540dc790 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 df8b5c26268422..60f7201b10c5ca 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 2408331a508f78..47865d1c021f80 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 be07c74cb89b34..5725bfde360be7 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 62230e9a0d2542..6c111d5a1ba177 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 ec7ff2aebafac3..c9ba7cb52cd6e6 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 6813c9a7939102..d29b0deba0208a 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 8a901173459201..3f63e87856c5b1 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 397e404a126fdb..7c784addaec07b 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 e4ef00ecba59c9..0ac5111201035d 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 0ce03a3a4dc496..fce332458dbb08 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 62cabd43957838..876d6f891e7f46 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 ac1d4ecc647b7e..25017057f15a31 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 abdd059b36830e..e7f9156f0e7ba4 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 9fabe06d3f4506..ddaa6ef13e6e95 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 d6eb9caab74f75..b388adc0885e77 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 ec28d20b49df4e..3b754647da4f4f 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 3762762ad52842..8640c96d2de7f4 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 8bbd515f46832f..f95e59e51c4ea6 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 69894f8a823431..88c024daf7e64e 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 a079ddb7b185ee..41ff5ecfa3b20d 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 705e20fa65524d..3e6ce8bfbd8cf3 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 f0c8eb8a318c77..c4b17dfe6e22f7 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 7935fa4b568a60..f4c0c2b95610b4 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 14ed52e5f274d7..c574ed86132b31 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 93eb95d8cad076..505b61fccd6b9b 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 5b10ac40df74d4..93011f40458587 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 a468ca59b46107..875c1eec412164 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 f65bed1548729f..859fa8ff608130 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 e24c33cb1a802d..1131cff7b17f55 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 d3b5cbd3a79bf6..01b5f23410c841 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 206f001b8387a7..c86f4fc56b71ec 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 5fbd2b44b2fa2a..8c60575e7d7073 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 cf41f2e72d2c15..475683cc7a6f5c 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 79c2ab096bbb02..e3d1c9d73b182d 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 880f05576e1ba5..da421050521923 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 93d067461d742e..4b2c34375f5ed4 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 6467e951e0c70d..40dc1d3673cb72 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 baef8f899cfc06..24c1514389112d 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 b563891672be38..7d2ec477a4f315 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 825e38e6c6e3a8..fd71da5aec411d 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 b14daccff2572e..d6bef1032c5a89 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 356e93c910a4e6..cc5290b8aaf5e2 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 f839079be4e8d9..46500e5d2a3cd5 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 c5c6470416db50..2c0312e7679e65 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 f5f7795f284b96..70f59d7a5d340f 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 cf52a8632292b9..376e05f5c0f3ed 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 35444d5d5e68ee..f6506c176c9c68 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 d6e2b3c3a94a84..c8eb9f45f3b585 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 0935595fd2c96d..e4300016aa1eee 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 3e9d0ede672153..518cd7f8e4ef82 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 a1edd8ac5e51ef..bbadb6c50bbe85 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 81777bf73885f0..e9dd84fedd07d7 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 2e794e13968fd5..dd655f6b953d1d 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 0e6da28020559e..710890c5031317 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 f2b6bd9ab37421..df1fcbeaf128b0 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 77cd0b87a21c81..ba0b6223576bb1 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 61171ef385d7c6..b2951dabf935d2 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 3e3218032d0774..a39bf21c7863aa 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 9365aff8923012..9d6ecde2b17995 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 f3d7cc2af36bf6..daaae25815aaee 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 f2cd4e4841e98f..2b6891027b2295 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 4b7570868ccb1e..eb205604cde0ff 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 779fec1860ded4..b906d5a9dbdab5 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 d3b5cbd3a79bf6..01b5f23410c841 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 79dfedbcb83a50..0fe8f02bc70e47 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 fd3e09aed91948..7d5ca0fe81e940 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 ade8308db41844..1d5db922283eaf 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 831285df8fac8a..e4aa62fb680f5e 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 14e522adb1a055..ebdf1e17d3403f 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 0ec14daeb7732e..20f71aab44c9b8 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 99e7d4e2c51ff9..9f40e86ed8bf17 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 dc7ad7096448a3..b6568ccb976b50 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 ae87135af91930..e2201c2fcb7302 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 d01845caf2ff60..6971eda404cd5c 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 b8da866b212ee5..ada82bf1cebc5f 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 dead7a46e2029f..85bc18fde4d065 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 9621363296b57b..e30463ddf50bae 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 033ebb157f61f2..03cdf56162aa0f 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 f5a4cbd4810abb..7caa880598b715 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 ceaf3870d9bd2d..d79234b3f2c92c 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 1dc11073a2f362..9420227ff26fd0 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 a74af47c3f486c..98cb23392cc3a0 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 37bff6c42314a0..1302fd7486959a 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 faf6908e9204ad..6a312fb977f556 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 c62efc8dabb042..a5a080f605384f 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 fa9640267d3d64..7ea659db5e1c5f 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 599fc41785e065..3298a6a2121775 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 6fc277d39e63ad..ba38dc1162d91f 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 a4fbcb36865042..4403e796f89dae 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 60234c8255d984..babe7b9459c03f 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 66f52faebaa92c..6a64557cafa830 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 89445c600a8a5a..2f32dc9454010f 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 ffe5704859eb35..ee9665356c793c 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 982fa42e1564b3..737cd018739977 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 d1957485830deb..0b79de96238297 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 18eee07016069d..dccc73251d42c0 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 7b392e0209390e..fc9b0b4215fca0 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 b595837075ee13..929012823cac69 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 a36ad649501d44..84b07538e0df03 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 20800c3bb080c1..d72fbaacf6312e 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 600b71237426ee..91f4c180f258e2 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 1d3a10a60ae33a..a5d901a2d16083 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 05971920182c97..c100352d8af7fc 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 ee7dbae5aef705..2a311e5201db90 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 53d6a5bd9869d1..d551cce69094aa 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 6b005afac0a612..5b3bfab3e93cd4 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 b3d7cbab9c56b2..3cca478a0e9bca 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 59562bdc6f135b..3edd8023c89afe 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 ccc7fb503ee008..ca9dd2531fb2ea 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 c4f4f5e0e56a0b..199f03ed16a041 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 d8fe64de2c8488..2e29a03862048e 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 84f965b728b84e..2c3b14874e7d2a 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 1fac5ce7347144..49682eb8870023 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 a4883638904973..cc2243d46ec078 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 eb40bfa7a4d23d..96a3b3c87232e8 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 2a34ba9d638269..64a2fba46dcc84 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 2da9169090fd87..0de1fb10dccd5f 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 237be9d6e1b6bc..c1b395c81e4ea2 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 c0f4469d29f10d..75733714fcc2bd 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 98cc89031c6473..39844827f99922 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 8d558a7b67952a..25b4b629f87bb4 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 e550b78644d895..286d72045282f7 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 6010a24ad082f8..bbc685e218448f 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 9dd7e2193db3c8..2edda1b9bc05b4 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 0dab386e08733f..7789a28e99ad51 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 b6896b270b8967..778ebad657e8e2 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 d18ed4ac77a525..e9832876da36cb 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 1ba3430551dd9a..8bd1b0f34d99c1 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 980842b93b194e..e63b03bbfe4579 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 030fefbaa31300..2a7aa0484542c7 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 08a0bc1024e352..ca93525cfd0394 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 6d7e79338f6ae0..1d1e904b827349 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 9efd1e8d716f71..6d503c173fa13b 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 b2e945b6215a3d..0afbe3b814a738 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 e0451c228f5a20..8ef3af253a50bd 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 3adc1eec5d422f..6c282f8f58b9bb 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 5703601b9ac349..c511e118b02650 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 424d35872dad20..d7ca8c380c487c 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 c55425965630de..636adaf783ec65 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 f4c1146e2084a3..3f21cf287a8e34 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 be27b4d044c18f..bf94096c66072d 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 45610b0b2965c2..dd04c084e1a8ea 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 2a5e2e2d92a454..d884df11e1fcab 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 79fa75d34a7303..7e3e40babdab75 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 105801a7b9ac90..85bea62cef495c 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 243f00c5b9949c..81c603407c8c4a 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 a4174bb9939319..5801d91aac46d1 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 e87f4f734343b3..2da65eccc1f043 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 304d212b116bc9..6186e15eaba716 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 6c78893bfb5853..dbaaff0da9c944 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 633c90fdc3e121..a49f9d3388a462 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 aa3f25a5a268f0..5bd25363ea0e67 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 d6c026341e09f6..6f34ea8c384e43 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 1c1ede47ac04a9..2ebf72fe2f0031 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 c0f57e97a16486..19c2d775bc4440 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 f9234eae6b0065..2fe143281d398e 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 e36b2f51e49746..06b7edb875e745 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 97ae9fc4635b1a..720478c36b55f9 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 f79e2c7618405d..9b96f07317755f 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 a667e218a2119a..7f147c6f2faa00 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 bb7f6aeaed5eba..33d3598f985fb4 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 439a4decc6786a..8e53ced468bb63 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 d666b460fdce7f..a239476a50b98b 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 5b994c4fee52d0..5fa672782165ac 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 821e4e5d5cc39c..a736681d2bef85 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 a29a0c97b9dcce..628ef77d6e47dd 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 66ae05294526a5..7d27790ed13247 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 cd867da9d0fa29..0565d3af9044e7 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 f991bbd6ae1eab..c71dad51baf515 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 6678f16a49d4b8..b93d2515ccb4f5 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 dcd34a07dee990..4eb9943df8d289 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 fa3291d097ff8a..d1b000df01e41e 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 8de5d5d81c03fe..a158426c68b258 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 f70aa23a1445dd..4c6b39d9062db8 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 4d21c098dd103e..d194a988acf04b 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 3e0e047382cacf..27d607380006f2 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 af3fab50b95a79..ca0efde8d61ab5 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 dcce66b0b6ac28..831d37e3483f0b 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 55af5d58816ee3..054ea0808b3996 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 c7f74773f9e174..032f3c9212ab29 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 3a8579835499ba..4abc092302a47d 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 323a85e821ad70..8a700b014e475d 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 d729d8adc74821..59a835b3ebb3ff 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 2c0204c26630d0..d04e7f022f5653 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 ef2682a8729f53..6d02f88a419058 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 89cd1e462be8c5..3b0cd7bd6c4f24 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 20eabbb7dbc43f..1b16f049bae623 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 62d07c92a3c362..9a19914c130135 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 a1e0167e04d7e6..cd93a227fa6f5a 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 4704adbf995f1a..910a563d680d3b 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 e9a4aa09d91146..708d32d231e33d 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 044b1b1b72f1f2..17ec1dbfbb4a62 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 b18c3712644805..ed8360ae938ec2 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 41464cbf071b20..9e4ef6e5953c55 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 93974cd116135f..3cca574798196f 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 feb2a13410e23a..be1b323b04ae5a 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 7f954ca55674a6..e12637e1e1e4a4 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 6bd58fae3afd03..2279aafd98f9e8 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 03e54ad34e809e..059d329f5f0955 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 161eebe9dc7898..044ad3602a2acb 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 2dbde13463ca29..ac3d25dc66ccae 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 fb73d2edf7a0b5..52de80f0c787e8 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 a8cd0b47872949..d9143020bc0ca5 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 4b539f66fa8143..b3f6b762d8eb91 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 1c35f377002b9d..78ee19fc7a6d03 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 a761275b63778b..2e0decd7a7637d 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 f5647c99748065..f37d0433abc2e3 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 c9c72a9b4e0ceb..e970bd10c54475 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 3196179da14fbe..65dbd3b390dc43 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 2b7aa79154d039..84bd7f996bb3c9 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 c049ae25368f56..b10191a2e46670 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 b062d417a0426d..178b35bf7852ba 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 95244ab69685a6..66bf0deb760bbc 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 8d8e0f1c062670..c1c7ca0bfcff81 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 4e8e08eabd1557..cb408ed82af4ed 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 45d4667e6a9428..c69d133d6a8a77 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 fc2d9fc9917fad..7115a9ba7104ce 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 4f134b8e23cb32..d18c606bd10175 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 17d651ce80eb58..73f5af6fc3cc4d 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 1a67586a360c96..137c626ebcad38 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 4342c9658f9b7b..7a7d82fc27bb1e 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 492b5529fc89be..bc4a3436719550 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 831ce5d135bde3..0f2f98e8b0e8c7 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 93fc23169ea001..c07f7f8b6b0e05 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 e12bde64c49378..f57350cb762d50 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 dd899258ebae50..69b7bb109c14e8 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 c5de27435b82fb..abbdc366c6a0f2 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 ff0106d2933681..bfbe750c25be97 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 b8996030aafc86..29b1b564becac3 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 45a80174f5abca..62d82a47d953ae 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 cb609121be7bba..1263c0c6819e23 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 2522fb06c22abb..f20834baf25d83 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 a3895d2019c434..11194b081eca08 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 8c6314fe0f3e87..b389af5cac4361 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 959e4d4c1aa2af..b223a03c4b1b3d 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 9d731bbf09dc08..a899b257be4ff6 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 a4fbd0b4a67bd8..6f0c9cc155f6e0 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 8e4e8818522b35..a28e388e47c0b7 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 91ae1090415ad0..3f94473ed1f021 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 c8d8397225b038..319fc14ca9e853 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 ad5f7eb21f09c3..ff09f12caa2ef1 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 28b451aa5061f1..b43d381fa230e3 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 b7b811238b9c45..e7c8ea914d6995 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 fd57c087c99890..617da33d5c9a88 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 98ba06acb92e0d..5b2812e87f6445 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 5ecc5fac7ca862..c9f1288c76dbcc 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 47a8e01362febb..9fe0a6ce8ea624 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 575b2aa5e39bea..94c19c8bf730e0 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 17ffd4859bf6cf..a58f407fa877a9 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 5da46d9880f479..f96467ca259ae4 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 9bf1f68571280e..33ce10b375936d 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 1ba414f79846f2..66a377bc351fd3 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 fe694847cf72a6..43fdfe5652267e 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 426c6aabab2037..9869d6edffe1ed 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 7208a4b4fabf90..d4b5ea25cbb95e 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 ce4f1ec38b4bd7..7aa0ae90333329 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 04176419084fe0..1f89fb72e18b76 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 4c66c2078f4be2..7d63c39a7cdf59 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 be5896e74d6d5a..7d7207197ce651 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 eeb71a31ec9d7c..21eec1a7884b1e 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 4ed75bd2251198..465956c2958f50 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 d82d18ac025e0a..e31dcea8dc7ee4 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 a556510b8b403a..090509f2673b74 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 27e041ebce5d5d..cf25eea650155c 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 aa8879d777f99e..215602e5812e2e 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 9dfdd6d7ab6526..c849d5e08a6bfc 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 18869d5c334577..ba7eb1f8626715 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 38f645516433f8..d945f278426d6c 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 6b18107c2f7556..356411af704085 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 fdfe6870583a74..73875386c79a33 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 9c86470f785e8e..69915ec4916cdd 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 85191008a0b338..4d1a2dd9dc34f7 100644 --- a/usr.sbin/zzz/Makefile +++ b/usr.sbin/zzz/Makefile @@ -1,4 +1,3 @@ - SCRIPTS=zzz.sh MAN= zzz.8