From owner-cvs-usrbin Sat Oct 5 19:35:55 1996 Return-Path: owner-cvs-usrbin Received: (from root@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA00658 for cvs-usrbin-outgoing; Sat, 5 Oct 1996 19:35:55 -0700 (PDT) Received: (from steve@localhost) by freefall.freebsd.org (8.7.5/8.7.3) id TAA00629; Sat, 5 Oct 1996 19:35:40 -0700 (PDT) Date: Sat, 5 Oct 1996 19:35:40 -0700 (PDT) From: Steve Price Message-Id: <199610060235.TAA00629@freefall.freebsd.org> To: CVS-committers, cvs-all, cvs-usrbin Subject: cvs commit: src/usr.bin/make/lst.lib lstForEachFrom.c lstInt.h src/usr.bin/make util.c Makefile arch.c buf.c buf.h compat.c cond.c config.h dir.c dir.h hash.h job.c job.h list.h lst.h main.c make.1 make.c make.h nonints.h parse.c pathnames.h sprite.h str.c suff.c targ.c var.c bit.h src/usr.bin/make/PSD.doc tutorial.ms Sender: owner-cvs-usrbin@FreeBSD.ORG X-Loop: FreeBSD.org Precedence: bulk steve 96/10/05 19:35:40 Modified: usr.bin/make Makefile arch.c buf.c buf.h compat.c cond.c config.h dir.c dir.h hash.h job.c job.h list.h lst.h main.c make.1 make.c make.h nonints.h parse.c pathnames.h sprite.h str.c suff.c targ.c var.c usr.bin/make/PSD.doc tutorial.ms usr.bin/make/lst.lib lstForEachFrom.c lstInt.h Added: usr.bin/make util.c Removed: usr.bin/make bit.h Log: Merge in NetBSD's changes to make(1). Changes include: - Add the .PHONY, .PARALLEL, and .WAIT directives - Added the -B and -m commandline flags - misc. man page cleanups - numerous job-related enhancements - removed unused header file (bit.h) - add util.c for functions not found in other envs. - and a few coordinated whitespace changes Special thanks to Christos Zoulas for help in the merge. A 'diff -ur' between Net and FreeBSD now only contains sccsid-related diffs. :) Obtained from: NetBSD, christos@netbsd.org, and me Revision Changes Path 1.6 +8 -4 src/usr.bin/make/Makefile 1.5 +177 -36 src/usr.bin/make/arch.c 1.5 +1 -1 src/usr.bin/make/buf.c 1.4 +1 -1 src/usr.bin/make/buf.h 1.5 +9 -11 src/usr.bin/make/compat.c 1.4 +6 -4 src/usr.bin/make/cond.c 1.3 +32 -7 src/usr.bin/make/config.h 1.4 +11 -11 src/usr.bin/make/dir.c 1.3 +1 -1 src/usr.bin/make/dir.h 1.4 +1 -1 src/usr.bin/make/hash.h 1.4 +978 -541 src/usr.bin/make/job.c 1.4 +1 -1 src/usr.bin/make/job.h 1.4 +1 -1 src/usr.bin/make/list.h 1.4 +2 -2 src/usr.bin/make/lst.h 1.10 +286 -35 src/usr.bin/make/main.c 1.6 +65 -24 src/usr.bin/make/make.1 1.5 +12 -3 src/usr.bin/make/make.c 1.4 +8 -2 src/usr.bin/make/make.h 1.3 +6 -2 src/usr.bin/make/nonints.h 1.13 +190 -215 src/usr.bin/make/parse.c 1.5 +2 -2 src/usr.bin/make/pathnames.h 1.4 +1 -1 src/usr.bin/make/sprite.h 1.6 +4 -5 src/usr.bin/make/str.c 1.5 +30 -18 src/usr.bin/make/suff.c 1.4 +4 -3 src/usr.bin/make/targ.c 1.6 +26 -7 src/usr.bin/make/var.c 1.2 +16 -3 src/usr.bin/make/PSD.doc/tutorial.ms 1.3 +2 -1 src/usr.bin/make/lst.lib/lstForEachFrom.c 1.2 +3 -2 src/usr.bin/make/lst.lib/lstInt.h