diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-10-18 14:04:06 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2013-10-18 14:04:06 +0000 |
commit | 22f6148911aa607f3ed4f23c188b8ccc4515fc7c (patch) | |
tree | a46af99bd0cd9a0153349f14503e9382b66201c0 /distrib/ramdisk/Makefile | |
parent | 5fa67f2813bac2f558791d215154f5a2d6f3deea (diff) |
cleanup elfrdsetroot references; ok miod
Diffstat (limited to 'distrib/ramdisk/Makefile')
-rw-r--r-- | distrib/ramdisk/Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/distrib/ramdisk/Makefile b/distrib/ramdisk/Makefile index 7c21b920cfc..38e988cbccc 100644 --- a/distrib/ramdisk/Makefile +++ b/distrib/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2013/10/14 00:00:12 guenther Exp $ +# $OpenBSD: Makefile,v 1.43 2013/10/18 14:04:04 deraadt Exp $ REV= ${OSrev} @@ -21,7 +21,6 @@ REALIMAGE!= echo /var/tmp/image.${PID} IMAGE?= ramdisk${REV}.fs IMAGESIZE?= 8192 # 4MB in 512 byte blocks NEWFS_WILL_FAIL?=false -RDSETROOT?= elfrdsetroot RDSETROOT_EXT_SRC=${.CURDIR}/../common/elf32.c ${.CURDIR}/../common/elf64.c CRUNCHGENOPTS?=-E KERNEL?= RAMDISK @@ -84,17 +83,17 @@ bsd: ${MAKE} clean && ${MAKE} depend && COPTS=-Os ${MAKE} cp ${.CURDIR}/../../sys/arch/${MACHINE}/compile/${KERNEL}/bsd bsd -bsd.rd: bsd ${IMAGE} ${RDSETROOT} +bsd.rd: bsd ${IMAGE} rdsetroot cp bsd bsd.rd - ${.OBJDIR}/${RDSETROOT} bsd.rd ${IMAGE} + ${.OBJDIR}/rdsetroot bsd.rd ${IMAGE} ${STRIP} bsd.rd bsd.gz: bsd.rd ${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd.gz -${RDSETROOT}: ${.CURDIR}/../common/${RDSETROOT}.c ${RDSETROOT_EXT_SRC} - ${HOSTCC} ${HOSTCCFLAGS} -o ${RDSETROOT} ${RDSETROOT_EXT_SRC} \ - ${.CURDIR}/../common/${RDSETROOT}.c +rdsetroot: ${.CURDIR}/../common/elfrdsetroot.c ${RDSETROOT_EXT_SRC} + ${HOSTCC} ${HOSTCCFLAGS} -o rdsetroot ${RDSETROOT_EXT_SRC} \ + ${.CURDIR}/../common/elfrdsetroot.c ${IMAGE}: ${CBIN} dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE} |