diff options
| author | jhb <jhb@FreeBSD.org> | 2014-05-29 16:03:08 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2014-05-29 16:03:08 +0000 |
| commit | 2bf4c9cd3e8c4b12dd4d3bd4e0927cf8351326f2 (patch) | |
| tree | fe7b1596898d556b3663361a1e2d790efb285bc0 | |
| parent | 400bcb6ec9ed2fc5451f1c1a7f99dbe66af2c4d6 (diff) | |
| download | FreeBSD-src-2bf4c9cd3e8c4b12dd4d3bd4e0927cf8351326f2.zip FreeBSD-src-2bf4c9cd3e8c4b12dd4d3bd4e0927cf8351326f2.tar.gz | |
Reorganize this Makefile so that all the bsd.*.mk bits are in one
section at the bottom.
Reviewed by: imp
| -rw-r--r-- | sys/Makefile | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sys/Makefile b/sys/Makefile index 8af56b8..a440e72 100644 --- a/sys/Makefile +++ b/sys/Makefile @@ -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 |
