s4-tdb: make tdb-wrap into a private library

this prevents double linking of the tdb wrap code

diff --git a/libcli/auth/wscript_build b/libcli/auth/wscript_build
index 712f828e9b7b7a46e46379bd5ce81255afe2bbf6..26b7438aa415e765e76fc3b794bfeef96aaad743 100644 (file)
--- 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 806dcee95ff15ee702a8cac78cb60ec911aba6fd..b7d4fed95edb553346076254d1b6e590502ad12c 100644 (file)
--- 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 49da72cacae324172515b28ad339aa0e0c418a6a..27b5582ad9d0664dc9a2397ab250fc87cd209c24 100644 (file)
--- 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 62e14c45290c8992b5c4048a5a247b6131a823cb..3039236befe7cf434ea5f2a035465c3f78f32c39 100644 (file)
--- 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'
        )