diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-05-22 16:09:10 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-05-22 16:09:10 +1000 |
| commit | fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5 (patch) | |
| tree | 6e6b4079ecf50b42b862d0f8accc392e5f061cb8 /source4/lib/registry | |
| parent | af82204f4355ac9011b61019bbbe40e7e3632d4c (diff) | |
| parent | 8172f3eb220575d40f9ab5129d36e4e0003dee56 (diff) | |
| download | samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.tar.gz samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.tar.bz2 samba-fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5.zip | |
Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit d7f3348c891e14de0e1b195714468ff998400f60)
Diffstat (limited to 'source4/lib/registry')
| -rw-r--r-- | source4/lib/registry/config.mk | 6 | ||||
| -rw-r--r-- | source4/lib/registry/tests/bindings.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index c0ad613c52..44adc53524 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -105,7 +105,11 @@ torture_registry_OBJ_FILES = $(addprefix $(libregistrysrcdir)/tests/, generic.o $(eval $(call proto_header_template,$(libregistrysrcdir)/tests/proto.h,$(torture_registry_OBJ_FILES:.o=.c))) [PYTHON::swig_registry] +LIBRARY_REALNAME = samba/_registry.$(SHLIBEXT) PUBLIC_DEPENDENCIES = registry -SWIG_FILE = registry.i 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) diff --git a/source4/lib/registry/tests/bindings.py b/source4/lib/registry/tests/bindings.py index 314cf778a1..1fb5c70b70 100644 --- a/source4/lib/registry/tests/bindings.py +++ b/source4/lib/registry/tests/bindings.py @@ -19,7 +19,7 @@ import os import unittest -import registry +from samba import registry import samba.tests class HelperTests(unittest.TestCase): |