Module Name: src
Committed By: uebayasi
Date: Mon Dec 14 12:43:48 UTC 2009
Modified Files:
src/games: Makefile
src/gnu/lib: Makefile
src/regress/usr.bin: Makefile
src/regress/usr.bin/rtld: Makefile
Log Message:
Conditionalize some build directories by ${MKCXX}.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/games/Makefile
cvs rdiff -u -r1.45 -r1.46 src/gnu/lib/Makefile
cvs rdiff -u -r1.16 -r1.17 src/regress/usr.bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/regress/usr.bin/rtld/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/Makefile
diff -u src/games/Makefile:1.24 src/games/Makefile:1.25
--- src/games/Makefile:1.24 Tue Jan 24 19:01:45 2006
+++ src/games/Makefile Mon Dec 14 12:43:48 2009
@@ -1,17 +1,23 @@
-# $NetBSD: Makefile,v 1.24 2006/01/24 19:01:45 elad Exp $
+# $NetBSD: Makefile,v 1.25 2009/12/14 12:43:48 uebayasi Exp $
# @(#)Makefile 8.3 (Berkeley) 7/24/94
# Missing: dungeon warp
# Moved: chess
# Don't belong: xneko xroach
+.include <bsd.own.mk>
+
SUBDIR= adventure arithmetic atc \
backgammon banner battlestar bcd boggle \
caesar canfield ching countmail cribbage \
- dab dm factor fish fortune gomoku \
+ dm factor fish fortune gomoku \
hack hangman hunt larn mille monop morse number \
phantasia pig pom ppt primes quiz \
rain random robots rogue sail snake tetris trek \
wargames worm worms wtf wump
+.if ${MKCXX} != "no"
+SUBDIR= dab
+.endif
+
.include <bsd.subdir.mk>
Index: src/gnu/lib/Makefile
diff -u src/gnu/lib/Makefile:1.45 src/gnu/lib/Makefile:1.46
--- src/gnu/lib/Makefile:1.45 Sun Nov 8 15:24:36 2009
+++ src/gnu/lib/Makefile Mon Dec 14 12:43:48 2009
@@ -1,9 +1,12 @@
-# $NetBSD: Makefile,v 1.45 2009/11/08 15:24:36 skrll Exp $
+# $NetBSD: Makefile,v 1.46 2009/12/14 12:43:48 uebayasi Exp $
.include <bsd.own.mk>
.if ${MKGCC} != "no"
-SUBDIR+= crtstuff4 libgcc4 libobjc4 libsupc++4 libstdc++-v3_4
+SUBDIR+= crtstuff4 libgcc4 libobjc4
+.if ${MKCXX} != "no"
+SUBDIR+= libsupc++4 libstdc++-v3_4
+.endif
.endif
SUBDIR+= libmalloc
Index: src/regress/usr.bin/Makefile
diff -u src/regress/usr.bin/Makefile:1.16 src/regress/usr.bin/Makefile:1.17
--- src/regress/usr.bin/Makefile:1.16 Fri Feb 13 05:21:24 2009
+++ src/regress/usr.bin/Makefile Mon Dec 14 12:43:48 2009
@@ -1,6 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2009/02/13 05:21:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2009/12/14 12:43:48 uebayasi Exp $
-SUBDIR+= c++ rtld
-SUBDIR+= sort xlint
+.include <bsd.own.mk>
+
+.if ${MKCXX} != "no"
+SUBDIR+= c++
+.endif
+
+SUBDIR+= rtld sort xlint
.include <bsd.subdir.mk>
Index: src/regress/usr.bin/rtld/Makefile
diff -u src/regress/usr.bin/rtld/Makefile:1.2 src/regress/usr.bin/rtld/Makefile:1.3
--- src/regress/usr.bin/rtld/Makefile:1.2 Thu Nov 14 21:10:45 2002
+++ src/regress/usr.bin/rtld/Makefile Mon Dec 14 12:43:48 2009
@@ -1,5 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2002/11/14 21:10:45 nathanw Exp $
+# $NetBSD: Makefile,v 1.3 2009/12/14 12:43:48 uebayasi Exp $
-SUBDIR+= dlopen testlib dlerror-false dlerror-cleared
+.include <bsd.own.mk>
+
+SUBDIR+= dlopen
+.if ${MKCXX} != "no"
+SUBDIR+= testlib
+.endif
+SUBDIR+= dlerror-false dlerror-cleared
.include <bsd.subdir.mk>
