Reorganize the way machine architectures are handled. Consolidate the
authorMatthew Dillon <dillon@dragonflybsd.org>
Sun, 22 Oct 2006 16:12:50 +0000 (16:12 +0000)
committerMatthew Dillon <dillon@dragonflybsd.org>
Sun, 22 Oct 2006 16:12:50 +0000 (16:12 +0000)
kernel configurations into a single generic directory.  Move machine-specific
Makefile's and loader scripts into the appropriate architecture directory.

Kernel and module builds also generally add sys/arch to the include path so
source files that include architecture-specific headers do not have to
be adjusted.

sys/<ARCH>            -> sys/arch/<ARCH>
sys/conf/*.<ARCH>     -> sys/arch/<ARCH>/conf/*.<ARCH>
sys/<ARCH>/conf/<KERNEL> -> sys/config/<KERNEL>

Makefile.inc1
include/Makefile

index fcbaba4..07f81f6 100644 (file)
@@ -1,6 +1,6 @@
 #
 # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $
-# $DragonFly: src/Makefile.inc1,v 1.88 2006/09/27 12:10:33 corecode Exp $
+# $DragonFly: src/Makefile.inc1,v 1.89 2006/10/22 16:12:48 dillon Exp $
 #
 # Build-time options are documented in make.conf(5).
 #
@@ -472,7 +472,7 @@ KERNCONF?=  GENERIC
 INSTKERNNAME?= kernel
 
 KRNLSRCDIR=    ${.CURDIR}/sys
-KRNLCONFDIR=   ${KRNLSRCDIR}/${TARGET}/conf
+KRNLCONFDIR=   ${KRNLSRCDIR}/config
 KRNLOBJDIR=    ${OBJTREE}${KRNLSRCDIR}
 KERNCONFDIR?=  ${KRNLCONFDIR}
 
index d801bdb..bc1a002 100644 (file)
@@ -1,6 +1,6 @@
 #      @(#)Makefile    8.2 (Berkeley) 1/4/94
 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $
-# $DragonFly: src/include/Makefile,v 1.29 2006/06/25 11:02:37 corecode Exp $
+# $DragonFly: src/include/Makefile,v 1.30 2006/10/22 16:12:50 dillon Exp $
 #
 # Doing a make install builds /usr/include
 #
@@ -159,12 +159,12 @@ copies:           mtree_setup
        cd ${.CURDIR}/../sys; \
                ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 opencrypto/*.h \
                ${DESTDIR}/usr/include/crypto
-.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include)
-       cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include; \
+.if exists(${.CURDIR}/../sys/arch/${MACHINE_ARCH}/include)
+       cd ${.CURDIR}/../sys/arch/${MACHINE_ARCH}/include; \
                ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
                ${DESTDIR}/usr/include/machine
-.if exists(${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc)
-       cd ${.CURDIR}/../sys/${MACHINE_ARCH}/include/pc; \
+.if exists(${.CURDIR}/../sys/arch/${MACHINE_ARCH}/include/pc)
+       cd ${.CURDIR}/../sys/arch/${MACHINE_ARCH}/include/pc; \
                ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \
                ${DESTDIR}/usr/include/machine/pc
 .endif
@@ -198,7 +198,7 @@ symlinks:   mtree_setup
        ${LN} -s ../../../../sys/$i ${DESTDIR}/usr/include/$i
 .endfor
        rm -rf ${DESTDIR}/usr/include/machine
-       ${LN} -s ../../sys/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
+       ${LN} -s ../../sys/arch/${MACHINE_ARCH}/include ${DESTDIR}/usr/include/machine
        rm -rf ${DESTDIR}/usr/include/i4b_machine
        ${LN} -s ../../sys/net/i4b/include/${MACHINE_ARCH} ${DESTDIR}/usr/include/i4b_machine