summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2011-04-06 14:26:00 +1000
committerAndrew Tridgell <tridge@samba.org>2011-04-06 08:12:19 +0200
commit15576da63a35bdd6486dab1816cc12ee92764dab (patch)
tree463632786fa07566113637837c4816a513c63f18 /source3
parent48220b8571ee767359d60f0a5a1ea40512a3e75f (diff)
downloadsamba-15576da63a35bdd6486dab1816cc12ee92764dab.tar.gz
samba-15576da63a35bdd6486dab1816cc12ee92764dab.tar.bz2
samba-15576da63a35bdd6486dab1816cc12ee92764dab.zip
lib: moved data_blob.c into samba-util-common
this avoids a duplication of the data_blob symbols some binaries (eg. smbtorture) Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/wscript_build8
1 files changed, 2 insertions, 6 deletions
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')