Module Name: src
Committed By: christos
Date: Sun Dec 10 14:29:47 UTC 2017
Modified Files:
src/sys/arch/aarch64/conf: Makefile.aarch64
src/sys/arch/i386/conf: Makefile.i386
src/sys/arch/sparc64/conf: Makefile.sparc64
src/sys/arch/usermode/conf: Makefile.usermode
src/sys/arch/xen/conf: Makefile.xen
src/sys/conf: dts.mk
Log Message:
- Allow multiple .BEGIN targets
- Make their protection consistent
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/aarch64/conf/Makefile.aarch64
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/i386/conf/Makefile.i386
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/sparc64/conf/Makefile.sparc64
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/xen/conf/Makefile.xen
cvs rdiff -u -r1.7 -r1.8 src/sys/conf/dts.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/conf/Makefile.aarch64
diff -u src/sys/arch/aarch64/conf/Makefile.aarch64:1.7 src/sys/arch/aarch64/conf/Makefile.aarch64:1.8
--- src/sys/arch/aarch64/conf/Makefile.aarch64:1.7 Thu May 5 17:14:14 2016
+++ src/sys/arch/aarch64/conf/Makefile.aarch64 Sun Dec 10 09:29:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.aarch64,v 1.7 2016/05/05 21:14:14 rjs Exp $
+# $NetBSD: Makefile.aarch64,v 1.8 2017/12/10 14:29:47 christos Exp $
# Makefile for NetBSD
#
@@ -92,9 +92,9 @@ spl.o vectors.o: assym.h
# would be defined
.MAIN: all
-.if make(depend) || make(all) || make(dependall)
-.BEGIN:
- @rm -f arm && \
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN::
+ -@rm -f arm && \
ln -s $S/arch/arm/include arm
.endif
Index: src/sys/arch/i386/conf/Makefile.i386
diff -u src/sys/arch/i386/conf/Makefile.i386:1.186 src/sys/arch/i386/conf/Makefile.i386:1.187
--- src/sys/arch/i386/conf/Makefile.i386:1.186 Wed Aug 9 15:11:13 2017
+++ src/sys/arch/i386/conf/Makefile.i386 Sun Dec 10 09:29:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.i386,v 1.186 2017/08/09 19:11:13 maxv Exp $
+# $NetBSD: Makefile.i386,v 1.187 2017/12/10 14:29:47 christos Exp $
# Makefile for NetBSD
#
@@ -94,8 +94,8 @@ acpi_wakeup_low.o busfunc.o: assym.h
##
.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- @rm -f i386 && \
+.BEGIN::
+ -@rm -f i386 && \
ln -s $S/arch/i386/include i386
.endif
Index: src/sys/arch/sparc64/conf/Makefile.sparc64
diff -u src/sys/arch/sparc64/conf/Makefile.sparc64:1.83 src/sys/arch/sparc64/conf/Makefile.sparc64:1.84
--- src/sys/arch/sparc64/conf/Makefile.sparc64:1.83 Mon Dec 4 04:44:33 2017
+++ src/sys/arch/sparc64/conf/Makefile.sparc64 Sun Dec 10 09:29:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.sparc64,v 1.83 2017/12/04 09:44:33 martin Exp $
+# $NetBSD: Makefile.sparc64,v 1.84 2017/12/10 14:29:47 christos Exp $
#=========================================================================
#
@@ -138,9 +138,9 @@ cpu_in_cksum.o lock_stubs.o: assym.h
# would be defined
.MAIN: all
-.if make(depend) || make(all) || make(dependall)
-.BEGIN:
- @rm -f sparc && \
+.if !make(obj) && !make(clean) && !make(cleandir)
+.BEGIN::
+ -@rm -f sparc && \
ln -s $S/arch/sparc/include sparc
.endif
Index: src/sys/arch/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.39 src/sys/arch/usermode/conf/Makefile.usermode:1.40
--- src/sys/arch/usermode/conf/Makefile.usermode:1.39 Wed Aug 26 23:20:13 2015
+++ src/sys/arch/usermode/conf/Makefile.usermode Sun Dec 10 09:29:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.39 2015/08/27 03:20:13 uebayasi Exp $
+# $NetBSD: Makefile.usermode,v 1.40 2017/12/10 14:29:47 christos Exp $
USETOOLS?= no
NEED_OWN_INSTALL_TARGET?= no
@@ -86,12 +86,12 @@ NVFLAGS= -n
##
.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- @rm -f i386 && \
+.BEGIN::
+ -@rm -f i386 && \
ln -s $S/arch/i386/include i386
- @rm -f amd64 && \
+ -@rm -f amd64 && \
ln -s $S/arch/amd64/include amd64
- @rm -f arm && \
+ -@rm -f arm && \
ln -s $S/arch/arm/include arm
.endif
Index: src/sys/arch/xen/conf/Makefile.xen
diff -u src/sys/arch/xen/conf/Makefile.xen:1.42 src/sys/arch/xen/conf/Makefile.xen:1.43
--- src/sys/arch/xen/conf/Makefile.xen:1.42 Wed Aug 9 15:11:13 2017
+++ src/sys/arch/xen/conf/Makefile.xen Sun Dec 10 09:29:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.xen,v 1.42 2017/08/09 19:11:13 maxv Exp $
+# $NetBSD: Makefile.xen,v 1.43 2017/12/10 14:29:47 christos Exp $
# NetBSD: Makefile.i386,v 1.132 2003/07/05 16:56:10 simonb Exp
# Makefile for NetBSD
@@ -86,16 +86,15 @@ vector.o: $S/arch/${XEN_BUILD}/${XEN_BUI
${NORMAL_S}
.ifndef noBEGIN
.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
+.BEGIN::
.for A in ${XEN_MACHINE_ARCHS}
- rm -f ${A}
- ln -s $S/arch/${A}/include ${A}
+ -@rm -f ${A} && \
+ ln -s $S/arch/${A}/include ${A}
.endfor
- -rm -rf xen-ma
- mkdir xen-ma
- ln -s ../${XEN_BUILD} xen-ma/machine
- rm -f machine
- ln -s ${ARCH_INC} machine
+ -@rm -rf xen-ma && \
+ mkdir xen-ma && ln -s ../${XEN_BUILD} xen-ma/machine &&
+ -@rm -f machine && \
+ ln -s ${ARCH_INC} machine
.endif
.endif
Index: src/sys/conf/dts.mk
diff -u src/sys/conf/dts.mk:1.7 src/sys/conf/dts.mk:1.8
--- src/sys/conf/dts.mk:1.7 Tue Dec 5 21:08:03 2017
+++ src/sys/conf/dts.mk Sun Dec 10 09:29:47 2017
@@ -1,11 +1,11 @@
-# $NetBSD: dts.mk,v 1.7 2017/12/06 02:08:03 christos Exp $
+# $NetBSD: dts.mk,v 1.8 2017/12/10 14:29:47 christos Exp $
DTSARCH?=${MACHINE_CPU}
DTSGNUARCH?=${DTSARCH}
DTSPADDING?=1024
.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
+.BEGIN::
-@mkdir -p dts
.for _arch in ${DTSGNUARCH}
-@ln -sf ${S:S@^../@../../@}/external/gpl2/dts/dist/arch/${_arch}/boot/dts dts/${_arch}
