Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src eliminate use of bsd.sys.mk from Makefiles
details: https://anonhg.NetBSD.org/src/rev/ae3c3746c06d
branches: trunk
changeset: 326021:ae3c3746c06d
user: christos <christos%NetBSD.org@localhost>
date: Thu Jan 16 01:15:32 2014 +0000
description:
eliminate use of bsd.sys.mk from Makefiles
diffstat:
Makefile | 3 +--
crypto/external/bsd/openssl/lib/libcrypto/Makefile | 3 +--
distrib/common/Makefile.bootcd | 3 +--
distrib/common/Makefile.distrib | 6 ++++--
distrib/common/bootimage/Makefile.bootimage | 3 +--
distrib/evbsh3/rom/ramdiskeb/Makefile | 4 ++--
distrib/evbsh3/rom/ramdiskel/Makefile | 4 ++--
distrib/sets/Makefile | 4 ++--
distrib/sets/mkvars.mk | 5 +++--
distrib/utils/sysinst/Makefile.inc | 3 +--
etc/Makefile | 3 +--
etc/Makefile.params | 3 +--
external/bsd/dhcp/Makefile.inc | 4 ++--
external/bsd/file/bin/Makefile | 3 +--
external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile | 4 ++--
external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile | 4 ++--
regress/sys/fs/ffs/Makefile | 4 ++--
share/man/Makefile | 3 +--
share/mk/Makefile | 6 +++---
sys/arch/alpha/stand/Makefile.bootprogs | 3 +--
sys/arch/arc/stand/boot/Makefile | 3 +--
sys/arch/cobalt/stand/boot/Makefile | 3 +--
sys/arch/emips/stand/Makefile.booters | 4 ++--
sys/arch/epoc32/stand/e32boot/exe/Makefile | 4 ++--
sys/arch/epoc32/stand/e32boot/ldd/Makefile | 5 +++--
sys/arch/hpc/stand/Makefile | 4 ++--
sys/arch/luna68k/stand/boot/Makefile | 3 +--
sys/arch/mipsco/stand/Makefile.booters | 4 ++--
sys/arch/mmeye/stand/boot/Makefile | 3 +--
sys/arch/pmax/stand/Makefile.booters | 3 +--
sys/arch/sbmips/stand/Makefile.bootprogs | 3 +--
sys/arch/sgimips/stand/boot64/Makefile | 3 +--
sys/kern/Makefile | 6 ++++--
tools/mandoc/Makefile | 3 +--
usr.sbin/puffs/Makefile.inc | 3 +--
35 files changed, 58 insertions(+), 71 deletions(-)
diffs (truncated from 557 to 300 lines):
diff -r 3448e5904fe1 -r ae3c3746c06d Makefile
--- a/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
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 -r 3448e5904fe1 -r ae3c3746c06d crypto/external/bsd/openssl/lib/libcrypto/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
.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 -r 3448e5904fe1 -r ae3c3746c06d distrib/common/Makefile.bootcd
--- a/distrib/common/Makefile.bootcd Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/common/Makefile.bootcd Thu Jan 16 01:15:32 2014 +0000
@@ -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/installimage.*,,gp'
.endif
-.include <bsd.sys.mk> # for HOST_SH
.include <bsd.own.mk> # For PRINTOBJDIR
.include <bsd.kernobj.mk> # For KERNSRCDIR
diff -r 3448e5904fe1 -r ae3c3746c06d distrib/common/Makefile.distrib
--- a/distrib/common/Makefile.distrib Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/common/Makefile.distrib Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
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 -r 3448e5904fe1 -r ae3c3746c06d distrib/common/bootimage/Makefile.bootimage
--- a/distrib/common/bootimage/Makefile.bootimage Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/common/bootimage/Makefile.bootimage Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d distrib/evbsh3/rom/ramdiskeb/Makefile
--- a/distrib/evbsh3/rom/ramdiskeb/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/evbsh3/rom/ramdiskeb/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
.include <bsd.own.mk>
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
-.include <bsd.sys.mk>
+.include <bsd.files.mk>
diff -r 3448e5904fe1 -r ae3c3746c06d distrib/evbsh3/rom/ramdiskel/Makefile
--- a/distrib/evbsh3/rom/ramdiskel/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/evbsh3/rom/ramdiskel/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
.include <bsd.own.mk>
.include <bsd.obj.mk>
.include <bsd.subdir.mk>
-.include <bsd.sys.mk>
+.include <bsd.files.mk>
diff -r 3448e5904fe1 -r ae3c3746c06d distrib/sets/Makefile
--- a/distrib/sets/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/sets/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
sourcesets: .PHONY makesrctars
@true
-.include <bsd.sys.mk>
+.include <bsd.files.mk>
diff -r 3448e5904fe1 -r ae3c3746c06d distrib/sets/mkvars.mk
--- a/distrib/sets/mkvars.mk Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/sets/mkvars.mk Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
#####
.include <bsd.own.mk>
-.include <bsd.sys.mk>
.include <bsd.endian.mk>
.if (${MKMAN} == "no" || empty(MANINSTALL:Mmaninstall))
@@ -88,3 +87,5 @@
.else
@echo MKSOLARIS="no"
.endif
+
+.include <bsd.files.mk>
diff -r 3448e5904fe1 -r ae3c3746c06d distrib/utils/sysinst/Makefile.inc
--- a/distrib/utils/sysinst/Makefile.inc Thu Jan 16 00:43:43 2014 +0000
+++ b/distrib/utils/sysinst/Makefile.inc Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
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 -r 3448e5904fe1 -r ae3c3746c06d etc/Makefile
--- a/etc/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/etc/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d etc/Makefile.params
--- a/etc/Makefile.params Thu Jan 16 00:43:43 2014 +0000
+++ b/etc/Makefile.params Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d external/bsd/dhcp/Makefile.inc
--- a/external/bsd/dhcp/Makefile.inc Thu Jan 16 00:43:43 2014 +0000
+++ b/external/bsd/dhcp/Makefile.inc Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
.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 -r 3448e5904fe1 -r ae3c3746c06d external/bsd/file/bin/Makefile
--- a/external/bsd/file/bin/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/external/bsd/file/bin/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/common/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/init/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d regress/sys/fs/ffs/Makefile
--- a/regress/sys/fs/ffs/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/regress/sys/fs/ffs/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 -r 3448e5904fe1 -r ae3c3746c06d share/man/Makefile
--- a/share/man/Makefile Thu Jan 16 00:43:43 2014 +0000
+++ b/share/man/Makefile Thu Jan 16 01:15:32 2014 +0000
@@ -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 @@
.endif
.include <bsd.subdir.mk>
-.include <bsd.sys.mk>
diff -r 3448e5904fe1 -r ae3c3746c06d share/mk/Makefile
Home |
Main Index |
Thread Index |
Old Index