summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2013-09-23 02:50:19 +0200
committerMichael Adam <obnox@samba.org>2013-09-23 20:21:55 +0200
commit2412682c0a6ba3cca59172f163aaf818d6b840d4 (patch)
tree9defe31cff345d9a01d3f0dbb3ca9532986e7414
parentac71b6f00c6aee2348d361809610afbe42163502 (diff)
downloadsamba-2412682c0a6ba3cca59172f163aaf818d6b840d4.tar.gz
samba-2412682c0a6ba3cca59172f163aaf818d6b840d4.tar.bz2
samba-2412682c0a6ba3cca59172f163aaf818d6b840d4.zip
build: make TDB_VALIDATE its own subsystem and have winbindd depend on it
Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-rwxr-xr-xsource3/wscript_build12
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/wscript_build b/source3/wscript_build
index 74c1aaa523..17ee6fbe0e 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -9,8 +9,6 @@ TDB_LIB_SRC = '''
lib/dbwrap/dbwrap_watch.c
lib/g_lock.c'''
-TDB_VALIDATE_SRC = '''lib/tdb_validate.c'''
-
AVAHI_SRC = 'lib/avahi.c smbd/avahi_register.c'
SERVER_MUTEX_SRC = 'lib/server_mutex.c'
@@ -316,8 +314,7 @@ WINBINDD_SRC1 = '''winbindd/winbindd.c
winbindd/winbindd_pam_auth_crap.c
winbindd/winbindd_pam_chng_pswd_auth_crap.c'''
-WINBINDD_SRC = '''${WINBINDD_SRC1}
- ${TDB_VALIDATE_SRC}'''
+WINBINDD_SRC = '''${WINBINDD_SRC1}'''
MANGLE_SRC = '''smbd/mangle.c smbd/mangle_hash.c smbd/mangle_hash2.c'''
@@ -1163,6 +1160,12 @@ bld.SAMBA3_BINARY('nmbd/nmbd',
PROFILE''',
install_path='${SBINDIR}')
+
+bld.SAMBA3_SUBSYSTEM('TDB_VALIDATE',
+ source='lib/tdb_validate.c',
+ deps='samba-util')
+
+
bld.SAMBA3_BINARY('winbindd/winbindd',
source=WINBINDD_SRC,
deps='''
@@ -1186,6 +1189,7 @@ bld.SAMBA3_BINARY('winbindd/winbindd',
RPC_NCACN_NP
RPC_PIPE_REGISTER
WB_REQTRANS
+ TDB_VALIDATE
''',
enabled=bld.env.build_winbind,
install_path='${SBINDIR}',