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

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

diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 70106989231d7f76f465f20a417f16606c80b9bd..269aa951c026cf2c6b7904ff6b166278e49af873 100644 (file)
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -2,26 +2,27 @@
 
 bld.RECURSE('samdb/ldb_modules')
 
-bld.SAMBA_SUBSYSTEM('SAMDB',
+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 NSS_WRAPPER 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'
        )
 
 
-bld.SAMBA_SUBSYSTEM('SAMDB_COMMON',
+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',
-       deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH LIBTSOCKET samba_socket LIBSAMBA-HOSTCONFIG'
+       private_library=True,
+       deps='ldb NDR_DRSBLOBS UTIL_LDB LIBCLI_AUTH samba-hostconfig samba_socket LIBCLI_LDAP_NDR'
        )
 
 
 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 schema/schema_info_attr.c schema/schema_filtered.c schema/dsdb_dn.c',
        autoproto='schema/proto.h',
-       # FIXME: Why does this use DSDB_MODULE_HELPERS?
-       deps='SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA tevent DSDB_MODULE_HELPERS'
+       deps='samdb-common NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA tevent'
        )
 
 
@@ -55,6 +56,6 @@ bld.SAMBA_PYTHON('python_dsdb',
                                 # the dependency on dcerpc here is because gensec
                                 # depends on dcerpc but the waf circular dependency finder
                                 # removes it so we end up with unresolved symbols.
-                 deps='SAMDB pyldb_util dcerpc com_err',
+                 deps='SAMDB pyldb-util dcerpc com_err',
                  realname='samba/dsdb.so'
                  )