Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/Makefile,v rcsdiff: /ftp/cvs/cvsroot/src/Makefile,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.62 retrieving revision 1.77 diff -u -p -r1.62 -r1.77 --- src/Makefile 1998/07/28 18:55:41 1.62 +++ src/Makefile 1999/01/03 22:17:19 1.77 @@ -1,9 +1,23 @@ -# $NetBSD: Makefile,v 1.62 1998/07/28 18:55:41 thorpej Exp $ +# $NetBSD: Makefile,v 1.77 1999/01/03 22:17:19 cjs Exp $ .include # for configuration variables. +# Configurations variables (can be set either in /etc/mk.conf or +# as environement variable +# NBUILDJOBS: the number of jobs to start in parallel in a 'make build'. +# defaults to 1 +# NOMAN: if set to 1, don't build and install man pages +# NOSHARE: if set to 1, don't build or install /usr/share stuffs +# UPDATE: if set to 1, don't do a 'make cleandir' before compile +# DESTDIR: The target directory for installation (default to '/', +# which mean the current system is updated). + HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo +.if defined(NBUILDJOBS) +_J= -j${NBUILDJOBS} +.endif + # NOTE THAT etc *DOES NOT* BELONG IN THE LIST BELOW SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys @@ -16,7 +30,8 @@ SUBDIR+= gnu # This is needed for libstdc++ and gen-params. includes-gnu: includes-include includes-sys -.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) +.if exists(domestic) && (!defined(EXPORTABLE_SYSTEM) ||\ + make(obj) || make(clean) || make(cleandir) || make(distclean)) SUBDIR+= domestic .endif @@ -42,52 +57,56 @@ beforeinstall: .endif afterinstall: -.ifndef NOMAN +.if !defined(NOMAN) && !defined(NOSHARE) (cd ${.CURDIR}/share/man && ${MAKE} makedb) .endif build: beforeinstall +.if !defined(NOSHARE) (cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) +.endif .if !defined(UPDATE) ${MAKE} cleandir .endif +.if empty(HAVE_GCC28) +.if defined(DESTDIR) + @echo "*** CAPUTE!" + @echo " You attempted to compile the world with egcs. You must" + @echo " first install a native egcs compiler." + false +.else + (cd ${.CURDIR}/gnu/usr.bin/egcs && \ + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \ + ${MAKE} NOMAN= install && ${MAKE} cleandir) +.endif +.endif ${MAKE} includes (cd ${.CURDIR}/lib/csu && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) (cd ${.CURDIR}/lib && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) (cd ${.CURDIR}/gnu/lib && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) -.if defined(USE_EGCS) - (cd ${.CURDIR}/gnu/usr.bin/egcs/libgcc && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) -.else -.if (${MACHINE_ARCH} != "alpha") && \ - (${MACHINE_ARCH} != "powerpc") - (cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) -.endif -.endif + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) .if exists(domestic) && !defined(EXPORTABLE_SYSTEM) # libtelnet depends on libdes and libkrb. libkrb depends on # libcom_err. .if exists(domestic/lib/libdes) (cd ${.CURDIR}/domestic/lib/libdes && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) .endif .if exists(domestic/lib/libcom_err) (cd ${.CURDIR}/domestic/lib/libcom_err && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) .endif .if exists(domestic/lib/libkrb) (cd ${.CURDIR}/domestic/lib/libkrb && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) .endif (cd ${.CURDIR}/domestic/lib && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) .endif - ${MAKE} depend && ${MAKE} && ${MAKE} install + ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} install @echo -n "Build finished at: " @date