Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Conditionalize some build directories by ${MKCXX}.



details:   https://anonhg.NetBSD.org/src/rev/fafeca585c38
branches:  trunk
changeset: 750033:fafeca585c38
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Mon Dec 14 12:43:48 2009 +0000

description:
Conditionalize some build directories by ${MKCXX}.

diffstat:

 games/Makefile                |  10 ++++++++--
 gnu/lib/Makefile              |   7 +++++--
 regress/usr.bin/Makefile      |  11 ++++++++---
 regress/usr.bin/rtld/Makefile |  10 ++++++++--
 4 files changed, 29 insertions(+), 9 deletions(-)

diffs (82 lines):

diff -r e4cb74d600bb -r fafeca585c38 games/Makefile
--- a/games/Makefile    Mon Dec 14 12:18:14 2009 +0000
+++ b/games/Makefile    Mon Dec 14 12:43:48 2009 +0000
@@ -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>
diff -r e4cb74d600bb -r fafeca585c38 gnu/lib/Makefile
--- a/gnu/lib/Makefile  Mon Dec 14 12:18:14 2009 +0000
+++ b/gnu/lib/Makefile  Mon Dec 14 12:43:48 2009 +0000
@@ -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
diff -r e4cb74d600bb -r fafeca585c38 regress/usr.bin/Makefile
--- a/regress/usr.bin/Makefile  Mon Dec 14 12:18:14 2009 +0000
+++ b/regress/usr.bin/Makefile  Mon Dec 14 12:43:48 2009 +0000
@@ -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 $
+
+.include <bsd.own.mk>
 
-SUBDIR+= c++ rtld
-SUBDIR+= sort xlint
+.if ${MKCXX} != "no"
+SUBDIR+= c++
+.endif
+
+SUBDIR+= rtld sort xlint
 
 .include <bsd.subdir.mk>
diff -r e4cb74d600bb -r fafeca585c38 regress/usr.bin/rtld/Makefile
--- a/regress/usr.bin/rtld/Makefile     Mon Dec 14 12:18:14 2009 +0000
+++ b/regress/usr.bin/rtld/Makefile     Mon Dec 14 12:43:48 2009 +0000
@@ -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 $
+
+.include <bsd.own.mk>
 
-SUBDIR+= dlopen testlib dlerror-false dlerror-cleared
+SUBDIR+= dlopen
+.if ${MKCXX} != "no"
+SUBDIR+= testlib
+.endif
+SUBDIR+= dlerror-false dlerror-cleared
 
 .include <bsd.subdir.mk>



Home | Main Index | Thread Index | Old Index