Module Name: src
Committed By: pooka
Date: Tue Mar 2 23:37:16 UTC 2010
Modified Files:
src/sys/modules/nfs: Makefile
src/sys/modules/nfsserver: Makefile
src/sys/rump/fs/lib/libnfs: Makefile
src/sys/rump/fs/lib/libnfsserver: Makefile
Removed Files:
src/sys/rump/fs/lib/libnfs: fs_nfs.h
Log Message:
Reflect removal of fs_nfs.h and -DNFS
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nfs/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/modules/nfsserver/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/fs/lib/libnfs/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/fs/lib/libnfs/fs_nfs.h
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/fs/lib/libnfsserver/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/nfs/Makefile
diff -u src/sys/modules/nfs/Makefile:1.1 src/sys/modules/nfs/Makefile:1.2
--- src/sys/modules/nfs/Makefile:1.1 Wed Nov 19 18:36:09 2008
+++ src/sys/modules/nfs/Makefile Tue Mar 2 23:37:16 2010
@@ -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>
Index: src/sys/modules/nfsserver/Makefile
diff -u src/sys/modules/nfsserver/Makefile:1.1 src/sys/modules/nfsserver/Makefile:1.2
--- src/sys/modules/nfsserver/Makefile:1.1 Wed Nov 19 18:36:09 2008
+++ src/sys/modules/nfsserver/Makefile Tue Mar 2 23:37:16 2010
@@ -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
Index: src/sys/rump/fs/lib/libnfs/Makefile
diff -u src/sys/rump/fs/lib/libnfs/Makefile:1.10 src/sys/rump/fs/lib/libnfs/Makefile:1.11
--- src/sys/rump/fs/lib/libnfs/Makefile:1.10 Tue Feb 16 20:42:46 2010
+++ src/sys/rump/fs/lib/libnfs/Makefile Tue Mar 2 23:37:16 2010
@@ -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>
Index: src/sys/rump/fs/lib/libnfsserver/Makefile
diff -u src/sys/rump/fs/lib/libnfsserver/Makefile:1.2 src/sys/rump/fs/lib/libnfsserver/Makefile:1.3
--- src/sys/rump/fs/lib/libnfsserver/Makefile:1.2 Tue Feb 16 20:42:46 2010
+++ src/sys/rump/fs/lib/libnfsserver/Makefile Tue Mar 2 23:37:16 2010
@@ -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>
