From owner-svn-src-head@FreeBSD.ORG  Thu May 29 16:03:09 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 41DE4A92;
 Thu, 29 May 2014 16:03:09 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 307A9291B;
 Thu, 29 May 2014 16:03:09 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TG39t7079732;
 Thu, 29 May 2014 16:03:09 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4TG39BJ079731;
 Thu, 29 May 2014 16:03:09 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201405291603.s4TG39BJ079731@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 29 May 2014 16:03:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r266845 - head/sys
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 May 2014 16:03:09 -0000

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