From 8515d23a3a920c27b37f3653850c61ba0f6eec71 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 29 Nov 2007 14:49:44 +0100
Subject: r26196: Always build python bindings for ldb. (This used to be commit
 0aa19ce73f435cab44f83023b9b265d4761d3c31)

---
 source4/lib/ldb/python.mk | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 source4/lib/ldb/python.mk

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
new file mode 100644
index 0000000000..12badf04f6
--- /dev/null
+++ b/source4/lib/ldb/python.mk
@@ -0,0 +1,7 @@
+#######################
+# Start LIBRARY swig_ldb
+[PYTHON::swig_ldb]
+PUBLIC_DEPENDENCIES = LIBLDB LIBPYTHON
+SWIG_FILE = ldb.i
+# End LIBRARY swig_ldb
+#######################
-- 
cgit 


From be33f4c611d37ebba59ff618033dc73601339ad1 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 23 Dec 2007 23:54:30 -0600
Subject: r26576: Allow the static module loading code to be used for the
 Python modules.

Simplify the way module initialization functions are handled.
(This used to be commit ba8be2dfc0de4434c798663336b81f7f95cde520)
---
 source4/lib/ldb/python.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 12badf04f6..f81c2e3e16 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,7 +1,7 @@
 #######################
 # Start LIBRARY swig_ldb
 [PYTHON::swig_ldb]
-PUBLIC_DEPENDENCIES = LIBLDB LIBPYTHON
+PUBLIC_DEPENDENCIES = LIBLDB
 SWIG_FILE = ldb.i
 # End LIBRARY swig_ldb
 #######################
-- 
cgit 


From 203d2b10bd5c3ae89f098adba91a5e751a9627af Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 20 Jan 2008 16:10:43 +0100
Subject: ldb: Fix building python modules against system-provided ldb. (This
 used to be commit 583ea85ae04c0bc2e70ab2e595e05f76f65c3be1)

---
 source4/lib/ldb/python.mk | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index f81c2e3e16..24ade8f977 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -2,6 +2,7 @@
 # Start LIBRARY swig_ldb
 [PYTHON::swig_ldb]
 PUBLIC_DEPENDENCIES = LIBLDB
+CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
 # End LIBRARY swig_ldb
 #######################
-- 
cgit 


From 03023c4f7d8c7bc6716982db86e8167f1ac6331b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 20 Jan 2008 16:28:43 +0100
Subject: build: Demote a bunch of libraries to subsystems. This makes
 packaging easier and should also make it easier to migrate to a new build
 system. (This used to be commit 77b400764e3dadfa05407343af649ad9298cc085)

---
 source4/lib/ldb/python.mk | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 24ade8f977..bbd4c1c5eb 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,8 +1,4 @@
-#######################
-# Start LIBRARY swig_ldb
 [PYTHON::swig_ldb]
 PUBLIC_DEPENDENCIES = LIBLDB
 CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
-# End LIBRARY swig_ldb
-#######################
-- 
cgit 


From 2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 4 Mar 2008 00:43:24 +0100
Subject: Fix includes. (This used to be commit
 99e61dade2bd9ae2a5dfe17f766528012c09e46c)

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

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index bbd4c1c5eb..448cc3ed60 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -2,3 +2,5 @@
 PUBLIC_DEPENDENCIES = LIBLDB
 CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
+
+swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
-- 
cgit 


From 2914b0ca04355f6f175b603a1de6030b20ce0830 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 21 May 2008 21:24:48 +0200
Subject: Remove support for .py files from smb_build - deal with it only in
 the makefiles. (This used to be commit
 b865249efaa58d0fc87fa25491fda3b970af81c3)

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

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 448cc3ed60..aeafb830d6 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -4,3 +4,5 @@ CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
 
 swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
+
+$(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py))
-- 
cgit 


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/lib/ldb/python.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index aeafb830d6..77af5d6183 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -6,3 +6,5 @@ SWIG_FILE = ldb.i
 swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
 
 $(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py))
+
+$(swig_ldb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
-- 
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/lib/ldb/python.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 77af5d6183..7b430f4e2f 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,7 +1,7 @@
 [PYTHON::swig_ldb]
+LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBLDB
 CFLAGS = -Ilib/ldb/include
-SWIG_FILE = ldb.i
 
 swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
 
-- 
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/lib/ldb/python.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 7b430f4e2f..89aba8f276 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -7,4 +7,4 @@ swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
 
 $(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py))
 
-$(swig_ldb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
-- 
cgit 


From 4fc224f48e28da253ebe5d7b44c766ac4a7e147c Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 May 2008 14:14:45 +0200
Subject: Use variable for ldb source directory. (This used to be commit
 48bfce0ea51b952baef5bfa667405e8742e5016f)

---
 source4/lib/ldb/python.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 89aba8f276..96ae6a5720 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,10 +1,10 @@
 [PYTHON::swig_ldb]
 LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBLDB
-CFLAGS = -Ilib/ldb/include
+CFLAGS = -I$(ldbdir)/include
 
-swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
+swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o
 
-$(eval $(call python_py_module_template,ldb.py,lib/ldb/ldb.py))
+$(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py))
 
 $(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
-- 
cgit 


From 16c883ca23a23d3784aec059ac949a066c29ac0d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 27 May 2008 16:23:12 +0200
Subject: Move CFLAGS that are not inherited out of smb_build. (This used to be
 commit 49dcf4b8811f92684a7ddd266ac289d8fc8ca215)

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

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 96ae6a5720..5325446e1e 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,9 +1,9 @@
 [PYTHON::swig_ldb]
 LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBLDB
-CFLAGS = -I$(ldbdir)/include
 
 swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o
+$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
 
 $(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py))
 
-- 
cgit 


From ce9db767a0b9c73101e79ab29c14777d2ec64918 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 11 Jun 2008 02:52:43 +0200
Subject: Use variables for source dir of python ldb bindings. (This used to be
 commit cd4eddd31354f4ae45e8747da1a70340000716c3)

---
 source4/lib/ldb/python.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 5325446e1e..8d48f5d810 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -2,9 +2,9 @@
 LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBLDB
 
-swig_ldb_OBJ_FILES = $(ldbdir)/ldb_wrap.o
-$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbdir)/include
+swig_ldb_OBJ_FILES = $(ldbsrcdir)/ldb_wrap.o
+$(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)/include
 
-$(eval $(call python_py_module_template,ldb.py,$(ldbdir)/ldb.py))
+$(eval $(call python_py_module_template,ldb.py,$(ldbsrcdir)/ldb.py))
 
 $(swig_ldb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
-- 
cgit 


From 929adc9efa5cf985f0585214d30d18521aa1a821 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sat, 14 Jun 2008 11:24:17 -0400
Subject: Make up the right dependencies now that ldb depends on libevents
 (This used to be commit 3b8eec7ca334528cad3cdcd5e3fc5ee555d8d0e0)

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

(limited to 'source4/lib/ldb/python.mk')

diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index 8d48f5d810..45f4f044ba 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -1,6 +1,6 @@
 [PYTHON::swig_ldb]
 LIBRARY_REALNAME = _ldb.$(SHLIBEXT)
-PUBLIC_DEPENDENCIES = LIBLDB
+PUBLIC_DEPENDENCIES = LIBLDB LIBEVENTS
 
 swig_ldb_OBJ_FILES = $(ldbsrcdir)/ldb_wrap.o
 $(swig_ldb_OBJ_FILES): CFLAGS+=-I$(ldbsrcdir)/include
-- 
cgit