diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf
index 056ed190f31b..2f1bff8fda6e 100644
--- a/etc/defaults/make.conf
+++ b/etc/defaults/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.74 1999/02/03 22:25:41 asami Exp $
+# $Id: make.conf,v 1.75 1999/03/14 19:05:16 billf Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -28,10 +28,6 @@
 # To avoid building sendmail
 #NO_SENDMAIL=	true
 #
-# To have 'obj' symlinks created in your source directory
-#       (they aren't needed/necessary)
-#OBJLINK=	yes
-#
 # To compile just the kernel with special optimisations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
 #
diff --git a/etc/make.conf b/etc/make.conf
index 056ed190f31b..2f1bff8fda6e 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.74 1999/02/03 22:25:41 asami Exp $
+# $Id: make.conf,v 1.75 1999/03/14 19:05:16 billf Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -28,10 +28,6 @@
 # To avoid building sendmail
 #NO_SENDMAIL=	true
 #
-# To have 'obj' symlinks created in your source directory
-#       (they aren't needed/necessary)
-#OBJLINK=	yes
-#
 # To compile just the kernel with special optimisations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
 #
diff --git a/release/Makefile b/release/Makefile
index 9bc3164f33fe..2ec2cf1d2036 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.472 1999/02/14 13:56:14 des Exp $
+#	$Id: Makefile,v 1.473 1999/03/10 03:50:38 jkh Exp $
 #
 # make release CHROOTDIR=/some/dir BUILDNAME=somename [ RELEASETAG=tag ]
 #
@@ -239,7 +239,6 @@ rerelease release:
 	echo "cd /usr/src/release/sysinstall"	>> ${CHROOTDIR}/mk
 	echo "make obj"				>> ${CHROOTDIR}/mk
 	echo "cd /usr/src/release"		>> ${CHROOTDIR}/mk
-	echo "make objlink"			>> ${CHROOTDIR}/mk
 	echo "make \$${_RELTARGET}"		>> ${CHROOTDIR}/mk
 	echo "echo make ${.TARGET} Finished"	>> ${CHROOTDIR}/mk
 	chmod 755 ${CHROOTDIR}/mk
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 056ed190f31b..2f1bff8fda6e 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.74 1999/02/03 22:25:41 asami Exp $
+# $Id: make.conf,v 1.75 1999/03/14 19:05:16 billf Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -28,10 +28,6 @@
 # To avoid building sendmail
 #NO_SENDMAIL=	true
 #
-# To have 'obj' symlinks created in your source directory
-#       (they aren't needed/necessary)
-#OBJLINK=	yes
-#
 # To compile just the kernel with special optimisations, you should use
 # this instead of CFLAGS (which is not applicable to kernel builds anyway):
 #
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index c6ce52529402..fe31e486f7d8 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -1,4 +1,4 @@
-#	$Id: bsd.obj.mk,v 1.25 1998/06/04 15:31:55 peter Exp $
+#	$Id: bsd.obj.mk,v 1.26 1998/08/30 20:33:27 jb Exp $
 #
 # The include file <bsd.obj.mk> handles creating the 'obj' directory
 # and cleaning up object files, etc.
@@ -31,10 +31,6 @@
 # NOOBJ		Do not create object directories.  This should not be set
 #		if anything is built.
 #
-# OBJLINK	Create a symbolic link from ${.CURDIR}/obj to
-#		${CANONICALOBJDIR}.  Note: this BREAKS the read-only source
-#		tree rule!
-#
 # +++ targets +++
 #
 #	clean:
@@ -60,7 +56,7 @@ objwarn:
 .if !defined(NOOBJ) && ${.OBJDIR} != ${CANONICALOBJDIR}
 .if ${.OBJDIR} == ${.CURDIR}
 	@${ECHO} "Warning: Object directory not changed from original ${.CURDIR}"
-.elif !defined(MAKEOBJDIR) && !defined(MAKEOBJDIRPREFIX) && !defined(OBJLINK)
+.elif !defined(MAKEOBJDIR) && !defined(MAKEOBJDIRPREFIX)
 	@${ECHO} "Warning: Using ${.OBJDIR} as object directory instead of\
 		canonical ${CANONICALOBJDIR}"
 .endif
@@ -70,7 +66,6 @@ objwarn:
 .if defined(NOOBJ)
 obj:
 .else
-.if !defined(OBJLINK)
 obj:	_SUBDIR
 	@if ! test -d ${CANONICALOBJDIR}/; then \
 		mkdir -p ${CANONICALOBJDIR}; \
@@ -80,31 +75,8 @@ obj:	_SUBDIR
 		fi; \
 		${ECHO} "${CANONICALOBJDIR} created for ${.CURDIR}"; \
 	fi
-.else
-obj:	_SUBDIR
-	@if ! test -d ${CANONICALOBJDIR}/; then \
-		mkdir -p ${CANONICALOBJDIR}; \
-		if ! test -d ${CANONICALOBJDIR}/; then \
-			${ECHO} "Unable to create ${CANONICALOBJDIR}."; \
-			exit 1; \
-		fi; \
-		rm -f ${.CURDIR}/obj; \
-		ln -s ${CANONICALOBJDIR} ${.CURDIR}/obj; \
-		${ECHO} "${.CURDIR} -> ${CANONICALOBJDIR}"; \
-	fi
 .endif
 .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?
diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk
index 5a5cc1a374f9..0fe628b57db7 100644
--- a/share/mk/bsd.subdir.mk
+++ b/share/mk/bsd.subdir.mk
@@ -1,5 +1,5 @@
 #	from: @(#)bsd.subdir.mk	5.9 (Berkeley) 2/1/91
-#	$Id: bsd.subdir.mk,v 1.24 1998/05/06 16:53:53 wosch Exp $
+#	$Id: bsd.subdir.mk,v 1.25 1998/08/08 07:02:08 peter 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, objlink, realinstall, regress, tags
+#	obj, realinstall, regress, tags
 #
 
 .if !target(__initialized__)
@@ -88,7 +88,7 @@ ${SUBDIR}::
 
 
 .for __target in all checkdpadd clean cleandepend cleandir depend lint \
-		 maninstall obj objlink regress tags
+		 maninstall obj regress tags
 .if !target(${__target})
 ${__target}: _SUBDIRUSE
 .endif