=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.15 retrieving revision 1.30 diff -u -r1.15 -r1.30 --- src/Makefile 1997/02/28 23:22:07 1.15 +++ src/Makefile 1998/05/11 20:34:54 1.30 @@ -1,19 +1,40 @@ -# $OpenBSD: Makefile,v 1.15 1997/02/28 23:22:07 niklas Exp $ -# $NetBSD: Makefile,v 1.25 1995/10/09 02:11:28 thorpej Exp $ +# $OpenBSD: Makefile,v 1.30 1998/05/11 20:34:54 niklas Exp $ +# +# For more information on building in tricky environments, please see +# the list of possible environment variables described in +# /usr/share/mk/bsd.README. +# +# Building recommendations: +# +# 1) If at all possible, put this source tree in /usr/src. If /usr/src +# must be a symbolic link, setenv BSDSRCDIR to point to the real location. +# +# 2) It is also recommended that you compile with objects outside the +# source tree. To do this, ensure /usr/obj exists or points to some +# area of disk of sufficient size. Then do "cd /usr/src; make obj". +# This will make a symbolic link called "obj" in each directory, as +# well as populate the /usr/obj properly with directories for the +# objects. +# +# 3) If you are reasonably sure that things will compile OK, use the +# "make build" target supplied here. Good luck. + .include # for NOMAN, if it's there. -# NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW - SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share games SUBDIR+= gnu 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 @@ -41,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 @@ -49,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) @@ -66,7 +93,8 @@ -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 @@ -75,7 +103,14 @@ ${MAKE} MACHINE=${TARGET} MACHINE_ARCH=`cat ${CROSSDIR}/TARGET_ARCH` \ DESTDIR=${CROSSDIR} includes -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 export BSDSRCDIR=`pwd`; \ (cd ${.CURDIR}/gnu/usr.bin/binutils; \ @@ -83,7 +118,7 @@ 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) @@ -91,6 +126,119 @@ ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \ ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-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 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; \ + 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 + +# Not yet functional +cross-ld: + -mkdir -p ${CROSSDIR}/usr/obj + -mkdir -p ${CROSSDIR}/usr/bin + (cd gnu/usr.bin/ld; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd gnu/usr.bin/ld; \ + TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} NOMAN=) + (cd gnu/usr.bin/ld; \ + 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 usr.bin/ar; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd usr.bin/ar; MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=) + (cd usr.bin/ar; \ + 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 usr.bin/ranlib; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd usr.bin/ranlib; MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=) + (cd usr.bin/ranlib; \ + 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 usr.bin/strip; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd usr.bin/strip; \ + MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=) + (cd usr.bin/strip; \ + 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 usr.bin/size; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd usr.bin/size; MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=) + (cd usr.bin/size; \ + 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 usr.bin/nm; \ + BSDOBJDIR=${CROSSDIR}/usr/obj \ + BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} obj) + (cd usr.bin/nm; MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ + ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=) + (cd usr.bin/nm; \ + 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; \ @@ -98,12 +246,13 @@ MAKEOBJDIR=obj.${MACHINE}.${TARGET} \ ${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} \ 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" install) .endif .include