diff options
| author | Michael Adam <obnox@samba.org> | 2011-07-06 17:02:13 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-07-29 12:23:13 +0200 |
| commit | d4c93ca721d0edd8780ce84e7cccd0e5a1ea4f37 (patch) | |
| tree | 42a13795bedd104e9e2ba0d20fad54924305ee6a | |
| parent | 2414fc88d85c8dcc22ddbb389255d6c36838cbad (diff) | |
| download | samba-d4c93ca721d0edd8780ce84e7cccd0e5a1ea4f37.tar.gz samba-d4c93ca721d0edd8780ce84e7cccd0e5a1ea4f37.tar.bz2 samba-d4c93ca721d0edd8780ce84e7cccd0e5a1ea4f37.zip | |
s3-waf: replace the dbwrap_util library by a dbwrap library that contains the dbwrap core
| -rwxr-xr-x | source3/wscript_build | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index cdf64bebf9..3fd655bc11 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -14,7 +14,6 @@ bld.env.public_headers_skip = ['lib/ldb_compat.h'] bld.env.public_headers_allow_broken = True TDB_LIB_SRC = ''' - lib/dbwrap.c lib/dbwrap/dbwrap_open.c lib/dbwrap_tdb.c lib/dbwrap_ctdb.c @@ -770,7 +769,7 @@ bld.SAMBA3_LIBRARY('smbregistry', source=REG_BASE_SRC, deps='''smbd_shim tdb-wrap3 NDR_SECURITY UTIL_TDB talloc replace util_reg samba-util security - errors3 adt_tree dbwrap_util util_str util_sec util_malloc''', + errors3 adt_tree dbwrap util_str util_sec util_malloc''', vars=locals(), allow_undefined_symbols=True, private_library=True) @@ -803,7 +802,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_SUBSYSTEM('samba3core', source=LIB_SRC, - deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap_util util_sec util_malloc memcache ccan errors3', + deps='LIBTSOCKET LIBCRYPTO ndr security NDR_SECURITY samba-util NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 UTIL_TDB UTIL_PW SAMBA_VERSION KRB5_WRAP flag_mapping util_reg PTHREADPOOL interfaces cap string_init param util_str CHARSET3 namearray dbwrap util_sec util_malloc memcache ccan errors3', vars=locals()) bld.SAMBA3_LIBRARY('smbd_shim', @@ -1008,8 +1007,8 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap3', deps='tdb-wrap', vars=locals()) -bld.SAMBA3_LIBRARY('dbwrap_util', - source='lib/dbwrap_util.c lib/dbwrap_rbt.c', +bld.SAMBA3_LIBRARY('dbwrap', + source='lib/dbwrap.c lib/dbwrap_util.c lib/dbwrap_rbt.c', deps='samba-util UTIL_TDB errors', private_library=True) |