diff options
author | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-09-05 19:29:42 +0000 |
---|---|---|
committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-09-05 19:29:42 +0000 |
commit | 2c3632d14fe37fa35c262ee9fb66835be0a52621 (patch) | |
tree | 57d0bb7a1e21c84dc625ee2f42c7677174a79c81 /usr.bin/bmake/Makefile | |
parent | 08d0b468f14fec9d8d11eea0c7886f53df4eda2e (diff) | |
parent | 6bbc783f48498b808e19db4441299dc7d85a278b (diff) | |
download | src-2c3632d14fe37fa35c262ee9fb66835be0a52621.tar.gz src-2c3632d14fe37fa35c262ee9fb66835be0a52621.zip |
Update to bmake-20200902
Lots of code refactoring, simplification and cleanup.
Lots of new unit-tests providing much higher code coverage.
All courtesy of rillig at netbsd.
Other significant changes:
o new read-only variable .SHELL which provides the path of the shell
used to run scripts (as defined by the .SHELL target).
o variable parsing detects more errors.
o new debug option -dl: LINT mode, does the equivalent of := for all
variable assignments so that file and line number are reported for
variable parse errors.
Notes
Notes:
svn path=/head/; revision=365366
Diffstat (limited to 'usr.bin/bmake/Makefile')
-rw-r--r-- | usr.bin/bmake/Makefile | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index 7ff49ad94892..4f7110563b80 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -12,7 +12,7 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.107 2020/06/07 21:18:46 sjg Exp $ +# $Id: Makefile,v 1.112 2020/08/28 16:26:17 sjg Exp $ PROG?= ${.CURDIR:T} @@ -22,9 +22,11 @@ SRCS= \ compat.c \ cond.c \ dir.c \ + enum.c \ for.c \ hash.c \ job.c \ + lst.c \ main.c \ make.c \ make_malloc.c \ @@ -39,36 +41,6 @@ SRCS= \ util.c \ var.c -# from lst.lib/ -SRCS+= \ - lstAppend.c \ - lstAtEnd.c \ - lstAtFront.c \ - lstClose.c \ - lstConcat.c \ - lstDatum.c \ - lstDeQueue.c \ - lstDestroy.c \ - lstDupl.c \ - lstEnQueue.c \ - lstFind.c \ - lstFindFrom.c \ - lstFirst.c \ - lstForEach.c \ - lstForEachFrom.c \ - lstInit.c \ - lstInsert.c \ - lstIsAtEnd.c \ - lstIsEmpty.c \ - lstLast.c \ - lstMember.c \ - lstNext.c \ - lstOpen.c \ - lstPrev.c \ - lstRemove.c \ - lstReplace.c \ - lstSucc.c - .sinclude "Makefile.inc" # this file gets generated by configure @@ -110,7 +82,6 @@ COPTS.filemon_dev.c += -DHAVE_FILEMON_H -I${FILEMON_H:H} .endif # USE_FILEMON .PATH: ${srcdir} -.PATH: ${srcdir}/lst.lib .if make(obj) || make(clean) SUBDIR+= unit-tests @@ -171,8 +142,11 @@ ${OBJS}: config.h # A simple unit-test driver to help catch regressions +TEST_MAKE ?= ${.OBJDIR}/${PROG:T} accept test: - cd ${.CURDIR}/unit-tests && MAKEFLAGS= ${.MAKE} -r -m / TEST_MAKE=${TEST_MAKE:U${.OBJDIR}/${PROG:T}} ${.TARGET} + cd ${.CURDIR}/unit-tests && \ + MAKEFLAGS= ${TEST_MAKE} -r -m / ${.TARGET} ${TESTS:DTESTS=${TESTS:Q}} + # override some simple things BINDIR= /usr/bin |