diff options
| -rw-r--r-- | share/mk/bsd.dep.mk | 9 | ||||
| -rw-r--r-- | share/mk/bsd.own.mk | 4 | ||||
| -rw-r--r-- | share/mk/bsd.subdir.mk | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/share/mk/bsd.dep.mk b/share/mk/bsd.dep.mk index f21fe7f3098..55cce19552b 100644 --- a/share/mk/bsd.dep.mk +++ b/share/mk/bsd.dep.mk @@ -1,9 +1,12 @@ -# $OpenBSD: bsd.dep.mk,v 1.6 2006/06/30 19:00:29 otto Exp $ +# $OpenBSD: bsd.dep.mk,v 1.7 2007/11/03 15:14:32 espie Exp $ # $NetBSD: bsd.dep.mk,v 1.12 1995/09/27 01:15:09 christos Exp $ # some of the rules involve .h sources, so remove them from mkdep line .if !target(depend) -depend: beforedepend .depend _SUBDIRUSE afterdepend +depend: beforedepend .depend subdirdepend afterdepend +.ORDER: beforedepend .depend subdirdepend afterdepend +subdirdepend: _SUBDIRUSE + . if defined(SRCS) .depend: ${SRCS} ${_LEXINTM} ${_YACCINTM} @rm -f .depend @@ -49,4 +52,4 @@ cleandepend: rm -f .depend ${.CURDIR}/tags .endif -.PHONY: beforedepend depend afterdepend cleandepend +.PHONY: beforedepend depend afterdepend cleandepend subdirdepend diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 641de0a5f98..23dda66b38e 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.own.mk,v 1.97 2006/10/06 20:58:17 miod Exp $ +# $OpenBSD: bsd.own.mk,v 1.98 2007/11/03 15:14:32 espie Exp $ # $NetBSD: bsd.own.mk,v 1.24 1996/04/13 02:08:09 thorpej Exp $ # Host-specific overrides @@ -150,6 +150,6 @@ NOPROFILE= BSD_OWN_MK=Done .PHONY: spell clean cleandir obj manpages print all \ - depend beforedepend afterdepend cleandepend \ + depend beforedepend afterdepend cleandepend subdirdepend \ all lint cleanman nlsinstall cleannls includes \ beforeinstall realinstall maninstall afterinstall install diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index 0420ac3dec7..e0582ea24e6 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -1,4 +1,4 @@ -# $OpenBSD: bsd.subdir.mk,v 1.14 2005/02/05 10:39:50 espie Exp $ +# $OpenBSD: bsd.subdir.mk,v 1.15 2007/11/03 15:14:32 espie Exp $ # $NetBSD: bsd.subdir.mk,v 1.11 1996/04/04 02:05:06 jtc Exp $ # @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91 @@ -43,7 +43,7 @@ _SUBDIRUSE: .USE ${MAKE} SKIPDIR="$${subskipdir}" \ $${_makefile_spec_} _THISDIR_="$${_nextdir_}" \ ${MAKE_FLAGS} \ - ${.TARGET:S/realinstall/install/:S/.depend/depend/}; \ + ${.TARGET:S/realinstall/install/:S/subdirdepend/depend/}; \ fi); \ done |