summaryrefslogtreecommitdiff
path: root/etc/etc.amd64/Makefile.inc
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2011-07-22 09:30:55 +0000
committerMarc Espie <espie@cvs.openbsd.org>2011-07-22 09:30:55 +0000
commita9b4c06ebf41cc104b32ac8b53f1216d9f43366b (patch)
tree0d13349816cc5f7b911f32ff2e178f3a11e5d3a6 /etc/etc.amd64/Makefile.inc
parent180b3f32fdc59ec916e5236e2f6f2445b1698cc7 (diff)
unify kernel building on various platforms.
feedback from miod@ and deraadt@
Diffstat (limited to 'etc/etc.amd64/Makefile.inc')
-rw-r--r--etc/etc.amd64/Makefile.inc23
1 files changed, 3 insertions, 20 deletions
diff --git a/etc/etc.amd64/Makefile.inc b/etc/etc.amd64/Makefile.inc
index f9d322aa017..564de071902 100644
--- a/etc/etc.amd64/Makefile.inc
+++ b/etc/etc.amd64/Makefile.inc
@@ -1,27 +1,10 @@
-# $OpenBSD: Makefile.inc,v 1.12 2011/04/15 03:11:38 deraadt Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2011/07/22 09:30:54 espie Exp $
-kernels: bsd bsd.mp bootblocks
- cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC/bsd \
- ${RELEASEDIR}/bsd
- cp ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP/bsd \
- ${RELEASEDIR}/bsd.mp
-
-bsd:
- cd ${.CURDIR}/../sys/arch/amd64/conf && config GENERIC
- cd ${.CURDIR}/../sys/arch/amd64/compile/GENERIC && \
- ${MAKE} clean && exec ${MAKE}
-
-bsd.mp:
- cd ${.CURDIR}/../sys/arch/amd64/conf && config GENERIC.MP
- cd ${.CURDIR}/../sys/arch/amd64/compile/GENERIC.MP && \
- ${MAKE} clean && exec ${MAKE}
+KERNELS += GENERIC.MP bsd.mp
bootblocks:
cp ${DESTDIR}/usr/mdec/pxeboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/cdboot ${RELEASEDIR}
cp ${DESTDIR}/usr/mdec/cdbr ${RELEASEDIR}
-MDEXT= bsd bsd.mp bsd.rd cd${OSrev}.iso \
- floppy${OSrev}.fs pxeboot cdboot cdbr
-
-.PHONY: bsd bsd.mp bootblocks
+MDEXT= bsd.rd cd${OSrev}.iso floppy${OSrev}.fs pxeboot cdboot cdbr