s4-waf: install the rest of the headers

8 files changed, 26 insertions, 20 deletions

diff --git a/source4/auth/wscript_build b/source4/auth/wscript_build
index ddfb046bad..c7dfa8943c 100644
--- a/source4/auth/wscript_build
+++ b/source4/auth/wscript_build
@@ -12,6 +12,7 @@ bld.SAMBA_SUBSYSTEM('auth_session',
 	autoproto='session_proto.h',
 	public_deps='CREDENTIALS',
 	public_headers='session.h',
+        header_path='samba',
 	deps='SAMDB'
 	)
 
diff --git a/source4/dynconfig/wscript b/source4/dynconfig/wscript
index 1f0c6c0372..3f609efa73 100644
--- a/source4/dynconfig/wscript
+++ b/source4/dynconfig/wscript
@@ -82,4 +82,6 @@ def build(bld):
     bld.SAMBA_SUBSYSTEM('DYNCONFIG',
                         'dynconfig.c',
                         deps='replace talloc',
+                        public_headers='../version.h',
+                        header_path='samba',
                         cflags=cflags)
diff --git a/source4/lib/cmdline/wscript_build b/source4/lib/cmdline/wscript_build
index 98a796577a..660f471bb6 100644
--- a/source4/lib/cmdline/wscript_build
+++ b/source4/lib/cmdline/wscript_build
@@ -4,11 +4,11 @@ bld.SAMBA_SUBSYSTEM('LIBCMDLINE_CREDENTIALS',
 	public_deps='CREDENTIALS LIBPOPT'
 	)
 
-
 bld.SAMBA_SUBSYSTEM('POPT_SAMBA',
 	source='popt_common.c',
 	public_deps='LIBPOPT',
-	public_headers='popt_common.h',
+	public_headers='popt_common.h:popt.h',
+        header_path='samba',
         deps='talloc'
 	)
 
diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index 92cefab8af..3a54e55415 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -107,6 +107,7 @@ def build(bld):
 		      COMMON_SRC + ' ' + LDB_MAP_SRC,
 		      deps=ldb_deps,
 		      includes='include',
+                      public_headers='include/ldb.h include/ldb_errors.h',
                       vnum=VERSION)
 
     bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
diff --git a/source4/libcli/ldap/wscript_build b/source4/libcli/ldap/wscript_build
index 10f82bcca1..3ed3627dc1 100644
--- a/source4/libcli/ldap/wscript_build
+++ b/source4/libcli/ldap/wscript_build
@@ -1,12 +1,8 @@
-# AUTOGENERATED by mktowscript.pl from ../../source4/libcli/ldap/config.mk
-# Please remove this notice if hand editing
-
-
 bld.SAMBA_SUBSYSTEM('LIBCLI_LDAP',
 	source='ldap_client.c ldap_bind.c ldap_ildap.c ldap_controls.c',
 	autoproto='ldap_proto.h',
 	public_deps='LIBSAMBA-ERRORS tevent LIBPACKET',
-	public_headers='ldap.h',
+	public_headers='ldap.h:ldap-util.h',
 	deps='LIBCLI_COMPOSITE samba_socket NDR_SAMR LIBTLS LIBCLI_LDAP_NDR LIBNDR LP_RESOLVE gensec LIBCLI_LDAP_MESSAGE'
 	)
 
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 537faf5950..7c4505c261 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -5,6 +5,7 @@ bld.BUILD_SUBDIR('wbclient')
 bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
 	source='../../libcli/util/doserr.c util/errormap.c util/nterr.c',
 	public_headers='../../libcli/util/error.h ../../libcli/util/ntstatus.h ../../libcli/util/doserr.h ../../libcli/util/werror.h',
+        header_path='core',
         deps='talloc'
 	)
 
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index f85f95ff4f..e4310e828f 100644
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -5,8 +5,8 @@ bld.SAMBA_LIBRARY('LIBNDR',
 	source='ndr/ndr_string.c ../../librpc/ndr/ndr_basic.c ../../librpc/ndr/uuid.c ../../librpc/ndr/ndr.c ../../librpc/ndr/ndr_misc.c ../../librpc/gen_ndr/ndr_misc.c',
 	# PC_FILES='../librpc/ndr.pc',
 	public_deps='LIBSAMBA-ERRORS talloc LIBSAMBA-UTIL CHARSET LIBSAMBA-HOSTCONFIG',
-	public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h',
-        header_path='gen_ndr',
+	public_headers='../../librpc/gen_ndr/misc.h ../../librpc/gen_ndr/ndr_misc.h ../../librpc/ndr/libndr.h:ndr.h',
+        header_path= [ ( '*gen_ndr*', 'gen_ndr' ) ],
         depends_on='PIDL_MISC',
 	vnum='0.0.1'
 	)
@@ -30,7 +30,8 @@ bld.SAMBA_SUBSYSTEM('NDR_COMPRESSION',
 bld.SAMBA_SUBSYSTEM('NDR_SECURITY',
 	source='../../librpc/gen_ndr/ndr_security.c ../../librpc/ndr/ndr_sec_helper.c gen_ndr/ndr_server_id.c',
 	public_deps='LIBNDR LIBSECURITY',
-	public_headers='../libcli/security/security.h gen_ndr/server_id.h'
+	public_headers='../libcli/security/security.h gen_ndr/server_id.h',
+        header_path='gen_ndr'
 	)
 
 
@@ -294,7 +295,8 @@ bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 bld.SAMBA_SUBSYSTEM('NDR_NBT',
 	source='../../librpc/gen_ndr/ndr_nbt.c',
 	public_deps='LIBNDR NDR_NBT_BUF NDR_SECURITY NDR_STANDARD LIBCLI_NDR_NETLOGON',
-	public_headers='../../librpc/gen_ndr/nbt.h'
+	public_headers='../../librpc/gen_ndr/nbt.h',
+        header_path='gen_ndr'
 	)
 
 
@@ -328,7 +330,8 @@ bld.SAMBA_LIBRARY('NDR_STANDARD',
 	# PC_FILES='../librpc/ndr_standard.pc',
 	deps='NDR_SECURITY',
 	public_deps='LIBNDR',
-	public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h'
+	public_headers='../../librpc/gen_ndr/samr.h ../../librpc/gen_ndr/ndr_samr.h ../rpc_server/lsa/lsa.h ../torture/rpc/netlogon.h ../../librpc/gen_ndr/atsvc.h ../../librpc/gen_ndr/ndr_atsvc.h ../../librpc/gen_ndr/ndr_svcctl.h ../../librpc/gen_ndr/svcctl.h',
+        header_path='gen_ndr'
 	)
 
 
@@ -430,7 +433,8 @@ bld.SAMBA_LIBRARY('dcerpc_samr',
 	# PC_FILES='dcerpc_samr.pc',
 	vnum='0.0.1',
 	public_deps='dcerpc NDR_STANDARD',
-	public_headers='../../librpc/gen_ndr/ndr_samr_c.h'
+	public_headers='../../librpc/gen_ndr/ndr_samr_c.h',
+        header_path='gen_ndr'
 	)
 
 
@@ -455,7 +459,8 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SRVSVC',
 bld.SAMBA_SUBSYSTEM('RPC_NDR_SVCCTL',
 	source='../../librpc/gen_ndr/ndr_svcctl_c.c',
 	public_deps='dcerpc NDR_STANDARD',
-	public_headers='../../librpc/gen_ndr/ndr_svcctl_c.h'
+	public_headers='../../librpc/gen_ndr/ndr_svcctl_c.h',
+        header_path='gen_ndr'
 	)
 
 
@@ -464,7 +469,8 @@ bld.SAMBA_LIBRARY('dcerpc_atsvc',
 	# PC_FILES='dcerpc_atsvc.pc',
 	vnum='0.0.1',
 	public_deps='dcerpc NDR_STANDARD',
-	public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h'
+	public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h',
+        header_path='gen_ndr'
 	)
 
 
@@ -585,7 +591,8 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_KEYSVC',
 bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
 	source='../../librpc/gen_ndr/ndr_dcerpc.c',
 	public_deps='LIBNDR',
-	public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h'
+	public_headers='rpc/dcerpc.h ../../librpc/gen_ndr/ndr_dcerpc.h ../../librpc/gen_ndr/dcerpc.h',
+        header_path= [ ('*gen_ndr*', 'gen_ndr') ],
 	)
 
 
@@ -596,6 +603,7 @@ bld.SAMBA_LIBRARY('dcerpc',
 	autoproto='rpc/dcerpc_proto.h',
 	public_deps='CREDENTIALS tevent talloc',
 	public_headers='../../librpc/gen_ndr/mgmt.h ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h ../../librpc/gen_ndr/ndr_epmapper_c.h',
+        header_path='gen_ndr',
 	vnum='0.0.1'
 	)
 
diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
index 6a871ab903..841554abfc 100644
--- a/source4/rpc_server/wscript_build
+++ b/source4/rpc_server/wscript_build
@@ -1,11 +1,8 @@
-# AUTOGENERATED by mktowscript.pl from ../../source4/rpc_server/config.mk
-# Please remove this notice if hand editing
-
-
 bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
 	source='common/server_info.c common/share_info.c common/forward.c',
 	autoproto='common/proto.h',
 	public_headers='common/common.h',
+        header_path='dcerpc_server',
 	deps='ldb'
 	)