===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v
retrieving revision 1.27
retrieving revision 1.31
diff -u -r1.27 -r1.31
--- src/Makefile	1998/04/25 06:42:44	1.27
+++ src/Makefile	1998/05/14 21:43:02	1.31
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.27 1998/04/25 06:42:44 niklas Exp $
+#	$OpenBSD: Makefile,v 1.31 1998/05/14 21:43:02 niklas Exp $
 
 #
 # For more information on building in tricky environments, please see
@@ -104,7 +104,7 @@
 	    DESTDIR=${CROSSDIR} includes
 
 .if ${TARGET} == "powerpc" || ${TARGET} == "alpha" || ${TARGET} == "arc" || \
-    ${TARGET} == "pmax" || ${TARGET} == "wgrisc"
+    ${TARGET} == "pmax" || ${TARGET} == "wgrisc" || ${TARGET} == "hppa"
 cross-binutils: cross-binutils-new
 .else
 cross-binutils: cross-binutils-old
@@ -126,7 +126,8 @@
 	    ${.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-binutils-old: cross-gas cross-ar cross-ld cross-strip cross-size \
+	cross-ranlib cross-nm
 
 cross-gas:
 	-mkdir -p ${CROSSDIR}/usr/obj
@@ -164,7 +165,6 @@
 	ln -sf ${CROSSDIR}/usr/bin/ld \
 	    ${CROSSDIR}/usr/`cat ${CROSSDIR}/TARGET_CANON`/bin/ld
 
-# Not yet tested for compatibility with any target
 cross-ar:
 	-mkdir -p ${CROSSDIR}/usr/obj
 	-mkdir -p ${CROSSDIR}/usr/bin
@@ -179,6 +179,66 @@
 	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; \
@@ -193,6 +253,16 @@
 	    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" 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#' usr.bin/cpp/cpp.sh \
+	    >${CROSSDIR}/usr/bin/cpp
+	chmod ${BINMODE} ${CROSSDIR}/usr/bin/cpp
+	chown ${BINOWN}.${BINGRP} ${CROSSDIR}/usr/bin/cpp
+
 .endif
 
 .include <bsd.subdir.mk>