Restored objlink. The previous commit was confused about the difference

between OBJLINK and objlink.
This commit is contained in:
bde 1999-03-21 06:43:40 +00:00
parent f2324aa5e8
commit 9a6c8cb992
2 changed files with 14 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $Id: bsd.obj.mk,v 1.26 1998/08/30 20:33:27 jb Exp $
# $Id: bsd.obj.mk,v 1.27 1999/03/14 20:41:13 markm Exp $
#
# The include file <bsd.obj.mk> handles creating the 'obj' directory
# and cleaning up object files, etc.
@ -78,6 +78,16 @@ obj: _SUBDIR
.endif
.endif
.if !target(objlink)
objlink: _SUBDIR
@if test -d ${CANONICALOBJDIR}/; then \
rm -f ${.CURDIR}/obj; \
ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
else \
echo "No ${CANONICALOBJDIR} to link to - do a make obj."; \
fi
.endif
#
# where would that obj directory be?
#

View File

@ -1,5 +1,5 @@
# from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
# $Id: bsd.subdir.mk,v 1.25 1998/08/08 07:02:08 peter Exp $
# $Id: bsd.subdir.mk,v 1.26 1999/03/14 20:41:14 markm Exp $
#
# The include file <bsd.subdir.mk> contains the default targets
# for building subdirectories.
@ -33,7 +33,7 @@
#
# afterdistribute, afterinstall, all, beforeinstall, checkdpadd,
# clean, cleandepend, cleandir, depend, install, lint, maninstall,
# obj, realinstall, regress, tags
# obj, objlink, realinstall, regress, tags
#
.if !target(__initialized__)
@ -88,7 +88,7 @@ ${SUBDIR}::
.for __target in all checkdpadd clean cleandepend cleandir depend lint \
maninstall obj regress tags
maninstall obj objlink regress tags
.if !target(${__target})
${__target}: _SUBDIRUSE
.endif