fix bogus dependencies, and allow mkdep to run

checked on amd64 by rpe@
okay jsing@

10 files changed, 20 insertions, 28 deletions

diff --git a/sys/arch/amd64/stand/biosboot/Makefile b/sys/arch/amd64/stand/biosboot/Makefile
index 7e3debc47af..5d79292ab5a 100644
--- a/sys/arch/amd64/stand/biosboot/Makefile
+++ b/sys/arch/amd64/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2013/01/17 12:37:44 jsing Exp $
+#	$OpenBSD: Makefile,v 1.9 2013/01/18 21:09:04 espie Exp $
 
 MAN=	biosboot.8
 
@@ -13,7 +13,7 @@ LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie
 LDFLAGS+=-melf_i386 -L/usr/libdata 
 INSTALL_STRIP=
 
-${.CURDIR}/biosboot.S: assym.h
+.depend 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 59154dd8cfc..9a00858829c 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.20 2013/01/18 11:35:24 jsing Exp $
+#	$OpenBSD: Makefile,v 1.21 2013/01/18 21:09:04 espie Exp $
 
 MAN?=	boot.8
 MLINKS?=boot.8 boot.conf.5
@@ -54,8 +54,7 @@ boot.bin: boot
 
 CLEANFILES+= ${PROG}.new
 
-${.CURDIR}/srt0.S: assym.h
-${SADIR}/libsa/gidt.S: assym.h
+.depend 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 354adaa6a2c..8fc81e41ced 100644
--- a/sys/arch/amd64/stand/cdboot/Makefile
+++ b/sys/arch/amd64/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2013/01/17 12:37:44 jsing Exp $
+#	$OpenBSD: Makefile,v 1.19 2013/01/18 21:09:04 espie Exp $
 
 MAN=	cdboot.8
 
@@ -39,8 +39,7 @@ SRCS+=	divdi3.c moddi3.c qdivrem.c
 .PATH:	${S}/lib/libz
 SRCS+=	adler32.c crc32.c inflate.c inftrees.c
 
-${.CURDIR}/srt0.S: assym.h
-${SADIR}/libsa/gidt.S: assym.h
+.depend 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 fb353ccaa2a..cfc3566731d 100644
--- a/sys/arch/amd64/stand/mbr/Makefile
+++ b/sys/arch/amd64/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2013/01/17 12:37:44 jsing Exp $
+#	$OpenBSD: Makefile,v 1.9 2013/01/18 21:09:04 espie Exp $
 #
 
 S=	${.CURDIR}/../../../..
@@ -21,7 +21,7 @@ INSTALL_STRIP=
 # Uncomment this to make mbr talk to a serial port.
 #CPPFLAGS+=-DSERIAL=0
 
-${.CURDIR}/mbr.S: assym.h
+.depend 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 6f54f2fb6b6..7de266c57fd 100644
--- a/sys/arch/amd64/stand/pxeboot/Makefile
+++ b/sys/arch/amd64/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2013/01/17 12:37:44 jsing Exp $
+#	$OpenBSD: Makefile,v 1.16 2013/01/18 21:09:04 espie Exp $
 
 MAN=	pxeboot.8
 
@@ -44,9 +44,7 @@ SRCS+=	divdi3.c moddi3.c qdivrem.c
 .PATH:	${S}/lib/libz
 SRCS+=	adler32.c crc32.c inflate.c inftrees.c
 
-${.CURDIR}/srt0.S: assym.h
-${SADIR}/libsa/gidt.S: assym.h
-${SADIR}/libsa/pxe_call.S: assym.h
+.depend 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 4cd3ff73770..f078dcde1b5 100644
--- a/sys/arch/i386/stand/biosboot/Makefile
+++ b/sys/arch/i386/stand/biosboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2013/01/18 04:10:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.26 2013/01/18 21:09:04 espie Exp $
 
 MAN=	biosboot.8
 
@@ -12,7 +12,7 @@ LD=ld
 LDFLAGS=-nostdlib -Ttext 0 -N -x -Bstatic -nopie
 INSTALL_STRIP=
 
-${.CURDIR}/biosboot.S: assym.h
+.depend 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 3326d71b7e3..d3e6ab97860 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.48 2013/01/18 04:10:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.49 2013/01/18 21:09:04 espie Exp $
 
 MAN?=	boot.8
 MLINKS?=boot.8 boot.conf.5
@@ -65,8 +65,7 @@ boot.bin: boot
 
 CLEANFILES+= ${PROG}.new
 
-${.CURDIR}/srt0.S: assym.h
-${SADIR}/libsa/gidt.S: assym.h
+.depend 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 4cb92db6409..b7d9c58c9d0 100644
--- a/sys/arch/i386/stand/cdboot/Makefile
+++ b/sys/arch/i386/stand/cdboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.16 2013/01/18 04:10:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.17 2013/01/18 21:09:04 espie Exp $
 
 MAN=	cdboot.8
 
@@ -43,8 +43,7 @@ SRCS+=	strlcpy.c
 .PATH:	${S}/lib/libz
 SRCS+=	adler32.c crc32.c inflate.c inftrees.c
 
-${.CURDIR}/srt0.S: assym.h
-${SADIR}/libsa/gidt.S: assym.h
+.depend 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 0882d869b5d..8fb916cbc57 100644
--- a/sys/arch/i386/stand/mbr/Makefile
+++ b/sys/arch/i386/stand/mbr/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.18 2013/01/18 04:10:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.19 2013/01/18 21:09:04 espie Exp $
 #
 
 S=	${.CURDIR}/../../../..
@@ -19,7 +19,7 @@ INSTALL_STRIP=
 # Uncomment this to make mbr talk to a serial port.
 #CPPFLAGS+=-DSERIAL=0
 
-${.CURDIR}/mbr.S: assym.h
+.depend 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 76093848b73..ae861e70b0d 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.13 2013/01/18 04:10:16 jsing Exp $
+#	$OpenBSD: Makefile,v 1.14 2013/01/18 21:09:04 espie Exp $
 
 MAN=	pxeboot.8
 
@@ -46,9 +46,7 @@ SRCS+=	strlcpy.c
 .PATH:	${S}/lib/libz
 SRCS+=	adler32.c crc32.c inflate.c inftrees.c
 
-${.CURDIR}/srt0.S: assym.h
-${SADIR}/libsa/gidt.S: assym.h
-${SADIR}/libsa/pxe_call.S: assym.h
+.depend srt0.o gidt.o pxe_call.o: assym.h
 
 ${PROG}: $(OBJS)
 	$(LD) $(LDFLAGS) -o ${PROG} $(OBJS)