View | Details | Raw Unified | Return to bug 191055
Collapse All | Expand All

(-)b/share/mk/bsd.progs.mk (-12 / +9 lines)
Lines 66-72 UPDATE_DEPENDFILE ?= NO Link Here
66
DEPENDFILE?= .depend.${PROG}
66
DEPENDFILE?= .depend.${PROG}
67
# prog.mk will do the rest
67
# prog.mk will do the rest
68
.else
68
.else
69
all: ${PROGS}
69
all: ${FILES} ${PROGS} ${SCRIPTS}
70
70
71
# We cannot capture dependencies for meta mode here
71
# We cannot capture dependencies for meta mode here
72
UPDATE_DEPENDFILE = NO
72
UPDATE_DEPENDFILE = NO
Lines 80-86 UPDATE_DEPENDFILE = NO Link Here
80
80
81
.ifndef _RECURSING_PROGS
81
.ifndef _RECURSING_PROGS
82
# tell progs.mk we might want to install things
82
# tell progs.mk we might want to install things
83
PROGS_TARGETS+= cleandepend cleandir cleanobj depend install
83
PROGS_TARGETS+= clean cleandepend cleandir cleanobj depend install
84
84
85
.for p in ${PROGS}
85
.for p in ${PROGS}
86
.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
86
.if defined(PROGS_CXX) && !empty(PROGS_CXX:M$p)
Lines 103-120 $p.$t: .PHONY .MAKE Link Here
103
$t: ${PROGS:%=%.$t}
103
$t: ${PROGS:%=%.$t}
104
.endfor
104
.endfor
105
105
106
SCRIPTS_TARGETS+= cleandepend cleandir cleanobj depend install
106
.if empty(PROGS) && !empty(SCRIPTS)
107
107
108
.for p in ${SCRIPTS}
108
.for t in ${PROGS_TARGETS:O:u}
109
.for t in ${SCRIPTS_TARGETS:O:u}
109
scripts.$t: .PHONY .MAKE
110
$p.$t: .PHONY .MAKE
110
	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} SUBDIR= _RECURSING_PROGS= \
111
	(cd ${.CURDIR} && ${MAKE} -f ${MAKEFILE} _RECURSING_PROGS= \
111
	    $t)
112
	    SUBDIR= SCRIPT=$p ${x.$p} ${@:E})
112
$t: scripts.$t
113
.endfor
114
.endfor
113
.endfor
115
114
116
.for t in ${SCRIPTS_TARGETS:O:u}
115
.endif
117
$t: ${SCRIPTS:%=%.$t}
118
.endfor
119
116
120
.endif
117
.endif

Return to bug 191055