svn commit: r288160 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Sep 24 00:17:00 2015
New Revision: 288160
URL: https://svnweb.freebsd.org/changeset/base/288160

Log:
  Document bsd.progs.mk and add more variables overrides.
  
  BINGRP BINMODE BINOWN LINKS MLINKS PROGNAME.
  
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.README
  head/share/mk/bsd.progs.mk

Modified: head/share/mk/bsd.README
==============================================================================
--- head/share/mk/bsd.README	Wed Sep 23 23:30:57 2015	(r288159)
+++ head/share/mk/bsd.README	Thu Sep 24 00:17:00 2015	(r288160)
@@ -292,6 +292,20 @@ PROG_CXX	If defined, the name of the pro
 		standard C++ library.  PROG_CXX overrides the value
 		of PROG if PROG is also set.
 
+PROGS		When used with <bsd.progs.mk>, allow building multiple
+PROGS_CXX	PROG and PROGS_CXX in one Makefile.  To define
+		individual variables for each program the VAR.prog
+		syntax should be used.  For example:
+
+		PROGS=		foo bar
+		SRCS.foo=	foo_src.c
+		LIBADD.foo=	util
+		SRCS.bar=	bar_src.c
+
+		The supported variables are BINDIR BINGRP BINMODE BINOWN
+		CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD
+		LDFLAGS LIBADD MAN MLINKS PROGNAME SRCS.
+
 PROGNAME	The name that the above program will be installed as, if
 		different from ${PROG}.
 

Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk	Wed Sep 23 23:30:57 2015	(r288159)
+++ head/share/mk/bsd.progs.mk	Thu Sep 24 00:17:00 2015	(r288160)
@@ -38,8 +38,10 @@ PROG ?= $t
 
 .if defined(PROG)
 # just one of many
-PROG_OVERRIDE_VARS += BINDIR DPSRCS MAN SRCS
-PROG_VARS += CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LDFLAGS ${PROG_OVERRIDE_VARS}
+PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN PROGNAME \
+			SRCS
+PROG_VARS +=	CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LIBADD LINKS \
+		LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
 .if empty(${PROG_OVERRIDE_VARS:M$v})
 .if defined(${v}.${PROG})