=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.73 retrieving revision 1.76 diff -u -r1.73 -r1.76 --- src/Makefile 2001/08/31 14:13:50 1.73 +++ src/Makefile 2001/09/07 19:29:49 1.76 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.73 2001/08/31 14:13:50 art Exp $ +# $OpenBSD: Makefile,v 1.76 2001/09/07 19:29:49 mickey Exp $ # # For more information on building in tricky environments, please see @@ -119,6 +119,9 @@ CPPFLAGS=-D__arch64__ .endif +cross-env: + @echo ${CROSSENV} DESTDIR=${CROSSDIR} + cross-helpers: @-mkdir -p ${CROSSDIR} echo _MACHINE_ARCH | \ @@ -158,8 +161,8 @@ MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \ ${MAKE} DESTDIR=${CROSSDIR} includes -.if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \ - ${TARGET} == "sparc64" +.if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \ + ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" cross-binutils: cross-binutils-new cross-binutils-links .else cross-binutils: cross-binutils-old cross-binutils-links @@ -201,7 +204,7 @@ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE}; \ + ${MAKE} depend all; \ TARGET_MACHINE_ARCH=${TARGET} \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) @@ -214,7 +217,7 @@ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} NOMAN=; \ + ${MAKE} NOMAN= depend all; \ TARGET_MACHINE_ARCH=${TARGET} \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) @@ -226,7 +229,7 @@ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ - MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/bin/ar \ @@ -237,7 +240,7 @@ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ - MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/bin/ranlib \ @@ -249,7 +252,7 @@ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= install) ln -sf ${CROSSDIR}/usr/bin/strip \ @@ -261,7 +264,7 @@ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/bin/size \ @@ -273,7 +276,7 @@ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} obj; \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \ DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN= install) ln -sf ${CROSSDIR}/usr/bin/nm \ @@ -297,7 +300,7 @@ ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \ ${CROSSDIR}/usr/bin/cc ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cccp \ + ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cpp \ ${CROSSDIR}/usr/libexec/cpp sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \ -e 's#/usr/include#${CROSSDIR}/usr/include#' \