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.98 retrieving revision 1.101 diff -u -p -r1.98 -r1.101 --- src/Makefile 1999/07/12 21:53:52 1.98 +++ src/Makefile 1999/11/30 17:48:11 1.101 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.98 1999/07/12 21:53:52 thorpej Exp $ +# $NetBSD: Makefile,v 1.101 1999/11/30 17:48:11 sommerfeld Exp $ # This is the top-level makefile for building NetBSD. For an outline of # how to build a snapshot or release, as well as other release engineering @@ -15,16 +15,18 @@ # (lowest priority). # # Variables: -# NBUILDJOBS is the number of jobs to start in parallel during a -# 'make build'. It defaults to 1. +# DESTDIR is the target directory for installation of the compiled +# software. It defaults to /. Note that programs are built against +# libraries installed in DESTDIR. # MKMAN, if set to `no', will prevent building of manual pages. +# MKOBJDIRS, if not set to `no', will build object directories at +# an appropriate point in a build. # MKSHARE, if set to `no', will prevent building and installing # anything in /usr/share. +# NBUILDJOBS is the number of jobs to start in parallel during a +# 'make build'. It defaults to 1. # UPDATE will avoid a `make cleandir' at the start of `make build', # as well as having the effects listed in /usr/share/mk/bsd.README. -# DESTDIR is the target directory for installation of the compiled -# software. It defaults to /. Note that programs are built against -# libraries installed in DESTDIR. # # Targets: # build: builds a full release of netbsd in DESTDIR. @@ -35,7 +37,7 @@ .include # for configuration variables. - +MKOBJDIRS ?= no HAVE_GCC28!= ${CXX} --version | egrep "^(2\.8|egcs)" ; echo .if defined(NBUILDJOBS) @@ -100,6 +102,9 @@ build: beforeinstall .if !defined(UPDATE) ${MAKE} cleandir .endif +.if ${MKOBJDIRS} != "no" + ${MAKE} obj +.endif .if empty(HAVE_GCC28) .if defined(DESTDIR) @echo "*** CAPUTE!" @@ -108,21 +113,21 @@ build: beforeinstall @false .else (cd ${.CURDIR}/gnu/usr.bin/egcs && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} ${_J} dependall MKMAN=no && \ ${MAKE} MKMAN=no install && ${MAKE} cleandir) .endif .endif ${MAKE} includes (cd ${.CURDIR}/lib/csu && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} ${_J} dependall MKMAN=no && \ ${MAKE} MKMAN=no install) (cd ${.CURDIR}/lib && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} ${_J} dependall MKMAN=no && \ ${MAKE} MKMAN=no install) (cd ${.CURDIR}/gnu/lib && \ - ${MAKE} depend && ${MAKE} ${_J} MKMAN=no MKINFO=no && \ + ${MAKE} ${_J} dependall MKMAN=no MKINFO=no && \ ${MAKE} MKMAN=no MKINFO=no install) - ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install + ${MAKE} ${_J} dependall && ${MAKE} _BUILD= install .if defined(DOMESTIC) && !defined(EXPORTABLE_SYSTEM) (cd ${.CURDIR}/${DOMESTIC} && ${MAKE} ${_J} _SLAVE_BUILD= build) .endif