diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2013-01-18 21:09:05 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2013-01-18 21:09:05 +0000 |
| commit | f9b13e2b82eb29e04043438332808b64bc8408f5 (patch) | |
| tree | c4cce6609c005824d8324aca99251ff215e0c790 /sys/arch/amd64/stand | |
| parent | 580ce525bce1d9d66f9b358ea01a9a9877cec4ef (diff) | |
fix bogus dependencies, and allow mkdep to run
checked on amd64 by rpe@
okay jsing@
Diffstat (limited to 'sys/arch/amd64/stand')
| -rw-r--r-- | sys/arch/amd64/stand/biosboot/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/boot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/cdboot/Makefile | 5 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/mbr/Makefile | 4 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/pxeboot/Makefile | 6 |
5 files changed, 10 insertions, 14 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) |