diff options
| author | Volker Lendecke <vl@samba.org> | 2023-01-12 12:11:49 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2023-01-12 15:38:30 +0000 |
| commit | 6dcbea9e0fb09f2d420b2424081bb20d459277fb (patch) | |
| tree | e80bdbb8afaf0d2084fb0532d035facb2a7e6941 /source3 | |
| parent | 98d84192a03a4f1135eaf1590fb62b16d8bc49c8 (diff) | |
| download | samba-6dcbea9e0fb09f2d420b2424081bb20d459277fb.tar.gz | |
build: Don't compile source3/lib/util_sd.c four times
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/torture/wscript_build | 2 | ||||
| -rw-r--r-- | source3/utils/wscript_build | 8 | ||||
| -rw-r--r-- | source3/wscript_build | 3 |
3 files changed, 9 insertions, 4 deletions
diff --git a/source3/torture/wscript_build b/source3/torture/wscript_build index e941829ab5f..18106aaf59a 100644 --- a/source3/torture/wscript_build +++ b/source3/torture/wscript_build @@ -58,7 +58,6 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3, test_idmap_cache.c test_hidenewfiles.c test_readdir_timestamp.c - ../lib/util_sd.c ''' + TORTURE3_ADDITIONAL_SOURCE, deps=''' talloc @@ -74,6 +73,7 @@ bld.SAMBA3_BINARY('smbtorture' + bld.env.suffix3, IDMAP_TDB_COMMON libcli_lsa3 samba-cluster-support + util_sd ''', cflags='-DWINBINDD_SOCKET_DIR=\"%s\"' % bld.env.WINBINDD_SOCKET_DIR, for_selftest=True) diff --git a/source3/utils/wscript_build b/source3/utils/wscript_build index f5aa0af7eed..49f97af8c7c 100644 --- a/source3/utils/wscript_build +++ b/source3/utils/wscript_build @@ -75,12 +75,13 @@ bld.SAMBA3_BINARY('nmblookup', LIBNMB''') bld.SAMBA3_BINARY('smbcacls', - source='smbcacls.c ../lib/util_sd.c', + source='smbcacls.c', deps=''' talloc CMDLINE_S3 msrpc3 libcli_lsa3 + util_sd krb5samba''') bld.SAMBA3_BINARY('smbcquotas', @@ -102,13 +103,14 @@ bld.SAMBA3_BINARY('eventlogadm', install_path='${SBINDIR}') bld.SAMBA3_BINARY('sharesec', - source='sharesec.c ../lib/util_sd.c', + source='sharesec.c', deps=''' talloc msrpc3 libcli_lsa3 CMDLINE_S3 cmdline_contexts + util_sd ''') bld.SAMBA3_BINARY('log2pcap', @@ -240,7 +242,6 @@ bld.SAMBA3_BINARY('net', ../registry/reg_format.c ../registry/reg_import.c net_registry_util.c - ../lib/util_sd.c net_help_common.c''', deps=''' talloc @@ -285,6 +286,7 @@ bld.SAMBA3_BINARY('net', common_auth ADOUBLE DNS_UTIL + util_sd ''') bld.SAMBA3_BINARY('mvxattr', diff --git a/source3/wscript_build b/source3/wscript_build index 97c6b5c17fc..4042d8e9c8d 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1127,6 +1127,9 @@ bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE', source='lib/tdb_validate.c', deps='samba-util') +bld.SAMBA3_SUBSYSTEM('util_sd', + deps='smbclient', + source='lib/util_sd.c') bld.SAMBA3_BINARY('client/smbclient', source=''' |