svn commit: r289052 - stable/10/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Thu Oct  8 19:19:56 2015
New Revision: 289052
URL: https://svnweb.freebsd.org/changeset/base/289052

Log:
  MFC r288160:
  
    Document bsd.progs.mk and add more variables overrides.

Modified:
  stable/10/share/mk/bsd.README
  stable/10/share/mk/bsd.progs.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.README
==============================================================================
--- stable/10/share/mk/bsd.README	Thu Oct  8 19:13:36 2015	(r289051)
+++ stable/10/share/mk/bsd.README	Thu Oct  8 19:19:56 2015	(r289052)
@@ -251,6 +251,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
+		LDADD.foo=	-lutil
+		SRCS.bar=	bar_src.c
+
+		The supported variables are BINDIR BINGRP BINMODE BINOWN
+		CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS DPSRCS LDADD
+		LDFLAGS MAN MLINKS PROGNAME SRCS.
+
 PROGNAME	The name that the above program will be installed as, if
 		different from ${PROG}.
 

Modified: stable/10/share/mk/bsd.progs.mk
==============================================================================
--- stable/10/share/mk/bsd.progs.mk	Thu Oct  8 19:13:36 2015	(r289051)
+++ stable/10/share/mk/bsd.progs.mk	Thu Oct  8 19:19:56 2015	(r289052)
@@ -42,8 +42,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 LDFLAGS ${PROG_OVERRIDE_VARS}
+PROG_OVERRIDE_VARS +=	BINDIR BINGRP BINOWN BINMODE DPSRCS MAN PROGNAME \
+			SRCS
+PROG_VARS +=	CFLAGS CPPFLAGS CXXFLAGS DPADD DPLIBS LDADD LINKS \
+		LDFLAGS MLINKS ${PROG_OVERRIDE_VARS}
 .for v in ${PROG_VARS:O:u}
 .if empty(${PROG_OVERRIDE_VARS:M$v})
 .if defined(${v}.${PROG})