From c8b2b109760b366bee6dcf7c6c306936d271f508 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Feb 2011 15:56:20 +1100 Subject: s3-waf: use SAMBA3_*() build rules in source3/build this brings the s3 waf build much closer to the proposed s3build top level build, using the same bld.SAMBA3_*() rules There are a few renames of subsystems in here, with a 3 suffix where it would create a conflict. Pair-Programmed-With: Andrew Bartlett --- source3/passdb/wscript_build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/passdb/wscript_build') diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build index fc53ee5a38..2c0416f681 100644 --- a/source3/passdb/wscript_build +++ b/source3/passdb/wscript_build @@ -6,26 +6,26 @@ PDB_ADS_SRC = 'pdb_ads.c' PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c' PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c' -bld.SAMBA_SUBSYSTEM('pdb', +bld.SAMBA3_SUBSYSTEM('pdb', source='pdb_interface.c', deps='', vars=locals()) -bld.SAMBA_MODULE('pdb_tdbsam', +bld.SAMBA3_MODULE('pdb_tdbsam', subsystem='pdb', source=PDB_TDBSAM_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam')) -bld.SAMBA_MODULE('pdb_ldap', +bld.SAMBA3_MODULE('pdb_ldap', subsystem='pdb', source=PDB_LDAP_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap') and bld.env.HAVE_LDAP) -bld.SAMBA_MODULE('pdb_ads', +bld.SAMBA3_MODULE('pdb_ads', subsystem='pdb', source=PDB_ADS_SRC, deps='LIBCLI_LDAP_NDR TLDAP', @@ -33,14 +33,14 @@ bld.SAMBA_MODULE('pdb_ads', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ads'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads')) -bld.SAMBA_MODULE('pdb_smbpasswd', +bld.SAMBA3_MODULE('pdb_smbpasswd', subsystem='pdb', source=PDB_SMBPASSWD_SRC, init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd')) -bld.SAMBA_MODULE('pdb_wbc_sam', +bld.SAMBA3_MODULE('pdb_wbc_sam', subsystem='pdb', source=PDB_WBC_SAM_SRC, init_function='', -- cgit