[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha3-1688-g8ee4f07
Jelmer Vernooij
jelmer at samba.org
Thu May 22 00:14:13 GMT 2008
The branch, v4-0-test has been updated
via 8ee4f075046e0b181ec8a4ac1eaf3ea5621a56bf (commit)
via 937456c69d23ece85bdb7415f52d722c2aa6b6b5 (commit)
from 30f8d581aa339b37b27011e65355937590df10b9 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 8ee4f075046e0b181ec8a4ac1eaf3ea5621a56bf
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 22 02:13:26 2008 +0200
Fix CFLAGS for SWIG files.
commit 937456c69d23ece85bdb7415f52d722c2aa6b6b5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu May 22 01:50:38 2008 +0200
Make sure the default ldb modules dir gets initialized.
-----------------------------------------------------------------------
Summary of changes:
source/auth/config.mk | 2 +-
source/lib/events/config.mk | 2 +-
source/lib/ldb/python.mk | 2 +-
source/lib/registry/config.mk | 2 +-
source/lib/tdb/python.mk | 2 +-
source/libcli/config.mk | 4 ++--
source/libcli/security/config.mk | 2 +-
source/param/config.mk | 2 +-
source/scripting/python/config.mk | 2 +-
source/scripting/python/samba/__init__.py | 2 ++
10 files changed, 12 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/auth/config.mk b/source/auth/config.mk
index 0f8b23e..f13c2e5 100644
--- a/source/auth/config.mk
+++ b/source/auth/config.mk
@@ -45,4 +45,4 @@ $(eval $(call python_py_module_template,samba/auth.py,$(authsrcdir)/auth.py))
swig_auth_OBJ_FILES = $(authsrcdir)/auth_wrap.o
-$(swig_auth_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(swig_auth_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
diff --git a/source/lib/events/config.mk b/source/lib/events/config.mk
index ca47f0d..9d57980 100644
--- a/source/lib/events/config.mk
+++ b/source/lib/events/config.mk
@@ -59,4 +59,4 @@ swig_events_OBJ_FILES = $(libeventssrcdir)/events_wrap.o
$(eval $(call python_py_module_template,samba/events.py,$(libeventssrcdir)/events.py))
-$(swig_events_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(swig_events_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
diff --git a/source/lib/ldb/python.mk b/source/lib/ldb/python.mk
index 7b430f4..89aba8f 100644
--- a/source/lib/ldb/python.mk
+++ b/source/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)
diff --git a/source/lib/registry/config.mk b/source/lib/registry/config.mk
index 90618ff..44adc53 100644
--- a/source/lib/registry/config.mk
+++ b/source/lib/registry/config.mk
@@ -112,4 +112,4 @@ swig_registry_OBJ_FILES = $(libregistrysrcdir)/registry_wrap.o
$(eval $(call python_py_module_template,samba/registry.py,lib/registry/registry.py))
-$(swig_registry_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(swig_registry_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 e71a60f..83336e7 100644
--- a/source/lib/tdb/python.mk
+++ b/source/lib/tdb/python.mk
@@ -6,5 +6,5 @@ swig_tdb_OBJ_FILES = lib/tdb/tdb_wrap.o
$(eval $(call python_py_module_template,tdb.py,lib/tdb/tdb.py))
-$(swig_tdb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(swig_tdb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index ee8d6b2..b24f3eb 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -82,7 +82,7 @@ python_libcli_nbt_OBJ_FILES = $(libclisrcdir)/swig/libcli_nbt_wrap.o
$(eval $(call python_py_module_template,samba/nbt.py,$(libclisrcdir)/swig/libcli_nbt.py))
-$(python_libcli_nbt_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(python_libcli_nbt_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
[PYTHON::python_libcli_smb]
LIBRARY_REALNAME = samba/_libcli_smb.$(SHLIBEXT)
@@ -92,7 +92,7 @@ python_libcli_smb_OBJ_FILES = $(libclisrcdir)/swig/libcli_smb_wrap.o
$(eval $(call python_py_module_template,samba/smb.py,$(libclisrcdir)/swig/libcli_smb.py))
-$(python_libcli_smb_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(python_libcli_smb_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
[SUBSYSTEM::LIBCLI_DGRAM]
diff --git a/source/libcli/security/config.mk b/source/libcli/security/config.mk
index 82fe8f1..f2883d1 100644
--- a/source/libcli/security/config.mk
+++ b/source/libcli/security/config.mk
@@ -15,4 +15,4 @@ swig_security_OBJ_FILES = $(libclisrcdir)/security/security_wrap.o
$(eval $(call python_py_module_template,samba/security.py,$(libclisrcdir)/security/security.py))
-$(swig_security_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(swig_security_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
diff --git a/source/param/config.mk b/source/param/config.mk
index eded8e4..02474d5 100644
--- a/source/param/config.mk
+++ b/source/param/config.mk
@@ -65,4 +65,4 @@ param_OBJ_FILES = $(paramsrcdir)/param_wrap.o
$(eval $(call python_py_module_template,samba/param.py,$(paramsrcdir)/param.py))
-$(param_OBJ_FILES): CFLAGS+="$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)"
+$(param_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL)
diff --git a/source/scripting/python/config.mk b/source/scripting/python/config.mk
index ddbc567..73607eb 100644
--- a/source/scripting/python/config.mk
+++ b/source/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")
diff --git a/source/scripting/python/samba/__init__.py b/source/scripting/python/samba/__init__.py
index b9d81c6..29afdb9 100644
--- a/source/scripting/python/samba/__init__.py
+++ b/source/scripting/python/samba/__init__.py
@@ -33,6 +33,8 @@ if _in_source_tree():
srcdir = "%s/../../.." % os.path.dirname(__file__)
sys.path.append("%s/bin/python" % srcdir)
default_ldb_modules_dir = "%s/bin/modules/ldb" % srcdir
+else:
+ default_ldb_modules_dir = None
import ldb
--
Samba Shared Repository
More information about the samba-cvs
mailing list