Source-Changes-HG archive

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

[src/trunk]: src/share/mk add MKRUMP by popular demand.



details:   https://anonhg.NetBSD.org/src/rev/d3da0bbccaa7
branches:  trunk
changeset: 780814:d3da0bbccaa7
user:      christos <christos%NetBSD.org@localhost>
date:      Wed Aug 08 13:56:13 2012 +0000

description:
add MKRUMP by popular demand.

diffstat:

 share/mk/bsd.README  |   6 +++++-
 share/mk/bsd.own.mk  |   3 ++-
 share/mk/bsd.prog.mk |  24 +++++++++++++++++-------
 3 files changed, 24 insertions(+), 9 deletions(-)

diffs (87 lines):

diff -r bccb0b7ba0d6 -r d3da0bbccaa7 share/mk/bsd.README
--- a/share/mk/bsd.README       Wed Aug 08 09:02:49 2012 +0000
+++ b/share/mk/bsd.README       Wed Aug 08 13:56:13 2012 +0000
@@ -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 @@
                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
diff -r bccb0b7ba0d6 -r d3da0bbccaa7 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Wed Aug 08 09:02:49 2012 +0000
+++ b/share/mk/bsd.own.mk       Wed Aug 08 13:56:13 2012 +0000
@@ -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 @@
        MKOBJ \
        MKPAM MKPERFUSE \
        MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
+       MKRUMP \
        MKSHARE MKSKEY MKSTATICLIB \
        MKX11FONTS \
        MKYP
diff -r bccb0b7ba0d6 -r d3da0bbccaa7 share/mk/bsd.prog.mk
--- a/share/mk/bsd.prog.mk      Wed Aug 08 09:02:49 2012 +0000
+++ b/share/mk/bsd.prog.mk      Wed Aug 08 13:56:13 2012 +0000
@@ -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 @@
 
 .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)



Home | Main Index | Thread Index | Old Index