pyxattr: Move to the same directory as the xattr code.

diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 1aaef3f1d4305897f94f41220173e45ea0537951..bf8b573b08265dd3fce1329416f04541253729b7 100644 (file)
--- 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
similarity index 100%
rename from source4/scripting/python/pyxattr_native.c
rename to source4/ntvfs/posix/python/pyxattr_native.c

diff --git a/source4/scripting/python/pyxattr_tdb.c b/source4/ntvfs/posix/python/pyxattr_tdb.c
similarity index 100%
rename from source4/scripting/python/pyxattr_tdb.c
rename to source4/ntvfs/posix/python/pyxattr_tdb.c

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 2aae592674aa6f31ee7a48957d00dd05073874af..3d255de00e662b95c554eed3fd70014dea4a737f 100644 (file)
--- 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))))