[PATCH] debug: make debug public again, for 4.3

[Brad Hards]

This is to allow a staged migration for external clients (e.g. openchange),
and does not represent a long term (including 4.4 and later) public API.

Signed-off-by: Brad Hards <bradh at frogmouth.net>
---
 auth/gensec/wscript_build  |  2 +-
 lib/tdb_wrap/wscript_build |  2 +-
 lib/util/wscript_build     | 16 +++++-----------
 libcli/util/wscript_build  |  2 +-
 source3/wscript_build      |  2 +-
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/auth/gensec/wscript_build b/auth/gensec/wscript_build
index e4c4a08..f96a40b 100755
--- a/auth/gensec/wscript_build
+++ b/auth/gensec/wscript_build
@@ -36,6 +36,6 @@ bld.SAMBA_MODULE('gensec_external',
 	source='external.c',
 	autoproto='external_proto.h',
 	subsystem='gensec',
-	deps='samba-debug talloc',
+	deps='samba-util talloc',
 	init_function='gensec_external_init'
 	)
diff --git a/lib/tdb_wrap/wscript_build b/lib/tdb_wrap/wscript_build
index 7e113c3..2a35215 100644
--- a/lib/tdb_wrap/wscript_build
+++ b/lib/tdb_wrap/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_LIBRARY('tdb-wrap',
                   source='tdb_wrap.c',
-                  deps='tdb talloc samba-debug',
+                  deps='tdb talloc samba-util',
                   private_library=True,
                   local_include=False
                  )
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 9663bb0..b5e03d1 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -41,14 +41,6 @@ if bld.CONFIG_SET('HAVE_GPFS'):
     samba_debug_add_deps += ' gpfswrap'
     samba_debug_add_inc  += bld.CONFIG_GET('CPPPATH_GPFS')
 
-bld.SAMBA_LIBRARY('samba-debug',
-                  source='debug.c',
-                  deps='replace time-basic close-low-fd talloc socket-blocking' + samba_debug_add_deps,
-                  public_deps='systemd systemd-journal lttng-ust',
-                  local_include=False,
-                  includes=samba_debug_add_inc,
-                  private_library=True)
-
 bld.SAMBA_LIBRARY('socket-blocking',
                   source='blocking.c',
                   local_include=False,
@@ -57,9 +49,11 @@ bld.SAMBA_LIBRARY('socket-blocking',
 bld.SAMBA_SUBSYSTEM('samba-util-core',
                     source='''xfile.c data_blob.c util_file.c time.c
                               signal.c util.c idtree.c fault.c
-                              substitute.c''',
-                    deps='''time-basic samba-debug socket-blocking talloc
-                            tevent execinfo pthread''',
+                              substitute.c debug.c''',
+                    deps='''time-basic socket-blocking talloc
+                            tevent execinfo pthread replace close-low-fd''' + samba_debug_add_deps,
+                    public_deps='systemd systemd-journal lttng-ust',
+                    includes=samba_debug_add_inc,
                     local_include=False)
 
 if not bld.env.SAMBA_UTIL_CORE_ONLY:
diff --git a/libcli/util/wscript_build b/libcli/util/wscript_build
index ccb882d..3bfa4b1 100644
--- a/libcli/util/wscript_build
+++ b/libcli/util/wscript_build
@@ -5,7 +5,7 @@ bld.SAMBA_LIBRARY('errors',
                   public_headers='error.h ntstatus.h doserr.h werror.h hresult.h',
                   header_path='core',
                   source='doserr.c errormap.c nterr.c errmap_unix.c hresult.c',
-                  public_deps='talloc samba-debug',
+                  public_deps='talloc samba-util',
                   private_library=True
                   )
 
diff --git a/source3/wscript_build b/source3/wscript_build
index ace4b99..e9e0bde 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -304,7 +304,7 @@ bld.SAMBA3_SUBSYSTEM('TDB_LIB',
 
 bld.SAMBA3_LIBRARY('messages_dgm',
                    source='''lib/messages_dgm.c lib/messages_dgm_ref.c''',
-                   deps='talloc UNIX_MSG POLL_FUNCS_TEVENT samba-debug',
+                   deps='talloc UNIX_MSG POLL_FUNCS_TEVENT samba-util',
                    private_library=True)
 
 bld.SAMBA3_LIBRARY('messages_util',
-- 
1.9.1