make obj dirs in iso; talked with miod about it

7 files changed, 51 insertions, 7 deletions

diff --git a/distrib/alpha/Makefile b/distrib/alpha/Makefile
index f9a135c170e..6b2057fd404 100644
--- a/distrib/alpha/Makefile
+++ b/distrib/alpha/Makefile
@@ -1,7 +1,11 @@
-#	$OpenBSD: Makefile,v 1.6 2003/03/06 00:02:05 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/08/14 18:57:32 deraadt Exp $
 
 SUBDIR= bsd.rd floppy floppyB cdfs # floppyC
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
 unconfig:
 	cd bsd.rd; ${MAKE} unconfig
 	cd floppy; ${MAKE} unconfig
diff --git a/distrib/amd64/Makefile b/distrib/amd64/Makefile
index 5978683ad74..233143a7019 100644
--- a/distrib/amd64/Makefile
+++ b/distrib/amd64/Makefile
@@ -1,7 +1,11 @@
-#	$OpenBSD: Makefile,v 1.2 2004/02/22 00:24:41 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 2007/08/14 18:57:32 deraadt Exp $
 
 SUBDIR= ramdisk_cd ramdiskA cdfs
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
 unconfig:
 	cd ramdisk_cd; ${MAKE} unconfig
 	cd ramdiskA; ${MAKE} unconfig
diff --git a/distrib/hppa/Makefile b/distrib/hppa/Makefile
index 07d3fbfcde4..30f75fce699 100644
--- a/distrib/hppa/Makefile
+++ b/distrib/hppa/Makefile
@@ -1,5 +1,13 @@
-#	$OpenBSD: Makefile,v 1.1 2003/01/30 21:05:00 mickey Exp $
+#	$OpenBSD: Makefile,v 1.2 2007/08/14 18:57:32 deraadt Exp $
 
 SUBDIR=ramdisk
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
+unconfig:
+	cd ramdisk_cd; ${MAKE} unconfig
+	cd ramdiskA; ${MAKE} unconfig
+
 .include <bsd.subdir.mk>
diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile
index 89a802e230a..796d17b278e 100644
--- a/distrib/i386/Makefile
+++ b/distrib/i386/Makefile
@@ -1,7 +1,11 @@
-#	$OpenBSD: Makefile,v 1.7 2004/08/15 21:43:35 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/08/14 18:57:32 deraadt Exp $
 
 SUBDIR= ramdisk_cd ramdiskA ramdiskB ramdiskC cdfs cdfs-emu
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
 unconfig:
 	cd ramdisk_cd; ${MAKE} unconfig
 	cd ramdiskA; ${MAKE} unconfig
diff --git a/distrib/macppc/Makefile b/distrib/macppc/Makefile
index a3b24ec9062..2660bc13af6 100644
--- a/distrib/macppc/Makefile
+++ b/distrib/macppc/Makefile
@@ -1,5 +1,13 @@
-#	$OpenBSD: Makefile,v 1.1 2001/09/01 16:47:03 drahn Exp $
+#	$OpenBSD: Makefile,v 1.2 2007/08/14 18:57:32 deraadt Exp $
 
 SUBDIR= ramdisk
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
+unconfig:
+	cd ramdisk_cd; ${MAKE} unconfig
+	cd ramdiskA; ${MAKE} unconfig
+
 .include <bsd.subdir.mk>
diff --git a/distrib/sparc/Makefile b/distrib/sparc/Makefile
index a04b04bb8a9..d90a9bd754b 100644
--- a/distrib/sparc/Makefile
+++ b/distrib/sparc/Makefile
@@ -1,5 +1,13 @@
-#	$OpenBSD: Makefile,v 1.6 2003/03/05 23:17:20 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.7 2007/08/14 18:57:32 deraadt Exp $
 
 SUBDIR+= ../ramdisk ../miniroot cdfs
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
+unconfig:
+	cd ramdisk_cd; ${MAKE} unconfig
+	cd ramdiskA; ${MAKE} unconfig
+
 .include <bsd.subdir.mk>
diff --git a/distrib/sparc64/Makefile b/distrib/sparc64/Makefile
index ddf9d84dce8..cc9f9ed67a1 100644
--- a/distrib/sparc64/Makefile
+++ b/distrib/sparc64/Makefile
@@ -1,6 +1,14 @@
-#	$OpenBSD: Makefile,v 1.7 2005/08/09 16:48:11 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 2007/08/14 18:57:32 deraadt Exp $
 
 # preserve order: 'miniroot' depends on 'bsd.rd', 'cdfs' depends on 'miniroot'
 SUBDIR+= ramdisk ramdiskB bsd.rd miniroot cdfs
 
+.if	make(obj)
+SUBDIR+= iso
+.endif
+
+unconfig:
+	cd ramdisk_cd; ${MAKE} unconfig
+	cd ramdiskA; ${MAKE} unconfig
+
 .include <bsd.subdir.mk>