=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.16 retrieving revision 1.36 diff -u -r1.16 -r1.36 --- src/Makefile 1997/04/18 06:47:08 1.16 +++ src/Makefile 1998/05/18 17:37:04 1.36 @@ -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.36 1998/05/18 17:37:04 mickey 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,61 +73,237 @@ .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) cross-tools: echo "TARGET must be set"; exit 1 .else -cross-tools: cross-helpers cross-includes cross-binutils cross-gcc +cross-tools: cross-helpers 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 \ + RANLIB=${CROSSDIR}/usr/bin/ranlib \ + SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \ + HOSTCC=cc cross-helpers: -mkdir -p ${CROSSDIR}/usr/include echo _MACHINE_ARCH | \ cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \ - ${CPP} -E |sed -n '$$p' >${CROSSDIR}/TARGET_ARCH + ${CPP} -E -I${.CURDIR}/sys/arch | \ + sed -n '$$p' >${CROSSDIR}/TARGET_ARCH eval `grep '^osr=' sys/conf/newvers.sh`; \ sed "s/\$$/-unknown-openbsd$$osr/" ${CROSSDIR}/TARGET_ARCH > \ ${CROSSDIR}/TARGET_CANON 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-binutils: +.if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \ + ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa" +cross-binutils: cross-binutils-new +.else +cross-binutils: cross-binutils-old +.endif + +cross-binutils-new: -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin export BSDSRCDIR=`pwd`; \ (cd ${.CURDIR}/gnu/usr.bin/binutils; \ BSDOBJDIR=${CROSSDIR}/usr/obj \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${MAKE} -f Makefile.bsd-wrapper obj); \ (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \ - ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \ + /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \ --prefix ${CROSSDIR}/usr \ --target `cat ${CROSSDIR}/TARGET_CANON` && \ ${MAKE} && ${MAKE} install) ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \ ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \ ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-as \ + ${CROSSDIR}/usr/bin/as + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ar \ + ${CROSSDIR}/usr/bin/ar + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ld \ + ${CROSSDIR}/usr/bin/ld + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-strip \ + ${CROSSDIR}/usr/bin/strip + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-size \ + ${CROSSDIR}/usr/bin/size + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-ranlib \ + ${CROSSDIR}/usr/bin/ranlib + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-nm \ + ${CROSSDIR}/usr/bin/nm + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder \ + ${CROSSDIR}/usr/bin/lorder +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 + (cd ${.CURDIR}/gnu/usr.bin/gas; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE}; \ + TARGET_MACHINE_ARCH=${TARGET} \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + 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 + (cd ${.CURDIR}/gnu/usr.bin/ld; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN=; \ + TARGET_MACHINE_ARCH=${TARGET} \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + 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 + (cd ${.CURDIR}/usr.bin/ar; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + 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 + (cd ${.CURDIR}/usr.bin/ranlib; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + 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 + (cd ${.CURDIR}/usr.bin/strip; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= install) + 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 + (cd ${.CURDIR}/usr.bin/size; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + 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 + (cd ${.CURDIR}/usr.bin/nm; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install) + ln -sf ${CROSSDIR}/usr/bin/nm \ + ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/nm + cross-gcc: -mkdir -p ${CROSSDIR}/usr/obj - (cd gnu/usr.bin/gcc; \ + -mkdir -p ${CROSSDIR}/usr/bin + cd ${.CURDIR}/gnu/usr.bin/gcc; \ BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ - ${MAKE} -f Makefile.bsd-wrapper obj) + ${MAKE} -f Makefile.bsd-wrapper obj (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \ - ${.CURDIR}/gnu/usr.bin/gcc/configure \ + /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \ --prefix ${CROSSDIR}/usr \ --target `cat ${CROSSDIR}/TARGET_CANON` && \ - ${MAKE} BISON=yacc LANGUAGES=c \ + ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \ + build_infodir=. \ GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \ - ${MAKE} LANGUAGES=c install) + ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \ + GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" \ + build_infodir=. INSTALL_MAN= INSTALL_HEADERS_DIR= install) + ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gcc \ + ${CROSSDIR}/usr/bin/cc + CPP=`${CROSSDIR}/usr/bin/cc -print-libgcc-file-name | \ + sed 's/libgcc\.a/cpp/'`; \ + sed -e 's#/usr/libexec/cpp#'$$CPP'#' \ + -e 's#/usr/include#${CROSSDIR}/usr/include#' \ + ${.CURDIR}/usr.bin/cpp/cpp.sh > ${CROSSDIR}/usr/bin/cpp + 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 + MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ + export MACHINE MACHINE_ARCH; \ + (cd ${.CURDIR}/lib; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj; \ + for lib in csu libc; do \ + (cd $$lib; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN=; \ + DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install); \ + done; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + 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 + .endif .include