diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/crypto/wscript_build | 9 | ||||
-rw-r--r-- | lib/ldb-samba/wscript_build | 13 | ||||
-rw-r--r-- | lib/ldb/wscript | 49 | ||||
-rw-r--r-- | lib/talloc/wscript | 29 | ||||
-rw-r--r-- | lib/tdb/wscript | 24 | ||||
-rw-r--r-- | lib/tevent/wscript | 13 |
6 files changed, 64 insertions, 73 deletions
diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build index 77c62758ce8..6841f99d568 100644 --- a/lib/crypto/wscript_build +++ b/lib/crypto/wscript_build @@ -29,9 +29,8 @@ bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO', deps='LIBCRYPTO' ) -for env in bld.gen_python_environments(): - bld.SAMBA_PYTHON('python_crypto', - source='py_crypto.c', - deps='LIBCRYPTO', - realname='samba/crypto.so' +bld.SAMBA_PYTHON('python_crypto', + source='py_crypto.c', + deps='LIBCRYPTO', + realname='samba/crypto.so' ) diff --git a/lib/ldb-samba/wscript_build b/lib/ldb-samba/wscript_build index 396a3816c21..3264757e8b7 100644 --- a/lib/ldb-samba/wscript_build +++ b/lib/ldb-samba/wscript_build @@ -18,13 +18,12 @@ bld.SAMBA_SUBSYSTEM('ldbwrap', deps='ldb samba-util ldbsamba samba-hostconfig' ) -for env in bld.gen_python_environments(): - pyparam_util = bld.pyembed_libname('pyparam_util') - pyldb_util = bld.pyembed_libname('pyldb-util') - pyauth = 'pyauth' - bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c', - deps='ldbsamba %s ldbwrap %s %s' % (pyparam_util, pyldb_util, pyauth), - realname='samba/_ldb.so') +pyparam_util = bld.pyembed_libname('pyparam_util') +pyldb_util = bld.pyembed_libname('pyldb-util') +pyauth = 'pyauth' +bld.SAMBA_PYTHON('python_samba__ldb', 'pyldb.c', + deps='ldbsamba %s ldbwrap %s %s' % (pyparam_util, pyldb_util, pyauth), + realname='samba/_ldb.so') bld.SAMBA_MODULE('ldbsamba_extensions', source='samba_extensions.c', diff --git a/lib/ldb/wscript b/lib/ldb/wscript index 051c274f3c8..4f0c68c9c6c 100644 --- a/lib/ldb/wscript +++ b/lib/ldb/wscript @@ -234,37 +234,34 @@ def build(bld): if bld.PYTHON_BUILD_IS_ENABLED(): if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - - name = bld.pyembed_libname('pyldb-util') - bld.SAMBA_LIBRARY(name, - deps='replace ldb', - source='pyldb_util.c', - public_headers=('' if private_library else 'pyldb.h'), - public_headers_install=not private_library, - vnum=VERSION, - private_library=private_library, - pc_files='pyldb-util.pc', - pyembed=True, - enabled=bld.PYTHON_BUILD_IS_ENABLED(), - abi_directory='ABI', - abi_match='pyldb_*') - - if not bld.CONFIG_SET('USING_SYSTEM_LDB'): - bld.SAMBA_PYTHON('pyldb', 'pyldb.c', - deps='replace ldb ' + name, - realname='ldb.so', - cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) + name = bld.pyembed_libname('pyldb-util') + bld.SAMBA_LIBRARY(name, + deps='replace ldb', + source='pyldb_util.c', + public_headers=('' if private_library else 'pyldb.h'), + public_headers_install=not private_library, + vnum=VERSION, + private_library=private_library, + pc_files='pyldb-util.pc', + pyembed=True, + enabled=bld.PYTHON_BUILD_IS_ENABLED(), + abi_directory='ABI', + abi_match='pyldb_*') + + if not bld.CONFIG_SET('USING_SYSTEM_LDB'): + bld.SAMBA_PYTHON('pyldb', 'pyldb.c', + deps='replace ldb ' + name, + realname='ldb.so', + cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) # Do only install this file as part of the Samba build if we do not # use the system libldb! if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'): - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - bld.SAMBA_SCRIPT('_ldb_text.py', - pattern='_ldb_text.py', - installdir='python') + bld.SAMBA_SCRIPT('_ldb_text.py', + pattern='_ldb_text.py', + installdir='python') - bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') + bld.INSTALL_FILES('${PYTHONARCHDIR}', '_ldb_text.py') if not bld.CONFIG_SET('USING_SYSTEM_LDB'): if bld.is_install: diff --git a/lib/talloc/wscript b/lib/talloc/wscript index eb68279638b..81d12f8c054 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -133,10 +133,9 @@ def build(bld): manpages='man/talloc.3') if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL'): - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - name = bld.pyembed_libname('pytalloc-util') + name = bld.pyembed_libname('pytalloc-util') - bld.SAMBA_LIBRARY(name, + bld.SAMBA_LIBRARY(name, source='pytalloc_util.c', public_deps='talloc', pyembed=True, @@ -149,18 +148,18 @@ def build(bld): pc_files='pytalloc-util.pc', enabled=bld.PYTHON_BUILD_IS_ENABLED() ) - bld.SAMBA_PYTHON('pytalloc', - 'pytalloc.c', - deps='talloc ' + name, - enabled=bld.PYTHON_BUILD_IS_ENABLED(), - realname='talloc.so') - - bld.SAMBA_PYTHON('test_pytalloc', - 'test_pytalloc.c', - deps=name, - enabled=bld.PYTHON_BUILD_IS_ENABLED(), - realname='_test_pytalloc.so', - install=False) + bld.SAMBA_PYTHON('pytalloc', + 'pytalloc.c', + deps='talloc ' + name, + enabled=bld.PYTHON_BUILD_IS_ENABLED(), + realname='talloc.so') + + bld.SAMBA_PYTHON('test_pytalloc', + 'test_pytalloc.c', + deps=name, + enabled=bld.PYTHON_BUILD_IS_ENABLED(), + realname='_test_pytalloc.so', + install=False) def test(ctx): diff --git a/lib/tdb/wscript b/lib/tdb/wscript index d4f2e88e279..c616b40fbe5 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -182,21 +182,19 @@ def build(bld): includes='include', install=False) if not bld.CONFIG_SET('USING_SYSTEM_PYTDB'): - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - bld.SAMBA_PYTHON('pytdb', - 'pytdb.c', - deps='tdb', - enabled=not bld.env.disable_python, - realname='tdb.so', - cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) + bld.SAMBA_PYTHON('pytdb', + 'pytdb.c', + deps='tdb', + enabled=not bld.env.disable_python, + realname='tdb.so', + cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) if not bld.env.disable_python: - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - bld.SAMBA_SCRIPT('_tdb_text.py', - pattern='_tdb_text.py', - installdir='python') - - bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py') + bld.SAMBA_SCRIPT('_tdb_text.py', + pattern='_tdb_text.py', + installdir='python') + + bld.INSTALL_FILES('${PYTHONARCHDIR}', '_tdb_text.py') def testonly(ctx): '''run tdb testsuite''' diff --git a/lib/tevent/wscript b/lib/tevent/wscript index ce6e12f4792..a9288add0a3 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -114,15 +114,14 @@ def build(bld): private_library=private_library) if not bld.CONFIG_SET('USING_SYSTEM_PYTEVENT') and not bld.env.disable_python: - for env in bld.gen_python_environments(['PKGCONFIGDIR']): - bld.SAMBA_PYTHON('_tevent', - 'pytevent.c', - deps='tevent', - realname='_tevent.so', - cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) + bld.SAMBA_PYTHON('_tevent', + 'pytevent.c', + deps='tevent', + realname='_tevent.so', + cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) - bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False) + bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False) # install out various python scripts for use by make test bld.SAMBA_SCRIPT('tevent_python', |