diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-10-30 12:14:15 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-10-30 23:49:01 +1100 |
| commit | eb0005dfcabedbeed0a75f139d6625b268d5062a (patch) | |
| tree | e0b95a315742466d330dfe35cb0fed2253112dbc | |
| parent | 045e3445a0cea796c400eacbdb28611b664ef902 (diff) | |
| download | samba-eb0005dfcabedbeed0a75f139d6625b268d5062a.tar.gz | |
s4-tdb: make tdb-wrap into a private library
this prevents double linking of the tdb wrap code
| -rw-r--r-- | libcli/auth/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/messaging/wscript_build | 2 | ||||
| -rw-r--r-- | source4/lib/wscript_build | 13 | ||||
| -rw-r--r-- | source4/param/wscript_build | 2 |
4 files changed, 10 insertions, 9 deletions
diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build index 712f828e9b7..26b7438aa41 100644 --- a/libcli/auth/wscript_build +++ b/libcli/auth/wscript_build @@ -21,6 +21,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_AUTH', bld.SAMBA_SUBSYSTEM('COMMON_SCHANNELDB', source='schannel_state_tdb.c', - deps='TDB_WRAP' + deps='tdb-wrap' ) diff --git a/source4/lib/messaging/wscript_build b/source4/lib/messaging/wscript_build index 806dcee95ff..b7d4fed95ed 100644 --- a/source4/lib/messaging/wscript_build +++ b/source4/lib/messaging/wscript_build @@ -3,7 +3,7 @@ bld.SAMBA_SUBSYSTEM('MESSAGING', source='messaging.c', - public_deps='samba-util TDB_WRAP NDR_IRPC UNIX_PRIVS UTIL_TDB CLUSTER ndr samba_socket dcerpc' + public_deps='samba-util tdb-wrap NDR_IRPC UNIX_PRIVS UTIL_TDB cluster ndr samba_socket dcerpc' ) diff --git a/source4/lib/wscript_build b/source4/lib/wscript_build index 49da72cacae..27b5582ad9d 100644 --- a/source4/lib/wscript_build +++ b/source4/lib/wscript_build @@ -9,13 +9,14 @@ bld.SAMBA_SUBSYSTEM('LZXPRESS', bld.SAMBA_SUBSYSTEM('GENCACHE', source='../../source3/lib/gencache.c', enabled=False, - deps='TDB_WRAP' + deps='tdb-wrap' ) -bld.SAMBA_SUBSYSTEM('TDB_WRAP', - source='tdb_wrap.c', - public_deps='tdb talloc', - public_headers='tdb_wrap.h' - ) +bld.SAMBA_LIBRARY('tdb-wrap', + source='tdb_wrap.c', + deps='tdb talloc samba-util', + public_headers='tdb_wrap.h', + private_library=True + ) diff --git a/source4/param/wscript_build b/source4/param/wscript_build index 62e14c45290..3039236befe 100644 --- a/source4/param/wscript_build +++ b/source4/param/wscript_build @@ -43,7 +43,7 @@ bld.SAMBA_MODULE('share_ldb', bld.SAMBA_SUBSYSTEM('SECRETS', source='secrets.c', - deps='ldb TDB_WRAP UTIL_TDB NDR_SECURITY tevent ldbwrap' + deps='ldb tdb-wrap UTIL_TDB NDR_SECURITY tevent ldbwrap' ) |