From 8cf61377aa388724150699618f5cd60682ffde37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 24 Oct 2010 10:42:58 -0700 Subject: waf: Remove lib prefix from libraries manually. --- source4/dsdb/samdb/ldb_modules/wscript_build | 40 ++++++++++++++-------------- source4/dsdb/wscript_build | 4 +-- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'source4/dsdb') diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build index b7a44ecf4f..a5a520c554 100644 --- a/source4/dsdb/samdb/ldb_modules/wscript_build +++ b/source4/dsdb/samdb/ldb_modules/wscript_build @@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('dsdb_module', bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS', source='util.c acl_util.c schema_util.c', autoproto='util_proto.h', - deps='ldb LIBNDR samdb_common security_session' + deps='ldb ndr samdb_common security_session' ) bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC', @@ -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 events LIBNDR DSDB_MODULE_HELPERS', + deps='SAMDB talloc events ndr 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 events LIBNDR' + deps='SAMDB talloc events ndr' ) @@ -47,7 +47,7 @@ bld.SAMBA_MODULE('ldb_objectguid', subsystem='ldb', init_function='LDB_MODULE(objectguid)', internal_module=False, - deps='SAMDB talloc events LIBNDR' + deps='SAMDB talloc events ndr' ) @@ -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 events LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS security_session' + deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security_session' ) @@ -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 events ldb LIBNDR LDBSAMBA' + deps='talloc events ldb ndr LDBSAMBA' ) @@ -165,7 +165,7 @@ bld.SAMBA_MODULE('ldb_local_password', subsystem='ldb', init_function='LDB_MODULE(local_password)', internal_module=False, - deps='talloc events LIBNDR SAMDB' + deps='talloc events ndr 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 events libsamba-util' + deps='talloc events samba-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 events LIBNDR libsamba-util SAMDB', + deps='talloc events ndr samba-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 events libsamba-util SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samba-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 events libsamba-util DSDB_MODULE_HELPERS' + deps='talloc events samba-util DSDB_MODULE_HELPERS' ) @@ -238,7 +238,7 @@ bld.SAMBA_MODULE('ldb_objectclass', subsystem='ldb', init_function='LDB_MODULE(objectclass)', internal_module=False, - deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS libsamba-util DSDB_MODULE_HELPER_SCHEMA' + deps='talloc events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA' ) @@ -246,7 +246,7 @@ bld.SAMBA_MODULE('ldb_objectclass_attrs', source='objectclass_attrs.c', subsystem='ldb', init_function='LDB_MODULE(objectclass_attrs)', - deps='talloc SAMDB libsamba-util', + deps='talloc SAMDB samba-util', internal_module=False, ) @@ -256,7 +256,7 @@ bld.SAMBA_MODULE('ldb_subtree_rename', subsystem='ldb', init_function='LDB_MODULE(subtree_rename)', internal_module=False, - deps='talloc events libsamba-util ldb samdb_common' + deps='talloc events samba-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 events libsamba-util DSDB_MODULE_HELPERS' + deps='talloc events samba-util 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 events libsamba-util ldb' + deps='talloc events samba-util ldb' ) @@ -292,7 +292,7 @@ bld.SAMBA_MODULE('ldb_anr', subsystem='ldb', init_function='LDB_MODULE(anr)', internal_module=False, - deps='talloc events libsamba-util SAMDB' + deps='talloc events samba-util SAMDB' ) @@ -301,7 +301,7 @@ bld.SAMBA_MODULE('ldb_instancetype', subsystem='ldb', init_function='LDB_MODULE(instancetype)', internal_module=False, - deps='talloc events libsamba-util SAMDB DSDB_MODULE_HELPERS' + deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS' ) @@ -310,7 +310,7 @@ bld.SAMBA_MODULE('ldb_operational', subsystem='ldb', init_function='LDB_MODULE(operational)', internal_module=False, - deps='talloc tevent libsamba-util samdb_common DSDB_MODULE_HELPERS auth auth_session' + deps='talloc tevent samba-util samdb_common DSDB_MODULE_HELPERS auth auth_session' ) @@ -328,7 +328,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids', subsystem='ldb', init_function='LDB_MODULE(resolve_oids)', internal_module=False, - deps='SAMDB talloc events LIBNDR' + deps='SAMDB talloc events ndr' ) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 616f1f625c..a7e0895f08 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('SAMDB', source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', autoproto='samdb/samdb_proto.h', public_deps='krb5', - deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDBSAMBA samdb_common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR libsamba-util com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS', + deps='ndr NDR_DRSUAPI NDR_DRSBLOBS auth_system_session LIBCLI_AUTH ndr SAMDB_SCHEMA LDBSAMBA samdb_common LIBCLI_DRSUAPI LIBCLI_LDAP_NDR samba-util com_err KERBEROS CREDENTIALS CREDENTIALS_SECRETS', vnum='0.0.1' ) @@ -15,7 +15,7 @@ bld.SAMBA_LIBRARY('samdb_common', source='common/util.c common/util_samr.c common/dsdb_dn.c common/dsdb_access.c ../../libds/common/flag_mapping.c', autoproto='common/proto.h', private_library=True, - deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH libsamba-hostconfig samba_socket LIBCLI_LDAP_NDR' + deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket LIBCLI_LDAP_NDR' ) -- cgit