diff options
| -rwxr-xr-x | buildtools/mktowscript/mktowscript.pl | 4 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 34 | ||||
| -rw-r--r-- | source4/dsdb/wscript_build | 12 |
3 files changed, 25 insertions, 25 deletions
diff --git a/buildtools/mktowscript/mktowscript.pl b/buildtools/mktowscript/mktowscript.pl index 5b3926065a..98c1b7ed32 100755 --- a/buildtools/mktowscript/mktowscript.pl +++ b/buildtools/mktowscript/mktowscript.pl @@ -409,7 +409,7 @@ sub process_results($) $list="'$list'"; } $list =~ s/\$\(\w+srcdir\)\///g; - printf(",\n\t%s", $list); + printf(",\n\tsource=%s", $list); $got_src = 1; next; } @@ -426,7 +426,7 @@ sub process_results($) } die("No source list in $s\n") unless $got_src or $got_private_deps; if (! $got_src) { - printf(",''\n\t"); + printf(",source=''\n\t"); } printf("%s\n\t)\n\n", $trailer); } diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 76bc3ba011..7db94a289c 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -179,7 +179,7 @@ Build.BuildContext.SAMBA_LIBRARY_INCLUDE_LIST = SAMBA_LIBRARY_INCLUDE_LIST ################################################################# # define a Samba library -def SAMBA_LIBRARY(bld, libname, source_list, +def SAMBA_LIBRARY(bld, libname, source, deps='', public_deps='', include_list='.', @@ -193,7 +193,7 @@ def SAMBA_LIBRARY(bld, libname, source_list, return # remember empty libraries, so we can strip the dependencies - if (source_list == '') or (source_list == []): + if (source == '') or (source == []): LOCAL_CACHE_SET(bld, 'EMPTY_TARGETS', libname, True) return @@ -204,7 +204,7 @@ def SAMBA_LIBRARY(bld, libname, source_list, bld.SET_BUILD_GROUP('main') bld( features = 'cc cshlib', - source = source_list, + source = source, target=libname, uselib_local = localdeps, uselib = sysdeps, @@ -232,7 +232,7 @@ Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY ################################################################# # define a Samba binary -def SAMBA_BINARY(bld, binname, source_list, +def SAMBA_BINARY(bld, binname, source, deps='', include_list='', public_headers=None, @@ -263,7 +263,7 @@ def SAMBA_BINARY(bld, binname, source_list, bld.SET_BUILD_GROUP(group) bld( features = 'cc cprogram', - source = source_list, + source = source, target = binname, uselib_local = localdeps, uselib = sysdeps, @@ -284,7 +284,7 @@ Build.BuildContext.SAMBA_BINARY = SAMBA_BINARY ################################################################# # define a Samba python module -def SAMBA_PYTHON(bld, name, source_list, +def SAMBA_PYTHON(bld, name, source, deps='', public_deps='', realname=''): @@ -338,19 +338,19 @@ Build.BuildContext.SAMBA_ERRTABLE = SAMBA_ERRTABLE ################################################################# # define a set of Samba PIDL targets -def SAMBA_PIDL_LIST(bld, directory, source_list, options=''): - for p in source_list.split(): +def SAMBA_PIDL_LIST(bld, directory, source, options=''): + for p in source.split(): bld.SAMBA_PIDL(directory, p, options) Build.BuildContext.SAMBA_PIDL_LIST = SAMBA_PIDL_LIST ################################################################ # build a C prototype file automatically -def AUTOPROTO(bld, header, source_list): +def AUTOPROTO(bld, header, source): if header is not None: bld.SET_BUILD_GROUP('prototypes') bld( - source = source_list, + source = source, target = header, rule = '../script/mkproto.pl --srcdir=.. --builddir=. --public=/dev/null --private=${TGT} ${SRC}' ) @@ -359,7 +359,7 @@ Build.BuildContext.AUTOPROTO = AUTOPROTO ################################################################# # define a Samba module. -def SAMBA_MODULE(bld, modname, source_list, +def SAMBA_MODULE(bld, modname, source, deps='', include_list='.', subsystem=None, @@ -373,7 +373,7 @@ def SAMBA_MODULE(bld, modname, source_list, return # remember empty modules, so we can strip the dependencies - if (source_list == '') or (source_list == []): + if (source == '') or (source == []): LOCAL_CACHE_SET(bld, 'EMPTY_TARGETS', modname, True) return @@ -384,7 +384,7 @@ def SAMBA_MODULE(bld, modname, source_list, bld.SET_BUILD_GROUP('main') bld( features = 'cc', - source = source_list, + source = source, target=modname, ccflags = CURRENT_CFLAGS(bld, cflags), includes='. ' + bld.env['BUILD_DIRECTORY'] + '/default ' + ilist) @@ -393,7 +393,7 @@ Build.BuildContext.SAMBA_MODULE = SAMBA_MODULE ################################################################# # define a Samba subsystem -def SAMBA_SUBSYSTEM(bld, modname, source_list, +def SAMBA_SUBSYSTEM(bld, modname, source, deps='', public_deps='', include_list='.', @@ -410,10 +410,10 @@ def SAMBA_SUBSYSTEM(bld, modname, source_list, # if the caller specifies a config_option, then we create a blank # subsystem if that configuration option was found at configure time if (config_option is not None) and bld.CONFIG_SET(config_option): - source_list = '' + source = '' # remember empty subsystems, so we can strip the dependencies - if (source_list == '') or (source_list == []): + if (source == '') or (source == []): LOCAL_CACHE_SET(bld, 'EMPTY_TARGETS', modname, True) return @@ -424,7 +424,7 @@ def SAMBA_SUBSYSTEM(bld, modname, source_list, bld.SET_BUILD_GROUP(group) bld( features = 'cc', - source = source_list, + source = source, target=modname, ccflags = CURRENT_CFLAGS(bld, cflags), includes='. ' + bld.env['BUILD_DIRECTORY'] + '/default ' + ilist) diff --git a/source4/dsdb/wscript_build b/source4/dsdb/wscript_build index 3db27c35c4..99ed061d27 100644 --- a/source4/dsdb/wscript_build +++ b/source4/dsdb/wscript_build @@ -4,7 +4,7 @@ bld.BUILD_SUBDIR('samdb/ldb_modules') bld.SAMBA_SUBSYSTEM('SAMDB', - 'samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', + source='samdb/samdb.c samdb/samdb_privilege.c samdb/cracknames.c repl/replicated_objects.c', autoproto='samdb/samdb_proto.h', public_deps='HEIMDAL_KRB5', deps='LIBNDR NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER auth_system_session LIBCLI_AUTH LIBNDR SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON LIBCLI_DRSUAPI LIBCLI_LDAP_NDR LIBSAMBA-UTIL' @@ -12,21 +12,21 @@ bld.SAMBA_SUBSYSTEM('SAMDB', bld.SAMBA_SUBSYSTEM('SAMDB_COMMON', - 'samdb/ldb_modules/util.c ./common/util.c common/dsdb_dn.c ./common/tests/dsdb_dn.c ../../libds/common/flag_mapping.c', + source='samdb/ldb_modules/util.c ./common/util.c common/dsdb_dn.c ./common/tests/dsdb_dn.c ../../libds/common/flag_mapping.c', autoproto='common/proto.h', deps='ldb NDR_DRSBLOBS LIBCLI_LDAP_NDR UTIL_LDB LIBCLI_AUTH' ) bld.SAMBA_SUBSYSTEM('SAMDB_SCHEMA', - 'schema/schema_init.c schema/schema_set.c schema/schema_query.c schema/tests/schema_syntax.c ./schema/schema_syntax.c schema/schema_description.c schema/schema_convert_to_ol.c schema/schema_inferiors.c schema/schema_prefixmap.c', + source='schema/schema_init.c schema/schema_set.c schema/schema_query.c schema/tests/schema_syntax.c ./schema/schema_syntax.c schema/schema_description.c schema/schema_convert_to_ol.c schema/schema_inferiors.c schema/schema_prefixmap.c', autoproto='schema/proto.h', deps='SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS LDBSAMBA' ) bld.SAMBA_MODULE('DREPL_SRV', - 'repl/drepl_service.c repl/drepl_periodic.c repl/drepl_partitions.c repl/drepl_out_pull.c repl/drepl_out_helpers.c repl/drepl_notify.c repl/drepl_ridalloc.c', + source='repl/drepl_service.c repl/drepl_periodic.c repl/drepl_partitions.c repl/drepl_out_pull.c repl/drepl_out_helpers.c repl/drepl_notify.c repl/drepl_ridalloc.c', autoproto='repl/drepl_service_proto.h', subsystem='service', init_function='server_service_drepl_init', @@ -35,7 +35,7 @@ bld.SAMBA_MODULE('DREPL_SRV', bld.SAMBA_MODULE('KCC_SRV', - 'kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_topology.c kcc/kcc_deleted.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c', + source='kcc/kcc_service.c kcc/kcc_connection.c kcc/kcc_topology.c kcc/kcc_deleted.c kcc/kcc_periodic.c kcc/kcc_drs_replica_info.c', autoproto='kcc/kcc_service_proto.h', subsystem='service', init_function='server_service_kcc_init', @@ -44,7 +44,7 @@ bld.SAMBA_MODULE('KCC_SRV', bld.SAMBA_MODULE('DNS_UPDATE_SRV', - 'dns/dns_update.c', + source='dns/dns_update.c', subsystem='service', init_function='server_service_dnsupdate_init', deps='SAMDB process_model UTIL_RUNCMD' |