===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.37
retrieving revision 1.50
diff -u -r1.37 -r1.50
--- src/Makefile	1998/05/18 17:40:00	1.37
+++ src/Makefile	1999/09/27 04:04:52	1.50
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.37 1998/05/18 17:40:00 mickey Exp $
+#	$OpenBSD: Makefile,v 1.50 1999/09/27 04:04:52 deraadt Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -17,8 +17,19 @@
 # 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
+# 3) It is strongly recommended that you build and install a new kernel
+# before rebuilding your system. Some of the new programs may use new
+# functionality or depend on API changes that your old kernel doesn't have.
+#
+# 4) If you are reasonably sure that things will compile OK, use the
 # "make build" target supplied here. Good luck.
+#
+# 5) If you want to setup a cross-build environment, there is a "cross-tools"
+# target available which upon completion of "make TARGET=<target> cross-tools" 
+# (where <target> is one of the names in the /sys/arch directory) will produce
+# a set of compilation tools along with the includes in the /usr/cross/<target>
+# directory.
+#
 
 .include <bsd.own.mk>	# for NOMAN, if it's there.
 
@@ -46,11 +57,11 @@
 .endif
 
 includes:
-	(cd ${.CURDIR}/include; ${MAKE} includes)	
+	(cd ${.CURDIR}/include; ${MAKE} prereq; ${MAKE} includes)
 
 beforeinstall:
 .ifndef DESTDIR
-	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs)
+	(cd ${.CURDIR}/etc && ${MAKE} DESTDIR= distrib-dirs)
 .else
 	(cd ${.CURDIR}/etc && ${MAKE} distrib-dirs)
 .endif
@@ -65,53 +76,80 @@
 .ifdef GLOBAL_AUTOCONF_CACHE
 	rm -f ${GLOBAL_AUTOCONF_CACHE}
 .endif
-	(cd ${.CURDIR}/share/mk && ${MAKE} install)
-	(cd ${.CURDIR}/include; ${MAKE} includes)
-	${MAKE} cleandir
-	(cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install)
+	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
+	(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)
-.endif
+	(cd ${.CURDIR}/kerberosIV && ${MAKE} SUDO=${SUDO} build)
 .if (${MACHINE_ARCH} == "mips")
 	ldconfig
 .endif
-	${MAKE} depend && ${MAKE} && ${MAKE} install
+.endif
+	${MAKE} depend && ${MAKE} && ${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 \
 		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
@@ -119,9 +157,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 \
@@ -131,7 +167,7 @@
 	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
 	    --prefix ${CROSSDIR}/usr \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    ${MAKE} && ${MAKE} install)
+	    ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} DESTDIR=${CROSSDIR} install)
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
 	    ${.CURDIR}/usr.bin/lorder/lorder.sh.gnm \
 	    ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-lorder
@@ -163,10 +199,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} \
@@ -179,9 +212,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} \
@@ -194,9 +225,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} \
@@ -207,9 +236,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} \
@@ -220,9 +247,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} \
@@ -234,9 +259,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} \
@@ -248,9 +271,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} \
@@ -262,9 +283,7 @@
 	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
+cross-gcc:	cross-dirs
 	cd ${.CURDIR}/gnu/usr.bin/gcc; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj BSDSRCDIR=${.CURDIR} \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
@@ -289,10 +308,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; \
@@ -302,16 +319,33 @@
 	    for lib in csu libc; 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); \
+		    ${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=; \
-	    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
-
+	    ${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)
+.endif
 .endif
 
 .include <bsd.subdir.mk>