Module Name: src
Committed By: christos
Date: Thu Jan 16 01:15:34 UTC 2014
Modified Files:
src: Makefile
src/crypto/external/bsd/openssl/lib/libcrypto: Makefile
src/distrib/common: Makefile.bootcd Makefile.distrib
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/evbsh3/rom/ramdiskeb: Makefile
src/distrib/evbsh3/rom/ramdiskel: Makefile
src/distrib/sets: Makefile mkvars.mk
src/distrib/utils/sysinst: Makefile.inc
src/etc: Makefile Makefile.params
src/external/bsd/dhcp: Makefile.inc
src/external/bsd/file/bin: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/common: Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/init: Makefile
src/regress/sys/fs/ffs: Makefile
src/share/man: Makefile
src/share/mk: Makefile
src/sys/arch/alpha/stand: Makefile.bootprogs
src/sys/arch/arc/stand/boot: Makefile
src/sys/arch/cobalt/stand/boot: Makefile
src/sys/arch/emips/stand: Makefile.booters
src/sys/arch/epoc32/stand/e32boot/exe: Makefile
src/sys/arch/epoc32/stand/e32boot/ldd: Makefile
src/sys/arch/hpc/stand: Makefile
src/sys/arch/luna68k/stand/boot: Makefile
src/sys/arch/mipsco/stand: Makefile.booters
src/sys/arch/mmeye/stand/boot: Makefile
src/sys/arch/pmax/stand: Makefile.booters
src/sys/arch/sbmips/stand: Makefile.bootprogs
src/sys/arch/sgimips/stand/boot64: Makefile
src/sys/kern: Makefile
src/tools/mandoc: Makefile
src/usr.sbin/puffs: Makefile.inc
Log Message:
eliminate use of bsd.sys.mk from Makefiles
To generate a diff of this commit:
cvs rdiff -u -r1.303 -r1.304 src/Makefile
cvs rdiff -u -r1.7 -r1.8 \
src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
cvs rdiff -u -r1.22 -r1.23 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.9 -r1.10 src/distrib/common/Makefile.distrib
cvs rdiff -u -r1.6 -r1.7 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.9 -r1.10 src/distrib/evbsh3/rom/ramdiskeb/Makefile
cvs rdiff -u -r1.9 -r1.10 src/distrib/evbsh3/rom/ramdiskel/Makefile
cvs rdiff -u -r1.90 -r1.91 src/distrib/sets/Makefile
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/mkvars.mk
cvs rdiff -u -r1.59 -r1.60 src/distrib/utils/sysinst/Makefile.inc
cvs rdiff -u -r1.410 -r1.411 src/etc/Makefile
cvs rdiff -u -r1.7 -r1.8 src/etc/Makefile.params
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcp/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/file/bin/Makefile
cvs rdiff -u -r1.20 -r1.21 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
cvs rdiff -u -r1.6 -r1.7 src/regress/sys/fs/ffs/Makefile
cvs rdiff -u -r1.31 -r1.32 src/share/man/Makefile
cvs rdiff -u -r1.48 -r1.49 src/share/mk/Makefile
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/alpha/stand/Makefile.bootprogs
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arc/stand/boot/Makefile
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cobalt/stand/boot/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/emips/stand/Makefile.booters
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/stand/e32boot/exe/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/epoc32/stand/e32boot/ldd/Makefile
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpc/stand/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/luna68k/stand/boot/Makefile
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mipsco/stand/Makefile.booters
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mmeye/stand/boot/Makefile
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/pmax/stand/Makefile.booters
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sbmips/stand/Makefile.bootprogs
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sgimips/stand/boot64/Makefile
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/Makefile
cvs rdiff -u -r1.6 -r1.7 src/tools/mandoc/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/puffs/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.303 src/Makefile:1.304
--- src/Makefile:1.303 Tue Jul 16 05:52:21 2013
+++ src/Makefile Wed Jan 15 20:15:32 2014
@@ -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>
Index: src/crypto/external/bsd/openssl/lib/libcrypto/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.7 src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.8
--- src/crypto/external/bsd/openssl/lib/libcrypto/Makefile:1.7 Fri Jan 18 13:09:56 2013
+++ src/crypto/external/bsd/openssl/lib/libcrypto/Makefile Wed Jan 15 20:15:32 2014
@@ -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
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.22 src/distrib/common/Makefile.bootcd:1.23
--- src/distrib/common/Makefile.bootcd:1.22 Tue Jan 29 14:48:41 2013
+++ src/distrib/common/Makefile.bootcd Wed Jan 15 20:15:32 2014
@@ -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/
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
Index: src/distrib/common/Makefile.distrib
diff -u src/distrib/common/Makefile.distrib:1.9 src/distrib/common/Makefile.distrib:1.10
--- src/distrib/common/Makefile.distrib:1.9 Thu Feb 16 19:33:25 2012
+++ src/distrib/common/Makefile.distrib Wed Jan 15 20:15:32 2014
@@ -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/p
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_
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.6 src/distrib/common/bootimage/Makefile.bootimage:1.7
--- src/distrib/common/bootimage/Makefile.bootimage:1.6 Sun Apr 22 03:23:42 2012
+++ src/distrib/common/bootimage/Makefile.bootimage Wed Jan 15 20:15:32 2014
@@ -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
Index: src/distrib/evbsh3/rom/ramdiskeb/Makefile
diff -u src/distrib/evbsh3/rom/ramdiskeb/Makefile:1.9 src/distrib/evbsh3/rom/ramdiskeb/Makefile:1.10
--- src/distrib/evbsh3/rom/ramdiskeb/Makefile:1.9 Fri Sep 18 05:24:59 2009
+++ src/distrib/evbsh3/rom/ramdiskeb/Makefile Wed Jan 15 20:15:32 2014
@@ -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>
Index: src/distrib/evbsh3/rom/ramdiskel/Makefile
diff -u src/distrib/evbsh3/rom/ramdiskel/Makefile:1.9 src/distrib/evbsh3/rom/ramdiskel/Makefile:1.10
--- src/distrib/evbsh3/rom/ramdiskel/Makefile:1.9 Fri Sep 18 05:24:59 2009
+++ src/distrib/evbsh3/rom/ramdiskel/Makefile Wed Jan 15 20:15:32 2014
@@ -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>
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.90 src/distrib/sets/Makefile:1.91
--- src/distrib/sets/Makefile:1.90 Wed Oct 30 11:17:01 2013
+++ src/distrib/sets/Makefile Wed Jan 15 20:15:33 2014
@@ -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>
Index: src/distrib/sets/mkvars.mk
diff -u src/distrib/sets/mkvars.mk:1.13 src/distrib/sets/mkvars.mk:1.14
--- src/distrib/sets/mkvars.mk:1.13 Mon Oct 14 12:00:16 2013
+++ src/distrib/sets/mkvars.mk Wed Jan 15 20:15:33 2014
@@ -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>
Index: src/distrib/utils/sysinst/Makefile.inc
diff -u src/distrib/utils/sysinst/Makefile.inc:1.59 src/distrib/utils/sysinst/Makefile.inc:1.60
--- src/distrib/utils/sysinst/Makefile.inc:1.59 Fri Apr 6 19:48:53 2012
+++ src/distrib/utils/sysinst/Makefile.inc Wed Jan 15 20:15:33 2014
@@ -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}
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.410 src/etc/Makefile:1.411
--- src/etc/Makefile:1.410 Mon Aug 19 12:34:29 2013
+++ src/etc/Makefile Wed Jan 15 20:15:33 2014
@@ -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
Index: src/etc/Makefile.params
diff -u src/etc/Makefile.params:1.7 src/etc/Makefile.params:1.8
--- src/etc/Makefile.params:1.7 Fri Nov 1 07:09:05 2013
+++ src/etc/Makefile.params Wed Jan 15 20:15:33 2014
@@ -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 \
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.8 src/external/bsd/dhcp/Makefile.inc:1.9
--- src/external/bsd/dhcp/Makefile.inc:1.8 Sat Sep 21 18:28:12 2013
+++ src/external/bsd/dhcp/Makefile.inc Wed Jan 15 20:15:33 2014
@@ -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 && ${
.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
Index: src/external/bsd/file/bin/Makefile
diff -u src/external/bsd/file/bin/Makefile:1.2 src/external/bsd/file/bin/Makefile:1.3
--- src/external/bsd/file/bin/Makefile:1.2 Sat Mar 23 12:15:57 2013
+++ src/external/bsd/file/bin/Makefile Wed Jan 15 20:15:33 2014
@@ -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"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.20 src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.21
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile:1.20 Fri Jan 10 10:50:34 2014
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Wed Jan 15 20:15:33 2014
@@ -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"
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile:1.8 Sun Feb 20 23:42:17 2011
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Wed Jan 15 20:15:33 2014
@@ -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"
Index: src/regress/sys/fs/ffs/Makefile
diff -u src/regress/sys/fs/ffs/Makefile:1.6 src/regress/sys/fs/ffs/Makefile:1.7
--- src/regress/sys/fs/ffs/Makefile:1.6 Tue Jun 29 23:26:27 2004
+++ src/regress/sys/fs/ffs/Makefile Wed Jan 15 20:15:33 2014
@@ -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
Index: src/share/man/Makefile
diff -u src/share/man/Makefile:1.31 src/share/man/Makefile:1.32
--- src/share/man/Makefile:1.31 Sat Oct 26 04:23:38 2013
+++ src/share/man/Makefile Wed Jan 15 20:15:33 2014
@@ -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>
Index: src/share/mk/Makefile
diff -u src/share/mk/Makefile:1.48 src/share/mk/Makefile:1.49
--- src/share/mk/Makefile:1.48 Tue Jan 14 13:51:45 2014
+++ src/share/mk/Makefile Wed Jan 15 20:15:33 2014
@@ -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 \
Index: src/sys/arch/alpha/stand/Makefile.bootprogs
diff -u src/sys/arch/alpha/stand/Makefile.bootprogs:1.33 src/sys/arch/alpha/stand/Makefile.bootprogs:1.34
--- src/sys/arch/alpha/stand/Makefile.bootprogs:1.33 Sun Jan 12 10:26:28 2014
+++ src/sys/arch/alpha/stand/Makefile.bootprogs Wed Jan 15 20:15:33 2014
@@ -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}/../../../..
Index: src/sys/arch/arc/stand/boot/Makefile
diff -u src/sys/arch/arc/stand/boot/Makefile:1.14 src/sys/arch/arc/stand/boot/Makefile:1.15
--- src/sys/arch/arc/stand/boot/Makefile:1.14 Sun Jan 12 10:26:28 2014
+++ src/sys/arch/arc/stand/boot/Makefile Wed Jan 15 20:15:33 2014
@@ -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
Index: src/sys/arch/cobalt/stand/boot/Makefile
diff -u src/sys/arch/cobalt/stand/boot/Makefile:1.26 src/sys/arch/cobalt/stand/boot/Makefile:1.27
--- src/sys/arch/cobalt/stand/boot/Makefile:1.26 Sun Jan 12 10:26:28 2014
+++ src/sys/arch/cobalt/stand/boot/Makefile Wed Jan 15 20:15:33 2014
@@ -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
Index: src/sys/arch/emips/stand/Makefile.booters
diff -u src/sys/arch/emips/stand/Makefile.booters:1.4 src/sys/arch/emips/stand/Makefile.booters:1.5
--- src/sys/arch/emips/stand/Makefile.booters:1.4 Sun Jan 12 10:26:28 2014
+++ src/sys/arch/emips/stand/Makefile.booters Wed Jan 15 20:15:33 2014
@@ -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}/../../../..
Index: src/sys/arch/epoc32/stand/e32boot/exe/Makefile
diff -u src/sys/arch/epoc32/stand/e32boot/exe/Makefile:1.3 src/sys/arch/epoc32/stand/e32boot/exe/Makefile:1.4
--- src/sys/arch/epoc32/stand/e32boot/exe/Makefile:1.3 Wed May 1 18:57:37 2013
+++ src/sys/arch/epoc32/stand/e32boot/exe/Makefile Wed Jan 15 20:15:33 2014
@@ -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>
Index: src/sys/arch/epoc32/stand/e32boot/ldd/Makefile
diff -u src/sys/arch/epoc32/stand/e32boot/ldd/Makefile:1.3 src/sys/arch/epoc32/stand/e32boot/ldd/Makefile:1.4
--- src/sys/arch/epoc32/stand/e32boot/ldd/Makefile:1.3 Wed May 1 18:57:37 2013
+++ src/sys/arch/epoc32/stand/e32boot/ldd/Makefile Wed Jan 15 20:15:33 2014
@@ -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>
Index: src/sys/arch/hpc/stand/Makefile
diff -u src/sys/arch/hpc/stand/Makefile:1.24 src/sys/arch/hpc/stand/Makefile:1.25
--- src/sys/arch/hpc/stand/Makefile:1.24 Sun Oct 19 18:05:21 2008
+++ src/sys/arch/hpc/stand/Makefile Wed Jan 15 20:15:34 2014
@@ -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
Index: src/sys/arch/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.10 src/sys/arch/luna68k/stand/boot/Makefile:1.11
--- src/sys/arch/luna68k/stand/boot/Makefile:1.10 Fri Jan 10 06:12:03 2014
+++ src/sys/arch/luna68k/stand/boot/Makefile Wed Jan 15 20:15:34 2014
@@ -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
Index: src/sys/arch/mipsco/stand/Makefile.booters
diff -u src/sys/arch/mipsco/stand/Makefile.booters:1.19 src/sys/arch/mipsco/stand/Makefile.booters:1.20
--- src/sys/arch/mipsco/stand/Makefile.booters:1.19 Sun Jan 12 10:26:30 2014
+++ src/sys/arch/mipsco/stand/Makefile.booters Wed Jan 15 20:15:34 2014
@@ -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
Index: src/sys/arch/mmeye/stand/boot/Makefile
diff -u src/sys/arch/mmeye/stand/boot/Makefile:1.3 src/sys/arch/mmeye/stand/boot/Makefile:1.4
--- src/sys/arch/mmeye/stand/boot/Makefile:1.3 Sun Jan 12 10:26:30 2014
+++ src/sys/arch/mmeye/stand/boot/Makefile Wed Jan 15 20:15:34 2014
@@ -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}/../../../..
Index: src/sys/arch/pmax/stand/Makefile.booters
diff -u src/sys/arch/pmax/stand/Makefile.booters:1.59 src/sys/arch/pmax/stand/Makefile.booters:1.60
--- src/sys/arch/pmax/stand/Makefile.booters:1.59 Sun Jan 12 10:26:30 2014
+++ src/sys/arch/pmax/stand/Makefile.booters Wed Jan 15 20:15:34 2014
@@ -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}/../../../..
Index: src/sys/arch/sbmips/stand/Makefile.bootprogs
diff -u src/sys/arch/sbmips/stand/Makefile.bootprogs:1.12 src/sys/arch/sbmips/stand/Makefile.bootprogs:1.13
--- src/sys/arch/sbmips/stand/Makefile.bootprogs:1.12 Sun Jan 12 10:26:30 2014
+++ src/sys/arch/sbmips/stand/Makefile.bootprogs Wed Jan 15 20:15:34 2014
@@ -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}/../../../..
Index: src/sys/arch/sgimips/stand/boot64/Makefile
diff -u src/sys/arch/sgimips/stand/boot64/Makefile:1.11 src/sys/arch/sgimips/stand/boot64/Makefile:1.12
--- src/sys/arch/sgimips/stand/boot64/Makefile:1.11 Fri Feb 25 18:37:32 2011
+++ src/sys/arch/sgimips/stand/boot64/Makefile Wed Jan 15 20:15:34 2014
@@ -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 d
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}/../../../..
Index: src/sys/kern/Makefile
diff -u src/sys/kern/Makefile:1.16 src/sys/kern/Makefile:1.17
--- src/sys/kern/Makefile:1.16 Fri Sep 2 18:15:16 2011
+++ src/sys/kern/Makefile Wed Jan 15 20:15:34 2014
@@ -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>
Index: src/tools/mandoc/Makefile
diff -u src/tools/mandoc/Makefile:1.6 src/tools/mandoc/Makefile:1.7
--- src/tools/mandoc/Makefile:1.6 Sun Jan 5 14:49:57 2014
+++ src/tools/mandoc/Makefile Wed Jan 15 20:15:34 2014
@@ -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/man
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}"
Index: src/usr.sbin/puffs/Makefile.inc
diff -u src/usr.sbin/puffs/Makefile.inc:1.13 src/usr.sbin/puffs/Makefile.inc:1.14
--- src/usr.sbin/puffs/Makefile.inc:1.13 Mon Jan 25 10:55:36 2010
+++ src/usr.sbin/puffs/Makefile.inc Wed Jan 15 20:15:34 2014
@@ -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
