[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha4-66-gcd4eddd

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  cd4eddd31354f4ae45e8747da1a70340000716c3 (commit)
       via  22e7bcfbe4534c070ac2dd5f39773ea023dfa7f7 (commit)
      from  d4c06bf333fe9ba2dd8b7ebd51a848d512f40983 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit cd4eddd31354f4ae45e8747da1a70340000716c3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 11 02:52:43 2008 +0200

    Use variables for source dir of python ldb bindings.

commit 22e7bcfbe4534c070ac2dd5f39773ea023dfa7f7
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Jun 11 02:47:09 2008 +0200

    Use variables for source dir of python tdb bindings.

-----------------------------------------------------------------------

Summary of changes:
 source/Makefile          |    2 ++
 source/lib/ldb/python.mk |    6 +++---
 source/lib/tdb/python.mk |    4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/Makefile b/source/Makefile
index b7d5206..1e5066b 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -61,6 +61,8 @@ libsrcdir := lib
 libsocketsrcdir := lib/socket
 libcharsetsrcdir := lib/charset
 ldb_sambasrcdir := lib/ldb-samba
+tdbsrcdir := lib/tdb
+ldbsrcdir := lib/ldb
 libtlssrcdir := lib/tls
 libregistrysrcdir := lib/registry
 smbreadlinesrcdir := lib/smbreadline
diff --git a/source/lib/ldb/python.mk b/source/lib/ldb/python.mk
index 5325446..8d48f5d 100644
--- a/source/lib/ldb/python.mk
+++ b/source/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)
diff --git a/source/lib/tdb/python.mk b/source/lib/tdb/python.mk
index 83336e7..12e8217 100644
--- a/source/lib/tdb/python.mk
+++ b/source/lib/tdb/python.mk
@@ -2,9 +2,9 @@
 LIBRARY_REALNAME = _tdb.$(SHLIBEXT)
 PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG
 
-swig_tdb_OBJ_FILES = lib/tdb/tdb_wrap.o
+swig_tdb_OBJ_FILES = $(tdbsrcdir)/tdb_wrap.o
 
-$(eval $(call python_py_module_template,tdb.py,lib/tdb/tdb.py))
+$(eval $(call python_py_module_template,tdb.py,$(tdbsrcdir)/tdb.py))
 
 $(swig_tdb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
 


-- 
Samba Shared Repository