Commit Graph

143 Commits

Author SHA1 Message Date
Jordan K. Hubbard
1130b656e5 Make the long-awaited change from $Id$ to $FreeBSD$
This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
1997-01-14 07:20:47 +00:00
Steve Price
8a87dec9bf Add a .POSIX directive. When the first non-comment
line of a Makefile contains this directive, make(1)
will enter a POSIX 1003.2 compliant mode.

Submitted by: Joerg Wunsch <joerg@freebsd.org>
1996-11-03 03:29:57 +00:00
Steve Price
97162b3f35 Remove extraneous comment, fix second-level tabs (one
tab and four spaces), and return error message in *err
instead of calling Parse_Error.

Suggested by: Bruce Evans <bde@zeta.org.au>
1996-10-12 02:15:30 +00:00
Steve Price
50dc64b15f Removed extra $Id$ string. 1996-10-11 04:15:57 +00:00
Steve Price
39dd3fffbf Reinstate '!=' fix by Bruce Evans. The original commit message from
parse.c(1.9) was:

revision 1.9
date: 1996/09/12 03:03:25;  author: bde;  state: Exp;  lines: +7 -6
Fixed handling of `!=' assignment.  Don't warn if the shell's output is
null, but warn if there was an error reading it.

Suggested by: Bruce Evans <bde@zeta.org.au>
1996-10-11 03:55:29 +00:00
Steve Price
5d55a64610 O' to be bitten by CVS. Cleanup after import
of Christos' version of make(1) and add Id's.

Set straight by: Bruce Evans and Peter Wemm :)
1996-10-08 04:07:59 +00:00
Steve Price
85aa37cd56 This commit was generated by cvs2svn to compensate for changes in r18764,
which included commits to RCS files with non-trunk default branches.
1996-10-06 16:45:32 +00:00
Steve Price
ea09f5e44d Import Christos Zoulas' version of NetBSD's make onto the
vendor branch for reference.

Obtained from: Christos Zoulas <christos@netbsd.org>
1996-10-06 16:45:32 +00:00
Steve Price
66b6f9d1e4 Clarify the rule used to determine the object
directory location.
1996-10-06 16:19:08 +00:00
Peter Wemm
6c7089bce5 Import the 4.4BSD-Lite2 version of make onto the vendor branch
"for reference".  This doesn't change anything since all files
have been touched.
1996-10-06 15:57:15 +00:00
Peter Wemm
6b8f99f0db This commit was generated by cvs2svn to compensate for changes in r18756,
which included commits to RCS files with non-trunk default branches.
1996-10-06 15:57:15 +00:00
Steve Price
8b69153a4d Correct problem with traversing into PSD.doc directory,
these files are actually installed/built as part of
src/share/doc/psd/12.make.  Oops. :)

Pointed out by:	Peter Wemm and Bruce Evans
1996-10-06 13:02:43 +00:00
Jordan K. Hubbard
09502a0eb9 Correct merge bogon: You want to descend into PSD.doc for both `all' and
`install' cases or there's never anything made to install, and you blow
up in the install. :-)
1996-10-06 12:43:14 +00:00
cvs2svn
fd28c66eb8 This commit was manufactured by cvs2svn to create branch 'CHRISTOS'. 1996-10-06 02:35:39 +00:00
Steve Price
c0d06fe463 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 <christos@netbsd.org>
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
1996-10-06 02:35:38 +00:00
Wolfram Schneider
e83201b43a delete doubled words, e.g.: "the the" -> "the" 1996-10-05 22:27:30 +00:00
Steve Price
6d29e75f84 Fix for PR# 1231, make(1) execution of ``.BEGIN'' does
not halt on error.  Thanks to Wolfram for reminding me. ;)

Also remove a unnecessary test for c == '\n', since the
loop (in ParseSkipLine) will not terminate unless
c == '\n' || c == EOF, and the EOF case is already
explicted handled by a return statement.
1996-09-25 02:55:49 +00:00
Steve Price
0e0e0239f0 Be sure to remove any newlines encountered when
parsing the input file in ParseSkipLine(...).
1996-09-23 17:21:34 +00:00
Steve Price
6bf3beb134 Fix for PR# 1095, make's continuation line handling buggy
when used with .elif.  Additional fixes include:

    - fix continuation line handling when using .for
    - plug up a memory leak
1996-09-22 02:28:36 +00:00
Steve Price
43bb0e149c Fix for PR#1230, make ``.for'' loops iterate backwards. 1996-09-21 04:00:22 +00:00
Steven Wallace
18e24ede6b Restore previous compatibility of ${.CURDIR}/obj.uname -m and
$(.CURDIR}/obj search while retaining compatability of new
prefix with cwd for the current source tree builds.
.TARGETOBJDIR has been removed from make and CANONICALOBJDIR set in
bsd.obj.mk

The builtin object directory searching is defined specifically as:

If MAKEOBJDIRPREFIX is defined, the search order is
${MAKEOBJDIRPREFIX}${.CURDIR}
${.CURDIR}

Else if MAKEOBJDIR is defined, the search order is
${MAKEOBJDIR}
${.CURDIR}

Otherwise, default to the search order
${.CURDIR}/obj.`uname -m`
$(.CURDIR}/obj
/usr/obj${.CURDIR}
${.CURDIR}

Reviewed by:	bde
1996-09-18 06:06:39 +00:00
Bruce Evans
d25a64252b Fixed handling of `!=' assignment. Don't warn if the shell's output is
null, but warn if there was an error reading it.
1996-09-12 03:03:25 +00:00
Bruce Evans
454f40052a Fixed a missing colon in `notyet' code. 1996-08-31 14:22:33 +00:00
Bruce Evans
274beb73fe Listed all the environment variables (MACHINE and PWD were missing).
Documented PWD.  MACHINE and MAKEOBJDIR are are still undocumented
except in main.c.  I will be changing MAKEOBJDIR back to its old
behaviour so that the comment in main.c actually applies.

Removed irrelevant misformatted text about make's name being argv[0].
1996-08-31 14:21:15 +00:00
Nate Williams
fe6ab298ab 'make' prints an extra leading `make: ' and extra trailing newline if
there is no target to make.

% make
make: make: no target to make.

%

Beause the function Punt() in main.c takes care of leading 'make:' and
trailing newline, so, there is no need to pass explicitly.

Submitted by:	enami@ba2.so-net.or.jp
Obtained from:	NetBSD GNATS
1996-07-23 18:55:21 +00:00
Bruce Evans
375633ec49 Added a -V option to print make's idea of the value of a variable.
Submitted by:	mark@linus.demon.co.uk (Mark Valentine)

Fixed bugs and inconsistencies in synopsis and usage message.
1996-07-17 11:02:43 +00:00
Jordan K. Hubbard
526195ad0d General -Wall warning cleanup, part I.
Submitted-By: Kent Vander Velden <graphix@iastate.edu>
1996-07-12 19:08:36 +00:00
Jordan K. Hubbard
c4d74c02f2 Put back the $PWD override behavior of revision 1.4. The concensus
*seems* to be that it was the right thing to do.
1996-07-01 22:55:57 +00:00
Jordan K. Hubbard
664a482fd0 Remove code which overrode the opinion of getcwd() with an often bogus
value for $PWD.
1996-06-27 21:59:25 +00:00
Jordan K. Hubbard
cd9a2f5c28 Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src.  This is the final version of the
patches, incorporating the feedback I've received from -current.
1996-06-24 04:26:21 +00:00
Joerg Wunsch
be71712986 Fix a typo.
Submitted by:	tgm@netcom.com (Thomas G. McWilliams)
1996-04-07 01:18:20 +00:00
Adam David
56c78cb71a Fix the :S modifier to substitute in each word of the variable, according
to the description in the manpage. g flag means "replace every occurence
in each word", and its absence means "replace first occurence in each word".
Previously, absence of the g flag was implemented to mean "replace first
occurence found in all words, and then stop replacing", which was incorrect.
1995-11-01 12:18:32 +00:00
Poul-Henning Kamp
0ad2ff70ee Stop using gnumalloc. 1995-09-22 14:14:32 +00:00
Andrey A. Chernov
2f22cc074c Back out prev. NetBSD fix, it cause skipping some error constructions,
don't delete initial space from line instead
1995-06-24 17:34:15 +00:00
Andrey A. Chernov
33e5f8f7b0 Don't make error on ^<spaces>\n
Obtained from: NetBSD
1995-06-24 17:23:31 +00:00
Andrey A. Chernov
fa19ca391b Fix parsing SYSV/GNU "include" 1995-06-18 13:08:18 +00:00
Andrey A. Chernov
76da55f6bc NetBSD fixes: declare more prototypes, move .OPTIONAL in alphabet
order, prevent suffix rule, if direct or children dependances exists,
forget to free v->name in var.c
My fixes: fix famous ^\t\n bug, correct free order in str_end
Reviewed by: bde
Obtained from: NetBSD, me
1995-06-18 12:34:14 +00:00
Andrey A. Chernov
6ed40291ad Allow additional parsing of SYSV/GNU make "include" directive, it covers
90% of problems in ports Makefiles
1995-06-16 22:46:38 +00:00
Rodney W. Grimes
7799f52a32 Remove trailing whitespace. 1995-05-30 06:41:30 +00:00
Jordan K. Hubbard
9f574f9a90 Bring in a number of changes from NetBSD's make, fixing quite a few
problems in the process:

1. Quoting should work properly now.  In particular, Chet's reported bash
   make problem has gone away.
2. A lot of memory that just wasn't being free'd after use is now freed.
   This should cause make to take up a LOT less memory when dealing with
   archive targets.
3. Give proper credit to Adam de Boor in a number of files.
Obtained from: NetBSD (and Adam de Boor)
1995-01-23 21:03:17 +00:00
David Greenman
14810c626c Use gnumalloc. 1994-08-29 17:01:06 +00:00
Sean Eric Fagan
7267a81cea Fix a problem with passing quoted strings down to commands.
Reviewed by:	Sean Eric Fagan
1994-08-24 21:14:27 +00:00
Rodney W. Grimes
9b50d90275 BSD 4.4 Lite Usr.bin Sources 1994-05-27 12:33:43 +00:00