Module Name: src
Committed By: pooka
Date: Thu Sep 3 12:04:50 UTC 2009
Modified Files:
src/distrib/sets/lists/comp: mi
src/sbin/mount_smbfs: Makefile
src/sys/fs/smbfs: Makefile
src/sys/netsmb: Makefile
Log Message:
Install smb headers relevant for userspace and make mount_smbfs
use installed headers instead of src/sys.
To generate a diff of this commit:
cvs rdiff -u -r1.1295 -r1.1296 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.6 -r1.7 src/sbin/mount_smbfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/fs/smbfs/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/netsmb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1295 src/distrib/sets/lists/comp/mi:1.1296
--- src/distrib/sets/lists/comp/mi:1.1295 Thu Sep 3 01:17:29 2009
+++ src/distrib/sets/lists/comp/mi Thu Sep 3 12:04:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1295 2009/09/03 01:17:29 joerg Exp $
+# $NetBSD: mi,v 1.1296 2009/09/03 12:04:50 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -635,6 +635,7 @@
./usr/include/fs/nilfs/nilfs_fs.h comp-c-include
./usr/include/fs/nilfs/nilfs_mount.h comp-c-include
./usr/include/fs/puffs/puffs_msgif.h comp-puffs-include
+./usr/include/fs/smbfs/smbfs.h comp-c-include
./usr/include/fs/sysvbfs/bfs.h comp-c-include
./usr/include/fs/sysvbfs/sysvbfs_args.h comp-c-include
./usr/include/fs/tmpfs/tmpfs_args.h comp-c-include
@@ -1631,6 +1632,11 @@
./usr/include/netns/spp_debug.h comp-obsolete obsolete
./usr/include/netns/spp_timer.h comp-obsolete obsolete
./usr/include/netns/spp_var.h comp-obsolete obsolete
+./usr/include/netsmb/iconv.h comp-c-include
+./usr/include/netsmb/netbios.h comp-c-include
+./usr/include/netsmb/smb.h comp-c-include
+./usr/include/netsmb/smb_conn.h comp-c-include
+./usr/include/netsmb/smb_dev.h comp-c-include
./usr/include/netpgp.h comp-c-include crypto
./usr/include/nfs/krpc.h comp-c-include
./usr/include/nfs/nfs.h comp-c-include
Index: src/sbin/mount_smbfs/Makefile
diff -u src/sbin/mount_smbfs/Makefile:1.6 src/sbin/mount_smbfs/Makefile:1.7
--- src/sbin/mount_smbfs/Makefile:1.6 Sat Apr 11 07:58:12 2009
+++ src/sbin/mount_smbfs/Makefile Thu Sep 3 12:04:50 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2009/04/11 07:58:12 lukem Exp $
+# $NetBSD: Makefile,v 1.7 2009/09/03 12:04:50 pooka Exp $
WARNS?= 3 # XXX: sign-compare issues
@@ -12,7 +12,7 @@
SMBDIST=${NETBSDSRCDIR}/dist/smbfs
-CPPFLAGS+= -I${NETBSDSRCDIR}/sys -I${SMBDIST}/include
+CPPFLAGS+= -I${SMBDIST}/include
.PATH: ${SMBDIST}/mount_smbfs ${SMBDIST}/lib/smb
Index: src/sys/fs/smbfs/Makefile
diff -u src/sys/fs/smbfs/Makefile:1.2 src/sys/fs/smbfs/Makefile:1.3
--- src/sys/fs/smbfs/Makefile:1.2 Tue Nov 26 23:30:35 2002
+++ src/sys/fs/smbfs/Makefile Thu Sep 3 12:04:50 2009
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2002/11/26 23:30:35 lukem Exp $
+# $NetBSD: Makefile,v 1.3 2009/09/03 12:04:50 pooka Exp $
INCSDIR= /usr/include/fs/smbfs
-#INCS= smbfs.h smbfs_node.h smbfs_subr.h
+INCS= smbfs.h
.include <bsd.kinc.mk>
Index: src/sys/netsmb/Makefile
diff -u src/sys/netsmb/Makefile:1.5 src/sys/netsmb/Makefile:1.6
--- src/sys/netsmb/Makefile:1.5 Tue Nov 26 23:30:34 2002
+++ src/sys/netsmb/Makefile Thu Sep 3 12:04:50 2009
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2002/11/26 23:30:34 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2009/09/03 12:04:50 pooka Exp $
INCSDIR= /usr/include/netsmb
-#INCS= iconv.h netbios.h smb.h smb_conn.h smb_dev.h smb_rq.h smb_subr.h \
-# smb_tran.h smb_trantcp.h
+INCS= iconv.h netbios.h smb.h smb_conn.h smb_dev.h
.include <bsd.kinc.mk>
