=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.16 retrieving revision 1.24 diff -u -r1.16 -r1.24 --- src/Makefile 1997/04/18 06:47:08 1.16 +++ src/Makefile 1998/02/15 20:56:40 1.24 @@ -1,5 +1,4 @@ -# $OpenBSD: Makefile,v 1.16 1997/04/18 06:47:08 deraadt Exp $ -# $NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $ +# $OpenBSD: Makefile,v 1.24 1998/02/15 20:56:40 niklas Exp $ # # For more information on building in tricky environments, please see @@ -28,10 +27,14 @@ SUBDIR+= sys lkm -.if defined(KERBEROS) +.if (${KERBEROS} == "yes") SUBDIR+= kerberosIV .endif +.if make(clean) || make(cleandir) || make(obj) +SUBDIR+= distrib +.endif + .if exists(regress) .ifmake !(install) SUBDIR+= regress @@ -59,6 +62,9 @@ .endif build: +.ifdef GLOBAL_AUTOCONF_CACHE + rm -f ${GLOBAL_AUTOCONF_CACHE} +.endif (cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/include; ${MAKE} includes) ${MAKE} cleandir @@ -67,9 +73,12 @@ .if (${MACHINE_ARCH} == "mips") ldconfig .endif -.if defined(KERBEROS) +.if (${KERBEROS} == "yes") (cd ${.CURDIR}/kerberosIV && ${MAKE} build) .endif +.if (${MACHINE_ARCH} == "mips") + ldconfig +.endif ${MAKE} depend && ${MAKE} && ${MAKE} install .if !defined(TARGET) @@ -108,6 +117,20 @@ ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \ ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \ ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder + +cross-gas: + -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin + (cd gnu/usr.bin/gas; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd gnu/usr.bin/gas; \ + TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE}) + (cd gnu/usr.bin/gas; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) cross-gcc: -mkdir -p ${CROSSDIR}/usr/obj