The branch, master has been updated via c251cb6 wafsamba: Fix soname for standalone private libraries. via a702c07 talloc: change pytalloc-util to be a public library. via d44e3bf talloc: Install pytalloc-util as system library. via 0ceb501 waf: Remove unused EXT_LIB_PYTHON. via 98cfc71 talloc: Avoid dependency on unknown EXT_LIB_PYTHON. via 1ae0981 talloc: Move pytalloc to lib/talloc. via 50256c0 waf: Only specify vnum for non-private libraries. via a74e8be waf: Stop automaticaly changing dashes to underscores in library names. via e4d9e97 waf: Don't auto-lowercase library names. via 8cf6137 waf: Remove lib prefix from libraries manually. via b2af2fd torture_local: Add missing dependency on socket_wrapper. via df76c3f waf: build private libraries with so names. via 20b5268 dcerpc_dns: Change back to subsystem for the moment. via d9cbcdd s4: Drop duplicate 'lib' prefix for private libraries. from 126f87e s3: Fix some DEBUG msgs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit c251cb62eca1b96e0b5b22a40c5a054d5d40c1f2 Author: Jelmer Vernooij <jel...@samba.org> Date: Tue Oct 26 10:25:35 2010 -0700 wafsamba: Fix soname for standalone private libraries. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Tue Oct 26 18:10:13 UTC 2010 on sn-devel-104 commit a702c07e0202e2f4b853f626ca704a4bec4ae8ca Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 12:53:59 2010 -0700 talloc: change pytalloc-util to be a public library. commit d44e3bf747f9812036f4b6ecf3ccb2fad1d25882 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 12:37:08 2010 -0700 talloc: Install pytalloc-util as system library. commit 0ceb5018f3a75f272faa4d7a7b5c79ca100f5ef0 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 12:17:43 2010 -0700 waf: Remove unused EXT_LIB_PYTHON. commit 98cfc71801dfc9bc05f282d3547574324d46a67f Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 12:15:12 2010 -0700 talloc: Avoid dependency on unknown EXT_LIB_PYTHON. commit 1ae0981ce8d9786608714d6e7a9e31f09d765b71 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 11:58:47 2010 -0700 talloc: Move pytalloc to lib/talloc. commit 50256c01d061c6d73bb2d8ee2c60785d58748e6c Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 11:50:47 2010 -0700 waf: Only specify vnum for non-private libraries. commit a74e8be6d1448f121181e6d7cca3841891321a12 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 11:26:09 2010 -0700 waf: Stop automaticaly changing dashes to underscores in library names. commit e4d9e974da730ef7a5ac5a33797652720d40ccb9 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 10:49:13 2010 -0700 waf: Don't auto-lowercase library names. commit 8cf61377aa388724150699618f5cd60682ffde37 Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 10:42:58 2010 -0700 waf: Remove lib prefix from libraries manually. commit b2af2fd3de37296c5589fd5f34bb3353227272cd Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 01:49:03 2010 -0700 torture_local: Add missing dependency on socket_wrapper. commit df76c3f1475f7df13f3771f6c23cae019bc10c8c Author: Jelmer Vernooij <jel...@samba.org> Date: Sun Oct 24 00:54:40 2010 -0700 waf: build private libraries with so names. commit 20b526855607f4ceeb02bd3010cfd820c33be237 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Oct 23 19:27:03 2010 -0700 dcerpc_dns: Change back to subsystem for the moment. commit d9cbcdd4109d361c909f2884fcf3797cf4052092 Author: Jelmer Vernooij <jel...@samba.org> Date: Sat Oct 23 18:41:59 2010 -0700 s4: Drop duplicate 'lib' prefix for private libraries. ----------------------------------------------------------------------- Summary of changes: buildtools/wafsamba/wafsamba.py | 12 +- lib/talloc/{talloc.pc.in => pytalloc-util.pc.in} | 6 +- lib/talloc/wscript | 66 +++++++++--- lib/tdb/wscript | 18 ++- lib/tdr/wscript_build | 2 +- lib/tevent/wscript | 19 ++- lib/torture/wscript_build | 2 +- lib/util/wscript_build | 2 +- lib/wscript_build | 2 +- libcli/auth/wscript_build | 2 +- libcli/cldap/wscript_build | 4 +- libcli/ldap/wscript_build | 8 +- libcli/nbt/wscript_build | 12 +- libcli/security/wscript_build | 4 +- libgpo/wscript_build | 4 +- librpc/wscript_build | 132 +++++++++++----------- nsswitch/wscript_build | 4 +- source3/librpc/wscript_build | 16 ++-- source3/wscript_build | 24 ++-- source4/auth/credentials/wscript_build | 4 +- source4/auth/gensec/wscript_build | 6 +- source4/auth/kerberos/wscript_build | 2 +- source4/auth/ntlm/wscript_build | 6 +- source4/auth/wscript_build | 4 +- source4/cldap_server/wscript_build | 2 +- source4/client/wscript_build | 4 +- source4/dns_server/wscript_build | 2 +- source4/dsdb/samdb/ldb_modules/wscript_build | 76 ++++++------ source4/dsdb/wscript_build | 8 +- source4/heimdal_build/wscript_build | 4 +- source4/kdc/wscript_build | 26 ++-- source4/ldap_server/wscript_build | 2 +- source4/lib/cmdline/wscript_build | 4 +- source4/lib/com/wscript_build | 2 +- source4/lib/events/wscript_build | 4 +- source4/lib/ldb-samba/wscript_build | 2 +- source4/lib/ldb/wscript | 10 +- source4/lib/messaging/wscript_build | 4 +- source4/lib/policy/wscript_build | 4 +- source4/lib/registry/wscript_build | 12 +- source4/lib/samba3/wscript_build | 2 +- source4/lib/socket/wscript_build | 6 +- source4/lib/tls/wscript | 2 +- source4/lib/wmi/wscript_build | 2 +- source4/libcli/ldap/wscript_build | 6 +- source4/libcli/security/wscript_build | 4 +- source4/libcli/wbclient/wscript_build | 2 +- source4/libcli/wscript_build | 18 ++-- source4/libnet/wscript_build | 6 +- source4/librpc/wscript_build | 130 ++++++++++++---------- source4/nbt_server/wscript_build | 6 +- source4/ntvfs/posix/wscript_build | 4 +- source4/ntvfs/sysdep/wscript_build | 2 +- source4/param/wscript_build | 16 ++-- source4/rpc_server/wscript_build | 18 ++-- source4/scripting/python/wscript_build | 19 +--- source4/smbd/wscript_build | 10 +- source4/torture/drs/wscript_build | 2 +- source4/torture/local/wscript_build | 2 +- source4/torture/wscript_build | 14 +- source4/utils/net/wscript_build | 2 +- source4/utils/wscript_build | 2 +- source4/winbind/wscript_build | 6 +- 63 files changed, 431 insertions(+), 377 deletions(-) copy lib/talloc/{talloc.pc.in => pytalloc-util.pc.in} (57%) Changeset truncated at 500 lines: diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index eb0c369..6ba0f37 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -174,13 +174,16 @@ def SAMBA_LIBRARY(bld, libname, source, raise Utils.WafError("public library '%s' must have a vnum" % libname) if target_type == 'PYTHON' or realname or not private_library: - # Sanitize the library name - bundled_name = libname.lower().replace('_', '-') - while bundled_name.startswith("lib"): - bundled_name = bundled_name[3:] + bundled_name = libname.replace('_', '-') else: bundled_name = PRIVATE_NAME(bld, libname, bundled_extension, private_library) + if private_library: + if vnum: + Logs.error("vnum is invalid for private libraries") + sys.exit(1) + vnum = Utils.g_module.VERSION + features = 'cc cshlib symlink_lib install_lib' if target_type == 'PYTHON': features += ' pyext' @@ -881,7 +884,6 @@ def subst_at_vars(task): return 0 - def PKG_CONFIG_FILES(bld, pc_files, vnum=None): '''install some pkg_config pc files''' dest = '${PKGCONFIGDIR}' diff --git a/lib/talloc/talloc.pc.in b/lib/talloc/pytalloc-util.pc.in similarity index 57% copy from lib/talloc/talloc.pc.in copy to lib/talloc/pytalloc-util.pc.in index 5ce2109..b17b373 100644 --- a/lib/talloc/talloc.pc.in +++ b/lib/talloc/pytalloc-util.pc.in @@ -3,9 +3,9 @@ exec_pref...@exec_prefix@ libd...@libdir@ included...@includedir@ -Name: talloc -Description: A hierarchical pool based memory system with destructors +Name: pytalloc-util +Description: Utility functions for using talloc objects with Python Version: @TALLOC_VERSION@ -Libs: -L${libdir} -ltalloc +Libs: -L${libdir} -lpytalloc-util Cflags: -I${includedir} URL: http://talloc.samba.org/ diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 56de6ea..6da1a66 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -6,6 +6,7 @@ VERSION = '2.0.3' blddir = 'bin' +import Logs import os, sys # find the buildtools directory @@ -29,29 +30,68 @@ def set_options(opt): opt.add_option('--enable-talloc-compat1', help=("Build talloc 1.x.x compat library [False]"), action="store_true", dest='TALLOC_COMPAT1', default=False) + if opt.IN_LAUNCH_DIR(): + opt.add_option('--disable-python', + help=("disable the pytevent module"), + action="store_true", dest='disable_python', default=False) + def configure(conf): conf.RECURSE('lib/replace') conf.env.standalone_talloc = conf.IN_LAUNCH_DIR() + conf.env.disable_python = getattr(Options.options, 'disable_python', False) + if not conf.env.standalone_talloc: if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, implied_deps='replace'): conf.define('USING_SYSTEM_TALLOC', 1) + if conf.CHECK_BUNDLED_SYSTEM('pytalloc-util', minversion=VERSION, + implied_deps='talloc replace'): + conf.define('USING_SYSTEM_PYTALLOC_UTIL', 1) conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 if conf.env.standalone_talloc: conf.find_program('xsltproc', var='XSLTPROC') - conf.SAMBA_CONFIG_H() + if not conf.env.disable_python: + # also disable if we don't have the python libs installed + conf.check_tool('python') + conf.check_python_version((2,4,2)) + conf.check_python_headers(mandatory=False) + if not conf.env.HAVE_PYTHON_H: + Logs.warn('Disabling pytalloc-util as python devel libs not found') + conf.env.disable_python = True + conf.SAMBA_CONFIG_H() def build(bld): bld.RECURSE('lib/replace') + if bld.env.standalone_talloc: + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + bld.env.TALLOC_VERSION = VERSION + bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION) + bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h') + private_library = False + vnum = VERSION + + # should we also install the symlink to libtalloc1.so here? + bld.SAMBA_LIBRARY('talloc-compat1', + 'compat/talloc_compat1.c', + deps='talloc', + enabled=bld.env.TALLOC_COMPAT1, + vnum=VERSION) + + if not bld.env.disable_python: + bld.PKG_CONFIG_FILES('pytalloc-util.pc', vnum=VERSION) + else: + private_library = True + vnum = None + if not bld.CONFIG_SET('USING_SYSTEM_TALLOC'): bld.SAMBA_LIBRARY('talloc', @@ -60,17 +100,18 @@ def build(bld): abi_file='ABI/talloc-%s.sigs' % VERSION, abi_match='talloc* _talloc*', hide_symbols=True, - vnum=VERSION, - private_library=not bld.env.standalone_talloc, + vnum=vnum, + private_library=private_library, manpages='talloc.3') - # should we also install the symlink to libtalloc1.so here? - bld.SAMBA_LIBRARY('talloc-compat1', - 'compat/talloc_compat1.c', - deps='talloc', - enabled = bld.env.TALLOC_COMPAT1, - vnum=VERSION, - private_library=not bld.env.standalone_talloc) + if not bld.CONFIG_SET('USING_SYSTEM_PYTALLOC_UTIL') and not bld.env.disable_python: + + bld.SAMBA_LIBRARY('pytalloc-util', + source='pytalloc.c', + public_deps='talloc', + pyext=True, + vnum=VERSION, + ) if not getattr(bld.env, '_SAMBA_BUILD_', 0) == 4: # s4 already has the talloc testsuite builtin to smbtorture @@ -79,11 +120,6 @@ def build(bld): deps='talloc', install=False) - if bld.env.standalone_talloc: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.env.TALLOC_VERSION = VERSION - bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION) - bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h') def test(ctx): '''run talloc testsuite''' diff --git a/lib/tdb/wscript b/lib/tdb/wscript index 37af34c..fcb15f8 100644 --- a/lib/tdb/wscript +++ b/lib/tdb/wscript @@ -62,6 +62,16 @@ def build(bld): freelistcheck.c lock.c dump.c freelist.c io.c open.c transaction.c hash.c''') + if bld.env.standalone_tdb: + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) + bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) + vnum = VERSION + private_library = False + else: + private_library = True + vnum = None + if not bld.CONFIG_SET('USING_SYSTEM_TDB'): bld.SAMBA_LIBRARY('tdb', COMMON_SRC, @@ -70,8 +80,8 @@ def build(bld): abi_file='ABI/tdb-%s.sigs' % VERSION, abi_match='tdb_*', hide_symbols=True, - vnum=VERSION, - private_library=not bld.env.standalone_tdb) + vnum=vnum, + private_library=private_library) bld.SAMBA_BINARY('tdbtorture', 'tools/tdbtorture.c', @@ -103,10 +113,6 @@ def build(bld): realname='tdb.so', cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) - if bld.env.standalone_tdb: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) - bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) def test(ctx): diff --git a/lib/tdr/wscript_build b/lib/tdr/wscript_build index 627bfec..431ac53 100644 --- a/lib/tdr/wscript_build +++ b/lib/tdr/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('TDR', source='tdr.c', autoproto='tdr_proto.h', - public_deps='talloc libsamba-util', + public_deps='talloc samba-util', public_headers='tdr.h' ) diff --git a/lib/tevent/wscript b/lib/tevent/wscript index a502860..590fbfe 100644 --- a/lib/tevent/wscript +++ b/lib/tevent/wscript @@ -66,6 +66,16 @@ def build(bld): if bld.CONFIG_SET('HAVE_EPOLL'): SRC += ' tevent_epoll.c' + if bld.env.standalone_tevent: + bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION) + bld.INSTALL_FILES('${INCLUDEDIR}', 'tevent.h') + private_library = False + vnum = VERSION + else: + private_library = True + vnum = None + if not bld.CONFIG_SET('USING_SYSTEM_TEVENT'): bld.SAMBA_LIBRARY('tevent', SRC, @@ -73,13 +83,8 @@ def build(bld): enabled= not bld.CONFIG_SET('USING_SYSTEM_TEVENT'), abi_file='ABI/tevent-%s.sigs' % VERSION, abi_match='tevent_* _tevent_*', - vnum=VERSION, - private_library=not bld.env.standalone_tevent) - - if bld.env.standalone_tevent: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' - bld.PKG_CONFIG_FILES('tevent.pc', vnum=VERSION) - bld.INSTALL_FILES('${INCLUDEDIR}', 'tevent.h') + vnum=vnum, + private_library=private_library) bld.SAMBA_PYTHON('pytevent', 'pytevent.c', diff --git a/lib/torture/wscript_build b/lib/torture/wscript_build index b758248..a68707a 100644 --- a/lib/torture/wscript_build +++ b/lib/torture/wscript_build @@ -4,6 +4,6 @@ bld.SAMBA_LIBRARY('torture', source='torture.c subunit.c', vnum='0.0.1', pc_files='torture.pc', - public_deps='libsamba-hostconfig libsamba-util libsamba-errors talloc tevent subunit', + public_deps='samba-hostconfig samba-util errors talloc tevent subunit', public_headers='torture.h' ) diff --git a/lib/util/wscript_build b/lib/util/wscript_build index de84d4e..e032e15 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('libsamba-util', +bld.SAMBA_LIBRARY('samba-util', source='xfile.c debug.c fault.c signal.c system.c time.c genrand.c dprintf.c util_str.c rfc1738.c substitute.c util_strlist.c util_file.c data_blob.c util.c blocking.c util_net.c fsusage.c ms_fnmatch.c mutex.c idtree.c become_daemon.c rbtree.c talloc_stack.c smb_threads.c params.c parmlist.c util_id.c select.c', public_deps='talloc LIBCRYPTO CHARSET execinfo uid_wrapper', public_headers='attr.h byteorder.h data_blob.h debug.h memory.h mutex.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h', diff --git a/lib/wscript_build b/lib/wscript_build index 7e4b3ca..bc9d5ed 100644 --- a/lib/wscript_build +++ b/lib/wscript_build @@ -27,7 +27,7 @@ bld.SAMBA_GENERATOR('external_init_py', bld.INSTALL_FILES('${PYTHONDIR}/samba/external', 'empty_file', destname='__init__.py') # a grouping library for event and socket related subsystems -bld.SAMBA_LIBRARY('samba_sockets', +bld.SAMBA_LIBRARY('samba-sockets', source=[], private_library=True, grouping_library=True, diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index 24b04c4..712f828 100644 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_SUBSYSTEM('ntlm_check', source='ntlm_check.c', - deps='libsamba-util' + deps='samba-util' ) diff --git a/libcli/cldap/wscript_build b/libcli/cldap/wscript_build index 2965322..d0c00d7 100644 --- a/libcli/cldap/wscript_build +++ b/libcli/cldap/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_CLDAP', source='cldap.c', - public_deps='cli_ldap', - deps='LIBTSOCKET libsamba-util UTIL_TEVENT ldb LIBCLI_NETLOGON' + public_deps='cli-ldap', + deps='LIBTSOCKET samba-util UTIL_TEVENT ldb LIBCLI_NETLOGON' ) diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build index d9030c0..5efb683 100644 --- a/libcli/ldap/wscript_build +++ b/libcli/ldap/wscript_build @@ -2,16 +2,16 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_MESSAGE', source='ldap_message.c', - public_deps='libsamba-errors talloc ldb', + public_deps='errors talloc ldb', public_headers='ldap_message.h ldap_errors.h', - deps='libsamba-util ASN1_UTIL' + deps='samba-util ASN1_UTIL' ) bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR', source='ldap_ndr.c', - public_deps='libsamba-errors talloc', + public_deps='errors talloc', public_headers='ldap_ndr.h', - deps='libsamba-util ldb NDR_SECURITY tevent' + deps='samba-util ldb NDR_SECURITY tevent' ) diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build index ec2b473..9cae6e0 100644 --- a/libcli/nbt/wscript_build +++ b/libcli/nbt/wscript_build @@ -7,9 +7,9 @@ bld.SAMBA_SUBSYSTEM('NDR_NBT_BUF', ) -bld.SAMBA_LIBRARY('cli_nbt', +bld.SAMBA_LIBRARY('cli-nbt', source='lmhosts.c nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c dns_hosts_file.c', - public_deps='LIBNDR NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket libsamba-util', + public_deps='ndr NDR_NBT tevent UTIL_TEVENT NDR_SECURITY samba_socket samba-util', private_library=True ) @@ -17,25 +17,25 @@ bld.SAMBA_LIBRARY('cli_nbt', bld.SAMBA_BINARY('nmblookup', source='tools/nmblookup.c', manpages='man/nmblookup.1', - deps='libsamba-hostconfig libsamba-util cli_nbt popt POPT_SAMBA libnetif LIBCLI_RESOLVE' + deps='samba-hostconfig samba-util cli-nbt popt POPT_SAMBA netif LIBCLI_RESOLVE' ) bld.SAMBA_SUBSYSTEM('LIBCLI_NDR_NETLOGON', source='../ndr_netlogon.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON', source='../netlogon.c', - public_deps='libsamba-util LIBCLI_NDR_NETLOGON' + public_deps='samba-util LIBCLI_NDR_NETLOGON' ) bld.SAMBA_PYTHON('python_netbios', source='pynbt.c', - public_deps='cli_nbt DYNCONFIG libsamba-hostconfig', + public_deps='cli-nbt DYNCONFIG samba-hostconfig', realname='samba/netbios.so' ) diff --git a/libcli/security/wscript_build b/libcli/security/wscript_build index ddf679c..4b3f46e 100644 --- a/libcli/security/wscript_build +++ b/libcli/security/wscript_build @@ -1,9 +1,9 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('libsecurity', +bld.SAMBA_LIBRARY('security', source='dom_sid.c display_sec.c secace.c secacl.c security_descriptor.c sddl.c privileges.c security_token.c access_check.c object_tree.c create_descriptor.c util_sid.c', private_library=True, - deps='talloc LIBNDR NDR_SECURITY' + deps='talloc ndr NDR_SECURITY' ) diff --git a/libgpo/wscript_build b/libgpo/wscript_build index e2fe711..e2422c5 100644 --- a/libgpo/wscript_build +++ b/libgpo/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_SUBSYSTEM('LIBGPO', source='gpo_util.c gpo_sec.c ../libgpo/gpext/gpext.c gpo_fetch.c gpo_ini.c ../source4/libgpo/ads_convenience.c ../source3/libgpo/gpo_filesync.c ../source4/libgpo/gpo_filesync.c', - deps='ldb libsamba-net', - enabled=False + deps='ldb samba-net', + enabled=False ) diff --git a/librpc/wscript_build b/librpc/wscript_build index 8124053..e322443 100644 --- a/librpc/wscript_build +++ b/librpc/wscript_build @@ -4,82 +4,82 @@ bld.RECURSE('idl') bld.SAMBA_SUBSYSTEM('NDR_AUDIOSRV', source='../librpc/gen_ndr/ndr_audiosrv.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_NAMED_PIPE_AUTH', source='../librpc/gen_ndr/ndr_named_pipe_auth.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DNSSERVER', source='../librpc/gen_ndr/ndr_dnsserver.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DNS', source='../librpc/gen_ndr/ndr_dns.c ../librpc/ndr/ndr_dns.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DSBACKUP', source='../librpc/gen_ndr/ndr_dsbackup.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_DFS', source='../librpc/gen_ndr/ndr_dfs.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_WINREG', source='../librpc/gen_ndr/ndr_winreg.c', - public_deps='LIBNDR NDR_SECURITY NDR_LSA' + public_deps='ndr NDR_SECURITY NDR_LSA' ) bld.SAMBA_SUBSYSTEM('NDR_EFS', source='../librpc/gen_ndr/ndr_efs.c', - public_deps='LIBNDR NDR_SECURITY' + public_deps='ndr NDR_SECURITY' ) bld.SAMBA_SUBSYSTEM('NDR_ROT', source='../librpc/gen_ndr/ndr_rot.c', - public_deps='LIBNDR NDR_ORPC' + public_deps='ndr NDR_ORPC' ) bld.SAMBA_SUBSYSTEM('NDR_FRSRPC', source='../librpc/ndr/ndr_frsrpc.c ../librpc/gen_ndr/ndr_frsrpc.c', - public_deps='LIBNDR' + public_deps='ndr' ) bld.SAMBA_SUBSYSTEM('NDR_FRSAPI', -- Samba Shared Repository