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.73 retrieving revision 1.94 diff -u -p -r1.73 -r1.94 --- src/Makefile 1998/12/02 22:53:06 1.73 +++ src/Makefile 1999/03/10 19:18:59 1.94 @@ -1,9 +1,23 @@ -# $NetBSD: Makefile,v 1.73 1998/12/02 22:53:06 thorpej Exp $ +# $NetBSD: Makefile,v 1.94 1999/03/10 19:18:59 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 sys @@ -16,7 +30,20 @@ SUBDIR+= gnu # This is needed for libstdc++ and gen-params. includes-gnu: includes-include includes-sys -.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) +# 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 compiling only "exportable" code AND +# doing it as part of installing a distribution. +# +# NOTE: due to the use of the make(foo) construct here, using the +# clean, cleandir, and obj targets on the command line in conjunction +# with any other target may produce unexpected results. + +.if exists(domestic) && \ + (make(clean) || make(cleandir) || make(obj) || \ + ((make(includes) || make(install)) && \ + !defined(EXPORTABLE_SYSTEM) && defined(_DISTRIB))) SUBDIR+= domestic .endif @@ -42,64 +69,55 @@ beforeinstall: .endif afterinstall: -.if !defined(NOMAN) && !defined(NOSHARE) - (cd ${.CURDIR}/share/man && ${MAKE} makedb) +.if ${MKMAN} != "no" && !defined(_BUILD) + ${MAKE} whatis.db .endif +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 !defined(NOSHARE) +.if ${MKSHARE} != "no" (cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) .endif .if !defined(UPDATE) ${MAKE} cleandir .endif -.if defined(USE_EGCS) && empty(HAVE_GCC28) +.if empty(HAVE_GCC28) .if defined(DESTDIR) @echo "*** CAPUTE!" - @echo " You attempted to compile the world with egcs. You must" + @echo " You attempted to compile the world without egcs. You must" @echo " first install a native egcs compiler." - false + @false .else (cd ${.CURDIR}/gnu/usr.bin/egcs && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install && \ - ${MAKE} cleandir) + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install && ${MAKE} cleandir) .endif .endif ${MAKE} includes (cd ${.CURDIR}/lib/csu && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install) (cd ${.CURDIR}/lib && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + ${MAKE} depend && ${MAKE} ${_J} MKMAN=no && \ + ${MAKE} MKMAN=no install) (cd ${.CURDIR}/gnu/lib && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) -.if !defined(USE_EGCS) -.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} MKMAN=no MKINFO=no && \ + ${MAKE} MKMAN=no MKINFO=no install) + ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= 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) -.endif -.if exists(domestic/lib/libcom_err) - (cd ${.CURDIR}/domestic/lib/libcom_err && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) -.endif -.if exists(domestic/lib/libkrb) - (cd ${.CURDIR}/domestic/lib/libkrb && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) -.endif - (cd ${.CURDIR}/domestic/lib && \ - ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install) + (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build) .endif - ${MAKE} depend && ${MAKE} && ${MAKE} install + ${MAKE} whatis.db @echo -n "Build finished at: " @date +release snapshot: build + (cd ${.CURDIR}/etc && ${MAKE} INSTALL_DONE=1 release) + .include