waf: Stop automaticaly changing dashes to underscores in library names.

[sfrench/samba-autobuild/.git] / source4 / dsdb / samdb / ldb_modules / wscript_build

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 95c327364c78046de4dc62408d82c4c257abd18d..a2ed6592f332b5c12f9e25428afd056ef5bc6af9 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -1,9 +1,15 @@
 #!/usr/bin/env python
 
+bld.SAMBA_LIBRARY('dsdb-module',
+       source=[],
+       deps='DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA DSDB_MODULE_HELPER_RIDALLOC',
+       private_library=True,
+       grouping_library=True)
+
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
-       source='util.c acl_util.c',
+       source='util.c acl_util.c schema_util.c',
        autoproto='util_proto.h',
-       deps='ldb LIBNDR SAMDB_COMMON'
+       deps='ldb ndr samdb-common security-session'
        )
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
@@ -22,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 events ndr DSDB_MODULE_HELPERS',
        internal_module=False,
        )
 
@@ -32,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 events ndr'
        )
 
 
@@ -41,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 events ndr'
        )
 
 
@@ -50,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'
+       deps='SAMDB talloc events ndr NDR_DRSUAPI NDR_DRSBLOBS ndr DSDB_MODULE_HELPERS security-session'
        )
 
 
@@ -59,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 events'
        )
 
 
@@ -67,8 +73,8 @@ bld.SAMBA_MODULE('ldb_schema_load',
        source='schema_load.c',
        subsystem='ldb',
        init_function='LDB_MODULE(schema_load)',
-       internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-       deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+       internal_module=False,
+       deps='SAMDB talloc events DSDB_MODULE_HELPERS'
        )
 
 
@@ -76,8 +82,8 @@ bld.SAMBA_MODULE('ldb_schema_data',
        source='schema_data.c',
        subsystem='ldb',
        init_function='LDB_MODULE(schema_data)',
-       internal_module=not bld.CONFIG_SET('USING_SYSTEM_LDB'),
-       deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
+       internal_module=False,
+       deps='SAMDB talloc events DSDB_MODULE_HELPERS'
        )
 
 
@@ -86,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 events DSDB_MODULE_HELPERS'
        )
 
 
@@ -95,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 events DSDB_MODULE_HELPERS'
        )
 
 
@@ -104,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 events SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_RIDALLOC'
        )
 
 
@@ -113,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 events ldb smbpasswd security NDR_SECURITY'
        )
 
 
@@ -122,17 +128,17 @@ 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 events ldb security NDR_SECURITY LDBSAMBA DSDB_MODULE_HELPERS'
        )
 
 
 bld.SAMBA_MODULE('ldb_simple_ldap_map',
        source='simple_ldap_map.c',
-       aliases='entryuuid nsuniqueid',
+       aliases='ldb_entryuuid ldb_nsuniqueid',
        subsystem='ldb',
        init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
        internal_module=False,
-       deps='talloc LIBEVENTS ldb LIBNDR'
+       deps='talloc events ldb ndr LDBSAMBA'
        )
 
 
@@ -141,7 +147,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
        subsystem='ldb',
        init_function='LDB_MODULE(rootdse)',
        internal_module=False,
-       deps='talloc LIBEVENTS SAMDB MESSAGING'
+       deps='talloc events SAMDB MESSAGING security-session DSDB_MODULE_HELPERS'
        )
 
 
@@ -150,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 HEIMDAL_HDB_KEYS krb5 com_err'
+       deps='talloc events SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS hdb krb5 com_err'
        )
 
 
@@ -159,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 events ndr SAMDB'
        )
 
 bld.SAMBA_MODULE('ldb_extended_dn_in',
@@ -167,15 +173,15 @@ 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 events samba-util'
        )
 
 
 bld.SAMBA_MODULE('ldb_extended_dn_out',
        source='extended_dn_out.c',
-       aliases='extended_dn_out_ldb extended_dn_out_openldap extended_dn_out_fds',
+       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 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)'
        )
@@ -186,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 events samba-util SAMDB DSDB_MODULE_HELPERS'
        )
 
 
@@ -195,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 events samba-util DSDB_MODULE_HELPERS'
        )
 
 
@@ -205,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 events SAMDB DSDB_MODULE_HELPERS'
        )
 
 
@@ -214,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 events SAMDB DSDB_MODULE_HELPERS'
        )
 
 
@@ -223,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 events CREDENTIALS ldb com_err KERBEROS_UTIL'
        )
 
 
@@ -232,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 events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS samba-util DSDB_MODULE_HELPER_SCHEMA'
        )
 
 
@@ -240,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,
        )
 
@@ -250,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 events samba-util ldb samdb-common'
        )
 
 
@@ -259,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 events samba-util DSDB_MODULE_HELPERS'
        )
 
 
@@ -268,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 events SAMDB DSDB_MODULE_HELPERS'
        )
 
 
@@ -277,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 events samba-util ldb'
        )
 
 
@@ -286,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 events samba-util SAMDB'
        )
 
 
@@ -295,7 +301,7 @@ bld.SAMBA_MODULE('ldb_instancetype',
        subsystem='ldb',
        init_function='LDB_MODULE(instancetype)',
        internal_module=False,
-       deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
+       deps='talloc events samba-util SAMDB DSDB_MODULE_HELPERS'
        )
 
 
@@ -304,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'
        )
 
 
@@ -313,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 events security NDR_SECURITY SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
        )
 
 
@@ -322,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 events ndr'
        )
 
 
@@ -331,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 events security SAMDB DSDB_MODULE_HELPERS DSDB_MODULE_HELPER_SCHEMA'
        )
 
 
@@ -340,7 +346,7 @@ bld.SAMBA_MODULE('ldb_lazy_commit',
        subsystem='ldb',
        internal_module=False,
        init_function='LDB_MODULE(lazy_commit)',
-       deps='SAMDB'
+       deps='SAMDB DSDB_MODULE_HELPERS'
        )
 
 bld.SAMBA_MODULE('ldb_aclread',
@@ -348,5 +354,13 @@ bld.SAMBA_MODULE('ldb_aclread',
        subsystem='ldb',
        init_function='LDB_MODULE(aclread)',
        internal_module=False,
-       deps='talloc LIBEVENTS LIBSECURITY SAMDB',
+       deps='talloc events security SAMDB DSDB_MODULE_HELPERS',
+       )
+
+bld.SAMBA_MODULE('ldb_simple_dn',
+       source='simple_dn.c',
+       subsystem='ldb',
+       init_function='LDB_MODULE(simple_dn)',
+       internal_module=False,
+       deps='talloc DSDB_MODULE_HELPERS'
        )