From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 23 Oct 2010 22:48:49 +0000 (-0700)
Subject: s4: Rename SAMDB_COMMON to samdb_common.
X-Git-Tag: samba-4.0.0alpha14~1720
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=7a731ccdfc83c9ce11cf92f190cf250ffb43c293;p=samba.git

s4: Rename SAMDB_COMMON to samdb_common.
---

diff --git a/source4/dsdb/samdb/ldb_modules/wscript_build b/source4/dsdb/samdb/ldb_modules/wscript_build
index 3f56ea31ff7..c41eabdc1ea 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 LIBSECURITY_SESSION'
+	deps='ldb LIBNDR samdb_common LIBSECURITY_SESSION'
 	)
 
 bld.SAMBA_SUBSYSTEM('DSDB_MODULE_HELPER_RIDALLOC',
@@ -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'
 	)
 
 
@@ -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 LIBSAMBA-UTIL samdb_common DSDB_MODULE_HELPERS auth auth_session'
 	)
 
 
diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build
index 89ff2a06d72..964fb9bbb60 100644
--- a/source4/dsdb/wscript_build
+++ b/source4/dsdb/wscript_build
@@ -6,12 +6,12 @@ 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='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',
 	vnum='0.0.1'
 	)
 
 
-bld.SAMBA_LIBRARY('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',
                   private_library=True,
@@ -22,7 +22,7 @@ bld.SAMBA_LIBRARY('SAMDB_COMMON',
 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',
-	deps='SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA tevent'
+	deps='samdb_common NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA tevent'
 	)
 
 
diff --git a/source4/winbind/wscript_build b/source4/winbind/wscript_build
index 40604efd464..170ff1e41e0 100644
--- a/source4/winbind/wscript_build
+++ b/source4/winbind/wscript_build
@@ -20,6 +20,6 @@ bld.SAMBA_SUBSYSTEM('WB_HELPER',
 bld.SAMBA_SUBSYSTEM('IDMAP',
 	source='idmap.c',
 	autoproto='idmap_proto.h',
-	public_deps='SAMDB_COMMON LDBSAMBA'
+	public_deps='samdb_common LDBSAMBA'
 	)