diff options
| author | christos <christos@NetBSD.org> | 2014-01-16 01:15:32 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2014-01-16 01:15:32 +0000 |
| commit | c41051819d6c66860cbf13a51d54cd914cf392f1 (patch) | |
| tree | db401d1f43a35aab22fe9a27e2806112a9cab5fe | |
| parent | 3eedeb8dd4e4d6ec7df42cad1047454c21afffea (diff) | |
eliminate use of bsd.sys.mk from Makefiles
35 files changed, 58 insertions, 71 deletions
@@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.303 2013/07/16 09:52:21 joerg Exp $ +# $NetBSD: Makefile,v 1.304 2014/01/16 01:15:32 christos Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -524,7 +524,6 @@ install-${dir}: .PHONY dependall-distrib depend-distrib all-distrib: .PHONY @true -.include <bsd.sys.mk> .include <bsd.obj.mk> .include <bsd.kernobj.mk> .include <bsd.subdir.mk> diff --git a/crypto/external/bsd/openssl/lib/libcrypto/Makefile b/crypto/external/bsd/openssl/lib/libcrypto/Makefile index 2d460191582..89459b6434b 100644 --- a/crypto/external/bsd/openssl/lib/libcrypto/Makefile +++ b/crypto/external/bsd/openssl/lib/libcrypto/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/01/18 18:09:56 christos Exp $ +# $NetBSD: Makefile,v 1.8 2014/01/16 01:15:32 christos Exp $ # RCSid: # Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp @@ -23,7 +23,6 @@ USE_FIPS= no .include <bsd.own.mk> .include <bsd.shlib.mk> -.include <bsd.sys.mk> # for HOST_SH # XXX There's a bit of work to do before we can enable warnings. WARNS=0 diff --git a/distrib/common/Makefile.bootcd b/distrib/common/Makefile.bootcd index 0187d680925..2e21cea9b3d 100644 --- a/distrib/common/Makefile.bootcd +++ b/distrib/common/Makefile.bootcd @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootcd,v 1.22 2013/01/29 19:48:41 christos Exp $ +# $NetBSD: Makefile.bootcd,v 1.23 2014/01/16 01:15:32 christos Exp $ # # Makefile snipped to create a CD/DVD ISO # @@ -55,7 +55,6 @@ CDRELEASE_EXCLUDE+= -s ',./installation/liveimage.*,,gp' CDRELEASE_EXCLUDE+= -s ',./installation/installimage.*,,gp' .endif -.include <bsd.sys.mk> # for HOST_SH .include <bsd.own.mk> # For PRINTOBJDIR .include <bsd.kernobj.mk> # For KERNSRCDIR diff --git a/distrib/common/Makefile.distrib b/distrib/common/Makefile.distrib index ca2adb00ecc..366bd022edd 100644 --- a/distrib/common/Makefile.distrib +++ b/distrib/common/Makefile.distrib @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.distrib,v 1.9 2012/02/17 00:33:25 riz Exp $ +# $NetBSD: Makefile.distrib,v 1.10 2014/01/16 01:15:32 christos Exp $ # # Makefile snippet to setup various make variables variables used in distrib/: # @@ -17,7 +17,7 @@ .if !defined(_MAKEFILE_DISTRIB_) _MAKEFILE_DISTRIB_=1 -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> DISTRIBDIR= ${NETBSDSRCDIR}/distrib DISTRIBREV!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -s @@ -29,5 +29,7 @@ DISTRIBVERDEP= ${NETBSDSRCDIR}/sys/sys/param.h \ MAKESUMS= MAKE=${MAKE:Q} CKSUM=${TOOL_CKSUM:Q} ${HOST_SH} ${DISTRIBDIR}/sets/makesums RELEASE_INSTALL=${INSTALL} ${RENAME} ${PRESERVE} ${COPY} -m ${NONBINMODE} +.include <bsd.files.mk> + .endif # _MAKEFILE_DISTRIB_ diff --git a/distrib/common/bootimage/Makefile.bootimage b/distrib/common/bootimage/Makefile.bootimage index 965c3db79b7..3fd83a2142d 100644 --- a/distrib/common/bootimage/Makefile.bootimage +++ b/distrib/common/bootimage/Makefile.bootimage @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.bootimage,v 1.6 2012/04/22 07:23:42 tsutsui Exp $ +# $NetBSD: Makefile.bootimage,v 1.7 2014/01/16 01:15:32 christos Exp $ # # Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved. # @@ -122,7 +122,6 @@ # (default: no) # -.include <bsd.sys.mk> # for HOST_SH .include <bsd.own.mk> # .include <bsd.endian.mk> # for TARGET_ENDIANNESS diff --git a/distrib/evbsh3/rom/ramdiskeb/Makefile b/distrib/evbsh3/rom/ramdiskeb/Makefile index 0884b7d203c..4101a3da8e8 100644 --- a/distrib/evbsh3/rom/ramdiskeb/Makefile +++ b/distrib/evbsh3/rom/ramdiskeb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/09/18 09:24:59 abs Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/16 01:15:32 christos Exp $ TOP= ${.CURDIR}/.. WARNS=1 @@ -84,4 +84,4 @@ clean cleandir distclean: .include <bsd.own.mk> .include <bsd.obj.mk> .include <bsd.subdir.mk> -.include <bsd.sys.mk> +.include <bsd.files.mk> diff --git a/distrib/evbsh3/rom/ramdiskel/Makefile b/distrib/evbsh3/rom/ramdiskel/Makefile index f02652f8b68..079028c17b3 100644 --- a/distrib/evbsh3/rom/ramdiskel/Makefile +++ b/distrib/evbsh3/rom/ramdiskel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2009/09/18 09:24:59 abs Exp $ +# $NetBSD: Makefile,v 1.10 2014/01/16 01:15:32 christos Exp $ TOP= ${.CURDIR}/.. WARNS=1 @@ -84,4 +84,4 @@ clean cleandir distclean: .include <bsd.own.mk> .include <bsd.obj.mk> .include <bsd.subdir.mk> -.include <bsd.sys.mk> +.include <bsd.files.mk> diff --git a/distrib/sets/Makefile b/distrib/sets/Makefile index 6472df9dd2b..b4939fed94e 100644 --- a/distrib/sets/Makefile +++ b/distrib/sets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.90 2013/10/30 15:17:01 apb Exp $ +# $NetBSD: Makefile,v 1.91 2014/01/16 01:15:33 christos Exp $ # Experimental RCS METALOG versioning # (Needs host's rcs(1) commands) @@ -336,4 +336,4 @@ sets: .PHONY maketars .WAIT makesums sourcesets: .PHONY makesrctars @true -.include <bsd.sys.mk> +.include <bsd.files.mk> diff --git a/distrib/sets/mkvars.mk b/distrib/sets/mkvars.mk index c6d9407991c..83539cbcf25 100644 --- a/distrib/sets/mkvars.mk +++ b/distrib/sets/mkvars.mk @@ -1,4 +1,4 @@ -# $NetBSD: mkvars.mk,v 1.13 2013/10/14 16:00:16 joerg Exp $ +# $NetBSD: mkvars.mk,v 1.14 2014/01/16 01:15:33 christos Exp $ MKEXTRAVARS= \ MACHINE \ @@ -35,7 +35,6 @@ MKEXTRAVARS= \ ##### .include <bsd.own.mk> -.include <bsd.sys.mk> .include <bsd.endian.mk> .if (${MKMAN} == "no" || empty(MANINSTALL:Mmaninstall)) @@ -88,3 +87,5 @@ mksolaris: .PHONY .else @echo MKSOLARIS="no" .endif + +.include <bsd.files.mk> diff --git a/distrib/utils/sysinst/Makefile.inc b/distrib/utils/sysinst/Makefile.inc index 434d92405bf..72ead95161b 100644 --- a/distrib/utils/sysinst/Makefile.inc +++ b/distrib/utils/sysinst/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.59 2012/04/06 23:48:53 riz Exp $ +# $NetBSD: Makefile.inc,v 1.60 2014/01/16 01:15:33 christos Exp $ # # Makefile for sysinst @@ -29,7 +29,6 @@ MSG_MD?= msg.md.${SYSINSTLANG} MENUS_MD?= menus.md.${SYSINSTLANG} .include <bsd.own.mk> # for mk.conf -.include <bsd.sys.mk> # for HOST_SH, TOOL_* .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib" _MKSHTARGET_CREATE?= ${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET} diff --git a/etc/Makefile b/etc/Makefile index 45867bdfa5a..21a35cfc2b2 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.410 2013/08/19 16:34:29 matt Exp $ +# $NetBSD: Makefile,v 1.411 2014/01/16 01:15:33 christos Exp $ # from: @(#)Makefile 8.7 (Berkeley) 5/25/95 # Environment variables without default values: @@ -36,7 +36,6 @@ # For MK* vars .include <bsd.own.mk> -.include <bsd.sys.mk> # for HOST_SH, TOOL_AWK, ... .include <bsd.kernobj.mk> # For KERNSRCDIR, KERNOBJDIR, ... .include <bsd.endian.mk> # For TARGET_ENDIANNESS diff --git a/etc/Makefile.params b/etc/Makefile.params index 5a0c2a34df8..64135e53c7a 100644 --- a/etc/Makefile.params +++ b/etc/Makefile.params @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.params,v 1.7 2013/11/01 11:09:05 apb Exp $ +# $NetBSD: Makefile.params,v 1.8 2014/01/16 01:15:33 christos Exp $ # # Makefile fragment for printing build parameters. # @@ -36,7 +36,6 @@ # .include <bsd.own.mk> # for some variables -.include <bsd.sys.mk> # for more variables RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \ DESTDIR DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \ diff --git a/external/bsd/dhcp/Makefile.inc b/external/bsd/dhcp/Makefile.inc index ced75c8fa1c..ddf7d1f4ee2 100644 --- a/external/bsd/dhcp/Makefile.inc +++ b/external/bsd/dhcp/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.8 2013/09/21 22:28:12 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.9 2014/01/16 01:15:33 christos Exp $ WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare @@ -20,7 +20,7 @@ DSTOBJDIR!=cd ${.PARSEDIR}/lib/dst && ${PRINTOBJDIR} .if (${USE_INET6} != "no") CPPFLAGS+= -DDHCPv6 .endif -CPPFLAGS+= -DISC_PLATFORM_USETHREADS -DHAVE_CONFIG_H +CPPFLAGS+= -DISC_PLATFORM_USETHREADS -DHAVE_CONFIG_H -DDEBUG CPPFLAGS+= -I${DIST} -I${DIST}/includes -I${DIST}/../include CPPFLAGS+= -I${BIND} -I${BIND}/includes -I${BIND}/../include .for dir in isc dns diff --git a/external/bsd/file/bin/Makefile b/external/bsd/file/bin/Makefile index 98c082d0831..b2a842332bf 100644 --- a/external/bsd/file/bin/Makefile +++ b/external/bsd/file/bin/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2013/03/23 16:15:57 christos Exp $ +# $NetBSD: Makefile,v 1.3 2014/01/16 01:15:33 christos Exp $ .include <bsd.own.mk> -.include <bsd.sys.mk> .include "../Makefile.inc" diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile index 06416959caa..87de648ffc9 100644 --- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2014/01/10 15:50:34 christos Exp $ +# $NetBSD: Makefile,v 1.21 2014/01/16 01:15:33 christos Exp $ -.include <bsd.own.mk> # prerequisite for bsd.sys.mk +.include <bsd.own.mk> .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile index cf2689bece2..717e6cd8e4e 100644 --- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile +++ b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2011/02/21 04:42:17 mrg Exp $ +# $NetBSD: Makefile,v 1.9 2014/01/16 01:15:33 christos Exp $ -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> .include "../../../Makefile.serverlib" .include "../../../Makefile.servermod" diff --git a/regress/sys/fs/ffs/Makefile b/regress/sys/fs/ffs/Makefile index dff9b405d8c..7f2702ac59b 100644 --- a/regress/sys/fs/ffs/Makefile +++ b/regress/sys/fs/ffs/Makefile @@ -1,4 +1,4 @@ -## $NetBSD: Makefile,v 1.6 2004/06/30 03:26:27 jmc Exp $ +## $NetBSD: Makefile,v 1.7 2014/01/16 01:15:33 christos Exp $ ## Notes: ## This set of tests creates a dummy directory tree in /tmp and ## populates it with several files. The test requires around 1100 @@ -15,7 +15,7 @@ ## ## This is derived from work done by Brian Grayson, submitted in PR 6706. -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> TMPL=/tmp/ffstemplate TMPMP=/tmp/ffsregresstest_mount diff --git a/share/man/Makefile b/share/man/Makefile index 7206928b11a..4431cb6ebd4 100644 --- a/share/man/Makefile +++ b/share/man/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2013/10/26 08:23:38 mbalmer Exp $ +# $NetBSD: Makefile,v 1.32 2014/01/16 01:15:33 christos Exp $ # from: @(#)Makefile 8.2 (Berkeley) 4/16/94 .include <bsd.own.mk> @@ -24,4 +24,3 @@ makedb: .endif .include <bsd.subdir.mk> -.include <bsd.sys.mk> diff --git a/share/mk/Makefile b/share/mk/Makefile index 169a0554e30..68a2cb3b5a9 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2014/01/14 18:51:45 christos Exp $ +# $NetBSD: Makefile,v 1.49 2014/01/16 01:15:33 christos Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 NOOBJ= # defined @@ -7,8 +7,8 @@ NOOBJ= # defined .if ${MKSHARE} != "no" FILES= bsd.README bsd.buildinstall.mk bsd.clang-analyze.mk bsd.clean.mk \ - bsd.dep.mk bsd.doc.mk bsd.endian.mk bsd.files.mk \ - bsd.gcc.mk bsd.hostlib.mk bsd.hostprog.mk bsd.inc.mk bsd.info.mk \ + bsd.dep.mk bsd.doc.mk bsd.endian.mk bsd.files.mk bsd.gcc.mk \ + bsd.host.mk bsd.hostlib.mk bsd.hostprog.mk bsd.inc.mk bsd.info.mk \ bsd.init.mk bsd.ioconf.mk bsd.kernobj.mk bsd.kinc.mk bsd.klinks.mk \ bsd.kmodule.mk bsd.lib.mk bsd.links.mk bsd.lua.mk \ bsd.man.mk bsd.nls.mk \ diff --git a/sys/arch/alpha/stand/Makefile.bootprogs b/sys/arch/alpha/stand/Makefile.bootprogs index 08ec5f6a1fa..6c1a0bfc10f 100644 --- a/sys/arch/alpha/stand/Makefile.bootprogs +++ b/sys/arch/alpha/stand/Makefile.bootprogs @@ -1,9 +1,8 @@ -# $NetBSD: Makefile.bootprogs,v 1.33 2014/01/12 15:26:28 tsutsui Exp $ +# $NetBSD: Makefile.bootprogs,v 1.34 2014/01/16 01:15:33 christos Exp $ NOMAN= # defined .include <bsd.own.mk> -.include <bsd.sys.mk> # for HOST_SH S= ${.CURDIR}/../../../.. diff --git a/sys/arch/arc/stand/boot/Makefile b/sys/arch/arc/stand/boot/Makefile index 1def98acfdf..284f55cb48e 100644 --- a/sys/arch/arc/stand/boot/Makefile +++ b/sys/arch/arc/stand/boot/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.14 2014/01/12 15:26:28 tsutsui Exp $ +# $NetBSD: Makefile,v 1.15 2014/01/16 01:15:33 christos Exp $ .include <bsd.own.mk> -.include <bsd.sys.mk> # for ${HOST_SH} S!= cd ${.CURDIR}/../../../..; pwd diff --git a/sys/arch/cobalt/stand/boot/Makefile b/sys/arch/cobalt/stand/boot/Makefile index dfbafc5ce78..64b171503ed 100644 --- a/sys/arch/cobalt/stand/boot/Makefile +++ b/sys/arch/cobalt/stand/boot/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.26 2014/01/12 15:26:28 tsutsui Exp $ +# $NetBSD: Makefile,v 1.27 2014/01/16 01:15:33 christos Exp $ NOMAN= # defined .include <bsd.own.mk> -.include <bsd.sys.mk> # for HOST_SH S= ${.CURDIR}/../../../.. MIPS= ${S}/arch/mips diff --git a/sys/arch/emips/stand/Makefile.booters b/sys/arch/emips/stand/Makefile.booters index 87e67daa578..26b1febaadd 100644 --- a/sys/arch/emips/stand/Makefile.booters +++ b/sys/arch/emips/stand/Makefile.booters @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.booters,v 1.4 2014/01/12 15:26:28 tsutsui Exp $ +# $NetBSD: Makefile.booters,v 1.5 2014/01/16 01:15:33 christos Exp $ -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> # $S must correspond to the top of the 'sys' tree S= ${.CURDIR}/../../../.. diff --git a/sys/arch/epoc32/stand/e32boot/exe/Makefile b/sys/arch/epoc32/stand/e32boot/exe/Makefile index 2843b712b40..692dcce4ae5 100644 --- a/sys/arch/epoc32/stand/e32boot/exe/Makefile +++ b/sys/arch/epoc32/stand/e32boot/exe/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2013/05/01 22:57:37 matt Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/16 01:15:33 christos Exp $ .include <bsd.own.mk> -.include <bsd.sys.mk> .include <bsd.obj.mk> .include <bsd.inc.mk> @@ -70,3 +69,4 @@ clean: rm -f $(PROG) $(OBJS) vers.c $(IN) $(MAP) rm -f $(PROG:.exe=.bas) $(PROG:.exe=.exp) +.include <bsd.files.mk> diff --git a/sys/arch/epoc32/stand/e32boot/ldd/Makefile b/sys/arch/epoc32/stand/e32boot/ldd/Makefile index 1631e4e2fec..203f7db68c4 100644 --- a/sys/arch/epoc32/stand/e32boot/ldd/Makefile +++ b/sys/arch/epoc32/stand/e32boot/ldd/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.3 2013/05/01 22:57:37 matt Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/16 01:15:33 christos Exp $ .include <bsd.own.mk> -.include <bsd.sys.mk> .include <bsd.obj.mk> .include <bsd.inc.mk> @@ -83,3 +82,5 @@ clean: rm -f $(PROG:.ldd=-s5.ldd) $(PROG:.ldd=-s5mx.ldd) rm -f $(PROG:.ldd=.bas) $(PROG:.ldd=.exp) rm -f arm + +.include <bsd.files.mk> diff --git a/sys/arch/hpc/stand/Makefile b/sys/arch/hpc/stand/Makefile index 38fdf61b06b..ebe53f7bede 100644 --- a/sys/arch/hpc/stand/Makefile +++ b/sys/arch/hpc/stand/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2008/10/19 22:05:21 apb Exp $ +# $NetBSD: Makefile,v 1.25 2014/01/16 01:15:34 christos Exp $ # -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> PROJECT_DIRS= hpcboot libz libsa diff --git a/sys/arch/luna68k/stand/boot/Makefile b/sys/arch/luna68k/stand/boot/Makefile index d478be1e23b..d2482561c13 100644 --- a/sys/arch/luna68k/stand/boot/Makefile +++ b/sys/arch/luna68k/stand/boot/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.10 2014/01/10 11:12:03 tsutsui Exp $ +# $NetBSD: Makefile,v 1.11 2014/01/16 01:15:34 christos Exp $ # @(#)Makefile 8.2 (Berkeley) 8/15/93 NOMAN= # defined .include <bsd.own.mk> -.include <bsd.sys.mk> S= ${.CURDIR}/../../../.. LIBSADIR= ${S}/lib/libsa diff --git a/sys/arch/mipsco/stand/Makefile.booters b/sys/arch/mipsco/stand/Makefile.booters index 3df1cf3adb5..05ba8bf2715 100644 --- a/sys/arch/mipsco/stand/Makefile.booters +++ b/sys/arch/mipsco/stand/Makefile.booters @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.booters,v 1.19 2014/01/12 15:26:30 tsutsui Exp $ +# $NetBSD: Makefile.booters,v 1.20 2014/01/16 01:15:34 christos Exp $ -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> S= ${.CURDIR}/../../../.. MIPS= ${S}/arch/mips diff --git a/sys/arch/mmeye/stand/boot/Makefile b/sys/arch/mmeye/stand/boot/Makefile index c62884ac83e..bb0cb32496f 100644 --- a/sys/arch/mmeye/stand/boot/Makefile +++ b/sys/arch/mmeye/stand/boot/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2014/01/12 15:26:30 tsutsui Exp $ +# $NetBSD: Makefile,v 1.4 2014/01/16 01:15:34 christos Exp $ NOMAN= # defined .include <bsd.own.mk> -.include <bsd.sys.mk> S= ${.CURDIR}/../../../.. diff --git a/sys/arch/pmax/stand/Makefile.booters b/sys/arch/pmax/stand/Makefile.booters index 181c5fd9eff..a8923b0eb9b 100644 --- a/sys/arch/pmax/stand/Makefile.booters +++ b/sys/arch/pmax/stand/Makefile.booters @@ -1,9 +1,8 @@ -# $NetBSD: Makefile.booters,v 1.59 2014/01/12 15:26:30 tsutsui Exp $ +# $NetBSD: Makefile.booters,v 1.60 2014/01/16 01:15:34 christos Exp $ NOMAN= # defined .include <bsd.own.mk> -.include <bsd.sys.mk> # for HOST_SH # $S must correspond to the top of the 'sys' tree S= ${.CURDIR}/../../../.. diff --git a/sys/arch/sbmips/stand/Makefile.bootprogs b/sys/arch/sbmips/stand/Makefile.bootprogs index 85b0944b787..9bdc65ff921 100644 --- a/sys/arch/sbmips/stand/Makefile.bootprogs +++ b/sys/arch/sbmips/stand/Makefile.bootprogs @@ -1,8 +1,7 @@ -# $NetBSD: Makefile.bootprogs,v 1.12 2014/01/12 15:26:30 tsutsui Exp $ +# $NetBSD: Makefile.bootprogs,v 1.13 2014/01/16 01:15:34 christos Exp $ .include <bsd.own.mk> .include <bsd.klinks.mk> -.include <bsd.sys.mk> # for HOST_SH S= ${.CURDIR}/../../../.. diff --git a/sys/arch/sgimips/stand/boot64/Makefile b/sys/arch/sgimips/stand/boot64/Makefile index f909cad1d85..1a19ada6e62 100644 --- a/sys/arch/sgimips/stand/boot64/Makefile +++ b/sys/arch/sgimips/stand/boot64/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2011/02/25 23:37:32 matt Exp $ +# $NetBSD: Makefile,v 1.12 2014/01/16 01:15:34 christos Exp $ PROG= ip30boot NOMAN= # defined @@ -10,7 +10,6 @@ SRCS= start.S boot.c bootinfo.c conf.c devopen.c putchar.c getchar.c \ CLEANFILES+= boot.map .include <bsd.own.mk> -.include <bsd.sys.mk> # for HOST_SH # $S must correspond to the top of the 'sys' tree S= ${.CURDIR}/../../../.. diff --git a/sys/kern/Makefile b/sys/kern/Makefile index 4e851692661..93efec61d80 100644 --- a/sys/kern/Makefile +++ b/sys/kern/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.16 2011/09/02 22:15:16 dyoung Exp $ +# $NetBSD: Makefile,v 1.17 2014/01/16 01:15:34 christos Exp $ # # from: @(#)Makefile 8.2 (Berkeley) 3/21/94 # Makefile for kernel tags files, init_sysent, etc. -.include <bsd.sys.mk> # for HOST_SH +.include <bsd.own.mk> # for HOST_SH all: @echo "make tags, links, init_sysent.c, or vnode_if.c only" @@ -59,3 +59,5 @@ links:: (cd ../$$i && { rm -f tags; ln -s ${SYSTAGS} tags; }); done -for i in ${ARCH}; do \ (cd ../arch/$$i && ${MAKE} ${MFLAGS} SYSTAGS=${SYSTAGS} links); done + +.include <bsd.files.mk> diff --git a/tools/mandoc/Makefile b/tools/mandoc/Makefile index 983c07fcd92..11c3f8cbd1c 100644 --- a/tools/mandoc/Makefile +++ b/tools/mandoc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2014/01/05 19:49:57 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2014/01/16 01:15:34 christos Exp $ HOSTPROGNAME= ${_TOOL_PREFIX}mandoc HOST_SRCDIR= external/bsd/mdocml/bin/mandoc @@ -6,7 +6,6 @@ HOST_SRCDIR= external/bsd/mdocml/bin/mandoc NOMAN= # defined .include <bsd.own.mk> -.include <bsd.sys.mk> NETBSD_MINOR!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh -n NETBSD_OSNAME= "NetBSD ${NETBSD_MINOR}" diff --git a/usr.sbin/puffs/Makefile.inc b/usr.sbin/puffs/Makefile.inc index 72a290fe787..ebc7c3b743e 100644 --- a/usr.sbin/puffs/Makefile.inc +++ b/usr.sbin/puffs/Makefile.inc @@ -1,9 +1,8 @@ -# $NetBSD: Makefile.inc,v 1.13 2010/01/25 15:55:36 pooka Exp $ +# $NetBSD: Makefile.inc,v 1.14 2014/01/16 01:15:34 christos Exp $ WARNS?= 4 .include <bsd.own.mk> -.include <bsd.sys.mk> USE_FORT?= yes # network client |
