=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.47 retrieving revision 1.68 diff -u -r1.47 -r1.68 --- src/Makefile 1999/02/02 02:36:35 1.47 +++ src/Makefile 2001/06/26 15:33:28 1.68 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.47 1999/02/02 02:36:35 imp Exp $ +# $OpenBSD: Makefile,v 1.68 2001/06/26 15:33:28 hin Exp $ # # For more information on building in tricky environments, please see @@ -38,10 +38,14 @@ SUBDIR+= sys lkm -.if (${KERBEROS} == "yes") +.if (${KERBEROS:L} == "yes") SUBDIR+= kerberosIV .endif +.if (${KERBEROS5:L} == "yes") +SUBDIR+= kerberosV +.endif + .if make(clean) || make(cleandir) || make(obj) SUBDIR+= distrib .endif @@ -53,52 +57,55 @@ regression-tests: @echo Running regression tests... - @(cd ${.CURDIR}/regress && ${MAKE} regress) + @cd ${.CURDIR}/regress && exec ${MAKE} regress .endif includes: - (cd ${.CURDIR}/include; ${MAKE} includes) + cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes beforeinstall: -.ifndef DESTDIR - (cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs) -.else - (cd ${.CURDIR}/etc && ${MAKE} distrib-dirs) -.endif - (cd ${.CURDIR}/include; ${MAKE} includes) + cd ${.CURDIR}/etc && exec ${MAKE} DESTDIR=${DESTDIR} distrib-dirs + cd ${.CURDIR}/include && exec ${MAKE} includes afterinstall: .ifndef NOMAN - (cd ${.CURDIR}/share/man && ${MAKE} makedb) + cd ${.CURDIR}/share/man && exec ${MAKE} makedb .endif build: .ifdef GLOBAL_AUTOCONF_CACHE - rm -f ${GLOBAL_AUTOCONF_CACHE} + cp /dev/null ${GLOBAL_AUTOCONF_CACHE} .endif - (cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install) - (cd ${.CURDIR}/include; ${SUDO} ${MAKE} includes) + cd ${.CURDIR}/share/mk && exec ${SUDO} ${MAKE} install + cd ${.CURDIR}/include && ${MAKE} prereq && exec ${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 + cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \ + NOMAN=1 exec ${SUDO} ${MAKE} install + cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \ + NOMAN=1 exec ${SUDO} ${MAKE} install +.if (${KERBEROS:L} == "yes") + cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \ + NOMAN=1 exec ${SUDO} ${MAKE} install .endif -.if (${KERBEROS} == "yes") - (cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build) +.if (${KERBEROS5:L} == "yes") + cd ${.CURDIR}/kerberosV/lib && ${MAKE} depend && ${MAKE} && \ + NOMAN=1 exec ${SUDO} ${MAKE} install .endif + cd ${.CURDIR}/gnu/usr.bin/perl && \ + ${MAKE} -f Makefile.bsd-wrapper depend && \ + ${MAKE} -f Makefile.bsd-wrapper perl.lib && \ + exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib .if (${MACHINE_ARCH} == "mips") - ldconfig + ldconfig -R .endif - ${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install + ${MAKE} depend && ${MAKE} && exec ${SUDO} ${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-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 \ @@ -108,23 +115,53 @@ RANLIB=${CROSSDIR}/usr/bin/ranlib \ SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \ HOSTCC=cc +CROSSPATH= ${PATH}:${CROSSDIR}/usr/bin 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 - export MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` ;\ +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/include/kerberosIV + @-mkdir -p ${CROSSDIR}/usr/include/kerberosV + @-mkdir -p ${CROSSDIR}/usr/lib + @-mkdir -p ${CROSSDIR}/usr/libexec + @-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 + cd include; \ + MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \ + ${MAKE} prereq && \ + MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \ ${MAKE} DESTDIR=${CROSSDIR} includes - ln -sf ${CROSSDIR}/usr/include \ - ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \ ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa" @@ -133,9 +170,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 \ @@ -144,43 +179,20 @@ (cd ${CROSSDIR}/usr/obj/gnu/usr.bin/binutils; \ /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \ --prefix ${CROSSDIR}/usr \ + --disable-nls --disable-gdbtk --disable-commonbfdlib \ --target `cat ${CROSSDIR}/TARGET_CANON` && \ - ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install) + ${MAKE} CFLAGS=${CFLAGS} && ${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`-strings \ - ${CROSSDIR}/usr/bin/strings - ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder \ + ${.CURDIR}/usr.bin/lorder/lorder.sh \ ${CROSSDIR}/usr/bin/lorder - ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objcopy \ - ${CROSSDIR}/usr/bin/objcopy - ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-objdump \ - ${CROSSDIR}/usr/bin/objdump - ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-gdb \ - ${CROSSDIR}/usr/bin/gdb cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \ cross-ranlib cross-nm + for cmd in ar as ld nm ranlib size strip; do \ + ln -sf $$cmd \ + ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; done -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} \ @@ -193,9 +205,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} \ @@ -208,9 +218,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} \ @@ -221,9 +229,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} \ @@ -234,9 +240,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} \ @@ -248,9 +252,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} \ @@ -262,9 +264,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} \ @@ -276,38 +276,34 @@ 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} \ - build_infodir=. \ + PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES=c \ + LDFLAGS=${LDSTATIC} build_infodir=. \ GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \ ${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'#' \ + ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ + ${CROSSDIR}/usr/obj/gnu/egcs/gcc/xcpp \ + ${CROSSDIR}/usr/libexec/cpp + sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/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 + chown ${BINOWN}:${BINGRP} ${CROSSDIR}/usr/bin/cpp # XXX MAKEOBJDIR maybe should be obj.${TARGET} here, revisit later -cross-lib: - -mkdir -p ${CROSSDIR}/usr/obj - -mkdir -p ${CROSSDIR}/usr/lib - -mkdir -p ${CROSSDIR}/var/db +cross-lib: cross-dirs MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ export MACHINE MACHINE_ARCH; \ (cd ${.CURDIR}/lib; \ @@ -329,24 +325,30 @@ ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ DESTDIR=${CROSSDIR} SKIPDIR=libocurses/PSD.doc \ ${MAKE} NOMAN= install) -.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) +.if (${KERBEROS:L} == "yes") + MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ + export MACHINE MACHINE_ARCH; \ + cd kerberosIV/lib; \ + BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= depend; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + ${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install .endif - ln -sf ${CROSSDIR}/usr/lib \ - ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib - +.if (${KERBEROS5:L} == "yes") + MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH`; \ + export MACHINE MACHINE_ARCH; \ + cd kerberosV/lib; \ + BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} obj; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= depend; \ + ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \ + ${CROSSENV} DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN= install +.endif .endif .include