Tue Jul 29 04:49:44 2008 UTC ()
if MKXORG != no, use external/mit/xorg subdir instead of x11 subdir for
the mk-x11 target.


(mrg)
diff -r1.253 -r1.254 src/Makefile

cvs diff -r1.253 -r1.254 src/Makefile (expand / switch to unified diff)

--- src/Makefile 2008/05/22 14:13:58 1.253
+++ src/Makefile 2008/07/29 04:49:43 1.254
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.253 2008/05/22 14:13:58 lukem Exp $ 1# $NetBSD: Makefile,v 1.254 2008/07/29 04:49:43 mrg Exp $
2 2
3# 3#
4# This is the top-level makefile for building NetBSD. For an outline of 4# This is the top-level makefile for building NetBSD. For an outline of
5# how to build a snapshot or release, as well as other release engineering 5# how to build a snapshot or release, as well as other release engineering
6# information, see http://www.NetBSD.org/developers/releng/index.html 6# information, see http://www.NetBSD.org/developers/releng/index.html
7# 7#
8# Not everything you can set or do is documented in this makefile. In 8# Not everything you can set or do is documented in this makefile. In
9# particular, you should review the files in /usr/share/mk (especially 9# particular, you should review the files in /usr/share/mk (especially
10# bsd.README) for general information on building programs and writing 10# bsd.README) for general information on building programs and writing
11# Makefiles within this structure, and see the comments in src/etc/Makefile 11# Makefiles within this structure, and see the comments in src/etc/Makefile
12# for further information on installation and release set options. 12# for further information on installation and release set options.
13# 13#
14# Variables listed below can be set on the make command line (highest 14# Variables listed below can be set on the make command line (highest
@@ -377,27 +377,31 @@ do-ld.so: .PHONY .MAKE @@ -377,27 +377,31 @@ do-ld.so: .PHONY .MAKE
377 ${MAKEDIRTARGET} libexec/ld.aout_so ${targ} 377 ${MAKEDIRTARGET} libexec/ld.aout_so ${targ}
378.endif 378.endif
379.if (${OBJECT_FMT} == "ELF") 379.if (${OBJECT_FMT} == "ELF")
380 ${MAKEDIRTARGET} libexec/ld.elf_so ${targ} 380 ${MAKEDIRTARGET} libexec/ld.elf_so ${targ}
381.endif 381.endif
382.endfor 382.endfor
383 383
384do-build: .PHONY .MAKE 384do-build: .PHONY .MAKE
385.for targ in dependall install 385.for targ in dependall install
386 ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no 386 ${MAKEDIRTARGET} . ${targ} BUILD_tools=no BUILD_lib=no
387.endfor 387.endfor
388 388
389do-x11: .PHONY .MAKE 389do-x11: .PHONY .MAKE
 390.if ${MKXORG} != "no"
 391 ${MAKEDIRTARGET} external/mit/xorg build
 392.else
390 ${MAKEDIRTARGET} x11 build 393 ${MAKEDIRTARGET} x11 build
 394.endif
391 395
392do-obsolete: .PHONY .MAKE 396do-obsolete: .PHONY .MAKE
393 ${MAKEDIRTARGET} etc install-obsolete-lists 397 ${MAKEDIRTARGET} etc install-obsolete-lists
394 398
395# 399#
396# Speedup stubs for some subtrees that don't need to run these rules. 400# Speedup stubs for some subtrees that don't need to run these rules.
397# (Tells <bsd.subdir.mk> not to recurse for them.) 401# (Tells <bsd.subdir.mk> not to recurse for them.)
398# 402#
399 403
400.for dir in bin etc distrib games libexec regress sbin usr.sbin tools 404.for dir in bin etc distrib games libexec regress sbin usr.sbin tools
401includes-${dir}: .PHONY 405includes-${dir}: .PHONY
402 @true 406 @true
403.endfor 407.endfor