=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/Makefile,v retrieving revision 1.80 retrieving revision 1.86 diff -u -r1.80 -r1.86 --- src/Makefile 2001/09/25 09:43:22 1.80 +++ src/Makefile 2002/08/11 22:48:05 1.86 @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.80 2001/09/25 09:43:22 espie Exp $ +# $OpenBSD: Makefile,v 1.86 2002/08/11 22:48:05 art 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. # @@ -25,7 +25,7 @@ # "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= cross-tools" +# target available which upon completion of "make TARGET= cross-tools" # (where 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/ # directory. @@ -47,17 +47,13 @@ .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 && exec ${MAKE} regress + @cd ${.CURDIR}/regress && ${MAKE} depend && exec ${MAKE} regress .endif includes: @@ -77,7 +73,6 @@ cp /dev/null ${GLOBAL_AUTOCONF_CACHE} .endif cd ${.CURDIR}/share/mk && exec ${SUDO} ${MAKE} install - cd ${.CURDIR}/gnu/share && exec ${SUDO} ${MAKE} install cd ${.CURDIR}/include && ${MAKE} prereq && exec ${SUDO} ${MAKE} includes ${SUDO} ${MAKE} cleandir cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && \ @@ -166,13 +161,13 @@ ${MAKE} DESTDIR=${CROSSDIR} includes .if ${TARGET} == "macppc" || ${TARGET} == "alpha" || ${TARGET} == "hppa" || \ - ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" + ${TARGET} == "sparc64"|| ${TARGET} == "mvmeppc" || ${TARGET} == "sparc" cross-binutils: cross-binutils-new cross-binutils-links .else 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 \ @@ -189,7 +184,7 @@ cross-ranlib cross-nm cross-binutils-links: cross-dirs - for cmd in ar as ld nm ranlib size strip; do \ + for cmd in ar as ld nm ranlib objcopy objdump size strings 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 ;\