diff options
author | ru <ru@FreeBSD.org> | 2004-02-07 23:30:45 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2004-02-07 23:30:45 +0000 |
commit | f53bd8d5bdedd831187e22cf272a5d79d9c56a5e (patch) | |
tree | 6319a9035cf5d9eea441f304e086561d9902c965 | |
parent | 0a1ce2dc9837bb14ad4d89b18b723f67bb7f6dcc (diff) | |
download | FreeBSD-src-f53bd8d5bdedd831187e22cf272a5d79d9c56a5e.zip FreeBSD-src-f53bd8d5bdedd831187e22cf272a5d79d9c56a5e.tar.gz |
Argh, unbreak "make depend" for AMD64.
Reported by: kris
-rw-r--r-- | sys/boot/i386/boot2/Makefile | 2 | ||||
-rw-r--r-- | sys/boot/i386/gptboot/Makefile | 2 | ||||
-rw-r--r-- | sys/boot/i386/libi386/Makefile | 9 | ||||
-rw-r--r-- | sys/boot/i386/loader/Makefile | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile index f1585daa..3356a6c 100644 --- a/sys/boot/i386/boot2/Makefile +++ b/sys/boot/i386/boot2/Makefile @@ -96,7 +96,7 @@ boot2.h: boot1.out REL1=`printf "%d" ${REL1}` > ${.TARGET} .if ${MACHINE_ARCH} == "amd64" -boot2.s: machine +beforedepend boot2.s: machine CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile index f1585daa..3356a6c 100644 --- a/sys/boot/i386/gptboot/Makefile +++ b/sys/boot/i386/gptboot/Makefile @@ -96,7 +96,7 @@ boot2.h: boot1.out REL1=`printf "%d" ${REL1}` > ${.TARGET} .if ${MACHINE_ARCH} == "amd64" -boot2.s: machine +beforedepend boot2.s: machine CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile index c785dc7..bfae7ce 100644 --- a/sys/boot/i386/libi386/Makefile +++ b/sys/boot/i386/libi386/Makefile @@ -30,11 +30,14 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ # the location of libstand CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ -.include <bsd.lib.mk> - .if ${MACHINE_ARCH} == "amd64" -${OBJS}: machine CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine .endif + +.include <bsd.lib.mk> + +.if ${MACHINE_ARCH} == "amd64" +beforedepend ${OBJS}: machine +.endif diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile index 27cbf5b..da6f696 100644 --- a/sys/boot/i386/loader/Makefile +++ b/sys/boot/i386/loader/Makefile @@ -93,7 +93,7 @@ loader.sym: ${OBJS} ${LIBFICL} ${LIBI386} ${LIBSTAND} ${LIBFICL} ${LIBI386} ${LIBSTAND} .if ${MACHINE_ARCH} == "amd64" -${OBJS}: machine +beforedepend ${OBJS}: machine CLEANFILES+= machine machine: ln -sf ${.CURDIR}/../../../i386/include machine |