r14511: Install more headers

(This used to be commit e1f896948fad8cf5a1aec300865c250c5721ee7d)

7 files changed, 22 insertions, 6 deletions

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index b214803215..465146ec17 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -96,6 +96,7 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT MESSAGING
 
 [LIBRARY::LIBCLI]
+PUBLIC_HEADERS = libcli.h
 VERSION = 0.0.1
 SO_VERSION = 0
 DESCRIPTION = SMB/CIFS client library
@@ -105,7 +106,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 
 [SUBSYSTEM::LIBSMB]
 REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
-PRIVATE_PROTO_HEADER = libcli_proto.h
+PUBLIC_PROTO_HEADER = libcli_proto.h
 OBJ_FILES = clireadwrite.o \
 		cliconnect.o \
 		clifile.o \
diff --git a/source4/libcli/ldap/config.mk b/source4/libcli/ldap/config.mk
index c0ad8d157f..624b2603ec 100644
--- a/source4/libcli/ldap/config.mk
+++ b/source4/libcli/ldap/config.mk
@@ -1,7 +1,8 @@
 #################################
 # Start SUBSYSTEM LIBCLI_LDAP
 [SUBSYSTEM::LIBCLI_LDAP]
-PRIVATE_PROTO_HEADER = ldap_proto.h
+PUBLIC_PROTO_HEADER = ldap_proto.h
+PUBLIC_HEADERS = ldap.h
 OBJ_FILES = ldap.o \
 		ldap_client.o \
 		ldap_bind.o \
diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h
index c358ac5752..c104fcf80e 100644
--- a/source4/libcli/libcli.h
+++ b/source4/libcli/libcli.h
@@ -22,7 +22,8 @@
 #ifndef __LIBCLI_H__
 #define __LIBCLI_H__
 
-#include "smb.h"
+#include <core.h>
+#include "librpc/gen_ndr/nbt.h"
 
 /* 
    smbcli_state: internal state used in libcli library for single-threaded callers, 
@@ -49,6 +50,9 @@ struct nbt_dc_name {
 	const char *name;
 };
 
+struct cli_credentials;
+struct event_context;
+#include "libcli/raw/libcliraw.h"
 #include "libcli/libcli_proto.h"
 
 #endif /* __LIBCLI_H__ */
diff --git a/source4/libcli/raw/interfaces.h b/source4/libcli/raw/interfaces.h
index 20b729caba..d662b9f5ae 100644
--- a/source4/libcli/raw/interfaces.h
+++ b/source4/libcli/raw/interfaces.h
@@ -19,6 +19,11 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBCLI_RAW_INTERFACES_H__
+#define __LIBCLI_RAW_INTERFACES_H__
+
+#include "smb.h" 
+
 /* this structure is just a wrapper for a string, the only reason we
    bother with this is that it allows us to check the length provided
    on the wire in testsuite test code to ensure that we are
@@ -2048,3 +2053,4 @@ union smb_search_close {
 	} findclose;
 };
 
+#endif /* __LIBCLI_RAW_INTERFACES_H__ */
diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h
index f115a18d23..21d0b0dcdb 100644
--- a/source4/libcli/raw/libcliraw.h
+++ b/source4/libcli/raw/libcliraw.h
@@ -20,8 +20,10 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __LIBCLI_RAW_H__
+#define __LIBCLI_RAW_H__
+
 #include "libcli/raw/request.h"
-#include "smb.h"
 #include "librpc/gen_ndr/nbt.h"
 
 struct smbcli_tree;  /* forward declare */
@@ -271,4 +273,7 @@ struct smbcli_request {
       goto failed; \
 }
 
+#include "libcli/raw/interfaces.h" 
 #include "libcli/raw/raw_proto.h"
+
+#endif /* __LIBCLI_RAW__H__ */
diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h
index 913d58409b..ceafacf9d4 100644
--- a/source4/libcli/smb2/smb2.h
+++ b/source4/libcli/smb2/smb2.h
@@ -20,8 +20,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "smb.h"
-
 struct smb2_options {
 	uint32_t timeout;
 };
diff --git a/source4/libcli/smb2/smb2_calls.h b/source4/libcli/smb2/smb2_calls.h
index 7349b609cb..af1730aeee 100644
--- a/source4/libcli/smb2/smb2_calls.h
+++ b/source4/libcli/smb2/smb2_calls.h
@@ -20,6 +20,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include "libcli/raw/interfaces.h"
 
 struct smb2_negprot {
 	struct {