[src/trunk]: src/sys Reflect removal of fs_nfs.h and -DNFS

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

details:   https://anonhg.NetBSD.org/src/rev/b62ca5ab6688
branches:  trunk
changeset: 752656:b62ca5ab6688
user:      pooka <pooka%NetBSD.org@localhost>
date:      Tue Mar 02 23:37:16 2010 +0000

description:
Reflect removal of fs_nfs.h and -DNFS

diffstat:

 sys/modules/nfs/Makefile              |  5 +++--
 sys/modules/nfsserver/Makefile        |  4 ++--
 sys/rump/fs/lib/libnfs/Makefile       |  8 ++++----
 sys/rump/fs/lib/libnfs/fs_nfs.h       |  3 ---
 sys/rump/fs/lib/libnfsserver/Makefile |  4 +---
 5 files changed, 10 insertions(+), 14 deletions(-)

diffs (87 lines):

diff -r 271d01c58303 -r b62ca5ab6688 sys/modules/nfs/Makefile
--- a/sys/modules/nfs/Makefile  Tue Mar 02 23:19:09 2010 +0000
+++ b/sys/modules/nfs/Makefile  Tue Mar 02 23:37:16 2010 +0000
@@ -1,15 +1,16 @@
-#      $NetBSD: Makefile,v 1.1 2008/11/19 18:36:09 ad Exp $
+#      $NetBSD: Makefile,v 1.2 2010/03/02 23:37:16 pooka Exp $
 
 .include "../Makefile.inc"
 
 KMOD=  nfs
 
-CPPFLAGS+=     -DNFS -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM -DARP=1
+CPPFLAGS+=     -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM -DARP=1
 
 .PATH: ${S}/nfs
 
 SRCS+= krpc_subr.c nfs_bio.c nfs_boot.c nfs_kq.c nfs_node.c
 SRCS+= nfs_socket.c nfs_subs.c nfs_iod.c nfs_vnops.c
 SRCS+= nfs_vfsops.c nfs_bootdhcp.c nfs_bootparam.c 
+SRCS+= nfs_clntsocket.c nfs_clntsubs.c
 
 .include <bsd.kmodule.mk>
diff -r 271d01c58303 -r b62ca5ab6688 sys/modules/nfsserver/Makefile
--- a/sys/modules/nfsserver/Makefile    Tue Mar 02 23:19:09 2010 +0000
+++ b/sys/modules/nfsserver/Makefile    Tue Mar 02 23:37:16 2010 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.1 2008/11/19 18:36:09 ad Exp $
+#      $NetBSD: Makefile,v 1.2 2010/03/02 23:37:16 pooka Exp $
 
 .include "../Makefile.inc"
 
 KMOD=  nfsserver
 
-CPPFLAGS+=     -DNFS -DNFSSERVER
+CPPFLAGS+=     -DNFSSERVER
 
 .PATH: ${S}/nfs
 
diff -r 271d01c58303 -r b62ca5ab6688 sys/rump/fs/lib/libnfs/Makefile
--- a/sys/rump/fs/lib/libnfs/Makefile   Tue Mar 02 23:19:09 2010 +0000
+++ b/sys/rump/fs/lib/libnfs/Makefile   Tue Mar 02 23:37:16 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2010/02/16 20:42:46 pooka Exp $
+#      $NetBSD: Makefile,v 1.11 2010/03/02 23:37:16 pooka Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../../nfs
@@ -6,12 +6,12 @@
 LIB=   rumpfs_nfs
 
 SRCS=  krpc_subr.c nfs_bio.c nfs_boot.c nfs_kq.c nfs_node.c            \
-       nfs_socket.c nfs_subs.c nfs_iod.c nfs_vfsops.c nfs_vnops.c      \
-       nfs_bootdhcp.c nfs_bootparam.c
+       nfs_socket.c nfs_clntsocket.c nfs_clntsubs.c nfs_subs.c         \
+       nfs_iod.c nfs_vfsops.c nfs_vnops.c nfs_bootdhcp.c nfs_bootparam.c
 
 CPPFLAGS+=     -I${.CURDIR}/../../../net/lib/libnet/opt
 CPPFLAGS+=     -I${.CURDIR}/../../../net/lib/libnetinet/opt
-CPPFLAGS+=     -DNFS -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM
+CPPFLAGS+=     -DNFS_BOOT_DHCP -DNFS_BOOT_BOOTPARAM
 
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>
diff -r 271d01c58303 -r b62ca5ab6688 sys/rump/fs/lib/libnfs/fs_nfs.h
--- a/sys/rump/fs/lib/libnfs/fs_nfs.h   Tue Mar 02 23:19:09 2010 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-/*     $NetBSD: fs_nfs.h,v 1.1 2008/10/06 01:00:57 pooka Exp $ */
-
-#define NFS
diff -r 271d01c58303 -r b62ca5ab6688 sys/rump/fs/lib/libnfsserver/Makefile
--- a/sys/rump/fs/lib/libnfsserver/Makefile     Tue Mar 02 23:19:09 2010 +0000
+++ b/sys/rump/fs/lib/libnfsserver/Makefile     Tue Mar 02 23:37:16 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2010/02/16 20:42:46 pooka Exp $
+#      $NetBSD: Makefile,v 1.3 2010/03/02 23:37:16 pooka Exp $
 #
 
 .PATH:  ${.CURDIR}/../../../../nfs
@@ -8,7 +8,5 @@
 SRCS=  nfs_export.c nfs_serv.c nfs_srvcache.c nfs_srvsubs.c            \
        nfs_srvsocket.c nfs_syscalls.c
 
-CPPFLAGS+=     -DNFS
-
 .include <bsd.lib.mk>
 .include <bsd.klinks.mk>