abb02fa2f9
This mostly fixes an interaction with bsd.test.mk with PROGS and SCRIPTS.
This was most notable with 'make clean' and 'make install', which r281055
and r272055 attempted to address but were inadequate.
It also addresses similar issues in bsd.progs.mk when not using bsd.test.mk.
This also fixes cases of NOT running commands in the parent when using
bsd.progs.mk:
- 'make clean' was not run for the main process for Makefiles which had both
FILES and SUBDIR but no PROGS or SCRIPTS. This usually was just a
leftover Kyuafile.auto. One such example is usr.bin/bmake/tests/sysmk/t1/2.
- 'make obj' was not running in the current directory with bsd.test.mk due
to early inclusion of bsd.subdir.mk. This was not really a problem due to
the SUBDIRS using 'mkdir -p' for their objdirs.
There were subtle bugs causing this wrong behavior:
1. bsd.progs.mk needs to set SCRIPTS to empty when recursing to avoid
the sub-makes from installing, cleaning or building the SCRIPTS;
only the parent make should be doing this. r281055 effectively did
the same but wasn't enough.
2. CLEANFILES may contain (especially from *.test.mk) files which only
the parent should clean, such as from FILES and SCRIPTS. To resolve
sub-makes also cleaning these, reset CLEANFILES and CLEANDIRS in the
children before including bsd.prog.mk. A tempting alternative would be
to only handle CLEANFILES in the parent but then the child bsd.prog.mk
CLEANFILES of per-PROGS wouldn't be setup.
3. bsd.subdir.mk was included too soon in bsd.test.mk. It needs to be
included after bsd.prog.mk as the SCRIPTS logic is short-circuitted if
'install:' is already defined (which bsd.subdir.mk does). There is
actually no need to include bsd.subdir.mk from bsd.test.mk as bsd.prog.mk
and bsd.obj.mk will do so in the proper order. The description in r257095
covers this for FILES and was fixed differently, though changing the
handling of target(install) in bsd.prog.mk may make sense after more
research.
4. bsd.progs.mk had extra logic to handle recursing SCRIPTS if PROGS was
empty, which isn't its business to be doing. SCRIPTS is handled fine
by bsd.prog.mk. This mostly reverts and reworks the fix in r259209 and
partially reverts r272055.
5. bsd.progs.mk has no need to depend 'all:' on SCRIPTS and FILES. These
are handled by bsd.prog.mk/bsd.files.mk fine. This also partially reverts
r272055.
6. bsd.progs.mk was not drop-in safe for bsd.prog.mk. Move the PROGS
check from r273186 to allow it to be used safely.
Specific tested cases:
SCRIPTS:no PROGS:no FILES:yes SUBDIR:yes
usr.bin/bmake/tests/sysmk/t1/2
SCRIPTS:yes PROGS:no FILES:yes SUBDIR:no
usr.bin/bmake/tests/sysmk/t1/2/1
SCRIPTS:yes PROGS:yes FILES:yes SUBDIR:yes
lib/libthr/tests
SCRIPTS:yes PROGS:no FILES:yes SUBDIR:no
usr.bin/yacc/tests
libexec/atf/atf-sh/tests
A full buildworld/installworld/clean comparison with mtree was also done.
The only relevant difference was the new fixed behavior of removing
Kyuafile.auto from the objdir in 'clean'.
Converting SCRIPTS to be a special case FILES group will make this less
fragile and is being explored.
One known remaining issue is 'cleandepend' removing the tags files for
every recursive call.
Note that the 'make clean' command runs for the CURDIR last, which can make
it appear to run multiple times when cleaning in tests/, but each command is
for a SUBDIR returning up the chain. This is purely bsd.subdir.mk behavior.
PR: 191055
PR: 191955
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
115 lines
2.7 KiB
Makefile
115 lines
2.7 KiB
Makefile
# $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.
|
|
.ifndef UPDATE_DEPENDFILE_PROG
|
|
UPDATE_DEPENDFILE_PROG = ${PROGS:[1]}
|
|
.export UPDATE_DEPENDFILE_PROG
|
|
.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
|
|
|
|
# prog.mk will do the rest
|
|
.else
|
|
all: ${PROGS}
|
|
|
|
# We cannot capture dependencies for meta mode here
|
|
UPDATE_DEPENDFILE = NO
|
|
# nor can we safely run in parallel.
|
|
.NOTPARALLEL:
|
|
.endif
|
|
.endif # PROGS || PROGS_CXX
|
|
|
|
# These are handled by the main make process.
|
|
.ifdef _RECURSING_PROGS
|
|
_PROGS_GLOBAL_VARS= CLEANFILES CLEANDIRS FILESGROUPS SCRIPTS
|
|
.for v in ${_PROGS_GLOBAL_VARS}
|
|
$v =
|
|
.endfor
|
|
.endif
|
|
|
|
# handle being called [bsd.]progs.mk
|
|
.include <bsd.prog.mk>
|
|
|
|
.if !empty(PROGS) && !defined(_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
|
|
|
|
# Main PROG target
|
|
$p ${p}_p: .PHONY .MAKE
|
|
(cd ${.CURDIR} && \
|
|
DEPENDFILE=.depend.$p \
|
|
${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
|
|
SUBDIR= PROG=$p ${x.$p})
|
|
|
|
# Pseudo targets for PROG, such as 'install'.
|
|
.for t in ${PROGS_TARGETS:O:u}
|
|
$p.$t: .PHONY .MAKE
|
|
(cd ${.CURDIR} && \
|
|
DEPENDFILE=.depend.$p \
|
|
${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
|
|
SUBDIR= PROG=$p ${x.$p} ${@:E})
|
|
.endfor
|
|
.endfor
|
|
|
|
# Depend main pseudo targets on all PROG.pseudo targets too.
|
|
.for t in ${PROGS_TARGETS:O:u}
|
|
$t: ${PROGS:%=%.$t}
|
|
.endfor
|
|
.endif
|