svn commit: r266845 - head/sys

[John Baldwin]

Author: jhb
Date: Thu May 29 16:03:08 2014
New Revision: 266845
URL: http://svnweb.freebsd.org/changeset/base/266845

Log:
  Reorganize this Makefile so that all the bsd.*.mk bits are in one
  section at the bottom.
  
  Reviewed by:	imp

Modified:
  head/sys/Makefile

Modified: head/sys/Makefile
==============================================================================
--- head/sys/Makefile	Thu May 29 15:46:57 2014	(r266844)
+++ head/sys/Makefile	Thu May 29 16:03:08 2014	(r266845)
@@ -1,15 +1,5 @@
 # $FreeBSD$
 
-.if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS) || \
-    make(glimpse) || make(glimpse-clean))
-.include <src.opts.mk>
-
-# The boot loader
-.if ${MK_BOOT} != "no"
-SUBDIR=	boot
-.endif
-.endif
-
 # Directories to include in cscope name file and TAGS.
 CSCOPEDIRS=	boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \
 		geom gnu isa kern libkern modules net net80211 \
@@ -30,12 +20,6 @@ CSCOPE_ARCHDIR += x86
 .endif
 .endif
 
-# Loadable kernel modules
-
-.if defined(MODULES_WITH_WORLD)
-SUBDIR+=modules
-.endif
-
 HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
 
 # You need the devel/cscope port for this.
@@ -85,4 +69,20 @@ glimpse:
 glimpse-clean:
 	cd ${.CURDIR}; rm -f .glimpse_*
 
+.if !(make(cscope) || make(cscope-clean) || make(cscope-hook) || make(TAGS) || \
+    make(glimpse) || make(glimpse-clean))
+.include <src.opts.mk>
+
+# The boot loader
+.if ${MK_BOOT} != "no"
+SUBDIR=	boot
+.endif
+
+# Loadable kernel modules
+
+.if defined(MODULES_WITH_WORLD)
+SUBDIR+=modules
+.endif
+
 .include <bsd.subdir.mk>
+.endif