Makefile, Makefile.inc: move MKOBJ to Makefile.inc

Makefile

@@ -275,12 +275,7 @@ SUBDIR +=	test
 # Note with some versions of Simon's "mk-files" this will cause obj* directories
 # to be created in the existing obj* directories the second time around...
 #
-
-MKOBJ = yes
-
-# Comment the .WAIT's out (and avoid -j) if your build blows up
-#
-# N.B.:  These .WAIT's should normally be OK as they are in a dependency list.
+# N.B.:  These .WAIT's should be OK as they end up in a dependency list.
 #
 BUILDTARGETS +=	bmake-do-obj
 #

Makefile.inc

@@ -181,6 +181,14 @@ PKGCONFIGDIR ?= ${LIBDIR}/pkgconfig
 # Note:  In order to avoid problems with parallel builds LDADD and DPADD should
 # not be set in src/Makefile, thus this .if:
 #
+MKOBJ = yes
+
+# yes, always -- we use this because it's safer when using a shared network
+# directory for building/testing/etc.  (though it is sometimes somewhat
+# annoying)
+#
+OBJMACHINE ?=	yes
+
 .if !defined(LIB)
 . if defined(MAKEOBJDIRPREFIX)
 # then .OBJDIR is from MAKEOBJDIRPREFIX
@@ -234,13 +242,6 @@ CXREF ?= cxref
 # XXX it should probably be in another file, and indeed it should probably be
 # part of the pkgsrc infrastructure, especially if using sjg's Mk-files.
 #
-
-# yes, always -- we use this because it's safer when using a shared network
-# directory for building/testing/etc.  (though it is sometimes somewhat
-# annoying)
-#
-OBJMACHINE ?=	yes
-
 # Unfortunately most MK files don't provide a "beforecleandir" or
 # "beforedistclean".
 #