=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.44 retrieving revision 1.56 diff -u -r1.44 -r1.56 --- src/Makefile 1999/01/08 00:26:59 1.44 +++ src/Makefile 2000/04/21 00:10:40 1.56 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.44 1999/01/08 00:26:59 millert Exp $ +# $OpenBSD: Makefile,v 1.56 2000/04/21 00:10:40 millert Exp $ # # For more information on building in tricky environments, please see @@ -57,7 +57,7 @@ .endif includes: - (cd ${.CURDIR}/include; ${MAKE} includes) + (cd ${.CURDIR}/include; ${MAKE} prereq; ${MAKE} includes) beforeinstall: .ifndef DESTDIR @@ -77,20 +77,22 @@ rm -f ${GLOBAL_AUTOCONF_CACHE} .endif (cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install) - (cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes) + (cd ${.CURDIR}/include; ${MAKE} prereq; ${SUDO} ${MAKE} includes) ${SUDO} ${MAKE} cleandir (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \ ${SUDO} ${MAKE} install) (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \ ${SUDO} ${MAKE} install) -.if (${MACHINE_ARCH} == "mips") - ldconfig -.endif .if (${KERBEROS} == "yes") - (cd ${.CURDIR}/kerberosIV && ${MAKE} build) + (cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \ + ${SUDO} ${MAKE} install) .endif + (cd ${.CURDIR}/gnu/usr.bin/perl && \ + ${MAKE} -f Makefile.bsd-wrapper depend && \ + ${MAKE} -f Makefile.bsd-wrapper perl.lib && \ + ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib) .if (${MACHINE_ARCH} == "mips") - ldconfig + ldconfig -R .endif ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install @@ -98,33 +100,58 @@ cross-tools: echo "TARGET must be set"; exit 1 .else -cross-tools: cross-helpers cross-includes cross-binutils cross-gcc cross-lib +cross-tools: cross-helpers cross-dirs cross-includes cross-binutils \ + cross-gcc cross-lib CROSSDIR= ${DESTDIR}/usr/cross/${TARGET} CROSSENV= AR=${CROSSDIR}/usr/bin/ar AS=${CROSSDIR}/usr/bin/as \ CC=${CROSSDIR}/usr/bin/cc CPP=${CROSSDIR}/usr/bin/cpp \ LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \ + LORDER=${CROSSDIR}/usr/bin/lorder \ RANLIB=${CROSSDIR}/usr/bin/ranlib \ SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \ HOSTCC=cc cross-helpers: - -mkdir -p ${CROSSDIR}/usr/include + mkdir -p ${CROSSDIR} echo _MACHINE_ARCH | \ cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \ ${CPP} -E -I${.CURDIR}/sys/arch | \ sed -n '$$p' >${CROSSDIR}/TARGET_ARCH +# GROSS KLUDGE MACHINE_ARCH is mips, but we use mipsel for gnu tools. +.if ${TARGET} == "arc" || ${TARGET} == "pmax" eval `grep '^osr=' sys/conf/newvers.sh`; \ + sed "s/\$$/el-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \ + ${CROSSDIR}/TARGET_CANON +.else + eval `grep '^osr=' sys/conf/newvers.sh`; \ sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \ ${CROSSDIR}/TARGET_CANON +.endif -cross-includes: - -mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include - ${MAKE} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \ - DESTDIR=${CROSSDIR} includes - ln -sf ${CROSSDIR}/usr/include \ - ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include +cross-dirs: ${CROSSDIR}/stamp.dirs + @-mkdir -p ${CROSSDIR} + @-mkdir -p ${CROSSDIR}/usr/obj + @-mkdir -p ${CROSSDIR}/usr/bin + @-mkdir -p ${CROSSDIR}/usr/include + @-mkdir -p ${CROSSDIR}/usr/lib + @-mkdir -p ${CROSSDIR}/var/db + @-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON` + @ln -sf ${CROSSDIR}/usr/include \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include + @ln -sf ${CROSSDIR}/usr/lib \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib + @-mkdir -p ${CROSSDIR}/usr/obj + @-mkdir -p ${CROSSDIR}/usr/bin + @-mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin +${CROSSDIR}/stamp.dirs: + @touch ${CROSSDIR}/stamp.dirs + +cross-includes: cross-dirs + export MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` ;\ + ${MAKE} DESTDIR=${CROSSDIR} includes + .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \ ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa" cross-binutils: cross-binutils-new @@ -132,9 +159,7 @@ cross-binutils: cross-binutils-old .endif -cross-binutils-new: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-binutils-new: cross-dirs export BSDSRCDIR=`pwd`; \ (cd ${.CURDIR}/gnu/usr.bin/binutils; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ @@ -146,7 +171,7 @@ --target `cat ${CROSSDIR}/TARGET_CANON` && \ ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install) ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \ - ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \ + ${.CURDIR}/usr.bin/lorder/lorder.sh \ ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-as \ ${CROSSDIR}/usr/bin/as @@ -176,10 +201,7 @@ cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \ cross-ranlib cross-nm -cross-gas: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin - -mkdir -p ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin +cross-gas: cross-dirs (cd ${.CURDIR}/gnu/usr.bin/gas; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -192,9 +214,7 @@ ln -sf ${CROSSDIR}/usr/bin/as \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/as -cross-ld: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-ld: cross-dirs (cd ${.CURDIR}/gnu/usr.bin/ld; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -207,9 +227,7 @@ ln -sf ${CROSSDIR}/usr/bin/ld \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ld -cross-ar: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-ar: cross-dirs (cd ${.CURDIR}/usr.bin/ar; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -220,9 +238,7 @@ ln -sf ${CROSSDIR}/usr/bin/ar \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ar -cross-ranlib: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-ranlib: cross-dirs (cd ${.CURDIR}/usr.bin/ranlib; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -233,9 +249,7 @@ ln -sf ${CROSSDIR}/usr/bin/ranlib \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ranlib -cross-strip: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-strip: cross-dirs (cd ${.CURDIR}/usr.bin/strip; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -247,9 +261,7 @@ ln -sf ${CROSSDIR}/usr/bin/strip \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/strip -cross-size: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-size: cross-dirs (cd ${.CURDIR}/usr.bin/size; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -261,9 +273,7 @@ ln -sf ${CROSSDIR}/usr/bin/size \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/size -cross-nm: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin +cross-nm: cross-dirs (cd ${.CURDIR}/usr.bin/nm; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ @@ -275,15 +285,13 @@ ln -sf ${CROSSDIR}/usr/bin/nm \ ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm -cross-gcc: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/bin - cd ${.CURDIR}/gnu/usr.bin/gcc; \ +cross-gcc: cross-dirs + cd ${.CURDIR}/gnu/egcs/gcc; \ BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} -f Makefile.bsd-wrapper obj - (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \ - /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \ + (cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \ + /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \ --prefix ${CROSSDIR}/usr \ --target `cat ${CROSSDIR}/TARGET_CANON` && \ ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \ @@ -302,10 +310,8 @@ chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp -cross-lib: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/lib - -mkdir -p ${CROSSDIR}/var/db +# XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later +cross-lib: cross-dirs MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ export MACHINE MACHINE_ARCH; \ (cd ${.CURDIR}/lib; \ @@ -315,17 +321,33 @@ for lib in csu libc; do \ (cd $$lib; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= depend; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} NOMAN=; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \ done; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= depend; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \ ${MAKE} NOMAN= install) - ln -sf ${CROSSDIR}/usr/lib \ - ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib - +.if (${KERBEROS} == "yes") + (cd kerberosIV; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + for lib in acl krb kadm kafs kdb; do \ + (cd $$lib; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= depend; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install); \ + done) +.endif .endif .include