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.31 retrieving revision 1.88 diff -u -p -r1.31 -r1.88 --- src/Makefile 1996/03/18 09:55:25 1.31 +++ src/Makefile 1999/02/17 08:00:52 1.88 @@ -1,13 +1,45 @@ -# $NetBSD: Makefile,v 1.31 1996/03/18 09:55:25 tls Exp $ +# $NetBSD: Makefile,v 1.88 1999/02/17 08:00:52 scottr 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 +# MKMAN: if set to no, don't build and install man pages +# MKSHARE: if set to no, 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 games -SUBDIR+= gnu +SUBDIR+= lib include bin libexec sbin usr.bin usr.sbin share sys -SUBDIR+= sys +.if exists(games) +SUBDIR+= games +.endif -.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) +SUBDIR+= gnu +# This is needed for libstdc++ and gen-params. +includes-gnu: includes-include includes-sys + +# Descend into the domestic tree if it exists AND +# 1) the target is clean, cleandir, or obj, OR +# 2) the the target is install or includes AND NOT +# a) compiling only "exportable" code OR +# b) doing it as part of build. + +.if exists(domestic) && \ + (make(clean) || make(cleandir) || make(obj) || \ + ((make(includes) || make(install)) && \ + !(defined(EXPORTABLE_SYSTEM) || defined(_BUILD)))) SUBDIR+= domestic .endif @@ -21,9 +53,11 @@ regression-tests: @(cd ${.CURDIR}/regress && ${MAKE} regress) .endif -.include # for NOMAN, if it's there. - beforeinstall: +.ifmake build + @echo -n "Build started at: " + @date +.endif .ifndef DESTDIR (cd ${.CURDIR}/etc && ${MAKE} DESTDIR=/ distrib-dirs) .else @@ -31,22 +65,55 @@ beforeinstall: .endif afterinstall: -.ifndef NOMAN - (cd ${.CURDIR}/share/man && ${MAKE} makedb) +.if ${MKMAN} != "no" && !defined(_BUILD) + ${MAKE} whatis.db .endif -build: -.if exists(domestic) - (cd ${.CURDIR}/domestic/include && ${MAKE} install) -.endif - (cd ${.CURDIR}/include && ${MAKE} install) +whatis.db: + (cd ${.CURDIR}/share/man && ${MAKE} makedb) + +# wrt info/dir below: It's safe to move this over top of /usr/share/info/dir, +# as the build will automatically remove/replace the non-pkg entries there. + +build: beforeinstall +.if ${MKSHARE} != "no" (cd ${.CURDIR}/share/mk && ${MAKE} install) + (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) +.endif +.if !defined(UPDATE) ${MAKE} cleandir - (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) -.if exists(domestic) - (cd ${.CURDIR}/domestic/lib/libcrypt && ${MAKE} depend && ${MAKE} && ${MAKE} install) .endif - ${MAKE} depend && ${MAKE} && ${MAKE} install +.if empty(HAVE_GCC28) +.if defined(DESTDIR) + @echo "*** CAPUTE!" + @echo " You attempted to compile the world without egcs. You must" + @echo " first install a native egcs compiler." + @false +.else + (cd ${.CURDIR}/gnu/usr.bin/egcs && \ + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install && ${MAKE} cleandir) +.endif +.endif + ${MAKE} _BUILD= includes + (cd ${.CURDIR}/lib/csu && \ + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install) + (cd ${.CURDIR}/lib && \ + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install) + (cd ${.CURDIR}/gnu/lib && \ + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install) + ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install +.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) + (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build) +.endif + ${MAKE} whatis.db + @echo -n "Build finished at: " + @date + +release snapshot: build + (cd ${.CURDIR}/etc && make INSTALL_DONE=1 release) .include