===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.63
retrieving revision 1.78
diff -u -r1.63 -r1.78
--- src/Makefile	2001/01/27 00:58:23	1.63
+++ src/Makefile	2001/09/14 06:03:11	1.78
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.63 2001/01/27 00:58:23 niklas Exp $
+#	$OpenBSD: Makefile,v 1.78 2001/09/14 06:03:11 fgsch Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -42,6 +42,10 @@
 SUBDIR+= kerberosIV
 .endif
 
+.if (${KERBEROS5:L} == "yes")
+SUBDIR+= kerberosV
+.endif
+
 .if   make(clean) || make(cleandir) || make(obj)
 SUBDIR+= distrib
 .endif
@@ -53,48 +57,45 @@
 
 regression-tests:
 	@echo Running regression tests...
-	@(cd ${.CURDIR}/regress && ${MAKE} regress)
+	@cd ${.CURDIR}/regress && exec ${MAKE} regress
 .endif
 
 includes:
-	(cd ${.CURDIR}/include; ${MAKE} prereq; ${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
 	cp /dev/null ${GLOBAL_AUTOCONF_CACHE}
 .endif
-	(cd ${.CURDIR}/share/mk && ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/include; ${MAKE} prereq; ${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} && \
-	    NOMAN=1 ${SUDO} ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && \
-	    NOMAN=1 ${SUDO} ${MAKE} install)
+	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 ${SUDO} ${MAKE} install)
+	cd ${.CURDIR}/kerberosIV/lib && ${MAKE} depend && ${MAKE} && \
+	    NOMAN=1 exec ${SUDO} ${MAKE} install
 .endif
-	(cd ${.CURDIR}/gnu/usr.bin/perl && \
+.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 && \
-	    ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib)
-.if (${MACHINE_ARCH} == "mips")
-	ldconfig -R
-.endif
-	${MAKE} depend && ${MAKE} && ${SUDO} ${MAKE} install
+	    exec ${SUDO} ${MAKE} -f Makefile.bsd-wrapper install.lib
+	${MAKE} depend && ${MAKE} && exec ${SUDO} ${MAKE} install
 
 .if !defined(TARGET)
 cross-tools:
@@ -106,42 +107,43 @@
 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 \
+		CXX=${CROSSDIR}/usr/bin/c++ \
 		LD=${CROSSDIR}/usr/bin/ld NM=${CROSSDIR}/usr/bin/nm \
-		LORDER=${CROSSDIR}/usr/bin/lorder \
-		RANLIB=${CROSSDIR}/usr/bin/ranlib \
+		LORDER=/usr/bin/lorder RANLIB=${CROSSDIR}/usr/bin/ranlib \
 		SIZE=${CROSSDIR}/usr/bin/size STRIP=${CROSSDIR}/usr/bin/strip \
 		HOSTCC=cc
 CROSSPATH=	${PATH}:${CROSSDIR}/usr/bin
 
+.if (${TARGET} == "sparc64")
+CROSSENV+= CPPFLAGS=-D__arch64__
+CPPFLAGS=-D__arch64__
+.endif
+
+cross-env:
+	@echo ${CROSSENV} DESTDIR=${CROSSDIR}
+
 cross-helpers:
-	mkdir -p ${CROSSDIR}
+	@-mkdir -p ${CROSSDIR}
 	echo _MACHINE_ARCH | \
 	    cat ${.CURDIR}/sys/arch/${TARGET}/include/param.h - | \
-	    ${CPP} -E -I${.CURDIR}/sys/arch | \
+	    ${CPP} ${CPPFLAGS} -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-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/lib
+	@-mkdir -p ${CROSSDIR}/usr/include/kerberosV
+	@-mkdir -p ${CROSSDIR}/usr/lib/apache/include/xml
 	@-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
+	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/include
 	@ln -sf ${CROSSDIR}/usr/lib \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/lib
 	@-mkdir -p ${CROSSDIR}/usr/obj
@@ -158,14 +160,14 @@
 	    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
+.if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \
+    ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" 
+cross-binutils: cross-binutils-new cross-binutils-links
 .else
-cross-binutils: cross-binutils-old
+cross-binutils: cross-binutils-old cross-binutils-links
 .endif
 
-cross-binutils-new:	cross-dirs
+cross-binutils-new:	cross-dirs 
 	export BSDSRCDIR=`pwd`; \
 	    (cd ${.CURDIR}/gnu/usr.bin/binutils; \
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
@@ -176,25 +178,29 @@
 	    --prefix ${CROSSDIR}/usr \
 	    --disable-nls --disable-gdbtk --disable-commonbfdlib \
 	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    ${MAKE} CFLAGS=${CFLAGS} && ${MAKE} install && \
-	    for cmd in addr2line ar as gasp gdb ld nm objcopy objdump ranlib \
-	    readelf size strings strip; do \
-	    ln -sf `cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
-	    ${CROSSDIR}/usr/bin/$$cmd; done)
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/usr.bin/lorder/lorder.sh \
-	    ${CROSSDIR}/usr/bin/lorder
+	    ${MAKE} CFLAGS="${CFLAGS}" && ${MAKE} install )
 
 cross-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
 	cross-ranlib cross-nm
 
+cross-binutils-links: cross-dirs
+	for cmd in ar as ld nm ranlib size strip; do \
+	    if [ ! -e ${CROSSDIR}/usr/bin/$$cmd -a -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
+		ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd \
+		${CROSSDIR}/usr/bin/$$cmd ;\
+	    elif [ -e ${CROSSDIR}/usr/bin/$$cmd -a ! -e ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd ]; then \
+		ln -sf ${CROSSDIR}/usr/bin/$$cmd \
+		${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-$$cmd; \
+	    fi ;\
+	done
+
 cross-gas:	cross-dirs
 	(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}; \
+	    ${MAKE} depend all; \
 	    TARGET_MACHINE_ARCH=${TARGET} \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
@@ -207,7 +213,7 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj; \
 	    TARGET_MACHINE_ARCH=${TARGET} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} NOMAN=; \
+	    ${MAKE} NOMAN= depend all; \
 	    TARGET_MACHINE_ARCH=${TARGET} \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
@@ -219,7 +225,7 @@
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ar \
@@ -230,7 +236,7 @@
 	    BSDOBJDIR=${CROSSDIR}/usr/obj \
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj; \
-	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN=; \
+	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} ${MAKE} NOMAN= depend all; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/ranlib \
@@ -242,7 +248,7 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/strip \
@@ -254,7 +260,7 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/size \
@@ -266,7 +272,7 @@
 	    BSDSRCDIR=${.CURDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} obj; \
 	    MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
-	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN=; \
+	    ${MAKE} TARGET_MACHINE_ARCH=${TARGET} NOMAN= depend all; \
 	    DESTDIR=${CROSSDIR} MAKEOBJDIR=obj.${MACHINE}.${TARGET} \
 	    ${MAKE} NOMAN= install)
 	ln -sf ${CROSSDIR}/usr/bin/nm \
@@ -280,17 +286,20 @@
 	(cd ${CROSSDIR}/usr/obj/gnu/egcs/gcc; \
 	    /bin/sh ${.CURDIR}/gnu/egcs/gcc/configure \
 	    --prefix ${CROSSDIR}/usr \
-	    --target `cat ${CROSSDIR}/TARGET_CANON` && \
-	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES=c \
+	    --target `cat ${CROSSDIR}/TARGET_CANON` \
+	    --with-gxx-include-dir=${CROSSDIR}/usr/include/g++ && \
+	    PATH=${CROSSPATH} ${MAKE} BISON=yacc LANGUAGES="c c++" \
 	    LDFLAGS=${LDSTATIC} build_infodir=. \
 	    GCC_FOR_TARGET="./xgcc -B./ -I${CROSSDIR}/usr/include" && \
-	    ${MAKE} BISON=yacc LANGUAGES=c LDFLAGS=${LDSTATIC} \
+	    ${MAKE} BISON=yacc LANGUAGES="c 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
+	ln -sf ${CROSSDIR}/usr/bin/`cat ${CROSSDIR}/TARGET_CANON`-g++ \
+	    ${CROSSDIR}/usr/bin/c++
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
-	    ${CROSSDIR}/usr/obj/gnu/egcs/gcc/xcpp \
+	    ${CROSSDIR}/usr/obj/gnu/egcs/gcc/cpp \
 	    ${CROSSDIR}/usr/libexec/cpp
 	sed -e 's#/usr/libexec/cpp#${CROSSDIR}/usr/libexec/cpp#' \
 	    -e 's#/usr/include#${CROSSDIR}/usr/include#' \
@@ -325,6 +334,18 @@
 	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
+.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} \