summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2017-10-17 19:31:57 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2017-10-17 19:31:57 +0000
commit19ff4eeead1fce1a8359c07f439c0cd82fdc410f (patch)
tree9e1f02bdb31a951974b5de53409f4b1c022c7541 /sys
parenta3d5933cd5951b1e97707fa1fddd53cade63d44c (diff)
remove the remaining references to .depend files since nothing creates them
any longer; ok espie@ deraadt@
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/stand/biosboot/Makefile4
-rw-r--r--sys/arch/amd64/stand/boot/Makefile4
-rw-r--r--sys/arch/amd64/stand/cdboot/Makefile4
-rw-r--r--sys/arch/amd64/stand/mbr/Makefile4
-rw-r--r--sys/arch/amd64/stand/pxeboot/Makefile4
-rw-r--r--sys/arch/i386/stand/biosboot/Makefile4
-rw-r--r--sys/arch/i386/stand/boot/Makefile4
-rw-r--r--sys/arch/i386/stand/cdboot/Makefile4
-rw-r--r--sys/arch/i386/stand/mbr/Makefile4
-rw-r--r--sys/arch/i386/stand/pxeboot/Makefile4
-rw-r--r--sys/arch/sparc64/stand/bootblk/Makefile5
-rw-r--r--sys/dev/microcode/aic7xxx/Makefile4
12 files changed, 22 insertions, 27 deletions
diff --git a/sys/arch/amd64/stand/biosboot/Makefile b/sys/arch/amd64/stand/biosboot/Makefile
index 0d3464635f9..e1e8bdd03ce 100644
--- a/sys/arch/amd64/stand/biosboot/Makefile
+++ b/sys/arch/amd64/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/05/30 22:32:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.13 2017/10/17 19:31:56 naddy Exp $
MAN= biosboot.8
@@ -13,7 +13,7 @@ LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie -znorelro
LDFLAGS+=-melf_i386 -L/usr/libdata
INSTALL_STRIP=
-.depend biosboot.o: assym.h
+biosboot.o: assym.h
${PROG}: $(OBJS)
@rm -f $(PROG)
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index aab8a1e2d56..ce68b7efaca 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2017/06/19 22:50:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.39 2017/10/17 19:31:56 naddy Exp $
COPTS?=
MAN?= boot.8
@@ -56,7 +56,7 @@ boot.bin: boot
CLEANFILES+= ${PROG}.new
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS)
diff --git a/sys/arch/amd64/stand/cdboot/Makefile b/sys/arch/amd64/stand/cdboot/Makefile
index e9eaa025483..401b9dcf1f7 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2017/05/30 22:32:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.34 2017/10/17 19:31:56 naddy Exp $
MAN= cdboot.8
@@ -41,7 +41,7 @@ SRCS+= divdi3.c moddi3.c qdivrem.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
diff --git a/sys/arch/amd64/stand/mbr/Makefile b/sys/arch/amd64/stand/mbr/Makefile
index a51b88429e6..1faac1fd691 100644
--- a/sys/arch/amd64/stand/mbr/Makefile
+++ b/sys/arch/amd64/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.11 2016/07/30 03:25:48 guenther Exp $
+# $OpenBSD: Makefile,v 1.12 2017/10/17 19:31:56 naddy Exp $
#
S= ${.CURDIR}/../../../..
@@ -21,7 +21,7 @@ INSTALL_STRIP=
# Uncomment this to make mbr talk to a serial port.
#CPPFLAGS+=-DSERIAL=0
-.depend mbr.o: assym.h
+mbr.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o $(PROG) $(OBJS)
diff --git a/sys/arch/amd64/stand/pxeboot/Makefile b/sys/arch/amd64/stand/pxeboot/Makefile
index 35f0211400e..eff32c5de2d 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2017/05/30 22:32:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.32 2017/10/17 19:31:56 naddy Exp $
MAN= pxeboot.8
@@ -47,7 +47,7 @@ SRCS+= divdi3.c moddi3.c qdivrem.c udivdi3.c umoddi3.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o pxe_call.o: assym.h
+srt0.o gidt.o pxe_call.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
diff --git a/sys/arch/i386/stand/biosboot/Makefile b/sys/arch/i386/stand/biosboot/Makefile
index 8e84b83e76a..b27e546af8c 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2017/06/01 11:18:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2017/10/17 19:31:56 naddy Exp $
MAN= biosboot.8
@@ -12,7 +12,7 @@ LD=ld
LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie -znorelro
INSTALL_STRIP=
-.depend biosboot.o: assym.h
+biosboot.o: assym.h
${PROG}: $(OBJS)
@rm -f $(PROG)
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index 82dc91f310c..6874e1723f8 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.66 2017/06/19 22:50:50 deraadt Exp $
+# $OpenBSD: Makefile,v 1.67 2017/10/17 19:31:56 naddy Exp $
COPTS?=
MAN?= boot.8
@@ -60,7 +60,7 @@ boot.bin: boot
CLEANFILES+= ${PROG}.new
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS)
diff --git a/sys/arch/i386/stand/cdboot/Makefile b/sys/arch/i386/stand/cdboot/Makefile
index 4679c7ddb9a..0c4dc2e159f 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2017/06/01 11:18:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.31 2017/10/17 19:31:56 naddy Exp $
MAN= cdboot.8
@@ -46,7 +46,7 @@ SRCS+= strlcpy.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o: assym.h
+srt0.o gidt.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
diff --git a/sys/arch/i386/stand/mbr/Makefile b/sys/arch/i386/stand/mbr/Makefile
index 7d98fadf493..a87e0947310 100644
--- a/sys/arch/i386/stand/mbr/Makefile
+++ b/sys/arch/i386/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2016/07/30 03:25:48 guenther Exp $
+# $OpenBSD: Makefile,v 1.21 2017/10/17 19:31:56 naddy Exp $
#
S= ${.CURDIR}/../../../..
@@ -19,7 +19,7 @@ INSTALL_STRIP=
# Uncomment this to make mbr talk to a serial port.
#CPPFLAGS+=-DSERIAL=0
-.depend mbr.o: assym.h
+mbr.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o $(PROG) $(OBJS)
diff --git a/sys/arch/i386/stand/pxeboot/Makefile b/sys/arch/i386/stand/pxeboot/Makefile
index 4ce9cd5468f..daa976064c7 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.27 2017/06/01 11:18:53 naddy Exp $
+# $OpenBSD: Makefile,v 1.28 2017/10/17 19:31:56 naddy Exp $
MAN= pxeboot.8
@@ -48,7 +48,7 @@ SRCS+= strlcpy.c
.PATH: ${S}/lib/libz
SRCS+= adler32.c crc32.c inflate.c inftrees.c
-.depend srt0.o gidt.o pxe_call.o: assym.h
+srt0.o gidt.o pxe_call.o: assym.h
${PROG}: $(OBJS)
$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)
diff --git a/sys/arch/sparc64/stand/bootblk/Makefile b/sys/arch/sparc64/stand/bootblk/Makefile
index 324d5d31fff..2e9f18b4319 100644
--- a/sys/arch/sparc64/stand/bootblk/Makefile
+++ b/sys/arch/sparc64/stand/bootblk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2016/11/06 16:04:20 tb Exp $
+# $OpenBSD: Makefile,v 1.14 2017/10/17 19:31:56 naddy Exp $
# $NetBSD: Makefile,v 1.1 2000/08/20 14:58:45 mrg Exp $
CURDIR= ${.CURDIR}
@@ -39,9 +39,6 @@ bootblk.text: bootblk.fth assym.fth.h
bootblk: bootblk.fth assym.fth.h
fgen -o bootblk ${.CURDIR}/bootblk.fth
-beforedepend:
- @touch .depend
-
beforeinstall:
${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
bootblk ${DESTDIR}/usr/mdec
diff --git a/sys/dev/microcode/aic7xxx/Makefile b/sys/dev/microcode/aic7xxx/Makefile
index bd97e6e83fe..5cb8188478a 100644
--- a/sys/dev/microcode/aic7xxx/Makefile
+++ b/sys/dev/microcode/aic7xxx/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2017/07/19 12:50:32 espie Exp $
+# $OpenBSD: Makefile,v 1.13 2017/10/17 19:31:56 naddy Exp $
# $FreeBSD: src/sys/dev/aic7xxx/Makefile,v 1.6 1999/08/28 00:41:22 peter Exp $
PROG= aicasm
@@ -15,10 +15,8 @@ LDADD+= -ll
CC=${HOSTCC}
# Correct path for kernel builds
-# Don't rely on the kernel's .depend file
.ifdef MAKESRCPATH
.PATH: ${MAKESRCPATH}
-DEPENDFILE=
.endif
CFLAGS+= -I. -I${.CURDIR}