build: list sources of subsystem LIBCLI_SAMR directly in the definition
[nivanova/samba-autobuild/.git] / source3 / wscript_build
index 74c1aaa523e02d527f10a2b3ec9151b7f4b9f733..39d5764da80134f50b4a6e3b389d2a8740b59df6 100755 (executable)
@@ -3,65 +3,12 @@
 from samba_utils import *
 import samba_version, samba3
 
-TDB_LIB_SRC = '''
-         lib/dbwrap/dbwrap_open.c
-          lib/dbwrap/dbwrap_ctdb.c
-          lib/dbwrap/dbwrap_watch.c
-          lib/g_lock.c'''
-
-TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-
-AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
-
-SERVER_MUTEX_SRC = 'lib/server_mutex.c'
-
-PASSCHANGE_SRC = '''libsmb/passchange.c'''
-
-LIBCLI_SPOOLSS_SRC = '''rpc_client/cli_spoolss.c
-                     rpc_client/init_spoolss.c'''
-
-LIBCLI_LSA_SRC = '''rpc_client/cli_lsarpc.c'''
-
-LIBCLI_SAMR_SRC = 'rpc_client/cli_samr.c'
-
 LIBCLI_NETLOGON_SRC = 'rpc_client/cli_netlogon.c rpc_client/util_netlogon.c'
 
 # this includes only the low level parse code, not stuff
 # that requires knowledge of security contexts
 REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
 
-LIB_SRC = '''
-          lib/messages.c lib/messages_local.c
-          lib/messages_ctdbd.c lib/ctdb_packet.c lib/ctdbd_conn.c
-         lib/ctdb_conn.c
-         lib/msg_channel.c
-          lib/id_cache.c
-          lib/talloc_dict.c
-          lib/serverid.c
-          lib/addrchange.c
-          ${TDB_LIB_SRC}
-          ../lib/util/debug_s3.c
-          lib/dumpcore.c
-          lib/interface.c
-          lib/username.c
-          lib/access.c lib/smbrun.c
-          lib/wins_srv.c
-          lib/substitute.c lib/substitute_generic.c
-          lib/ms_fnmatch.c
-          lib/tallocmsg.c lib/dmallocmsg.c
-          intl/lang_tdb.c
-          lib/gencache.c
-          lib/events.c
-          lib/server_contexts.c
-          lib/server_prefork.c
-          lib/server_prefork_util.c
-          lib/ldap_escape.c
-          lib/fncall.c
-          libads/krb5_errs.c lib/system_smbd.c lib/audit.c
-         lib/tevent_wait.c
-          lib/idmap_cache.c
-          lib/util_ea.c'''
-
 LIB_UTIL_SRC = '''
                lib/system.c
                lib/sendfile.c
@@ -230,95 +177,6 @@ SLCACHE_SRC = '''libsmb/samlogon_cache.c'''
 
 DCUTIL_SRC  = '''libsmb/namequery_dc.c libsmb/trustdom_cache.c libsmb/dsgetdcname.c'''
 
-WINBINDD_SRC1 = '''winbindd/winbindd.c
-                   winbindd/winbindd_group.c
-                   winbindd/winbindd_util.c
-                   winbindd/winbindd_cache.c
-                   winbindd/winbindd_pam.c
-                   winbindd/winbindd_misc.c
-                   winbindd/winbindd_cm.c
-                   winbindd/winbindd_wins_byip.c
-                   winbindd/winbindd_wins_byname.c
-                   winbindd/winbindd_msrpc.c
-                   winbindd/winbindd_rpc.c
-                   winbindd/winbindd_reconnect.c
-                   winbindd/winbindd_ads.c
-                   winbindd/winbindd_samr.c
-                   winbindd/winbindd_dual.c
-                   winbindd/winbindd_dual_ndr.c
-                   winbindd/winbindd_dual_srv.c
-                   winbindd/winbindd_async.c
-                   winbindd/winbindd_creds.c
-                   winbindd/winbindd_cred_cache.c
-                   winbindd/winbindd_ccache_access.c
-                   winbindd/winbindd_domain.c
-                   winbindd/winbindd_idmap.c
-                   winbindd/winbindd_locator.c
-                   winbindd/winbindd_ndr.c
-                   winbindd/wb_ping.c
-                   winbindd/wb_lookupsid.c
-                   winbindd/wb_lookupsids.c
-                   winbindd/wb_lookupname.c
-                   winbindd/wb_uid2sid.c
-                   winbindd/wb_gid2sid.c
-                   winbindd/wb_sids2xids.c
-                   winbindd/wb_queryuser.c
-                   winbindd/wb_lookupuseraliases.c
-                   winbindd/wb_lookupusergroups.c
-                   winbindd/wb_getpwsid.c
-                   winbindd/wb_gettoken.c
-                   winbindd/wb_seqnum.c
-                   winbindd/wb_seqnums.c
-                   winbindd/wb_group_members.c
-                   winbindd/wb_getgrsid.c
-                   winbindd/wb_query_user_list.c
-                   winbindd/wb_fill_pwent.c
-                   winbindd/wb_next_pwent.c
-                   winbindd/wb_next_grent.c
-                   winbindd/wb_dsgetdcname.c
-                   winbindd/winbindd_lookupsid.c
-                   winbindd/winbindd_lookupsids.c
-                   winbindd/winbindd_lookupname.c
-                   winbindd/winbindd_sid_to_uid.c
-                   winbindd/winbindd_sid_to_gid.c
-                   winbindd/winbindd_uid_to_sid.c
-                   winbindd/winbindd_gid_to_sid.c
-                   winbindd/winbindd_sids_to_xids.c
-                   winbindd/winbindd_allocate_uid.c
-                   winbindd/winbindd_allocate_gid.c
-                   winbindd/winbindd_getpwsid.c
-                   winbindd/winbindd_getpwnam.c
-                   winbindd/winbindd_getpwuid.c
-                   winbindd/winbindd_getsidaliases.c
-                   winbindd/winbindd_getuserdomgroups.c
-                   winbindd/winbindd_getgroups.c
-                   winbindd/winbindd_show_sequence.c
-                   winbindd/winbindd_getgrgid.c
-                   winbindd/winbindd_getgrnam.c
-                   winbindd/winbindd_getusersids.c
-                   winbindd/winbindd_lookuprids.c
-                   winbindd/winbindd_setpwent.c
-                   winbindd/winbindd_getpwent.c
-                   winbindd/winbindd_endpwent.c
-                   winbindd/winbindd_setgrent.c
-                   winbindd/winbindd_getgrent.c
-                   winbindd/winbindd_endgrent.c
-                   winbindd/winbindd_dsgetdcname.c
-                   winbindd/winbindd_getdcname.c
-                   winbindd/winbindd_list_users.c
-                   winbindd/winbindd_list_groups.c
-                   winbindd/winbindd_check_machine_acct.c
-                   winbindd/winbindd_change_machine_acct.c
-                   winbindd/winbindd_ping_dc.c
-                   winbindd/winbindd_pam_auth.c
-                   winbindd/winbindd_pam_logoff.c
-                   winbindd/winbindd_pam_chauthtok.c
-                   winbindd/winbindd_pam_auth_crap.c
-                   winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
-
-WINBINDD_SRC = '''${WINBINDD_SRC1}
-                  ${TDB_VALIDATE_SRC}'''
-
 MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
 
 SMBD_SRC_MAIN = '''smbd/server.c'''
@@ -650,7 +508,7 @@ bld.SAMBA3_LIBRARY('gpo',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('AVAHI',
-                    source=AVAHI_SRC,
+                    source='lib/avahi.c smbd/avahi_register.c',
                     deps='avahi-common avahi-client',
                     enabled=bld.env.with_avahi)
 
@@ -715,8 +573,8 @@ bld.SAMBA3_LIBRARY('smbldaphelper',
                    private_library=True)
 
 bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
-                     source=SERVER_MUTEX_SRC,
-                    deps='talloc')
+                     source='lib/server_mutex.c',
+                     deps='talloc')
 
 bld.SAMBA3_SUBSYSTEM('PARAM_UTIL',
                     source=PARAM_UTIL_SRC,
@@ -795,8 +653,51 @@ bld.SAMBA3_SUBSYSTEM('samba3util',
                    deps='ndr samba-security NDR_SECURITY samba-util util_tdb ccan-hash',
                    vars=locals())
 
+
+bld.SAMBA3_SUBSYSTEM('TDB_LIB',
+                     source='''lib/dbwrap/dbwrap_open.c
+                     lib/dbwrap/dbwrap_ctdb.c
+                     lib/dbwrap/dbwrap_watch.c
+                     lib/g_lock.c''',
+                     deps='dbwrap')
+
 bld.SAMBA3_SUBSYSTEM('samba3core',
-                   source=LIB_SRC,
+                   source='''lib/messages.c
+                   lib/messages_local.c
+                   lib/messages_ctdbd.c
+                   lib/ctdb_packet.c
+                   lib/ctdbd_conn.c
+                   lib/ctdb_conn.c
+                   lib/msg_channel.c
+                   lib/id_cache.c
+                   lib/talloc_dict.c
+                   lib/serverid.c
+                   lib/addrchange.c
+                   ../lib/util/debug_s3.c
+                   lib/dumpcore.c
+                   lib/interface.c
+                   lib/username.c
+                   lib/access.c lib/smbrun.c
+                   lib/wins_srv.c
+                   lib/substitute.c
+                   lib/substitute_generic.c
+                   lib/ms_fnmatch.c
+                   lib/tallocmsg.c
+                   lib/dmallocmsg.c
+                   intl/lang_tdb.c
+                   lib/gencache.c
+                   lib/events.c
+                   lib/server_contexts.c
+                   lib/server_prefork.c
+                   lib/server_prefork_util.c
+                   lib/ldap_escape.c
+                   lib/fncall.c
+                   libads/krb5_errs.c
+                   lib/system_smbd.c
+                   lib/audit.c
+                   lib/tevent_wait.c
+                   lib/idmap_cache.c
+                   lib/util_ea.c''',
                    deps='''
                         samba3util
                         LIBTSOCKET
@@ -809,8 +710,8 @@ bld.SAMBA3_SUBSYSTEM('samba3core',
                         param
                         dbwrap
                         samba3-util
-                        errors3''',
-                   vars=locals())
+                        errors3
+                        TDB_LIB''')
 
 bld.SAMBA3_LIBRARY('smbd_shim',
                    source='''lib/smbd_shim.c''',
@@ -1037,12 +938,11 @@ bld.SAMBA3_SUBSYSTEM('PLAINTEXT_AUTH',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('PASSCHANGE',
-                    source=PASSCHANGE_SRC,
+                    source='libsmb/passchange.c',
                     deps='''LIBCLI_SAMR
                     INIT_LSA
                     msrpc3
-                    krb5samba''',
-                    vars=locals())
+                    krb5samba''')
 
 bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
                     source='lib/version.c',
@@ -1090,11 +990,11 @@ bld.SAMBA3_SUBSYSTEM('errors3',
                      deps='errors')
 
 bld.SAMBA3_SUBSYSTEM('LIBCLI_SAMR',
-                    source=LIBCLI_SAMR_SRC,
+                    source='rpc_client/cli_samr.c',
                     deps='RPC_NDR_SAMR')
 
 bld.SAMBA3_LIBRARY('libcli_lsa3',
-                   source=LIBCLI_LSA_SRC,
+                   source='rpc_client/cli_lsarpc.c',
                    deps='RPC_NDR_LSA INIT_LSA',
                    private_library=True)
 
@@ -1104,7 +1004,8 @@ bld.SAMBA3_LIBRARY('libcli_netlogon3',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('cli_spoolss',
-                   source=LIBCLI_SPOOLSS_SRC,
+                   source='''rpc_client/cli_spoolss.c
+                   rpc_client/init_spoolss.c''',
                    deps='RPC_NDR_SPOOLSS param secrets3',
                    private_library=True)
 
@@ -1163,8 +1064,98 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
                  PROFILE''',
                  install_path='${SBINDIR}')
 
+
+bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
+                     source='lib/tdb_validate.c',
+                     deps='samba-util')
+
+
 bld.SAMBA3_BINARY('winbindd/winbindd',
-                 source=WINBINDD_SRC,
+                 source='''winbindd/winbindd.c
+                 winbindd/winbindd_group.c
+                 winbindd/winbindd_util.c
+                 winbindd/winbindd_cache.c
+                 winbindd/winbindd_pam.c
+                 winbindd/winbindd_misc.c
+                 winbindd/winbindd_cm.c
+                 winbindd/winbindd_wins_byip.c
+                 winbindd/winbindd_wins_byname.c
+                 winbindd/winbindd_msrpc.c
+                 winbindd/winbindd_rpc.c
+                 winbindd/winbindd_reconnect.c
+                 winbindd/winbindd_ads.c
+                 winbindd/winbindd_samr.c
+                 winbindd/winbindd_dual.c
+                 winbindd/winbindd_dual_ndr.c
+                 winbindd/winbindd_dual_srv.c
+                 winbindd/winbindd_async.c
+                 winbindd/winbindd_creds.c
+                 winbindd/winbindd_cred_cache.c
+                 winbindd/winbindd_ccache_access.c
+                 winbindd/winbindd_domain.c
+                 winbindd/winbindd_idmap.c
+                 winbindd/winbindd_locator.c
+                 winbindd/winbindd_ndr.c
+                 winbindd/wb_ping.c
+                 winbindd/wb_lookupsid.c
+                 winbindd/wb_lookupsids.c
+                 winbindd/wb_lookupname.c
+                 winbindd/wb_uid2sid.c
+                 winbindd/wb_gid2sid.c
+                 winbindd/wb_sids2xids.c
+                 winbindd/wb_queryuser.c
+                 winbindd/wb_lookupuseraliases.c
+                 winbindd/wb_lookupusergroups.c
+                 winbindd/wb_getpwsid.c
+                 winbindd/wb_gettoken.c
+                 winbindd/wb_seqnum.c
+                 winbindd/wb_seqnums.c
+                 winbindd/wb_group_members.c
+                 winbindd/wb_getgrsid.c
+                 winbindd/wb_query_user_list.c
+                 winbindd/wb_fill_pwent.c
+                 winbindd/wb_next_pwent.c
+                 winbindd/wb_next_grent.c
+                 winbindd/wb_dsgetdcname.c
+                 winbindd/winbindd_lookupsid.c
+                 winbindd/winbindd_lookupsids.c
+                 winbindd/winbindd_lookupname.c
+                 winbindd/winbindd_sid_to_uid.c
+                 winbindd/winbindd_sid_to_gid.c
+                 winbindd/winbindd_uid_to_sid.c
+                 winbindd/winbindd_gid_to_sid.c
+                 winbindd/winbindd_sids_to_xids.c
+                 winbindd/winbindd_allocate_uid.c
+                 winbindd/winbindd_allocate_gid.c
+                 winbindd/winbindd_getpwsid.c
+                 winbindd/winbindd_getpwnam.c
+                 winbindd/winbindd_getpwuid.c
+                 winbindd/winbindd_getsidaliases.c
+                 winbindd/winbindd_getuserdomgroups.c
+                 winbindd/winbindd_getgroups.c
+                 winbindd/winbindd_show_sequence.c
+                 winbindd/winbindd_getgrgid.c
+                 winbindd/winbindd_getgrnam.c
+                 winbindd/winbindd_getusersids.c
+                 winbindd/winbindd_lookuprids.c
+                 winbindd/winbindd_setpwent.c
+                 winbindd/winbindd_getpwent.c
+                 winbindd/winbindd_endpwent.c
+                 winbindd/winbindd_setgrent.c
+                 winbindd/winbindd_getgrent.c
+                 winbindd/winbindd_endgrent.c
+                 winbindd/winbindd_dsgetdcname.c
+                 winbindd/winbindd_getdcname.c
+                 winbindd/winbindd_list_users.c
+                 winbindd/winbindd_list_groups.c
+                 winbindd/winbindd_check_machine_acct.c
+                 winbindd/winbindd_change_machine_acct.c
+                 winbindd/winbindd_ping_dc.c
+                 winbindd/winbindd_pam_auth.c
+                 winbindd/winbindd_pam_logoff.c
+                 winbindd/winbindd_pam_chauthtok.c
+                 winbindd/winbindd_pam_auth_crap.c
+                 winbindd/winbindd_pam_chng_pswd_auth_crap.c''',
                  deps='''
                  talloc
                  tevent
@@ -1186,10 +1177,10 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
                  RPC_NCACN_NP
                  RPC_PIPE_REGISTER
                  WB_REQTRANS
+                 TDB_VALIDATE
                  ''',
                  enabled=bld.env.build_winbind,
-                 install_path='${SBINDIR}',
-                 vars=locals())
+                 install_path='${SBINDIR}')
 
 bld.SAMBA3_BINARY('rpcclient/rpcclient',
                  source=RPCCLIENT_SRC,