Date: Thu, 16 Apr 2015 22:06:49 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r281624 - user/ngie/fix-progs/share/mk Message-ID: <201504162206.t3GM6n8P013554@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Apr 16 22:06:48 2015 New Revision: 281624 URL: https://svnweb.freebsd.org/changeset/base/281624 Log: Neuter bsd.progs.mk Notify users that they should replace bsd.progs.mk with bsd.prog.mk Modified: user/ngie/fix-progs/share/mk/bsd.progs.mk Modified: user/ngie/fix-progs/share/mk/bsd.progs.mk ============================================================================== --- user/ngie/fix-progs/share/mk/bsd.progs.mk Thu Apr 16 22:05:09 2015 (r281623) +++ user/ngie/fix-progs/share/mk/bsd.progs.mk Thu Apr 16 22:06:48 2015 (r281624) @@ -1,129 +1,4 @@ # $FreeBSD$ -# $Id: progs.mk,v 1.11 2012/11/06 17:18:54 sjg Exp $ -# -# @(#) Copyright (c) 2006, Simon J. Gerraty -# -# This file is provided in the hope that it will -# be of use. There is absolutely NO WARRANTY. -# Permission to copy, redistribute or otherwise -# use this file is hereby granted provided that -# the above copyright notice and this notice are -# left intact. -# -# Please send copies of changes and bug-fixes to: -# sjg@crufty.net -# -.MAIN: all - -.if defined(PROGS) || defined(PROGS_CXX) -# we really only use PROGS below... -PROGS += ${PROGS_CXX} - -# In meta mode, we can capture dependenices for _one_ of the progs. -# if makefile doesn't nominate one, we use the first. -.if defined(.PARSEDIR) -.ifndef UPDATE_DEPENDFILE_PROG -UPDATE_DEPENDFILE_PROG = ${PROGS:[1]} -.export UPDATE_DEPENDFILE_PROG -.endif -.else -UPDATE_DEPENDFILE_PROG?= no -.endif - -.ifndef PROG -# They may have asked us to build just one -.for t in ${PROGS} -.if make($t) -PROG ?= $t -.endif -.endfor -.endif - -.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} -.for v in ${PROG_VARS:O:u} -.if empty(${PROG_OVERRIDE_VARS:M$v}) -.if defined(${v}.${PROG}) -$v += ${${v}.${PROG}} -.elif defined(${v}_${PROG}) -$v += ${${v}_${PROG}} -.endif -.else -$v ?= -.endif -.endfor - -# for meta mode, there can be only one! -.if ${PROG} == ${UPDATE_DEPENDFILE_PROG} -UPDATE_DEPENDFILE ?= yes -.endif -UPDATE_DEPENDFILE ?= NO - -# ensure that we don't clobber each other's dependencies -DEPENDFILE?= .depend.${PROG} -# prog.mk will do the rest -.else -all: ${FILES} ${PROGS} ${SCRIPTS} - -# We cannot capture dependencies for meta mode here -UPDATE_DEPENDFILE = NO -# nor can we safely run in parallel. -.NOTPARALLEL: -.endif -.endif - -# The non-recursive call to bsd.progs.mk will handle FILES; NUL out -# FILESGROUPS so recursive calls don't duplicate the work -.ifdef _RECURSING_PROGS -FILESGROUPS= -.endif - -# handle being called [bsd.]progs.mk +.warning "Please use bsd.prog.mk instead of bsd.progs.mk" .include <bsd.prog.mk> - -.ifndef _RECURSING_PROGS -# tell progs.mk we might want to install things -PROGS_TARGETS+= checkdpadd clean cleandepend cleandir cleanobj depend install - -.for p in ${PROGS} -.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p) -# bsd.prog.mk may need to know this -x.$p= PROG_CXX=$p -.endif - -$p ${p}_p: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ - DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ - ${x.$p}) - -.for t in ${PROGS_TARGETS:O:u} -$p.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \ - SUBDIR= PROG=$p \ - DEPENDFILE=.depend.$p .MAKE.DEPENDFILE=.depend.$p \ - ${x.$p} ${@:E}) -.endfor -.endfor - -.if !empty(PROGS) -.for t in ${PROGS_TARGETS:O:u} -$t: ${PROGS:%=%.$t} -.endfor -.endif - -.if empty(PROGS) && !empty(SCRIPTS) - -.for t in ${PROGS_TARGETS:O:u} -scripts.$t: .PHONY .MAKE - (cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} SUBDIR= _RECURSING_PROGS= \ - $t) -$t: scripts.$t -.endfor - -.endif - -.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504162206.t3GM6n8P013554>