From cf26d8a958256e1f56f9bc5a9611868d04a15e74 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 23 Oct 2010 23:49:33 +0200 Subject: s4: Rename LIBEVENTS to libevents. --- source4/auth/credentials/wscript_build | 2 +- source4/dsdb/samdb/ldb_modules/wscript_build | 68 ++++++++++++++-------------- source4/lib/com/wscript_build | 2 +- source4/lib/events/wscript_build | 2 +- source4/lib/messaging/wscript_build | 2 +- source4/libcli/wbclient/wscript_build | 2 +- source4/libcli/wscript_build | 4 +- source4/ntvfs/sysdep/wscript_build | 2 +- source4/rpc_server/wscript_build | 2 +- source4/smbd/wscript_build | 8 ++-- source4/utils/wscript_build | 2 +- 11 files changed, 48 insertions(+), 48 deletions(-) diff --git a/source4/auth/credentials/wscript_build b/source4/auth/credentials/wscript_build index 9e81e8fd79..be004a87c6 100644 --- a/source4/auth/credentials/wscript_build +++ b/source4/auth/credentials/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_SUBSYSTEM('CREDENTIALS', source='credentials.c', autoproto='credentials_proto.h', public_headers='credentials.h', - deps='LIBCRYPTO LIBSAMBA-ERRORS LIBEVENTS LIBCLI_AUTH LIBSECURITY', + deps='LIBCRYPTO LIBSAMBA-ERRORS libevents LIBCLI_AUTH LIBSECURITY', ) bld.SAMBA_SUBSYSTEM('CREDENTIALS_KRB5', diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index abac6f498b..2c28e56402 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -28,7 +28,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb', source='samba_dsdb.c', subsystem='ldb', init_function='LDB_MODULE(samba_dsdb)', - deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS', + deps='SAMDB talloc libevents LIBNDR DSDB_MODULE_HELPERS', internal_module=False, ) @@ -38,7 +38,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets', subsystem='ldb', init_function='LDB_MODULE(samba_secrets)', internal_module=False, - deps='SAMDB talloc LIBEVENTS LIBNDR' + deps='SAMDB talloc libevents LIBNDR' ) @@ -47,7 +47,7 @@ bld.SAMBA_MODULE('ldb_objectguid', subsystem='ldb', init_function='LDB_MODULE(objectguid)', internal_module=False, - deps='SAMDB talloc LIBEVENTS LIBNDR' + deps='SAMDB talloc libevents LIBNDR' ) @@ -56,7 +56,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data', subsystem='ldb', init_function='LDB_MODULE(repl_meta_data)', internal_module=False, - deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS LIBSECURITY_SESSION' + deps='SAMDB talloc libevents LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS LIBSECURITY_SESSION' ) @@ -65,7 +65,7 @@ bld.SAMBA_MODULE('ldb_dsdb_cache', subsystem='ldb', init_function='LDB_MODULE(dsdb_cache)', internal_module=False, - deps='SAMDB talloc LIBEVENTS' + deps='SAMDB talloc libevents' ) @@ -74,7 +74,7 @@ bld.SAMBA_MODULE('ldb_schema_load', subsystem='ldb', init_function='LDB_MODULE(schema_load)', internal_module=False, - deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' + deps='SAMDB talloc libevents DSDB_MODULE_HELPERS' ) @@ -83,7 +83,7 @@ bld.SAMBA_MODULE('ldb_schema_data', subsystem='ldb', init_function='LDB_MODULE(schema_data)', internal_module=False, - deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' + deps='SAMDB talloc libevents DSDB_MODULE_HELPERS' ) @@ -92,7 +92,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo', subsystem='ldb', init_function='LDB_MODULE(naming_fsmo)', internal_module=False, - deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' + deps='SAMDB talloc libevents DSDB_MODULE_HELPERS' ) @@ -101,7 +101,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo', subsystem='ldb', init_function='LDB_MODULE(pdc_fsmo)', internal_module=False, - deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS' + deps='SAMDB talloc libevents DSDB_MODULE_HELPERS' ) @@ -110,7 +110,7 @@ bld.SAMBA_MODULE('ldb_samldb', subsystem='ldb', init_function='LDB_MODULE(samldb)', internal_module=False, - deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC' + deps='talloc libevents SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC' ) @@ -119,7 +119,7 @@ bld.SAMBA_MODULE('ldb_samba3sam', subsystem='ldb', init_function='LDB_MODULE(samba3sam)', internal_module=False, - deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY' + deps='talloc libevents ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY' ) @@ -128,7 +128,7 @@ bld.SAMBA_MODULE('ldb_samba3sid', subsystem='ldb', init_function='LDB_MODULE(samba3sid)', internal_module=False, - deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS' + deps='talloc libevents ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS' ) @@ -138,7 +138,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map', subsystem='ldb', init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)', internal_module=False, - deps='talloc LIBEVENTS ldb LIBNDR LDBSAMBA' + deps='talloc libevents ldb LIBNDR LDBSAMBA' ) @@ -147,7 +147,7 @@ bld.SAMBA_MODULE('ldb_rootdse', subsystem='ldb', init_function='LDB_MODULE(rootdse)', internal_module=False, - deps='talloc LIBEVENTS SAMDB MESSAGING LIBSECURITY_SESSION DSDB_MODULE_HELPERS' + deps='talloc libevents SAMDB MESSAGING LIBSECURITY_SESSION DSDB_MODULE_HELPERS' ) @@ -156,7 +156,7 @@ bld.SAMBA_MODULE('ldb_password_hash', subsystem='ldb', init_function='LDB_MODULE(password_hash)', internal_module=False, - deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err' + deps='talloc libevents SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err' ) @@ -165,7 +165,7 @@ bld.SAMBA_MODULE('ldb_local_password', subsystem='ldb', init_function='LDB_MODULE(local_password)', internal_module=False, - deps='talloc LIBEVENTS LIBNDR SAMDB' + deps='talloc libevents LIBNDR SAMDB' ) bld.SAMBA_MODULE('ldb_extended_dn_in', @@ -173,7 +173,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in', subsystem='ldb', init_function='LDB_MODULE(extended_dn_in)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL' + deps='talloc libevents LIBSAMBA-UTIL' ) @@ -181,7 +181,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out', source='extended_dn_out.c', aliases='ldb_extended_dn_out_ldb ldb_extended_dn_out_openldap ldb_extended_dn_out_fds', subsystem='ldb', - deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB', + deps='talloc libevents LIBNDR LIBSAMBA-UTIL SAMDB', internal_module=False, init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)' ) @@ -192,7 +192,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store', subsystem='ldb', init_function='LDB_MODULE(extended_dn_store)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS' + deps='talloc libevents LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS' ) @@ -201,7 +201,7 @@ bld.SAMBA_MODULE('ldb_show_deleted', subsystem='ldb', init_function='LDB_MODULE(show_deleted)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS' + deps='talloc libevents LIBSAMBA-UTIL DSDB_MODULE_HELPERS' ) @@ -211,7 +211,7 @@ bld.SAMBA_MODULE('ldb_partition', subsystem='ldb', init_function='LDB_MODULE(partition)', internal_module=False, - deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' + deps='talloc libevents SAMDB DSDB_MODULE_HELPERS' ) @@ -220,7 +220,7 @@ bld.SAMBA_MODULE('ldb_new_partition', subsystem='ldb', init_function='LDB_MODULE(new_partition)', internal_module=False, - deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' + deps='talloc libevents SAMDB DSDB_MODULE_HELPERS' ) @@ -229,7 +229,7 @@ bld.SAMBA_MODULE('ldb_update_keytab', subsystem='ldb', init_function='LDB_MODULE(update_keytab)', internal_module=False, - deps='talloc LIBEVENTS CREDENTIALS ldb com_err KERBEROS_UTIL' + deps='talloc libevents CREDENTIALS ldb com_err KERBEROS_UTIL' ) @@ -238,7 +238,7 @@ bld.SAMBA_MODULE('ldb_objectclass', subsystem='ldb', init_function='LDB_MODULE(objectclass)', internal_module=False, - deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL DSDB_MODULE_HELPER_SCHEMA' + deps='talloc libevents LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL DSDB_MODULE_HELPER_SCHEMA' ) @@ -256,7 +256,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename', subsystem='ldb', init_function='LDB_MODULE(subtree_rename)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb SAMDB_COMMON' + deps='talloc libevents LIBSAMBA-UTIL ldb SAMDB_COMMON' ) @@ -265,7 +265,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete', subsystem='ldb', init_function='LDB_MODULE(subtree_delete)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS' + deps='talloc libevents LIBSAMBA-UTIL DSDB_MODULE_HELPERS' ) @@ -274,7 +274,7 @@ bld.SAMBA_MODULE('ldb_linked_attributes', subsystem='ldb', init_function='LDB_MODULE(linked_attributes)', internal_module=False, - deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS' + deps='talloc libevents SAMDB DSDB_MODULE_HELPERS' ) @@ -283,7 +283,7 @@ bld.SAMBA_MODULE('ldb_ranged_results', subsystem='ldb', init_function='LDB_MODULE(ranged_results)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb' + deps='talloc libevents LIBSAMBA-UTIL ldb' ) @@ -292,7 +292,7 @@ bld.SAMBA_MODULE('ldb_anr', subsystem='ldb', init_function='LDB_MODULE(anr)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB' + deps='talloc libevents LIBSAMBA-UTIL SAMDB' ) @@ -301,7 +301,7 @@ bld.SAMBA_MODULE('ldb_instancetype', subsystem='ldb', init_function='LDB_MODULE(instancetype)', internal_module=False, - deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS' + deps='talloc libevents LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS' ) @@ -319,7 +319,7 @@ bld.SAMBA_MODULE('ldb_descriptor', subsystem='ldb', init_function='LDB_MODULE(descriptor)', internal_module=False, - deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' + deps='talloc libevents LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' ) @@ -328,7 +328,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids', subsystem='ldb', init_function='LDB_MODULE(resolve_oids)', internal_module=False, - deps='SAMDB talloc LIBEVENTS LIBNDR' + deps='SAMDB talloc libevents LIBNDR' ) @@ -337,7 +337,7 @@ bld.SAMBA_MODULE('ldb_acl', subsystem='ldb', init_function='LDB_MODULE(acl)', internal_module=False, - deps='talloc LIBEVENTS LIBSECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' + deps='talloc libevents LIBSECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA' ) @@ -354,7 +354,7 @@ bld.SAMBA_MODULE('ldb_aclread', subsystem='ldb', init_function='LDB_MODULE(aclread)', internal_module=False, - deps='talloc LIBEVENTS LIBSECURITY SAMDB DSDB_MODULE_HELPERS', + deps='talloc libevents LIBSECURITY SAMDB DSDB_MODULE_HELPERS', ) bld.SAMBA_MODULE('ldb_simple_dn', diff --git a/source4/lib/com/wscript_build b/source4/lib/com/wscript_build index 9d962e16a5..4061f28457 100644 --- a/source4/lib/com/wscript_build +++ b/source4/lib/com/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_SUBSYSTEM('COM', source='tables.c rot.c main.c', - deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBEVENTS LIBNDR PIDL_DCOM' + deps='LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG libevents LIBNDR PIDL_DCOM' ) diff --git a/source4/lib/events/wscript_build b/source4/lib/events/wscript_build index 836ce9ec2b..559f844acc 100644 --- a/source4/lib/events/wscript_build +++ b/source4/lib/events/wscript_build @@ -1,7 +1,7 @@ #!/usr/bin/env python -bld.SAMBA_LIBRARY('LIBEVENTS', +bld.SAMBA_LIBRARY('libevents', source='tevent_s4.c', deps='LIBSAMBA-UTIL', public_deps='tevent', diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build index 983895ec26..cddf76e8a0 100644 --- a/source4/lib/messaging/wscript_build +++ b/source4/lib/messaging/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_SUBSYSTEM('MESSAGING', bld.SAMBA_PYTHON('python_messaging', source='pymessaging.c', - deps='MESSAGING LIBEVENTS pyparam_util', + deps='MESSAGING libevents pyparam_util', realname='samba/messaging.so' ) diff --git a/source4/libcli/wbclient/wscript_build b/source4/libcli/wbclient/wscript_build index c7a2148519..3e584939e2 100644 --- a/source4/libcli/wbclient/wscript_build +++ b/source4/libcli/wbclient/wscript_build @@ -2,7 +2,7 @@ bld.SAMBA_SUBSYSTEM('LIBWBCLIENT_OLD', source='wbclient.c', - public_deps='LIBSAMBA-ERRORS LIBEVENTS', + public_deps='LIBSAMBA-ERRORS libevents', deps='NDR_WINBIND MESSAGING RPC_NDR_WINBIND' ) diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build index d8f7c52417..45f9d48b62 100644 --- a/source4/libcli/wscript_build +++ b/source4/libcli/wscript_build @@ -30,7 +30,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_LSA', bld.SAMBA_SUBSYSTEM('LIBCLI_COMPOSITE', source='composite/composite.c', autoproto='composite/proto.h', - public_deps='LIBEVENTS' + public_deps='libevents' ) @@ -51,7 +51,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_DGRAM', bld.SAMBA_SUBSYSTEM('LIBCLI_WREPL', source='wrepl/winsrepl.c', autoproto='wrepl/winsrepl_proto.h', - public_deps='NDR_WINSREPL samba_socket LIBEVENTS LIBPACKET LIBSAMBA_TSOCKET' + public_deps='NDR_WINSREPL samba_socket libevents LIBPACKET LIBSAMBA_TSOCKET' ) diff --git a/source4/ntvfs/sysdep/wscript_build b/source4/ntvfs/sysdep/wscript_build index e20397968b..2426452875 100644 --- a/source4/ntvfs/sysdep/wscript_build +++ b/source4/ntvfs/sysdep/wscript_build @@ -4,7 +4,7 @@ bld.SAMBA_MODULE('sys_notify_inotify', source='inotify.c', subsystem='sys_notify', init_function='sys_notify_inotify_init', - deps='LIBEVENTS', + deps='libevents', enabled = bld.CONFIG_SET('HAVE_LINUX_INOTIFY') ) diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build index 141a69d243..afadd95385 100644 --- a/source4/rpc_server/wscript_build +++ b/source4/rpc_server/wscript_build @@ -19,7 +19,7 @@ bld.SAMBA_MODULE('dcerpc_rpcecho', source='echo/rpc_echo.c', subsystem='dcerpc_server', init_function='dcerpc_server_rpcecho_init', - deps='NDR_STANDARD LIBEVENTS' + deps='NDR_STANDARD libevents' ) diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build index 1323cc937c..486b0ceea8 100644 --- a/source4/smbd/wscript_build +++ b/source4/smbd/wscript_build @@ -18,7 +18,7 @@ bld.SAMBA_BINARY('samba', source='server.c', manpages='samba.8', subsystem_name='service', - deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE + deps='''libevents process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE popt gensec registry ntptr ntvfs share CLUSTER DCESRV COMMON_SCHANNELDB SECRETS''', pyembed=True, install_path='${SBINDIR}' @@ -39,7 +39,7 @@ bld.SAMBA_MODULE('process_model_standard', source='process_standard.c', subsystem='process_model', init_function='process_model_standard_init', - deps='LIBEVENTS LDBSAMBA' + deps='libevents LDBSAMBA' ) @@ -56,14 +56,14 @@ bld.SAMBA_MODULE('process_model_prefork', source='process_prefork.c', subsystem='process_model', init_function='process_model_prefork_init', - deps='LIBEVENTS' + deps='libevents' ) bld.SAMBA_MODULE('process_model_onefork', source='process_onefork.c', subsystem='process_model', init_function='process_model_onefork_init', - deps='LIBEVENTS' + deps='libevents' ) diff --git a/source4/utils/wscript_build b/source4/utils/wscript_build index 4e1c4c548d..cc1820d68b 100644 --- a/source4/utils/wscript_build +++ b/source4/utils/wscript_build @@ -3,7 +3,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', + deps='LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL popt POPT_SAMBA POPT_CREDENTIALS gensec LIBCLI_RESOLVE auth ntlm_check MESSAGING libevents service', pyembed=True ) -- cgit