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.67
retrieving revision 1.79
diff -u -p -r1.67 -r1.79
--- src/Makefile	1998/09/27 18:18:42	1.67
+++ src/Makefile	1999/01/24 07:42:34	1.79
@@ -1,9 +1,23 @@
-#	$NetBSD: Makefile,v 1.67 1998/09/27 18:18:42 christos Exp $
+#	$NetBSD: Makefile,v 1.79 1999/01/24 07:42:34 scottr Exp $
 
 .include <bsd.own.mk>			# 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,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(EXPORTABLE_SYSTEM) && (make(includes) || make(install))))
 SUBDIR+= domestic
 .endif
 
@@ -42,62 +60,41 @@ 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
-	${MAKE} includes
-	(cd ${.CURDIR}/lib/csu && \
-	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
-	(cd ${.CURDIR}/lib && \
-	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
-	(cd ${.CURDIR}/gnu/lib && \
-	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
-.if defined(USE_EGCS) && !empty(HAVE_GCC28)
-	(cd ${.CURDIR}/gnu/lib/libgcc && \
-	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${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
-.if	(${MACHINE_ARCH} != "powerpc")
-	(cd ${.CURDIR}/gnu/usr.bin/gcc/libgcc && \
-	    ${MAKE} depend && NOMAN= ${MAKE} && NOMAN= ${MAKE} install)
+	(cd ${.CURDIR}/gnu/usr.bin/egcs && \
+	    ${MAKE} depend && ${MAKE} ${_J} NOMAN= && \
+	    ${MAKE} NOMAN= install && ${MAKE} cleandir)
 .endif
 .endif
+	${MAKE} EXPORTABLE_SYSTEM= 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} EXPORTABLE_SYSTEM= 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)
-.endif
-	${MAKE} depend && ${MAKE} && ${MAKE} install
-.if defined(USE_EGCS)
-.if defined(DESTDIR) && (${HAVE_GCC28} == "")
-	@echo '***** WARNING ***** Your system compiler is not GCC 2.8 or higher'
-	@echo 'and you have built a distribution with GCC 2.8 and DESTDIR set.'
-	@echo 'You will need to rebuild libgcc from gnu/usr.bin/egcs/libgcc'
-	@echo 'in order to have full C++ support in the binary set.'
-.else
-	(cd ${.CURDIR}/gnu/lib/libgcc &&\
-	    ${MAKE} depend && ${MAKE} && ${MAKE} install)
-.endif # DESTDIR && !HAVE_GCC28
-.endif # USE_EGCS
+	(cd ${.CURDIR}/domestic && ${MAKE} ${_J} _SLAVE_BUILD= build)
+.endif
 	@echo -n "Build finished at: "
 	@date