[src/trunk]: src/sys/rump Build compat code only when specified by RUMP_COMPAT

[pooka <pooka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7ef425dd2dcd
branches:  trunk
changeset: 337654:7ef425dd2dcd
user:      pooka <pooka%NetBSD.org@localhost>
date:      Wed Apr 22 17:57:49 2015 +0000

description:
Build compat code only when specified by RUMP_COMPAT

diffstat:

 sys/rump/dev/lib/libraidframe/Makefile      |  10 ++++++++--
 sys/rump/kern/lib/libtty/Makefile           |   7 ++++++-
 sys/rump/librump/rumpkern/Makefile.rumpkern |   4 +++-
 sys/rump/librump/rumpvfs/Makefile.rumpvfs   |   4 +++-
 sys/rump/net/lib/libnet/Makefile            |  12 +++++++++---
 5 files changed, 29 insertions(+), 8 deletions(-)

diffs (121 lines):

diff -r aabc5792c0bb -r 7ef425dd2dcd sys/rump/dev/lib/libraidframe/Makefile
--- a/sys/rump/dev/lib/libraidframe/Makefile    Wed Apr 22 17:42:22 2015 +0000
+++ b/sys/rump/dev/lib/libraidframe/Makefile    Wed Apr 22 17:57:49 2015 +0000
@@ -1,6 +1,8 @@
-#      $NetBSD: Makefile,v 1.4 2014/03/13 01:49:59 pooka Exp $
+#      $NetBSD: Makefile,v 1.5 2015/04/22 17:57:49 pooka Exp $
 #
 
+.include <bsd.init.mk>
+
 .PATH: ${.CURDIR}/../../../../dev/raidframe
 
 LIB=   rumpdev_raidframe
@@ -19,10 +21,14 @@
        rf_raid5.c rf_raid5_rotatedspare.c rf_reconbuffer.c             \
        rf_reconmap.c rf_reconstruct.c rf_reconutil.c rf_revent.c       \
        rf_shutdown.c rf_sstf.c rf_states.c rf_stripelocks.c            \
-       rf_strutils.c rf_utils.c rf_compat50.c rf_paritymap.c
+       rf_strutils.c rf_utils.c rf_paritymap.c
 
 SRCS+= raidframe_component.c
 
+.if !empty(RUMP_COMPAT:M50)
+SRCS+= rf_compat50.c
+.endif
+
 CPPFLAGS+=     -I${RUMPTOP}/librump/rumpvfs
 
 .include <bsd.lib.mk>
diff -r aabc5792c0bb -r 7ef425dd2dcd sys/rump/kern/lib/libtty/Makefile
--- a/sys/rump/kern/lib/libtty/Makefile Wed Apr 22 17:42:22 2015 +0000
+++ b/sys/rump/kern/lib/libtty/Makefile Wed Apr 22 17:57:49 2015 +0000
@@ -1,13 +1,18 @@
-#      $NetBSD: Makefile,v 1.3 2014/03/13 02:02:30 pooka Exp $
+#      $NetBSD: Makefile,v 1.4 2015/04/22 17:57:49 pooka Exp $
 #
 
+.include <bsd.init.mk>
+
 .PATH:  ${.CURDIR}/../../../../kern                                    \
        ${.CURDIR}/../../../../compat/common
 
 LIB=   rumpkern_tty
 
 SRCS=  tty.c tty_bsdpty.c tty_conf.c tty_ptm.c tty_pty.c tty_tty.c tty_subr.c
+
+.if !empty(RUMP_COMPAT:M60)
 SRCS+= tty_60.c
+.endif
 
 SRCS+= tty_component.c
 
diff -r aabc5792c0bb -r 7ef425dd2dcd sys/rump/librump/rumpkern/Makefile.rumpkern
--- a/sys/rump/librump/rumpkern/Makefile.rumpkern       Wed Apr 22 17:42:22 2015 +0000
+++ b/sys/rump/librump/rumpkern/Makefile.rumpkern       Wed Apr 22 17:57:49 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpkern,v 1.156 2015/04/22 16:49:42 pooka Exp $
+#      $NetBSD: Makefile.rumpkern,v 1.157 2015/04/22 17:57:49 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -153,9 +153,11 @@
 SRCS+= cprng_fast.c
 
 # compat
+.if !empty(RUMP_COMPAT:M50)
 SRCS+= kern_select_50.c
 SRCS+= kern_time_50.c
 SRCS+= rndpseudo_50.c
+.endif
 
 # Set RUMP_UNREAL_ALLOCATORS to "yes" to use memory allocation hypercalls
 # directly instead of the kmem/pool allocators backed by hypercalls.
diff -r aabc5792c0bb -r 7ef425dd2dcd sys/rump/librump/rumpvfs/Makefile.rumpvfs
--- a/sys/rump/librump/rumpvfs/Makefile.rumpvfs Wed Apr 22 17:42:22 2015 +0000
+++ b/sys/rump/librump/rumpvfs/Makefile.rumpvfs Wed Apr 22 17:57:49 2015 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.rumpvfs,v 1.44 2015/04/22 17:00:59 pooka Exp $
+#      $NetBSD: Makefile.rumpvfs,v 1.45 2015/04/22 17:57:49 pooka Exp $
 #
 
 .include "${RUMPTOP}/Makefile.rump"
@@ -70,7 +70,9 @@
 SRCS+= firmload.c
 
 # compat syscalls
+.if !empty(RUMP_COMPAT:M50)
 SRCS+= vfs_syscalls_50.c rumpvfs_compat50.c
+.endif
 
 SRCS+= rumpvnode_if.c
 
diff -r aabc5792c0bb -r 7ef425dd2dcd sys/rump/net/lib/libnet/Makefile
--- a/sys/rump/net/lib/libnet/Makefile  Wed Apr 22 17:42:22 2015 +0000
+++ b/sys/rump/net/lib/libnet/Makefile  Wed Apr 22 17:57:49 2015 +0000
@@ -1,16 +1,22 @@
-#      $NetBSD: Makefile,v 1.20 2014/03/13 02:06:32 pooka Exp $
+#      $NetBSD: Makefile,v 1.21 2015/04/22 17:57:49 pooka Exp $
 #
 
+.include <bsd.init.mk>
+
 .PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
 
 LIB=   rumpnet_net
 
 # iffy stuff
-SRCS=  if.c if_loop.c route.c rtsock.c rtsock_50.c raw_usrreq.c        \
+SRCS=  if.c if_loop.c route.c rtsock.c raw_usrreq.c                    \
        raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c
-SRCS+= if_43.c pfil.c uipc_syscalls_50.c
+SRCS+= if_43.c pfil.c
 SRCS+= net_component.c
 
+.if !empty(RUMP_COMPAT:M50)
+SRCS+= rtsock_50.c uipc_syscalls_50.c
+.endif
+
 CPPFLAGS+=     -I${.CURDIR}/opt -I${.CURDIR}/../libnetinet/opt
 CPPFLAGS+=     -DCOMPAT_OIFREQ -DCOMPAT_OIFDATA