summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xlib/util/wscript_build4
-rwxr-xr-xsource3/wscript_build8
2 files changed, 4 insertions, 8 deletions
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index e39af54c0f..19ccb5c4f7 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -3,7 +3,7 @@
# as we move files into common between samba-util and samba-util3, move them here.
# Both samba-util and samba-util3 depend on this private library
bld.SAMBA_LIBRARY('samba-util-common',
- source='''talloc_stack.c smb_threads.c xfile.c
+ source='''talloc_stack.c smb_threads.c xfile.c data_blob.c
util_file.c time.c rbtree.c rfc1738.c select.c
genrand.c fsusage.c blocking.c become_daemon.c
signal.c system.c params.c util.c util_id.c util_net.c
@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
if bld.env._SAMBA_BUILD_ == 4:
bld.SAMBA_LIBRARY('samba-util',
- source='''dprintf.c data_blob.c
+ source='''dprintf.c
ms_fnmatch.c parmlist.c substitute.c util_str.c
''',
deps='samba-util-common',
diff --git a/source3/wscript_build b/source3/wscript_build
index af03e4ca1b..6db9c86dc5 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -776,7 +776,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
bld.SAMBA3_LIBRARY('samba3core',
source=LIB_SRC,
- deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg',
+ deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 CHARSET3 UTIL_TDB UTIL_PW SAMBA_VERSION krb5 flag_mapping util_reg',
private_library=True,
vars=locals())
@@ -966,10 +966,6 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
public_deps='ICONV_WRAPPER CODEPOINTS',
deps='DYNCONFIG')
-bld.SAMBA3_SUBSYSTEM('samba-util3',
- source='../lib/util/data_blob.c',
- deps='talloc CHARSET3 samba-util-common')
-
bld.SAMBA3_SUBSYSTEM('ldb3',
source='lib/ldb_compat.c')
@@ -1317,7 +1313,7 @@ if not bld.env.toplevel_build:
bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='POPT_SAMBA3')
bld.SAMBA3_SUBSYSTEM('tdb-wrap', source='', deps='tdb-wrap3')
bld.SAMBA3_SUBSYSTEM('errors', source='', deps='errors3')
- bld.SAMBA3_SUBSYSTEM('samba-util', source='', deps='samba-util3')
+ bld.SAMBA3_SUBSYSTEM('samba-util', source='')
bld.SAMBA3_SUBSYSTEM('CHARSET', source='', deps='CHARSET3')
bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')