Module Name: src
Committed By: christos
Date: Wed Aug 8 13:56:14 UTC 2012
Modified Files:
src/share/mk: bsd.README bsd.own.mk bsd.prog.mk
Log Message:
add MKRUMP by popular demand.
To generate a diff of this commit:
cvs rdiff -u -r1.297 -r1.298 src/share/mk/bsd.README
cvs rdiff -u -r1.702 -r1.703 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.274 -r1.275 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.297 src/share/mk/bsd.README:1.298
--- src/share/mk/bsd.README:1.297 Sat Jul 14 12:04:06 2012
+++ src/share/mk/bsd.README Wed Aug 8 09:56:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.297 2012/07/14 16:04:06 spz Exp $
+# $NetBSD: bsd.README,v 1.298 2012/08/08 13:56:13 christos Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -362,6 +362,10 @@ MKZFS If "no", do not build and install
compatibility kernel modules.
Default: yes on i386/amd64, no elsewhere.
+MKRUMP If "no", do not build and install rump related headers,
+ libraries, and programs.
+ Default: yes
+
USE_HESIOD If "no", disables building Hesiod support into
various system utilities/libraries that support it.
If ${MKHESIOD} is "no", USE_HESIOD will also be
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.702 src/share/mk/bsd.own.mk:1.703
--- src/share/mk/bsd.own.mk:1.702 Sun Aug 5 00:11:35 2012
+++ src/share/mk/bsd.own.mk Wed Aug 8 09:56:13 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.702 2012/08/05 04:11:35 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.703 2012/08/08 13:56:13 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -825,6 +825,7 @@ _MKVARS.yes= \
MKOBJ \
MKPAM MKPERFUSE \
MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
+ MKRUMP \
MKSHARE MKSKEY MKSTATICLIB \
MKX11FONTS \
MKYP
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.274 src/share/mk/bsd.prog.mk:1.275
--- src/share/mk/bsd.prog.mk:1.274 Wed Feb 29 15:07:57 2012
+++ src/share/mk/bsd.prog.mk Wed Aug 8 09:56:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.274 2012/02/29 20:07:57 tron Exp $
+# $NetBSD: bsd.prog.mk,v 1.275 2012/08/08 13:56:14 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -310,24 +310,34 @@ _CCLINK= ${CXX} ${_CCLINKFLAGS}
.if defined(RUMPPRG)
PROG= ${RUMPPRG}
-.ifndef CRUNCHEDPROG
+. ifndef CRUNCHEDPROG
+. if (${MKRUMP} != "no")
PROGS= ${RUMPPRG} rump.${RUMPPRG}
-. if defined(SRCS)
+. else
+PROGS= ${RUMPPRG}
+. endif
+. if defined(SRCS)
+. if (${MKRUMP} != "no")
SRCS.rump.${PROG}:= ${SRCS} ${PROG}_rumpops.c ${RUMPSRCS}
+. endif
SRCS+= ${PROG}_hostops.c
-. else
+. else
SRCS= ${PROG}.c ${PROG}_hostops.c
+. if (${MKRUMP} != "no")
SRCS.rump.${PROG}= ${PROG}.c ${PROG}_rumpops.c ${RUMPSRCS}
-. endif
+. endif
+. endif
+. if (${MKRUMP} != "no")
DPSRCS+= ${PROG}_rumpops.c ${RUMPSRCS}
LDADD.rump.${PROG}+= -lrumpclient
DPADD.rump.${PROG}+= ${LIBRUMPCLIENT}
MAN.rump.${PROG}= # defined but feeling empty
_RUMPINSTALL.rump.${PROG}=# defined
-.else # CRUNCHEDPROG
+. endif
+. else # CRUNCHEDPROG
PROGS= ${PROG}
CPPFLAGS+= -DCRUNCHOPS
-.endif
+. endif
.endif
.if defined(PROG)
