summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-01-04 12:56:29 +0100
committerGünther Deschner <gd@samba.org>2011-01-04 12:56:29 +0100
commit34596493bada8ce9fb00fd7d4d60ac245a71d5e6 (patch)
treef7a0709f399061d06a7b81f29e5f3021b3d75795
parentd2e93cce88b69bdf489984f34376ca30934684ad (diff)
downloadsamba-34596493bada8ce9fb00fd7d4d60ac245a71d5e6.tar.gz
samba-34596493bada8ce9fb00fd7d4d60ac245a71d5e6.tar.xz
samba-34596493bada8ce9fb00fd7d4d60ac245a71d5e6.zip
s3-waf: add UTIL_TDB subsystem.
Guenther
-rw-r--r--source3/wscript_build16
1 files changed, 10 insertions, 6 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 21da0699c56..2cb5e3179bf 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -3,7 +3,7 @@
from samba_utils import *
import samba_version
-TDB_LIB_SRC = '''../lib/util/util_tdb.c
+TDB_LIB_SRC = '''
lib/dbwrap.c lib/dbwrap_tdb.c
lib/dbwrap_ctdb.c
lib/g_lock.c
@@ -673,9 +673,7 @@ NTLM_AUTH_SRC = '''${NTLM_AUTH_SRC1}
libsmb/clikrb5.c libads/kerberos.c'''
-VLP_SRC = '''printing/tests/vlp.c
- ../lib/util/util_tdb.c
- ${LIBSAMBAUTIL_SRC}'''
+VLP_SRC = '''printing/tests/vlp.c'''
RPC_OPEN_TCP_SRC = 'torture/rpc_open_tcp.c'
@@ -866,7 +864,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET',
+ deps='LIBCRYPTO ndr security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap samba-util CHARSET UTIL_TDB',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -981,6 +979,12 @@ bld.SAMBA_SUBSYSTEM('FNAME_UTIL',
source=FNAME_UTIL_SRC,
vars=locals())
+bld.SAMBA_SUBSYSTEM('UTIL_TDB',
+ source='../lib/util/util_tdb.c',
+ local_include=False,
+ public_deps='tdb talloc'
+ )
+
bld.SAMBA_SUBSYSTEM('LIBNET',
source=LIBNET_SRC,
deps='NDR_LIBNET_JOIN',
@@ -1473,7 +1477,7 @@ bld.SAMBA_BINARY('split_tokens',
bld.SAMBA_BINARY('vlp',
source=VLP_SRC,
- deps='''talloc tdb PARAM_UTIL''',
+ deps='''talloc tdb PARAM_UTIL UTIL_TDB''',
vars=locals())
swat_files=recursive_dirlist('../swat', '../swat', '*')