Don't use _SUBDIRUSE outside of bsd.subdir.mk.

This commit is contained in:
mycroft 1997-05-07 17:06:16 +00:00
parent b89441bd06
commit b2a77a6aa4
9 changed files with 24 additions and 59 deletions

View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.19 1997/04/18 18:05:24 cgd Exp $
# $NetBSD: Makefile,v 1.20 1997/05/07 17:11:58 mycroft Exp $
# Make a distribution for the alpha, on a spare disk.
# This creates a large, gzipped disk image in ${.OBJDIR}
@ -92,10 +92,8 @@ x11.tar.gz: mount-fs build-fs
.endif
_SUBDIRUSE:
# clean dependencies in case somebody decides to shortcut the build.
clean:
clean cleandir:
/bin/rm -f ${TARGETS}
/bin/rm -f mount-fs build-fs unmount-fs

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.dep.mk,v 1.16 1997/05/07 16:44:04 mycroft Exp $
# $NetBSD: bsd.dep.mk,v 1.17 1997/05/07 17:06:16 mycroft Exp $
.PHONY: cleandepend
cleandir: cleandepend
@ -34,7 +34,7 @@ depend: .depend
${CXXFLAGS:M-[ID]*} ${CPPFLAGS} $$files; \
fi
.endif
depend: _SUBDIRUSE afterdepend
depend: afterdepend
.if !target(beforedepend)
beforedepend:
.endif
@ -45,7 +45,7 @@ afterdepend:
.if !target(tags)
.if defined(SRCS)
tags: ${SRCS} _SUBDIRUSE
tags: ${SRCS}
-cd ${.CURDIR}; ctags -f /dev/stdout ${.ALLSRC:N*.h} | \
sed "s;\${.CURDIR}/;;" > tags
.else

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.doc.mk,v 1.29 1997/05/07 16:35:44 mycroft Exp $
# $NetBSD: bsd.doc.mk,v 1.30 1997/05/07 17:06:18 mycroft Exp $
# @(#)bsd.doc.mk 8.1 (Berkeley) 8/14/93
.include <bsd.own.mk>
@ -6,7 +6,7 @@
.MAIN: all
.PHONY: cleandoc docinstall print spell
install: docinstall
clean: cleandoc
clean cleandir: cleandoc
BIB?= bib
EQN?= eqn

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.kmod.mk,v 1.13 1997/05/07 15:53:30 mycroft Exp $
# $NetBSD: bsd.kmod.mk,v 1.14 1997/05/07 17:06:19 mycroft Exp $
.if exists(${.CURDIR}/../Makefile.inc)
.include "${.CURDIR}/../Makefile.inc"
@ -9,7 +9,7 @@
.MAIN: all
.PHONY: cleankmod kmodinstall load unload
install: kmodinstall
clean: cleankmod
clean cleandir: cleankmod
S!= cd ${.CURDIR}/..;pwd
KERN= $S/kern
@ -35,7 +35,7 @@ ${PROG}: ${DPSRCS} ${OBJS} ${DPADD}
MAN= ${KMOD}.4
.endif
all: machine ${PROG} _SUBDIRUSE
all: machine ${PROG}
machine:
ln -s $S/arch/${MACHINE}/include machine

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.lib.mk,v 1.97 1997/05/07 15:53:30 mycroft Exp $
# $NetBSD: bsd.lib.mk,v 1.98 1997/05/07 17:06:22 mycroft Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.if exists(${.CURDIR}/../Makefile.inc)
@ -10,7 +10,7 @@
.MAIN: all
.PHONY: cleanlib libinstall
install: libinstall
clean: cleanlib
clean cleandir: cleanlib
.if exists(${.CURDIR}/shlib_version)
SHLIB_MAJOR != . ${.CURDIR}/shlib_version ; echo $$major
@ -155,7 +155,7 @@ _LIBS+=lib${LIB}.so.${SHLIB_MAJOR}.${SHLIB_MINOR}
_LIBS+=llib-l${LIB}.ln
.endif
all: ${_LIBS} _SUBDIRUSE
all: ${_LIBS}
OBJS+= ${SRCS:N*.h:R:S/$/.o/g}

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.obj.mk,v 1.11 1997/05/06 20:54:38 mycroft Exp $
# $NetBSD: bsd.obj.mk,v 1.12 1997/05/07 17:06:24 mycroft Exp $
.if !target(obj)
.if defined(NOOBJ)
@ -23,7 +23,7 @@ __usrobjdirpf=
.endif
.endif
obj: _SUBDIRUSE
obj:
@cd ${.CURDIR}; rm -f ${__objdir} > /dev/null 2>&1 || true; \
here=`/bin/pwd`; subdir=$${here#${BSDSRCDIR}/}; \
if test $$here != $$subdir ; then \

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.own.mk,v 1.36 1997/05/07 15:53:33 mycroft Exp $
# $NetBSD: bsd.own.mk,v 1.37 1997/05/07 17:06:26 mycroft Exp $
.if defined(MAKECONF) && exists(${MAKECONF})
.include "${MAKECONF}"
@ -85,7 +85,7 @@ TARGETS+= all clean cleandir depend includes install lint obj tags
beforedepend afterdepend beforeinstall afterinstall
.if !target(install)
install: _SUBDIRUSE afterinstall
install: afterinstall
afterinstall: beforeinstall
.if !target(beforeinstall)
beforeinstall:
@ -94,8 +94,3 @@ beforeinstall:
afterinstall:
.endif
.endif
.if !target(clean)
clean: _SUBDIRUSE
cleandir: _SUBDIRUSE clean
.endif

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.prog.mk,v 1.74 1997/05/07 15:53:34 mycroft Exp $
# $NetBSD: bsd.prog.mk,v 1.75 1997/05/07 17:06:28 mycroft Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.if exists(${.CURDIR}/../Makefile.inc)
@ -10,7 +10,7 @@
.MAIN: all
.PHONY: cleanprog proginstall scriptsinstall
install: proginstall scriptsinstall
clean: cleanprog
clean cleandir: cleanprog
.SUFFIXES: .out .o .c .cc .C .y .l .s .8 .7 .6 .5 .4 .3 .2 .1 .0
@ -104,7 +104,7 @@ MAN= ${PROG}.1
.endif # !defined(MAN)
.endif # defined(PROG)
all: ${PROG} _SUBDIRUSE
all: ${PROG}
cleanprog:
rm -f a.out [Ee]rrs mklog core *.core \

View File

@ -1,4 +1,4 @@
# $NetBSD: bsd.subdir.mk,v 1.19 1997/05/07 15:53:35 mycroft Exp $
# $NetBSD: bsd.subdir.mk,v 1.20 1997/05/07 17:06:30 mycroft Exp $
# @(#)bsd.subdir.mk 8.1 (Berkeley) 6/8/93
.include <bsd.own.mk>
@ -42,36 +42,8 @@ ${targ}-${dir}: .MAKE __SUBDIRINTERNALUSE
${dir}: all-${dir}
.endfor
.if !target(all)
all: _SUBDIRUSE
.endif
.if !target(clean)
clean: _SUBDIRUSE
.endif
.if !target(cleandir)
cleandir: _SUBDIRUSE
.endif
.if !target(depend)
depend: _SUBDIRUSE
.endif
.if !target(includes)
includes: _SUBDIRUSE
.endif
.if !target(lint)
lint: _SUBDIRUSE
.endif
.if !target(obj)
obj: _SUBDIRUSE
.endif
.if !target(tags)
tags: _SUBDIRUSE
.endif
.for targ in ${TARGETS}
${targ}: _SUBDIRUSE
.endfor
.include <bsd.own.mk>