summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/armv7/stand/efiboot/Makefile4
-rw-r--r--sys/arch/loongson/stand/boot/Makefile.inc4
-rw-r--r--sys/arch/loongson/stand/libsa/Makefile4
-rw-r--r--sys/arch/luna88k/stand/boot/Makefile4
-rw-r--r--sys/arch/octeon/stand/boot/Makefile.inc4
-rw-r--r--sys/arch/octeon/stand/libsa/Makefile4
-rw-r--r--sys/arch/socppc/stand/boot/Makefile4
7 files changed, 15 insertions, 13 deletions
diff --git a/sys/arch/armv7/stand/efiboot/Makefile b/sys/arch/armv7/stand/efiboot/Makefile
index efb9b48073e..cc4e86a3a38 100644
--- a/sys/arch/armv7/stand/efiboot/Makefile
+++ b/sys/arch/armv7/stand/efiboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2016/05/23 02:19:46 jsg Exp $
+# $OpenBSD: Makefile,v 1.6 2016/11/06 16:42:00 tb Exp $
NOMAN= #
@@ -64,7 +64,7 @@ ${PROG.elf}: ${OBJS}
fi
mv ${.TARGET}.tmp ${.TARGET}
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../../${MACHINE}/include machine)
@([ -h arm ] || ln -s ${.CURDIR}/../../../arm/include arm)
diff --git a/sys/arch/loongson/stand/boot/Makefile.inc b/sys/arch/loongson/stand/boot/Makefile.inc
index 98bf17e40f0..a25dd082520 100644
--- a/sys/arch/loongson/stand/boot/Makefile.inc
+++ b/sys/arch/loongson/stand/boot/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2014/07/12 23:34:54 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2016/11/06 16:42:00 tb Exp $
NOMAN=
S= ${.CURDIR}/../../../..
@@ -29,7 +29,7 @@ SRCS+= boot.c cmd.c vars.c
SRCS+= strlcat.c strlcpy.c strlen.c
SRCS+= udivdi3.c qdivrem.c
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/loongson/stand/libsa/Makefile b/sys/arch/loongson/stand/libsa/Makefile
index 844b3333cfb..08fa3c27a38 100644
--- a/sys/arch/loongson/stand/libsa/Makefile
+++ b/sys/arch/loongson/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2015/11/16 19:33:52 miod Exp $
+# $OpenBSD: Makefile,v 1.8 2016/11/06 16:42:00 tb Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -40,7 +40,7 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc
NOPROFILE=
NOPIC=
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/luna88k/stand/boot/Makefile b/sys/arch/luna88k/stand/boot/Makefile
index 19ee4be36f5..63881742742 100644
--- a/sys/arch/luna88k/stand/boot/Makefile
+++ b/sys/arch/luna88k/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/07/30 03:25:49 guenther Exp $
+# $OpenBSD: Makefile,v 1.8 2016/11/06 16:42:00 tb Exp $
# $NetBSD: Makefile,v 1.9 2013/01/22 15:48:40 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
@@ -66,8 +66,10 @@ install: ${PROG}
CLEANFILES+= ${PROG}.elf
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h m88k ] || ln -s ${.CURDIR}/../../../m88k/include m88k)
+.endif
.include <bsd.prog.mk>
diff --git a/sys/arch/octeon/stand/boot/Makefile.inc b/sys/arch/octeon/stand/boot/Makefile.inc
index 08e239a5fbf..990b8c073b4 100644
--- a/sys/arch/octeon/stand/boot/Makefile.inc
+++ b/sys/arch/octeon/stand/boot/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.2 2013/06/05 01:09:09 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2016/11/06 16:42:00 tb Exp $
NOMAN=
S= ${.CURDIR}/../../../..
@@ -27,7 +27,7 @@ SRCS+= boot.c cmd.c vars.c
SRCS+= strlcat.c strlcpy.c strlen.c
SRCS+= udivdi3.c qdivrem.c
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/octeon/stand/libsa/Makefile b/sys/arch/octeon/stand/libsa/Makefile
index ed14a0e2aba..0432e12354f 100644
--- a/sys/arch/octeon/stand/libsa/Makefile
+++ b/sys/arch/octeon/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2015/11/16 19:33:52 miod Exp $
+# $OpenBSD: Makefile,v 1.6 2016/11/06 16:42:00 tb Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -39,7 +39,7 @@ ${OBJS}: ${.CURDIR}/../Makefile.inc
NOPROFILE=
NOPIC=
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../include machine)
@([ -h mips64 ] || ln -s ${.CURDIR}/../../../mips64/include mips64)
diff --git a/sys/arch/socppc/stand/boot/Makefile b/sys/arch/socppc/stand/boot/Makefile
index 4ad4c127090..ea8c0af367a 100644
--- a/sys/arch/socppc/stand/boot/Makefile
+++ b/sys/arch/socppc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2016/07/30 03:25:49 guenther Exp $
+# $OpenBSD: Makefile,v 1.18 2016/11/06 16:42:00 tb Exp $
.include "${.CURDIR}/../Makefile.inc"
@@ -58,7 +58,7 @@ realinstall:
${INSTALL} ${INSTALL_COPY} ${INSTALL_STRIP} -o ${BINOWN} -g ${BINGRP} \
-m ${BINMODE} ${PROG}.elf ${DESTDIR}${BINDIR}/${PROG}.elf
-.if !make(obj)
+.if !make(clean) && !make(cleandir) && !make(includes) && !make(obj)
.BEGIN:
@([ -h machine ] || ln -s ${.CURDIR}/../../../${MACHINE}/include machine)
@([ -h powerpc ] || ln -s ${.CURDIR}/../../../powerpc/include powerpc)