summaryrefslogtreecommitdiff
path: root/distrib/i386/common/Makefile.inc
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/i386/common/Makefile.inc')
-rw-r--r--distrib/i386/common/Makefile.inc15
1 files changed, 4 insertions, 11 deletions
diff --git a/distrib/i386/common/Makefile.inc b/distrib/i386/common/Makefile.inc
index 8823497eb10..e755d39c92c 100644
--- a/distrib/i386/common/Makefile.inc
+++ b/distrib/i386/common/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.44 2017/08/13 15:41:30 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.45 2019/04/05 21:08:00 deraadt Exp $
TOP= ${.CURDIR}/..
@@ -65,10 +65,9 @@ bsd.gz: bsd.rd
strip -R .comment -R .SUNW_ctf bsd.strip
gzip -c9n bsd.strip > bsd.gz
-bsd.rd: ${IMAGE} bsd rdsetroot
+bsd.rd: ${IMAGE} bsd
cp bsd bsd.rd
- ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
-
+ rdsetroot bsd.rd ${IMAGE}
bsd:
cd ${.CURDIR}/../../../sys/arch/i386/compile/${RAMDISK} && \
@@ -88,11 +87,6 @@ ${IMAGE}: ${CBIN}
df -i /dev/${VND}a
vnconfig -u ${VND}
-rdsetroot: ${TOP}/../common/elfrdsetroot.c
- ${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
- ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
- ${TOP}/../common/elf64.c
-
.ifdef RELEASEDIR
install:
.ifndef NOBSDRD
@@ -118,8 +112,7 @@ ${CRUNCHCONF}: ${LISTS}
clean cleandir:
/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
*.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \
- lib*.a lib*.olist ${CBIN}.map \
- rdsetroot boot ${CRUNCHCONF} ${FS}
+ lib*.a lib*.olist ${CBIN}.map boot ${CRUNCHCONF} ${FS}
/bin/rm -rf ${IMAGE}.d
.include <bsd.obj.mk>