diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/ldb/wscript | 2 | ||||
| -rwxr-xr-x | source4/librpc/wscript_build | 2 | ||||
| -rw-r--r-- | source4/param/wscript_build | 4 | ||||
| -rw-r--r-- | source4/scripting/python/wscript_build | 18 | ||||
| -rw-r--r-- | source4/smbd/wscript_build | 6 | ||||
| -rw-r--r-- | source4/torture/wscript_build | 6 | ||||
| -rw-r--r-- | source4/utils/net/wscript_build | 2 | ||||
| -rw-r--r-- | source4/utils/wscript_build | 2 | ||||
| -rw-r--r-- | source4/web_server/wscript_build | 6 |
9 files changed, 24 insertions, 24 deletions
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index cf013ce1f2..fffd8ce85b 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -108,7 +108,7 @@ def build(bld): abi_file = 'ABI/ldb-%s.sigs' % VERSION bld.SAMBA_SUBSYSTEM('pyldb_util', deps='ldb', - source='pyldb_util.c', needs_python=True) + source='pyldb_util.c', pyembed=True) if not bld.CONFIG_SET('USING_SYSTEM_LDB'): modules_dir = bld.EXPAND_VARIABLES('${LDB_MODULESDIR}') diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build index fc68326425..8d506034ad 100755 --- a/source4/librpc/wscript_build +++ b/source4/librpc/wscript_build @@ -174,7 +174,7 @@ bld.SAMBA_LIBRARY('dcerpc', bld.SAMBA_SUBSYSTEM('pyrpc_util', source='rpc/pyrpc_util.c', public_deps='PYTALLOC pyparam_util pycredentials dcerpc', - needs_python=True, + pyembed=True, ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 749aab36e2..3cb5e1bfe9 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -14,7 +14,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-HOSTCONFIG', bld.SAMBA_SUBSYSTEM('PROVISION', source='provision.c pyparam.c', deps='LIBPYTHON pyparam_util ldb PYTALLOC', - needs_python=True, + pyembed=True, ) @@ -57,6 +57,6 @@ bld.SAMBA_PYTHON('param', bld.SAMBA_SUBSYSTEM('pyparam_util', source='pyparam_util.c', deps='LIBPYTHON LIBSAMBA-HOSTCONFIG', - needs_python=True + pyembed=True ) diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build index d28985609f..055edc8f6a 100644 --- a/source4/scripting/python/wscript_build +++ b/source4/scripting/python/wscript_build @@ -1,19 +1,19 @@ #!/usr/bin/env python bld.SAMBA_SUBSYSTEM('LIBPYTHON', - source='modules.c', - public_deps='EXT_LIB_PYTHON', - init_function_sentinal='{NULL,NULL}', - needs_python=True, - deps='talloc', + source='modules.c', + public_deps='EXT_LIB_PYTHON', + init_function_sentinal='{NULL,NULL}', + pyembed=True, + deps='talloc', ) bld.SAMBA_SUBSYSTEM('PYTALLOC', - source='../../../lib/talloc/pytalloc.c', - public_deps='EXT_LIB_PYTHON talloc', - needs_python=True, - ) + source='../../../lib/talloc/pytalloc.c', + public_deps='EXT_LIB_PYTHON talloc', + pyembed=True, +) bld.SAMBA_PYTHON('python_uuid', diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 89eba835d1..a57fe291d6 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -17,11 +17,11 @@ bld.SAMBA_SUBSYSTEM('PIDFILE', bld.SAMBA_BINARY('samba', source='server.c', manpages='samba.8', - subsystem_name='service', + subsystem_name='service', deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE popt gensec registry ntptr ntvfs share CLUSTER DCESRV''', - needs_python=True, - install_path='${SBINDIR}' + pyembed=True, + install_path='${SBINDIR}' ) diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build index ddbf70af43..194758e6a9 100644 --- a/source4/torture/wscript_build +++ b/source4/torture/wscript_build @@ -144,7 +144,7 @@ bld.SAMBA_SUBSYSTEM('torturemain', source='smbtorture.c torture.c shell.c', subsystem_name='smbtorture', deps='torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES, - needs_python=True + pyembed=True ) bld.SAMBA_BINARY('smbtorture', @@ -152,7 +152,7 @@ bld.SAMBA_BINARY('smbtorture', manpages='man/smbtorture.1', public_headers='smbtorture.h', deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES, - needs_python=True + pyembed=True ) # this is used in the build farm to build a smbtorture.static binary for s3 @@ -160,7 +160,7 @@ bld.SAMBA_BINARY('smbtorture.static', source=[], deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES, enabled = bld.env.BUILD_FARM, - needs_python=True + pyembed=True ) bld.env.NONSHARED_BINARIES.append('smbtorture.static') diff --git a/source4/utils/net/wscript_build b/source4/utils/net/wscript_build index 99d8c5593d..ee40cb8582 100644 --- a/source4/utils/net/wscript_build +++ b/source4/utils/net/wscript_build @@ -13,6 +13,6 @@ bld.SAMBA_BINARY('net', source='net.c net_password.c net_vampire.c net_gpo.c', autoproto='net_proto.h', deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL LIBSAMBA-NET popt POPT_SAMBA POPT_CREDENTIALS net_drs policy auth', - needs_python=True + pyembed=True ) diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index a0b3ac5f9a..4e1c4c548d 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_BINARY('ntlm_auth', source='ntlm_auth.c', manpages='man/ntlm_auth.1', deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING LIBEVENTS service', - needs_python=True + pyembed=True ) diff --git a/source4/web_server/wscript_build b/source4/web_server/wscript_build index 7064831072..dc1c3870dc 100644 --- a/source4/web_server/wscript_build +++ b/source4/web_server/wscript_build @@ -2,9 +2,9 @@ bld.SAMBA_SUBSYSTEM('WEB_WSGI', - source='wsgi.c', - deps='talloc LIBTSOCKET', - needs_python=True + source='wsgi.c', + deps='talloc LIBTSOCKET', + pyembed=True ) |