summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-01-22 12:02:51 +1300
committerJelmer Vernooij <jelmer@samba.org>2010-01-25 15:18:01 +0100
commit8562bbdce5fd2711f527c3922b684f651f68c7f7 (patch)
tree01b88db61ae6a19231bb658cb9e8f5240800e02a
parentb35dcd7a1811c6151469fc023e6a40616ca83497 (diff)
downloadsamba-8562bbdce5fd2711f527c3922b684f651f68c7f7.tar.gz
samba-8562bbdce5fd2711f527c3922b684f651f68c7f7.tar.bz2
samba-8562bbdce5fd2711f527c3922b684f651f68c7f7.zip
pyxattr: Move to the same directory as the xattr code.
-rw-r--r--source4/ntvfs/posix/config.mk11
-rw-r--r--source4/ntvfs/posix/python/pyxattr_native.c (renamed from source4/scripting/python/pyxattr_native.c)0
-rw-r--r--source4/ntvfs/posix/python/pyxattr_tdb.c (renamed from source4/scripting/python/pyxattr_tdb.c)0
-rw-r--r--source4/scripting/python/config.mk21
4 files changed, 11 insertions, 21 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 1aaef3f1d4..bf8b573b08 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -77,3 +77,14 @@ ntvfs_posix_OBJ_FILES = $(addprefix $(ntvfssrcdir)/posix/, \
$(eval $(call proto_header_template,$(ntvfssrcdir)/posix/vfs_posix_proto.h,$(ntvfs_posix_OBJ_FILES:.o=.c)))
+[PYTHON::python_xattr_native]
+LIBRARY_REALNAME = samba/xattr_native.$(SHLIBEXT)
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR
+
+python_xattr_native_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_native.o
+
+[PYTHON::python_xattr_tdb]
+LIBRARY_REALNAME = samba/xattr_tdb.$(SHLIBEXT)
+PRIVATE_DEPENDENCIES = LIBNDR LIBLDB python_dcerpc_security pyparam_util share
+
+python_xattr_tdb_OBJ_FILES = $(ntvfssrcdir)/posix/python/pyxattr_tdb.o $(ntvfssrcdir)/posix/xattr_tdb.o
diff --git a/source4/scripting/python/pyxattr_native.c b/source4/ntvfs/posix/python/pyxattr_native.c
index 9b60039a38..9b60039a38 100644
--- a/source4/scripting/python/pyxattr_native.c
+++ b/source4/ntvfs/posix/python/pyxattr_native.c
diff --git a/source4/scripting/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
index e49cd887d0..e49cd887d0 100644
--- a/source4/scripting/python/pyxattr_tdb.c
+++ b/source4/ntvfs/posix/python/pyxattr_tdb.c
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 2aae592674..3d255de00e 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -23,27 +23,6 @@ python_glue_OBJ_FILES = $(pyscriptsrcdir)/pyglue.o
$(python_glue_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-[PYTHON::python_xattr_native]
-LIBRARY_REALNAME = samba/xattr_native.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS python_dcerpc_security pyparam_util WRAP_XATTR
-
-python_xattr_native_OBJ_FILES = $(pyscriptsrcdir)/pyxattr_native.o
-
-$(python_xattr_native_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-
-#ntvfs_common pvfs_acl
-#$(ntvfs_posix_OBJ_FILES)
-[PYTHON::python_xattr_tdb]
-LIBRARY_REALNAME = samba/xattr_tdb.$(SHLIBEXT)
-PRIVATE_DEPENDENCIES = LIBNDR LIBLDB python_dcerpc_security pyparam_util share
-#dcerpc_server
-
-python_xattr_tdb_OBJ_FILES = $(pyscriptsrcdir)/pyxattr_tdb.o $(ntvfssrcdir)/posix/xattr_tdb.o
-#{$(ntvfssrcdir)/ntvfs_interface.o
-#$(ntvfs_posix_OBJ_FILES)
-
-$(python_xattr_tdb_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)
-
_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py")
$(eval $(foreach pyfile, $(_PY_FILES),$(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(subst ../lib/subunit/python,,$(pyfile))),$(pyfile))))