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.238.2.2 retrieving revision 1.242 diff -u -p -r1.238.2.2 -r1.242 --- src/Makefile 2005/08/28 10:17:52 1.238.2.2 +++ src/Makefile 2006/01/21 19:01:15 1.242 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.238.2.2 2005/08/28 10:17:52 tron Exp $ +# $NetBSD: Makefile,v 1.242 2006/01/21 19:01:15 dsl Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -59,6 +59,8 @@ # Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR} # sourcesets: # Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR} +# syspkgs: +# Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR} # # Targets invoked by `make build,' in order: # cleandir: cleans the tree. @@ -124,7 +126,7 @@ SUBDIR+= ${dir} .endfor .if exists(regress) -regression-tests: .PHONY +regression-tests: .PHONY .MAKE @echo Running regression tests... ${MAKEDIRTARGET} regress regress .endif @@ -133,7 +135,7 @@ regression-tests: .PHONY NOPOSTINSTALL= # defined .endif -afterinstall: .PHONY +afterinstall: .PHONY .MAKE .if ${MKMAN} != "no" ${MAKEDIRTARGET} share/man makedb .endif @@ -218,7 +220,7 @@ includes-gnu: .PHONY includes-lib START_TIME!= date -build: .PHONY +build: .PHONY .MAKE .if defined(BUILD_DONE) @echo "Build already installed into ${DESTDIR}" .else @@ -236,7 +238,7 @@ build: .PHONY # ${RELEASEDIR}). "buildworld" enforces a build to ${DESTDIR} != / # -distribution buildworld: .PHONY +distribution buildworld: .PHONY .MAKE .if make(buildworld) && \ (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") @echo "Won't make ${.TARGET} with DESTDIR=/" @@ -260,7 +262,7 @@ distribution buildworld: .PHONY HOST_UNAME_S!= uname -s HOST_UNAME_M!= uname -m -installworld: .PHONY +installworld: .PHONY .MAKE .if (!defined(DESTDIR) || ${DESTDIR} == "" || ${DESTDIR} == "/") @echo "Can't make ${.TARGET} to DESTDIR=/" @false @@ -286,8 +288,8 @@ installworld: .PHONY # Create sets from $DESTDIR or $NETBSDSRCDIR into $RELEASEDIR # -.for tgt in sets sourcesets -${tgt}: .PHONY +.for tgt in sets sourcesets syspkgs +${tgt}: .PHONY .MAKE ${MAKEDIRTARGET} distrib/sets ${tgt} .endfor @@ -297,7 +299,7 @@ ${tgt}: .PHONY # are made. # -release snapshot: .PHONY +release snapshot: .PHONY .MAKE ${MAKEDIRTARGET} . distribution ${MAKEDIRTARGET} etc release DISTRIBUTION_DONE=1 @echo "make ${.TARGET} started at: ${START_TIME}" @@ -318,7 +320,7 @@ check-tools: .PHONY @echo '*** WARNING: NBUILDJOBS is obsolete; use -j directly instead!' .endif -do-distrib-dirs: .PHONY +do-distrib-dirs: .PHONY .MAKE .if !defined(DESTDIR) || ${DESTDIR} == "" ${MAKEDIRTARGET} etc distrib-dirs DESTDIR=/ .else @@ -331,13 +333,13 @@ do-${targ}: .PHONY ${targ} .endfor .for dir in tools tools/compat lib/csu gnu/lib/crtstuff${LIBGCC_EXT} gnu/lib/libgcc${LIBGCC_EXT} lib/libc lib/libdes lib gnu/lib -do-${dir:S/\//-/g}: .PHONY +do-${dir:S/\//-/g}: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} ${dir} ${targ} .endfor .endfor -do-ld.so: .PHONY +do-ld.so: .PHONY .MAKE .for targ in dependall install .if (${OBJECT_FMT} == "a.out") ${MAKEDIRTARGET} libexec/ld.aout_so ${targ} @@ -347,15 +349,15 @@ do-ld.so: .PHONY .endif .endfor -do-build: .PHONY +do-build: .PHONY .MAKE .for targ in dependall install ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no .endfor -do-x11: .PHONY +do-x11: .PHONY .MAKE ${MAKEDIRTARGET} x11 build -do-obsolete: .PHONY +do-obsolete: .PHONY .MAKE ${MAKEDIRTARGET} etc install-obsolete-lists # @@ -393,5 +395,5 @@ ${.CURDIR}/BUILDING: doc/BUILDING.mdoc # # Display current make(1) parameters # -params: .PHONY +params: .PHONY .MAKE ${MAKEDIRTARGET} etc params