build: waf quicktest nearly works

Rewrote wafsamba using a new dependency handling system, and started
adding the waf test code

1 files changed, 41 insertions, 45 deletions

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 7a01ecec9b..76503ef82b 100644
--- a/source4/dsdb/samdb/ldb_modules/wscript_build
+++ b/source4/dsdb/samdb/ldb_modules/wscript_build
@@ -1,7 +1,3 @@
-# AUTOGENERATED by mktowscript.pl from ../../source4/dsdb/samdb/ldb_modules/config.mk
-# Please remove this notice if hand editing
-
-
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
 	source='util.c ridalloc.c',
 	autoproto='util_proto.h',
@@ -11,7 +7,7 @@ bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPERS',
 
 bld.SAMBA_MODULE('ldb_samba_dsdb',
 	source='samba_dsdb.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(samba_dsdb)',
 	deps='SAMDB talloc LIBEVENTS LIBNDR DSDB_MODULE_HELPERS'
 	)
@@ -19,7 +15,7 @@ bld.SAMBA_MODULE('ldb_samba_dsdb',
 
 bld.SAMBA_MODULE('ldb_samba_secrets',
 	source='samba_secrets.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(samba_secrets)',
 	deps='SAMDB talloc LIBEVENTS LIBNDR'
 	)
@@ -27,7 +23,7 @@ bld.SAMBA_MODULE('ldb_samba_secrets',
 
 bld.SAMBA_MODULE('ldb_objectguid',
 	source='objectguid.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(objectguid)',
 	deps='SAMDB talloc LIBEVENTS LIBNDR'
 	)
@@ -35,7 +31,7 @@ bld.SAMBA_MODULE('ldb_objectguid',
 
 bld.SAMBA_MODULE('ldb_repl_meta_data',
 	source='repl_meta_data.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(repl_meta_data)',
 	deps='SAMDB talloc LIBEVENTS LIBNDR NDR_DRSUAPI NDR_DRSBLOBS LIBNDR DSDB_MODULE_HELPERS'
 	)
@@ -43,7 +39,7 @@ bld.SAMBA_MODULE('ldb_repl_meta_data',
 
 bld.SAMBA_MODULE('ldb_dsdb_cache',
 	source='dsdb_cache.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(dsdb_cache)',
 	deps='SAMDB talloc LIBEVENTS'
 	)
@@ -51,7 +47,7 @@ bld.SAMBA_MODULE('ldb_dsdb_cache',
 
 bld.SAMBA_MODULE('ldb_schema_load',
 	source='schema_load.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(schema_load)',
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
 	)
@@ -59,7 +55,7 @@ bld.SAMBA_MODULE('ldb_schema_load',
 
 bld.SAMBA_MODULE('ldb_schema_data',
 	source='schema_data.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(schema_data)',
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
 	)
@@ -67,7 +63,7 @@ bld.SAMBA_MODULE('ldb_schema_data',
 
 bld.SAMBA_MODULE('ldb_naming_fsmo',
 	source='naming_fsmo.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(naming_fsmo)',
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
 	)
@@ -75,7 +71,7 @@ bld.SAMBA_MODULE('ldb_naming_fsmo',
 
 bld.SAMBA_MODULE('ldb_pdc_fsmo',
 	source='pdc_fsmo.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(pdc_fsmo)',
 	deps='SAMDB talloc LIBEVENTS DSDB_MODULE_HELPERS'
 	)
@@ -83,7 +79,7 @@ bld.SAMBA_MODULE('ldb_pdc_fsmo',
 
 bld.SAMBA_MODULE('ldb_samldb',
 	source='samldb.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(samldb)',
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -91,7 +87,7 @@ bld.SAMBA_MODULE('ldb_samldb',
 
 bld.SAMBA_MODULE('ldb_samba3sam',
 	source='samba3sam.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(samba3sam)',
 	deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
 	)
@@ -99,7 +95,7 @@ bld.SAMBA_MODULE('ldb_samba3sam',
 
 bld.SAMBA_MODULE('ldb_samba3sid',
 	source='samba3sid.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(samba3sid)',
 	deps='talloc LIBEVENTS ldb SMBPASSWD NSS_WRAPPER LIBSECURITY NDR_SECURITY'
 	)
@@ -108,7 +104,7 @@ bld.SAMBA_MODULE('ldb_samba3sid',
 bld.SAMBA_MODULE('ldb_simple_ldap_map',
 	source='simple_ldap_map.c',
 	aliases='entryuuid nsuniqueid',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(entryuuid),LDB_MODULE(nsuniqueid)',
 	deps='talloc LIBEVENTS ldb LIBNDR'
 	)
@@ -116,7 +112,7 @@ bld.SAMBA_MODULE('ldb_simple_ldap_map',
 
 bld.SAMBA_MODULE('ldb_rootdse',
 	source='rootdse.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(rootdse)',
 	deps='talloc LIBEVENTS SAMDB'
 	)
@@ -124,7 +120,7 @@ bld.SAMBA_MODULE('ldb_rootdse',
 
 bld.SAMBA_MODULE('ldb_password_hash',
 	source='password_hash.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(password_hash)',
 	deps='talloc LIBEVENTS SAMDB LIBCLI_AUTH NDR_DRSBLOBS KERBEROS HEIMDAL_HDB_KEYS HEIMDAL_KRB5'
 	)
@@ -132,7 +128,7 @@ bld.SAMBA_MODULE('ldb_password_hash',
 
 bld.SAMBA_MODULE('ldb_local_password',
 	source='local_password.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(local_password)',
 	deps='talloc LIBEVENTS LIBNDR SAMDB'
 	)
@@ -140,7 +136,7 @@ bld.SAMBA_MODULE('ldb_local_password',
 
 bld.SAMBA_MODULE('ldb_kludge_acl',
 	source='kludge_acl.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(kludge_acl)',
 	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
 	)
@@ -148,7 +144,7 @@ bld.SAMBA_MODULE('ldb_kludge_acl',
 
 bld.SAMBA_MODULE('ldb_extended_dn_in',
 	source='extended_dn_in.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(extended_dn_in)',
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
 	)
@@ -157,7 +153,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_in',
 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',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	deps='talloc LIBEVENTS LIBNDR LIBSAMBA-UTIL SAMDB',
 	init_function='LDB_MODULE(extended_dn_out_ldb),LDB_MODULE(extended_dn_out_openldap),LDB_MODULE(extended_dn_out_fds)'
 	)
@@ -165,7 +161,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_out',
 
 bld.SAMBA_MODULE('ldb_extended_dn_store',
 	source='extended_dn_store.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(extended_dn_store)',
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -173,7 +169,7 @@ bld.SAMBA_MODULE('ldb_extended_dn_store',
 
 bld.SAMBA_MODULE('ldb_show_deleted',
 	source='show_deleted.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(show_deleted)',
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
 	)
@@ -182,7 +178,7 @@ bld.SAMBA_MODULE('ldb_show_deleted',
 bld.SAMBA_MODULE('ldb_partition',
 	source='partition.c partition_init.c',
 	autoproto='partition_proto.h',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(partition)',
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -190,7 +186,7 @@ bld.SAMBA_MODULE('ldb_partition',
 
 bld.SAMBA_MODULE('ldb_new_partition',
 	source='new_partition.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(new_partition)',
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -198,15 +194,15 @@ bld.SAMBA_MODULE('ldb_new_partition',
 
 bld.SAMBA_MODULE('ldb_update_keytab',
 	source='update_keytab.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(update_keytab)',
-	deps='talloc LIBEVENTS CREDENTIALS'
+	deps='talloc LIBEVENTS CREDENTIALS ldb'
 	)
 
 
 bld.SAMBA_MODULE('ldb_objectclass',
 	source='objectclass.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(objectclass)',
 	deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS LIBSAMBA-UTIL'
 	)
@@ -214,15 +210,15 @@ bld.SAMBA_MODULE('ldb_objectclass',
 
 bld.SAMBA_MODULE('ldb_subtree_rename',
 	source='subtree_rename.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(subtree_rename)',
-	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
 	)
 
 
 bld.SAMBA_MODULE('ldb_subtree_delete',
 	source='subtree_delete.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(subtree_delete)',
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL DSDB_MODULE_HELPERS'
 	)
@@ -230,7 +226,7 @@ bld.SAMBA_MODULE('ldb_subtree_delete',
 
 bld.SAMBA_MODULE('ldb_linked_attributes',
 	source='linked_attributes.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(linked_attributes)',
 	deps='talloc LIBEVENTS SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -238,15 +234,15 @@ bld.SAMBA_MODULE('ldb_linked_attributes',
 
 bld.SAMBA_MODULE('ldb_ranged_results',
 	source='ranged_results.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(ranged_results)',
-	deps='talloc LIBEVENTS LIBSAMBA-UTIL'
+	deps='talloc LIBEVENTS LIBSAMBA-UTIL ldb'
 	)
 
 
 bld.SAMBA_MODULE('ldb_anr',
 	source='anr.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(anr)',
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
 	)
@@ -254,7 +250,7 @@ bld.SAMBA_MODULE('ldb_anr',
 
 bld.SAMBA_MODULE('ldb_instancetype',
 	source='instancetype.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(instancetype)',
 	deps='talloc LIBEVENTS LIBSAMBA-UTIL SAMDB'
 	)
@@ -262,15 +258,15 @@ bld.SAMBA_MODULE('ldb_instancetype',
 
 bld.SAMBA_MODULE('ldb_operational',
 	source='operational.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(operational)',
-	deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS'
+	deps='talloc tevent LIBSAMBA-UTIL SAMDB_COMMON DSDB_MODULE_HELPERS auth_sam'
 	)
 
 
 bld.SAMBA_MODULE('ldb_descriptor',
 	source='descriptor.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(descriptor)',
 	deps='talloc LIBEVENTS LIBSECURITY NDR_SECURITY SAMDB DSDB_MODULE_HELPERS'
 	)
@@ -278,7 +274,7 @@ bld.SAMBA_MODULE('ldb_descriptor',
 
 bld.SAMBA_MODULE('ldb_resolve_oids',
 	source='resolve_oids.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(resolve_oids)',
 	deps='SAMDB talloc LIBEVENTS LIBNDR'
 	)
@@ -286,7 +282,7 @@ bld.SAMBA_MODULE('ldb_resolve_oids',
 
 bld.SAMBA_MODULE('ldb_acl',
 	source='acl.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(acl)',
 	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
 	)
@@ -294,7 +290,7 @@ bld.SAMBA_MODULE('ldb_acl',
 
 bld.SAMBA_MODULE('ldb_lazy_commit',
 	source='lazy_commit.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(lazy_commit)',
 	deps='SAMDB'
 	)
@@ -302,7 +298,7 @@ bld.SAMBA_MODULE('ldb_lazy_commit',
 
 bld.SAMBA_MODULE('ldb_validate_update',
 	source='validate_update.c',
-	subsystem='ldb',
+	subsystem='LIBLDB',
 	init_function='LDB_MODULE(validate_update)',
 	deps='talloc LIBEVENTS LIBSECURITY SAMDB'
 	)