Author: jelmer Date: 2006-03-17 13:55:10 +0000 (Fri, 17 Mar 2006) New Revision: 14511
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14511 Log: Install more headers Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm branches/SAMBA_4_0/source/build/smb_build/input.pm branches/SAMBA_4_0/source/headermap.txt branches/SAMBA_4_0/source/lib/charset/charset.h branches/SAMBA_4_0/source/lib/cmdline/config.mk branches/SAMBA_4_0/source/lib/cmdline/popt_common.h branches/SAMBA_4_0/source/lib/util/util.h branches/SAMBA_4_0/source/libcli/config.mk branches/SAMBA_4_0/source/libcli/ldap/config.mk branches/SAMBA_4_0/source/libcli/libcli.h branches/SAMBA_4_0/source/libcli/raw/interfaces.h branches/SAMBA_4_0/source/libcli/raw/libcliraw.h branches/SAMBA_4_0/source/libcli/smb2/smb2.h branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h branches/SAMBA_4_0/source/librpc/config.mk branches/SAMBA_4_0/source/smb_server/smb_server.h branches/SAMBA_4_0/source/torture/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm 2006-03-17 13:55:10 UTC (rev 14511) @@ -63,7 +63,8 @@ "MANPAGE" => "string", "INSTALLDIR" => "string", "PRIVATE_PROTO_HEADER" => "string", - "PUBLIC_HEADERS" => "string", + "PUBLIC_PROTO_HEADER" => "string", + "PUBLIC_HEADERS" => "list", "EXTRA_CFLAGS" => "string" }, Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-03-17 13:55:10 UTC (rev 14511) @@ -147,18 +147,6 @@ my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_; foreach my $part (values %$INPUT) { - unless(defined($part->{NOPROTO})) { - if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") { - $part->{NOPROTO} = "YES"; - } else { - $part->{NOPROTO} = "NO"; - } - } - - if (defined($part->{PRIVATE_PROTO_HEADER})) { - $part->{NOPROTO} = "YES"; - } - unless (defined($part->{STANDARD_VISIBILITY})) { if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") { $part->{STANDARD_VISIBILITY} = "hidden"; @@ -170,9 +158,12 @@ unless (defined($part->{EXTRA_CFLAGS})) { $part->{EXTRA_CFLAGS} = ""; } + + unless (defined($part->{PUBLIC_HEADERS})) { + $part->{PUBLIC_HEADERS} = []; + } if (defined($part->{PUBLIC_PROTO_HEADER})) { - $part->{NOPROTO} = "YES"; push (@{$part->{PUBLIC_HEADERS}}, $part->{PUBLIC_PROTO_HEADER}); } Modified: branches/SAMBA_4_0/source/headermap.txt =================================================================== --- branches/SAMBA_4_0/source/headermap.txt 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/headermap.txt 2006-03-17 13:55:10 UTC (rev 14511) @@ -60,3 +60,12 @@ libcli/auth/credentials.h: domain_credentials.h lib/charset/charset.h: charset.h lib/charset/charset_proto.h: charset/proto.h +libcli/ldap/ldap.h: ldap.h +libcli/ldap/ldap_proto.h: ldap_proto.h +torture/torture.h: torture.h +torture/proto.h: torture/proto.h +libcli/libcli.h: client.h +libcli/libcli_proto.h: client/proto.h +librpc/gen_ndr/nbt.h: gen_ndr/nbt.h +librpc/gen_ndr/svcctl.h: gen_ndr/nbt.h +lib/cmdline/popt_common.h: samba/popt.h Modified: branches/SAMBA_4_0/source/lib/charset/charset.h =================================================================== --- branches/SAMBA_4_0/source/lib/charset/charset.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/lib/charset/charset.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -22,6 +22,8 @@ #ifndef __CHARSET_H__ #define __CHARSET_H__ +#include "lib/talloc/talloc.h" + /* this defines the charset types used in samba */ typedef enum {CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t; Modified: branches/SAMBA_4_0/source/lib/cmdline/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/cmdline/config.mk 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/lib/cmdline/config.mk 2006-03-17 13:55:10 UTC (rev 14511) @@ -4,6 +4,7 @@ REQUIRED_SUBSYSTEMS = CREDENTIALS [SUBSYSTEM::POPT_SAMBA] +PUBLIC_HEADERS = popt_common.h OBJ_FILES = popt_common.o [SUBSYSTEM::POPT_CREDENTIALS] Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.h =================================================================== --- branches/SAMBA_4_0/source/lib/cmdline/popt_common.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/lib/cmdline/popt_common.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -21,7 +21,7 @@ #ifndef _POPT_COMMON_H #define _POPT_COMMON_H -#include "popt.h" +#include <popt.h> /* Common popt structures */ extern struct poptOption popt_common_samba[]; Modified: branches/SAMBA_4_0/source/lib/util/util.h =================================================================== --- branches/SAMBA_4_0/source/lib/util/util.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/lib/util/util.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -24,6 +24,7 @@ #ifndef _SAMBA_UTIL_H_ #define _SAMBA_UTIL_H_ +#include "core.h" #include "charset/charset.h" /** Modified: branches/SAMBA_4_0/source/libcli/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/config.mk 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/config.mk 2006-03-17 13:55:10 UTC (rev 14511) @@ -96,6 +96,7 @@ 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 @@ [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 \ Modified: branches/SAMBA_4_0/source/libcli/ldap/config.mk =================================================================== --- branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/ldap/config.mk 2006-03-17 13:55:10 UTC (rev 14511) @@ -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 \ Modified: branches/SAMBA_4_0/source/libcli/libcli.h =================================================================== --- branches/SAMBA_4_0/source/libcli/libcli.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/libcli.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -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 @@ const char *name; }; +struct cli_credentials; +struct event_context; +#include "libcli/raw/libcliraw.h" #include "libcli/libcli_proto.h" #endif /* __LIBCLI_H__ */ Modified: branches/SAMBA_4_0/source/libcli/raw/interfaces.h =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/interfaces.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/raw/interfaces.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -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 @@ } findclose; }; +#endif /* __LIBCLI_RAW_INTERFACES_H__ */ Modified: branches/SAMBA_4_0/source/libcli/raw/libcliraw.h =================================================================== --- branches/SAMBA_4_0/source/libcli/raw/libcliraw.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/raw/libcliraw.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -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 @@ goto failed; \ } +#include "libcli/raw/interfaces.h" #include "libcli/raw/raw_proto.h" + +#endif /* __LIBCLI_RAW__H__ */ Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2.h =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/smb2.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/smb2/smb2.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -20,8 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "smb.h" - struct smb2_options { uint32_t timeout; }; Modified: branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h =================================================================== --- branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/libcli/smb2/smb2_calls.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -20,6 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "libcli/raw/interfaces.h" struct smb2_negprot { struct { Modified: branches/SAMBA_4_0/source/librpc/config.mk =================================================================== --- branches/SAMBA_4_0/source/librpc/config.mk 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/librpc/config.mk 2006-03-17 13:55:10 UTC (rev 14511) @@ -201,6 +201,7 @@ [LIBRARY::NDR_SVCCTL] VERSION = 0.0.1 +PUBLIC_HEADERS = gen_ndr/svcctl.h SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_svcctl.o @@ -409,6 +410,7 @@ SO_VERSION = 0 DESCRIPTION = OBJ_FILES = gen_ndr/ndr_nbt.o +PUBLIC_HEADERS = gen_ndr/nbt.h REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL [LIBRARY::NDR_WINSREPL] Modified: branches/SAMBA_4_0/source/smb_server/smb_server.h =================================================================== --- branches/SAMBA_4_0/source/smb_server/smb_server.h 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/smb_server/smb_server.h 2006-03-17 13:55:10 UTC (rev 14511) @@ -20,9 +20,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "smb.h" #include "libcli/raw/request.h" #include "smbd/process_model.h" +#include "libcli/raw/interfaces.h" /* this header declares the core context structures associated with smb Modified: branches/SAMBA_4_0/source/torture/config.mk =================================================================== --- branches/SAMBA_4_0/source/torture/config.mk 2006-03-17 13:17:25 UTC (rev 14510) +++ branches/SAMBA_4_0/source/torture/config.mk 2006-03-17 13:55:10 UTC (rev 14511) @@ -220,7 +220,8 @@ # Start BINARY smbtorture [BINARY::smbtorture] INSTALLDIR = BINDIR -PRIVATE_PROTO_HEADER = proto.h +PUBLIC_HEADERS = torture.h +PUBLIC_PROTO_HEADER = proto.h OBJ_FILES = \ torture.o \ torture_util.o