diff options
| author | sjg <sjg@FreeBSD.org> | 2013-09-05 15:57:26 +0000 |
|---|---|---|
| committer | sjg <sjg@FreeBSD.org> | 2013-09-05 15:57:26 +0000 |
| commit | 61d13f6983f254f54a424483966100812c5a5c36 (patch) | |
| tree | 11421e940bc58d36b4c59c4094bd98d6e21635b0 /usr.bin | |
| parent | 42eb0e69b4a01ca059fa4db4d572fa4154de4bb7 (diff) | |
| parent | 2abe6518e634d199cdd179ce1f2b3edce30a42e1 (diff) | |
| download | FreeBSD-src-61d13f6983f254f54a424483966100812c5a5c36.zip FreeBSD-src-61d13f6983f254f54a424483966100812c5a5c36.tar.gz | |
Merge bmake-20130904
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/bmake/Makefile | 4 | ||||
| -rw-r--r-- | usr.bin/bmake/unit-tests/Makefile | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.bin/bmake/Makefile b/usr.bin/bmake/Makefile index f7c403c..4129552 100644 --- a/usr.bin/bmake/Makefile +++ b/usr.bin/bmake/Makefile @@ -14,10 +14,10 @@ CFLAGS+= -I${.CURDIR} CLEANDIRS+= FreeBSD CLEANFILES+= bootstrap -# $Id: Makefile,v 1.17 2013/07/30 19:13:53 sjg Exp $ +# $Id: Makefile,v 1.20 2013/09/04 15:42:03 sjg Exp $ # Base version on src date -MAKE_VERSION= 20130810 +MAKE_VERSION= 20130904 PROG?= ${.CURDIR:T} diff --git a/usr.bin/bmake/unit-tests/Makefile b/usr.bin/bmake/unit-tests/Makefile index 4cbf6a2..be4cd2f 100644 --- a/usr.bin/bmake/unit-tests/Makefile +++ b/usr.bin/bmake/unit-tests/Makefile @@ -5,9 +5,9 @@ SRCTOP?= ${.CURDIR:H:H:H} -# $Id: Makefile.in,v 1.43 2013/07/16 21:14:30 sjg Exp $ +# $Id: Makefile.in,v 1.44 2013/08/28 22:09:29 sjg Exp $ # -# $NetBSD: Makefile,v 1.37 2013/07/16 19:59:28 sjg Exp $ +# $NetBSD: Makefile,v 1.38 2013/08/28 21:56:50 sjg Exp $ # # Unit tests for make(1) # The main targets are: @@ -52,6 +52,7 @@ SUBFILES= \ phony-end \ posix \ qequals \ + sunshcmd \ sysv \ ternary \ unexport \ |
