From 82bcf967b79321706cd19c759ea54c4465fe0d96 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 May 2008 21:32:53 +0200
Subject: Move CFLAGS overrides for SWIG modules to Makefile. (This used to be
 commit 58665a8a8e4b10435aebbf2c95b6a8e50db232d6)

---
 source4/scripting/python/config.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/scripting/python/config.mk')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 1fa273e99d..cc94abb702 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,6 +21,8 @@ SWIG_FILE = misc.i
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
+$(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+
 _PY_FILES = $(shell find $(pyscriptsrcdir) -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
-- 
cgit 


From 49706ab19bd3ffd6125639e6a7753b2350cf54e1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 May 2008 23:59:34 +0200
Subject: Move more modules inside of the samba package. (This used to be
 commit 9b39e99f48266a54ed0b8890c2efde218b4b118a)

---
 source4/scripting/python/config.mk | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/python/config.mk')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cc94abb702..37e346a73a 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -16,15 +16,20 @@ PRIVATE_DEPENDENCIES = LIBNDR
 python_uuid_OBJ_FILES = $(pyscriptsrcdir)/uuidmodule.o
 
 [PYTHON::python_misc]
+LIBRARY_REALNAME = samba/_misc.$(SHLIBEXT)
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
-SWIG_FILE = misc.i
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
 $(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
 
-_PY_FILES = $(shell find $(pyscriptsrcdir) -name "*.py")
+_PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
 $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile))))
 
+$(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))
+
+epydoc:: pythonmods
+	PYTHONPATH=$(pythonbuilddir) epydoc samba dcerpc
+
 install:: installpython
-- 
cgit 


From 059c012656e6369f417c11f9984ddb1925782394 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 00:56:36 +0200
Subject: Fix dependencies and imports. (This used to be commit
 37ef86f8de9039b8226b190254d842e92b5faad7)

---
 source4/scripting/python/config.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/scripting/python/config.mk')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index 37e346a73a..ddbc5674f2 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -6,7 +6,7 @@ INIT_FUNCTION_SENTINEL = { NULL, NULL }
 LIBPYTHON_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, modules.o)
 
 [SUBSYSTEM::PYTALLOC]
-PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
+PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON LIBTALLOC
 
 PYTALLOC_OBJ_FILES = $(addprefix $(pyscriptsrcdir)/, pytalloc.o)
 
@@ -30,6 +30,6 @@ $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubs
 $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py))
 
 epydoc:: pythonmods
-	PYTHONPATH=$(pythonbuilddir) epydoc samba dcerpc
+	PYTHONPATH=$(pythonbuilddir) epydoc --no-private samba dcerpc tdb ldb subunit
 
 install:: installpython
-- 
cgit 


From 5ce59419a07c8e147daf51b77ffe2117f3d6a505 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 22 May 2008 02:13:26 +0200
Subject: Fix CFLAGS for SWIG files. (This used to be commit
 8ee4f075046e0b181ec8a4ac1eaf3ea5621a56bf)

---
 source4/scripting/python/config.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/scripting/python/config.mk')

diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index ddbc5674f2..73607eb76c 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -21,7 +21,7 @@ PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 
 python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o
 
-$(python_misc_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
 
 _PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py")
 
-- 
cgit