cli-raw: Add public libsmbclient-raw library.

diff --git a/source4/client/wscript_build b/source4/client/wscript_build
index 94b579c0d5f3d389a3187954243e43b893555ad7..d1622b3d1d07584199bdc4cd7a3fce39159ba2e1 100644 (file)
--- a/source4/client/wscript_build
+++ b/source4/client/wscript_build
@@ -2,7 +2,7 @@
 
 bld.SAMBA_BINARY('smbclient',
        source='client.c',
-       deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS cli_raw'
+       deps='samba-hostconfig SMBREADLINE samba-util LIBCLI_SMB RPC_NDR_SRVSVC LIBCLI_LSA popt POPT_SAMBA POPT_CREDENTIALS smbclient-raw'
        )
 
 

diff --git a/source4/libcli/rap/wscript_build b/source4/libcli/rap/wscript_build
index eac7b906753728503b63285c7468f8d1f74932e8..b58e3acdbf947f0198e4cd4805168011257202aa 100644 (file)
--- a/source4/libcli/rap/wscript_build
+++ b/source4/libcli/rap/wscript_build
@@ -2,6 +2,6 @@
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_RAP',
        source='rap.c',
-       public_deps='cli_raw NDR_RAP',
+       public_deps='smbclient-raw NDR_RAP',
        autoproto='proto.h'
        )

diff --git a/source4/libcli/raw/smbclient-raw.pc.in b/source4/libcli/raw/smbclient-raw.pc.in
new file mode 100644 (file)
index 0000000..3c0c791
--- /dev/null
+++ b/source4/libcli/raw/smbclient-raw.pc.in
@@ -0,0 +1,10 @@
+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 1f3d7ef3b552785967ac335af958ff560fd95fa8..8aac8272e395285c7952e62c06402f6f91a9b710 100644 (file)
--- a/source4/libcli/smb2/wscript_build
+++ b/source4/libcli/smb2/wscript_build
@@ -4,6 +4,6 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_SMB2',
        source='transport.c request.c negprot.c session.c tcon.c create.c close.c connect.c getinfo.c write.c read.c setinfo.c find.c ioctl.c logoff.c tdis.c flush.c lock.c notify.c cancel.c keepalive.c break.c util.c signing.c lease_break.c',
        autoproto='smb2_proto.h',
        deps='tevent-util',
-       public_deps='cli_raw LIBPACKET gensec tevent'
+       public_deps='smbclient-raw LIBPACKET gensec tevent'
        )
 

diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 93c718610760828c776c827e7df743b81444a0a1..a2bd3a64e9443c23e373ecca60dca9e6b884d685 100644 (file)
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -75,17 +75,19 @@ 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',
        autoproto='libcli_proto.h',
-       public_deps='cli_raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
+       public_deps='smbclient-raw errors LIBCLI_AUTH LIBCLI_SMB_COMPOSITE cli-nbt security LIBCLI_RESOLVE LIBCLI_DGRAM LIBCLI_SMB2 LIBCLI_FINDDCS samba_socket'
        )
 
 
-bld.SAMBA_LIBRARY('cli_raw',
+bld.SAMBA_LIBRARY('smbclient-raw',
        source='raw/rawfile.c raw/smb_signing.c raw/clisocket.c raw/clitransport.c raw/clisession.c raw/clitree.c raw/clierror.c raw/rawrequest.c raw/rawreadwrite.c raw/rawsearch.c raw/rawsetfileinfo.c raw/raweas.c raw/rawtrans.c raw/clioplock.c raw/rawnegotiate.c raw/rawfsinfo.c raw/rawfileinfo.c raw/rawnotify.c raw/rawioctl.c raw/rawacl.c raw/rawdate.c raw/rawlpq.c raw/rawshadow.c',
        autoproto='raw/raw_proto.h',
        public_deps='samba_socket LIBPACKET LIBCRYPTO',
        deps='cli_composite LIBCLI_RESOLVE security ndr samba-util errors charset talloc LIBCLI_SMB_COMPOSITE tevent NDR_NBT_BUF cli_smb_common',
        public_headers='raw/request.h:smb_request.h raw/signing.h:smb_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,
+       private_library=False,
+       pc_files='raw/smbclient-raw.pc',
+       vnum='0.0.1'
        )
 
 bld.RECURSE('smb2')

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index e695c4e4c17d02a084096abc6f4b659c350f95d4..8a17b6a7f2f4515ccdf8c04b354b68cc04b1bb84 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -138,7 +138,7 @@ bld.SAMBA_LIBRARY('dcerpc',
        rpc/dcerpc_util.c rpc/dcerpc_smb.c rpc/dcerpc_smb2.c rpc/dcerpc_sock.c
        rpc/dcerpc_connect.c rpc/dcerpc_secondary.c''',
        pc_files='dcerpc.pc',
-       deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH cli_raw LP_RESOLVE tevent-util dcerpc-binding',
+       deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH smbclient-raw LP_RESOLVE tevent-util dcerpc-binding',
        autoproto='rpc/dcerpc_proto.h',
        public_deps='credentials tevent talloc',
        public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h

diff --git a/source4/ntvfs/wscript_build b/source4/ntvfs/wscript_build
index 24ce18f3075c65cda4292628fc9bb078b0e4de6a..fa1e071395c8903eaf2d9bcbea0282935f654d98 100644 (file)
--- a/source4/ntvfs/wscript_build
+++ b/source4/ntvfs/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_MODULE('ntvfs_cifs',
        source='cifs/vfs_cifs.c',
        subsystem='ntvfs',
        init_function='ntvfs_cifs_init',
-       deps='LIBCLI_SMB cli_raw'
+       deps='LIBCLI_SMB smbclient-raw'
        )
 
 
@@ -17,7 +17,7 @@ bld.SAMBA_MODULE('ntvfs_smb2',
        source='smb2/vfs_smb2.c',
        subsystem='ntvfs',
        init_function='ntvfs_smb2_init',
-       deps='LIBCLI_SMB cli_raw'
+       deps='LIBCLI_SMB smbclient-raw'
        )
 
 

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index b3826d6b3847efe78cf8579c53d2aaeeda3f8ef0..704f26f99476a24e0e6d26823f225477ee80f538 100644 (file)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -4,14 +4,14 @@
 bld.SAMBA_SUBSYSTEM('TORTURE_UTIL',
        source='util_smb.c',
        public_deps='torture POPT_CREDENTIALS',
-       deps='cli_raw'
+       deps='smbclient-raw'
        )
 
 
 bld.SAMBA_MODULE('TORTURE_BASIC',
        source='basic/base.c basic/misc.c basic/scanner.c basic/utable.c basic/charset.c basic/mangle_test.c basic/denytest.c basic/aliases.c basic/locking.c basic/secleak.c basic/rename.c basic/dir.c basic/delete.c basic/unlink.c basic/disconnect.c basic/delaywrite.c basic/attr.c basic/properties.c',
        subsystem='smbtorture',
-       deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL cli_raw TORTURE_RAW',
+       deps='LIBCLI_SMB POPT_CREDENTIALS TORTURE_UTIL smbclient-raw TORTURE_RAW',
        internal_module=True,
        autoproto='basic/proto.h',
        init_function='torture_base_init'
@@ -157,7 +157,7 @@ bld.SAMBA_BINARY('smbtorture',
 bld.SAMBA_BINARY('gentest',
        source='gentest.c',
        manpages='man/gentest.1',
-       deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB cli_raw'
+       deps='samba-hostconfig samba-util popt POPT_SAMBA POPT_CREDENTIALS LIBCLI_SMB smbclient-raw'
        )