===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.40
retrieving revision 1.113
diff -u -r1.40 -r1.113
--- src/Makefile	1998/09/07 00:47:11	1.40
+++ src/Makefile	2005/09/16 12:28:34	1.113
@@ -1,14 +1,15 @@
-#	$OpenBSD: Makefile,v 1.40 1998/09/07 00:47:11 niklas Exp $
+#	$OpenBSD: Makefile,v 1.113 2005/09/16 12:28:34 jmc 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.
+# must be a symbolic link, set BSDSRCDIR in the environment 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
@@ -17,14 +18,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.
 #
-# 4) 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" 
+# 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.
+# directory. The "cross-distrib" target will build cross-tools as well as
+# binaries for a given <target>.
 #
 
 .include <bsd.own.mk>	# for NOMAN, if it's there.
@@ -34,294 +40,58 @@
 
 SUBDIR+= sys lkm
 
-.if (${KERBEROS} == "yes")
-SUBDIR+= kerberosIV
+.if (${KERBEROS5:L} == "yes")
+SUBDIR+= kerberosV
 .endif
 
 .if   make(clean) || make(cleandir) || make(obj)
-SUBDIR+= distrib
+SUBDIR+= distrib regress
 .endif
 
 .if exists(regress)
-.ifmake !(install)
-SUBDIR+= regress
-.endif
-
 regression-tests:
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+	@cd ${.CURDIR}/regress && ${MAKE} depend && 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)
-	${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
-.if (${MACHINE_ARCH} == "mips")
-	ldconfig
-.endif
-	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
+	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} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
+	cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
+	${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
 
+CROSS_TARGETS=cross-env cross-dirs cross-obj cross-includes cross-binutils \
+	cross-gcc cross-tools cross-lib cross-bin cross-etc-root-var \
+	cross-depend cross-clean cross-cleandir
+
 .if !defined(TARGET)
-cross-tools:
-	echo "TARGET must be set"; exit 1
+${CROSS_TARGETS}:
+	@echo "TARGET must be set for $@"; exit 1
 .else
-cross-tools:	cross-helpers cross-includes cross-binutils cross-gcc cross-lib
+. include "Makefile.cross"
+.endif # defined(TARGET)
 
-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 -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
-
-.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; \
-	    /bin/sh ${BSDSRCDIR}/gnu/usr.bin/binutils/configure \
-	    --prefix ${CROSSDIR}/usr \
-	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    ${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
-	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 \
-	    ${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
-
-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
-	-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
-	(cd ${CROSSDIR}/usr/obj/gnu/usr.bin/gcc; \
-	    /bin/sh ${.CURDIR}/gnu/usr.bin/gcc/configure \
-	    --prefix ${CROSSDIR}/usr \
-	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    ${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'#' \
-	    -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=; \
-		    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-		    DESTDIR=${CROSSDIR} ${MAKE} NOMAN= install); \
-	    done; \
-	    ${CROSSENV} MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
-	    ${CROSSENV} 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
+.PHONY: ${CROSS_TARGETS} \
+	build regression-tests includes beforeinstall afterinstall \
+	all depend
 
 .include <bsd.subdir.mk>