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.52 retrieving revision 1.81 diff -u -p -r1.52 -r1.81 --- src/Makefile 1998/05/10 10:37:59 1.52 +++ src/Makefile 1999/01/28 15:36:48 1.81 @@ -1,7 +1,23 @@ -# $NetBSD: Makefile,v 1.52 1998/05/10 10:37:59 mycroft Exp $ +# $NetBSD: Makefile,v 1.81 1999/01/28 15:36:48 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 +# 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 @@ -14,7 +30,11 @@ SUBDIR+= gnu # This is needed for libstdc++ and gen-params. includes-gnu: includes-include includes-sys -.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) +# This little mess makes the includes and install targets +# do the expected thing. +.if exists(domestic) && \ + (make(clean) || make(cleandir) || make(obj) || \ + (!defined(_BUILD) && (make(includes) || make(install)))) SUBDIR+= domestic .endif @@ -40,57 +60,45 @@ beforeinstall: .endif afterinstall: -.ifndef NOMAN - (cd ${.CURDIR}/share/man && ${MAKE} makedb) +.if !defined(NOMAN) && !defined(NOSHARE) && !defined(_BUILD) + ${MAKE} whatis.db .endif +whatis.db: + (cd ${.CURDIR}/share/man && ${MAKE} makedb) + build: beforeinstall +.if !defined(NOSHARE) (cd ${.CURDIR}/share/mk && ${MAKE} install) (cd ${.CURDIR}/share/tmac && ${MAKE} && ${MAKE} install) -.if exists(domestic) && !defined (EXPORTABLE_SYSTEM) -.if exists(domestic/usr.bin/compile_et) - (cd ${.CURDIR}/domestic/usr.bin/compile_et && \ - ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) -.endif -.if exists(domestic/usr.bin/make_cmds) - (cd ${.CURDIR}/domestic/usr.bin/make_cmds && \ - ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) -.endif .endif .if !defined(UPDATE) ${MAKE} cleandir .endif - ${MAKE} includes - (cd ${.CURDIR}/lib/csu && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/gnu/lib && ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/usr.bin/lex &&\ - ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/usr.bin/yacc && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) - (cd ${.CURDIR}/usr.bin/xlint && \ - ${MAKE} depend && ${MAKE} && ${MAKE} 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 && ${MAKE} && ${MAKE} install) -.endif -.if exists(domestic/lib/libcom_err) - (cd ${.CURDIR}/domestic/lib/libcom_err && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) -.endif -.if exists(domestic/lib/libkrb) - (cd ${.CURDIR}/domestic/lib/libkrb && \ - ${MAKE} depend && ${MAKE} && ${MAKE} install) +.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 - (cd ${.CURDIR}/domestic/lib/ && ${MAKE} depend && ${MAKE} && \ - ${MAKE} install) + ${MAKE} _BUILD= includes + (cd ${.CURDIR}/lib/csu && \ + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) + (cd ${.CURDIR}/lib && \ + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) + (cd ${.CURDIR}/gnu/lib && \ + ${MAKE} depend && ${MAKE} ${_J} NOMAN= && ${MAKE} NOMAN= install) + ${MAKE} depend && ${MAKE} ${_J} && ${MAKE} _BUILD= install +.if exists(domestic) && !defined(EXPORTABLE_SYSTEM) + (cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build) .endif - ${MAKE} depend && ${MAKE} && ${MAKE} install + ${MAKE} whatis.db @echo -n "Build finished at: " @date