From 844acb226086e55de9a2442396a4e002471295e8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Mar 2010 20:12:16 +1100 Subject: build: waf quicktest nearly works Rewrote wafsamba using a new dependency handling system, and started adding the waf test code --- source4/ntvfs/posix/wscript_build | 8 ++++---- source4/ntvfs/wscript_build | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'source4/ntvfs') diff --git a/source4/ntvfs/posix/wscript_build b/source4/ntvfs/posix/wscript_build index 3336950974..070c2fb8f6 100644 --- a/source4/ntvfs/posix/wscript_build +++ b/source4/ntvfs/posix/wscript_build @@ -28,25 +28,25 @@ bld.SAMBA_SUBSYSTEM('pvfs_aio', bld.SAMBA_MODULE('ntvfs_posix', - source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c xattr_system.c xattr_tdb.c', + source='vfs_posix.c pvfs_util.c pvfs_search.c pvfs_dirlist.c pvfs_fileinfo.c pvfs_unlink.c pvfs_mkdir.c pvfs_open.c pvfs_read.c pvfs_flush.c pvfs_write.c pvfs_fsinfo.c pvfs_qfileinfo.c pvfs_setfileinfo.c pvfs_rename.c pvfs_resolve.c pvfs_shortname.c pvfs_lock.c pvfs_oplock.c pvfs_wait.c pvfs_seek.c pvfs_ioctl.c pvfs_xattr.c pvfs_streams.c pvfs_notify.c pvfs_sys.c xattr_system.c xattr_tdb.c', autoproto='vfs_posix_proto.h', subsystem='ntvfs', init_function='ntvfs_posix_init', deps='NDR_XATTR WRAP_XATTR BLKID ntvfs_common MESSAGING LIBWBCLIENT_OLD pvfs_acl pvfs_aio', - output_type='MERGED_OBJ' + internal_module=True ) bld.SAMBA_PYTHON('python_xattr_native', source='python/pyxattr_native.c', - deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR', + deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR attr', realname='samba/xattr_native.so' ) bld.SAMBA_PYTHON('python_xattr_tdb', source='python/pyxattr_tdb.c xattr_tdb.c', - deps='LIBNDR ldb python_dcerpc_security pyparam_util share', + deps='LIBNDR ldb python_dcerpc_security pyparam_util share attr', realname='samba/xattr_tdb.so' ) diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build index c806720860..7b4c10d8cc 100644 --- a/source4/ntvfs/wscript_build +++ b/source4/ntvfs/wscript_build @@ -23,7 +23,7 @@ bld.SAMBA_MODULE('ntvfs_smb2', bld.SAMBA_MODULE('ntvfs_simple', - source='simple/vfs_simple.c cifs_posix_cli/svfs_util.c ./simple/svfs_util.c', + source='simple/vfs_simple.c simple/svfs_util.c', autoproto='simple/proto.h', subsystem='ntvfs', init_function='ntvfs_simple_init' @@ -31,7 +31,7 @@ bld.SAMBA_MODULE('ntvfs_simple', bld.SAMBA_MODULE('ntvfs_cifsposix', - source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c ./simple/svfs_util.c', + source='cifs_posix_cli/vfs_cifs_posix.c cifs_posix_cli/svfs_util.c', autoproto='cifs_posix_cli/proto.h', subsystem='ntvfs', init_function='ntvfs_cifs_posix_init' -- cgit