Make libcli-smb-raw private, for now.

Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-By: Andrew Bartlett <abartlet@samba.org>
Reviewed-By: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index f79cc2b6149a485f3b2343ca31bcd04191462fed..debec463a1462fefd78eac7053b2839ede2074af 100644 (file)
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -4,7 +4,7 @@ bld.SAMBA_LIBRARY('cli-ldap',
                   source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
                   autoproto='ldap_proto.h',
                   public_deps='errors tevent',
-                  public_headers='libcli_ldap.h:ldap-util.h',
+                  private_headers='libcli_ldap.h:ldap-util.h',
                   deps='cli_composite LIBSAMBA_TSOCKET samba_socket NDR_SAMR LIBTLS ndr LP_RESOLVE gensec cli-ldap-common',
                   private_library=True
                   )

diff --git a/source4/libcli/raw/smbclient-raw.pc.in b/source4/libcli/raw/smbclient-raw.pc.in
deleted file mode 100644 (file)
index 3c0c791..0000000
--- a/source4/libcli/raw/smbclient-raw.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: smbclient-raw
-Description: SMB client
-Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -lsmbclient-raw
-Cflags: -I${includedir} -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/libcli/smb2/wscript_build b/source4/libcli/smb2/wscript_build
index 02fc5b821d9c9b68932469bd82d740483e944a06..a15753feadfd808c7394aeaf33e7290904268254 100644 (file)
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -5,6 +5,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
        autoproto='smb2_proto.h',
        deps='tevent-util cli_smb_common',
        public_deps='smbclient-raw gensec samba-credentials tevent',
-       public_headers='smb2.h',
+       private_headers='smb2.h',
        )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 59b0bc7d965c2d58136adc46bfd7a0e7d2cceb14..a3c072d7366f4c5a28f6d6cce9767a0d89554ed2 100755 (executable)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -28,7 +28,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
        source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
        deps='LIBCLI_SMB2 tevent-util',
        public_deps='cli_composite samba-credentials gensec LIBCLI_RESOLVE tevent',
-       public_headers='smb_composite/smb_composite.h',
+       private_headers='smb_composite/smb_composite.h',
        )
 
 bld.SAMBA_PYTHON('pysmb',
@@ -75,7 +75,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_FINDDCS',
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_SMB',
        source='clireadwrite.c cliconnect.c clifile.c clilist.c clitrans2.c climessage.c clideltree.c',
-       public_headers='libcli.h:smb_cli.h',
+       private_headers='libcli.h:smb_cli.h',
        public_deps='smbclient-raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt samba-security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
        )
 
@@ -85,10 +85,8 @@ bld.SAMBA_LIBRARY('smbclient-raw',
        autoproto='raw/raw_proto.h',
        public_deps='samba_socket LIBPACKET LIBCRYPTO',
        deps='cli_composite LIBCLI_RESOLVE samba-security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent cli_smb_common',
-       public_headers='raw/request.h:smb_request.h raw/signing.h:smb_raw_signing.h raw/libcliraw.h:smb_cliraw.h raw/interfaces.h:smb_raw_interfaces.h raw/smb.h:smb_raw.h raw/trans2.h:smb_raw_trans2.h',
-       private_library=False,
-       pc_files='raw/smbclient-raw.pc',
-       vnum='0.0.1'
+       private_headers='raw/request.h:smb_request.h raw/signing.h:smb_raw_signing.h raw/libcliraw.h:smb_cliraw.h raw/interfaces.h:smb_raw_interfaces.h raw/smb.h:smb_raw.h raw/trans2.h:smb_raw_trans2.h',
+       private_library=True,
        )
 
 bld.RECURSE('smb2')

diff --git a/source4/torture/raw/session.c b/source4/torture/raw/session.c
index 1937ef7a78328512fe9045274ba313f95644e1a8..6938c88f95d16d1fe93d057d3c187aff1c714206 100644 (file)
--- a/source4/torture/raw/session.c
+++ b/source4/torture/raw/session.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "torture.h"
-#include "smb_cli.h"
+#include "libcli/libcli.h"
 #include "torture/raw/proto.h"
 #include "smb_composite/smb_composite.h"
 #include "lib/cmdline/popt_common.h"