summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-24 02:52:51 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-24 02:52:51 +0200
commit0f043c197c473c801fc32c727194b5a2d6ae232f (patch)
treeb270f5c7303589226e1a513eefbf82b3f6eb8c50
parent7ec58471dfd12cbd3aa38a07145b1ecceaec1933 (diff)
downloadsamba-0f043c197c473c801fc32c727194b5a2d6ae232f.tar.gz
samba-0f043c197c473c801fc32c727194b5a2d6ae232f.tar.bz2
samba-0f043c197c473c801fc32c727194b5a2d6ae232f.zip
Move pytalloc to talloc directory.
-rw-r--r--lib/talloc/pytalloc.c (renamed from source4/scripting/python/pytalloc.c)4
-rw-r--r--lib/talloc/pytalloc.h (renamed from source4/scripting/python/pytalloc.h)0
-rw-r--r--source4/scripting/python/config.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/source4/scripting/python/pytalloc.c b/lib/talloc/pytalloc.c
index ca476e9604..f4b7d10e97 100644
--- a/source4/scripting/python/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "includes.h"
-#include "scripting/python/pytalloc.h"
+#include <talloc.h>
+#include "../lib/talloc/pytalloc.h"
void py_talloc_dealloc(PyObject* self)
{
diff --git a/source4/scripting/python/pytalloc.h b/lib/talloc/pytalloc.h
index aad5840a67..aad5840a67 100644
--- a/source4/scripting/python/pytalloc.h
+++ b/lib/talloc/pytalloc.h
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index c88728a9fd..5a44fd5ae6 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -8,7 +8,7 @@ LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o)
[SUBSYSTEM::PYTALLOC]
PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON LIBTALLOC
-PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, pytalloc.o)
+PYTALLOC_OBJ_FILES = ../lib/talloc/pytalloc.o
[PYTHON::python_uuid]
PRIVATE_DEPENDENCIES = LIBNDR