diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-28 15:43:26 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:27:12 +1000 |
| commit | 01682f797f755fdd6de5b6096275da7488f0f294 (patch) | |
| tree | 46a73e8799be702a102ed301ba01e797f460204c | |
| parent | c2d17cf978cb2d5275b2915fb0a87daa79acc28b (diff) | |
| download | samba-01682f797f755fdd6de5b6096275da7488f0f294.tar.gz samba-01682f797f755fdd6de5b6096275da7488f0f294.tar.bz2 samba-01682f797f755fdd6de5b6096275da7488f0f294.zip | |
s4-waf: fixed some deps now we don't auto-include tevent and replace
this is preparation for being able to use system versions of these
libraries
| -rw-r--r-- | lib/socket_wrapper/wscript_build | 4 | ||||
| -rw-r--r-- | lib/util/wscript_build | 2 | ||||
| -rw-r--r-- | libcli/ldap/wscript_build | 2 | ||||
| -rw-r--r-- | source4/auth/wscript_build | 2 | ||||
| -rw-r--r-- | source4/dsdb/wscript_build | 2 | ||||
| -rw-r--r-- | source4/param/wscript_build | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/lib/socket_wrapper/wscript_build b/lib/socket_wrapper/wscript_build index d5ca1107a6..9fc05e5a38 100644 --- a/lib/socket_wrapper/wscript_build +++ b/lib/socket_wrapper/wscript_build @@ -1,6 +1,6 @@ #!/usr/bin/env python bld.SAMBA_SUBSYSTEM('SOCKET_WRAPPER', - source='socket_wrapper.c' - ) + source='socket_wrapper.c', + deps='replace') diff --git a/lib/util/wscript_build b/lib/util/wscript_build index 57ac729f47..d2406659dc 100644 --- a/lib/util/wscript_build +++ b/lib/util/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_LIBRARY('LIBSAMBA-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', - public_deps='talloc LIBCRYPTO LIBREPLACE_NETWORK CHARSET execinfo UID_WRAPPER', + public_deps='talloc LIBCRYPTO LIBREPLACE_NETWORK CHARSET execinfo UID_WRAPPER tevent', 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', header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ], local_include=False, diff --git a/libcli/ldap/wscript_build b/libcli/ldap/wscript_build index 61c2f40969..c8274ab945 100644 --- a/libcli/ldap/wscript_build +++ b/libcli/ldap/wscript_build @@ -12,6 +12,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP_NDR', source='ldap_ndr.c', public_deps='LIBSAMBA-ERRORS talloc', public_headers='ldap_ndr.h', - deps='LIBSAMBA-UTIL ldb NDR_MISC NDR_SECURITY' + deps='LIBSAMBA-UTIL ldb NDR_MISC NDR_SECURITY tevent' ) diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build index ce4dc7b21e..e159292b77 100644 --- a/source4/auth/wscript_build +++ b/source4/auth/wscript_build @@ -36,7 +36,7 @@ bld.SAMBA_SUBSYSTEM('auth_system_session', bld.SAMBA_SUBSYSTEM('auth_sam', source='sam.c', autoproto='auth_sam.h', - public_deps='SAMDB UTIL_LDB LIBSECURITY ldb', + public_deps='SAMDB UTIL_LDB LIBSECURITY ldb tevent', deps='' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 99b91a89f9..ed81d2faa5 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -23,7 +23,7 @@ bld.SAMBA_SUBSYSTEM('SAMDB_COMMON', bld.SAMBA_SUBSYSTEM('SAMDB_SCHEMA', source='schema/schema_init.c schema/schema_set.c schema/schema_query.c schema/schema_syntax.c schema/schema_description.c schema/schema_convert_to_ol.c schema/schema_inferiors.c schema/schema_prefixmap.c', autoproto='schema/proto.h', - deps='SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA' + deps='SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA tevent' ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 351dedfaf1..f35d1c4e3a 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -42,7 +42,7 @@ bld.SAMBA_MODULE('share_ldb', bld.SAMBA_SUBSYSTEM('SECRETS', source='secrets.c', - deps='ldb TDB_WRAP UTIL_TDB NDR_SECURITY' + deps='ldb TDB_WRAP UTIL_TDB NDR_SECURITY tevent' ) |