diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2007-09-17 12:42:10 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2007-09-17 12:42:10 +0000 |
| commit | 04da241c9a9d1947a02599b69c4d28cad730e2ee (patch) | |
| tree | 411a70834205a49e35f9401bcb6a7d91905ebc7a /usr.bin/make/Makefile | |
| parent | 623d7eb586551d91075741d88eb155937894af6b (diff) | |
rewrite of the basic suffix/target parsing: use hash for suffixes.
Store special targets in target hash, and use them for the parsing.
Use OP_DUMMY flag to mark targets that don't really exist yet, such
as interrupt and default nodes.
Also, .PATHxxx is special in suffixes.
Small tweaks to compat.c, so that run_commands does more stuff after
the fork() (and thus no need to free things).
Remove distinction between local and global jobs.
Diffstat (limited to 'usr.bin/make/Makefile')
| -rw-r--r-- | usr.bin/make/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile index afc59ae3895..c60937fd0ed 100644 --- a/usr.bin/make/Makefile +++ b/usr.bin/make/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2007/09/16 10:39:07 espie Exp $ +# $OpenBSD: Makefile,v 1.47 2007/09/17 12:42:09 espie Exp $ PROG= make CFLAGS+= -I${.OBJDIR} -I${.CURDIR} @@ -15,9 +15,8 @@ CDEFS+=-DHAS_EXTENDED_GETCWD CFLAGS+=${CDEFS} HOSTCFLAGS+=${CDEFS} -SRCS= arch.c buf.c cmd_exec.c compat.c cond.c dir.c direxpand.c \ - engine.c error.c for.c \ - init.c job.c lowparse.c main.c make.c memory.c parse.c \ +SRCS= arch.c buf.c cmd_exec.c compat.c cond.c dir.c direxpand.c engine.c \ + error.c for.c init.c job.c lowparse.c main.c make.c memory.c parse.c \ parsevar.c str.c stats.c suff.c targ.c timestamp.c \ var.c varmodifiers.c varname.c SRCS+= lstAddNew.c lstAppend.c lstConcat.c lstConcatDestroy.c \ @@ -28,10 +27,9 @@ SRCS+= lstAddNew.c lstAppend.c lstConcat.c lstConcatDestroy.c \ CLEANFILES+=generate hashconsts.h generate.o regress.o check CLEANFILES+=${LIBOBJS} libohash.a -CLEANFILES+= varhashconsts.h condhashconsts.h nodehashconsts.h -CLEANFILES+= generate.o generate +CLEANFILES+= varhashconsts.h condhashconsts.h generate.o generate -beforedepend: varhashconsts.h condhashconsts.h +beforedepend: varhashconsts.h condhashconsts.h nodehashconsts.h # may need tweaking if you add variable synonyms or change the hash function MAGICVARSLOTS=77 MAGICCONDSLOTS=65 @@ -57,8 +55,10 @@ regress: check # kludge for people who forget to make depend var.o: varhashconsts.h cond.o: condhashconsts.h +targ.o parse.o: nodehashconsts.h var.ln: varhashconsts.h cond.ln: condhashconsts.h +targ.ln parse.ln: nodehashconsts.h .if make(install) SUBDIR+= PSD.doc |