cleanup elfrdsetroot references; ok miod

8 files changed, 36 insertions, 46 deletions

diff --git a/distrib/alpha/bsd.rd/Makefile b/distrib/alpha/bsd.rd/Makefile
index 45a2b4a4817..d5ee8975bad 100644
--- a/distrib/alpha/bsd.rd/Makefile
+++ b/distrib/alpha/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2011/07/08 21:39:32 drahn Exp $
+#	$OpenBSD: Makefile,v 1.20 2013/10/18 14:04:03 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -23,8 +23,6 @@ RAMDISK=	RAMDISKBIG
 BOOT?=		/usr/mdec/boot
 BOOTXX?=	/usr/mdec/bootxx
 
-RDSETROOT=	elfrdsetroot
-
 .include "${TOP}/inst-common/Makefile.inc"
 
 LISTS+=		${.CURDIR}/list.local
@@ -44,9 +42,9 @@ bsd.rd:	bsd.rd_unz
 	${STRIP} bsd.strip
 	${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.rd
 
-bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
+bsd.rd_unz: bsd ${IMAGE} rdsetroot
 	cp bsd bsd.rd_unz
-	${.OBJDIR}/${RDSETROOT} bsd.rd_unz ${IMAGE}
+	${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE}
 
 bsd:
 	cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
@@ -58,7 +56,7 @@ ${IMAGE}:	do_prep do_mount do_files do_umount
 	mv -f ${REALIMAGE} ${IMAGE}
 
 elfrdsetroot: ${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot \
+	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
 	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
 	    ${TOP}/../common/elf64.c
 
diff --git a/distrib/alpha/common/Makefile.inc b/distrib/alpha/common/Makefile.inc
index 45450cb93a9..06d66e6f438 100644
--- a/distrib/alpha/common/Makefile.inc
+++ b/distrib/alpha/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.24 2011/07/08 21:39:32 drahn Exp $
+#	$OpenBSD: Makefile.inc,v 1.25 2013/10/18 14:04:04 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -26,8 +26,6 @@ FLOPPYTYPE?=	floppy
 BOOT?=		/usr/mdec/boot
 BOOTXX?=	/usr/mdec/bootxx
 
-RDSETROOT=	elfrdsetroot
-
 .include "${TOP}/inst-common/Makefile.inc"
 
 all: ${CBIN} ${FLOPPY}
@@ -68,9 +66,9 @@ bsd.gz:	bsd.rd
 	${STRIP} bsd.strip
 	${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.gz
 
-bsd.rd: bsd ${IMAGE} ${RDSETROOT}
+bsd.rd: bsd ${IMAGE} rdsetroot
 	cp bsd bsd.rd
-	${.OBJDIR}/${RDSETROOT} bsd.rd ${IMAGE}
+	${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
 
 bsd:
 	cd ${.CURDIR}/../../../sys/arch/alpha/conf && config ${RAMDISK}
@@ -81,8 +79,8 @@ bsd:
 ${IMAGE}:	do_prep do_mount do_files do_umount
 	mv -f ${REALIMAGE} ${IMAGE}
 
-elfrdsetroot: ${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot \
+rdsetroot: ${TOP}/../common/elfrdsetroot.c
+	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
 	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
 	    ${TOP}/../common/elf64.c
 
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 934f7882a15..23f272aafbe 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.25 2013/10/14 00:00:08 guenther Exp $
+#	$OpenBSD: Makefile,v 1.26 2013/10/18 14:04:04 deraadt Exp $
 
 CBIN=		instbin
 ARCHDIR=	${.CURDIR}/..
@@ -20,8 +20,6 @@ REALIMAGE!=	echo /var/tmp/image.${PID}
 IMAGE?=		ramdisk${REV}.fs
 IMAGESIZE?=	4608 # 2.25MB 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
 UTILS?=		${.CURDIR}/../../miniroot
@@ -66,17 +64,19 @@ obsd:
 	    ${MAKE} clean && exec ${MAKE}
 	cp ${SRCDIR}/sys/arch/${MACHINE}/compile/${KERNEL}/bsd obsd
 
-bsd.rd:	obsd ${IMAGE} ${RDSETROOT}
+bsd.rd:	obsd ${IMAGE} rdsetroot
 	cp obsd bsd.rd
-	${.OBJDIR}/${RDSETROOT} bsd.rd ${IMAGE}
+	${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
 	@${STRIP} bsd.rd
 
 bsd:	bsd.rd
 	${GZIPCMD} ${GZIPFLAGS} < bsd.rd > bsd
 
-${RDSETROOT}: ${.CURDIR}/../../common/${RDSETROOT}.c ${RDSETROOT_EXT_SRC}
-	${HOSTCC} ${HOSTCCFLAGS} -o ${RDSETROOT} ${RDSETROOT_EXT_SRC} \
-	    ${.CURDIR}/../../common/${RDSETROOT}.c
+rdsetroot: ${.CURDIR}/../../common/elfrdsetroot.c \
+	   ${.CURDIR}/../../common/elf32.c ${.CURDIR}/../../common/elf64.c
+	${HOSTCC} ${HOSTCCFLAGS} -o rdsetroot \
+	    ${.CURDIR}/../../common/elf32.c ${.CURDIR}/../../common/elf64.c
+	    ${.CURDIR}/../../common/elfrdsetroot.c
 
 ${IMAGE}: ${CBIN}
 	dd if=/dev/zero of=${REALIMAGE} count=${IMAGESIZE}
diff --git a/distrib/luna88k/ramdisk/Makefile b/distrib/luna88k/ramdisk/Makefile
index b89499c4e94..f02a8bcaf3d 100644
--- a/distrib/luna88k/ramdisk/Makefile
+++ b/distrib/luna88k/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2013/10/15 22:46:51 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.16 2013/10/18 14:04:04 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -57,7 +57,7 @@ rd_teardown:
 
 rdsetroot:	${TOP}/../common/elfrdsetroot.c
 	${HOSTCC} -o rdsetroot \
-	    ${TOP}/../common/rdsetroot.c ${TOP}/../common/elf32.c \
+	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
 	    ${TOP}/../common/elf64.c
 
 unconfig:
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}
diff --git a/distrib/sgi/ramdisk/Makefile b/distrib/sgi/ramdisk/Makefile
index 5c8aa85537d..116649fb1c6 100644
--- a/distrib/sgi/ramdisk/Makefile
+++ b/distrib/sgi/ramdisk/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.19 2013/10/14 00:00:12 guenther Exp $
+#	$OpenBSD: Makefile,v 1.20 2013/10/18 14:04:04 deraadt Exp $
 
 REV=		${OSrev}
 
@@ -73,7 +73,7 @@ rd_teardown:
 	-umount ${MOUNT_POINT}
 	-vnconfig -u ${VND}
 
-rdsetroot:	${TOP}/../common/rdsetroot.c
+rdsetroot:	${TOP}/../common/elfrdsetroot.c
 	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
 	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
 	    ${TOP}/../common/elf64.c
diff --git a/distrib/sparc64/bsd.rd/Makefile b/distrib/sparc64/bsd.rd/Makefile
index fc4b5563166..fbb93bdef81 100644
--- a/distrib/sparc64/bsd.rd/Makefile
+++ b/distrib/sparc64/bsd.rd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2013/10/15 22:46:53 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.27 2013/10/18 14:04:05 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -27,9 +27,7 @@ RAMDISK=	RAMDISK
 BOOT?=		/usr/mdec/boot
 BOOTXX?=	/usr/mdec/bootxx
 
-RDSETROOT=	elfrdsetroot
-
-CLEANFILES+=	bsd.rd_unz elfrdsetroot
+CLEANFILES+=	bsd.rd_unz rdsetroot
 
 #.include "${TOP}/common/Makefile.inc"
 
@@ -48,9 +46,9 @@ bsd.rd:	bsd.rd_unz
 	${STRIP} bsd.strip
 	${GZIPCMD} -c ${GZIPFLAGS} bsd.strip > bsd.rd
 
-bsd.rd_unz: bsd ${IMAGE} ${RDSETROOT}
+bsd.rd_unz: bsd ${IMAGE} rdsetroot
 	cp bsd bsd.rd_unz
-	${.OBJDIR}/${RDSETROOT} bsd.rd_unz ${IMAGE}
+	${.OBJDIR}/rdsetroot bsd.rd_unz ${IMAGE}
 
 bsd:
 	cd ${.CURDIR}/../../../sys/arch/sparc64/conf && config ${RAMDISK}
@@ -61,8 +59,8 @@ bsd:
 ${IMAGE}:	do_prep do_mount do_files do_umount
 	mv -f ${REALIMAGE} ${IMAGE}
 
-elfrdsetroot: ${TOP}/../common/elfrdsetroot.c
-	${HOSTCC} ${HOSTCFLAGS} -o elfrdsetroot \
+rdsetroot:	${TOP}/../common/elfrdsetroot.c
+	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
 	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
 	    ${TOP}/../common/elf64.c
 
@@ -101,9 +99,6 @@ rd_teardown:
 	cp ${REALIMAGE} ${IMAGE}
 	rm ${REALIMAGE}
 
-rdsetroot:	${TOP}/../../common/rdsetroot.c
-	${HOSTCC} -o rdsetroot ${TOP}/../../common/rdsetroot.c
-
 unconfig:
 	-umount -f ${MOUNT_POINT}
 	-vnconfig -u ${VND}
diff --git a/distrib/sparc64/common/Makefile.inc b/distrib/sparc64/common/Makefile.inc
index e5040f76fd2..6a565211e71 100644
--- a/distrib/sparc64/common/Makefile.inc
+++ b/distrib/sparc64/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.14 2013/10/15 22:46:53 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.15 2013/10/18 14:04:05 deraadt Exp $
 
 TOP=		${.CURDIR}/..
 
@@ -67,8 +67,8 @@ rd_teardown:
 	cp ${REALIMAGE} ${IMAGE}
 	rm ${REALIMAGE}
 
-rdsetroot:	${TOP}/../../common/rdsetroot.c
-	${HOSTCC} -o rdsetroot ${TOP}/../../common/rdsetroot.c
+rdsetroot:	${TOP}/../../common/elfrdsetroot.c
+	${HOSTCC} -o rdsetroot ${TOP}/../../common/elfrdsetroot.c
 
 unconfig:
 	-umount -f ${MOUNT_POINT}