From 2eeb0e5f282a22e11de07d4038b01fc446e3fc14 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 6 Nov 2006 12:05:09 +0000
Subject: r19569: Require that all public header files have a destination path.
 Fix places where this was currently not the case. (This used to be commit
 3894497a232df8cf0457c7439c9ae347f63f24a1)

---
 source4/headermap.txt           | 9 ++++++++-
 source4/librpc/config.mk        | 1 -
 source4/script/installheader.pl | 3 +--
 source4/smbd/config.mk          | 2 +-
 source4/torture/config.mk       | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'source4')

diff --git a/source4/headermap.txt b/source4/headermap.txt
index 937e283470..fb1b146e7f 100644
--- a/source4/headermap.txt
+++ b/source4/headermap.txt
@@ -73,7 +73,7 @@ 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
-include/dlinklist.h: dlinklist.h
+lib/util/dlinklist.h: dlinklist.h
 version.h: samba/version.h
 param/proto.h: param/proto.h
 param/param.h: param.h
@@ -85,3 +85,10 @@ libcli/util/error.h: core/error.h
 libcli/util/proto.h: core/error_proto.h
 lib/db_wrap.h: db_wrap.h
 lib/db_wrap_proto.h: db_wrap/proto.h
+torture/ui.h: torture/ui.h
+torture/torture.h: torture/torture.h
+librpc/gen_ndr/winbind.h: winbind.h
+param/share.h: param/share.h
+param/share_proto.h: param/share_proto.h
+lib/util/util_tdb.h: util_tdb.h
+lib/util/wrap_xattr.h: wrap_xattr.h
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index eeb4506219..02e6f9c2e5 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -148,7 +148,6 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 VERSION = 0.0.1
 SO_VERSION = 0
 OBJ_FILES = gen_ndr/ndr_nfs4acl.o
-PUBLIC_HEADERS = gen_ndr/nfs4acl.h
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_SECURITY
 
 [LIBRARY::NDR_SPOOLSS]
diff --git a/source4/script/installheader.pl b/source4/script/installheader.pl
index 7b8dd8e92a..d1f96b2592 100755
--- a/source4/script/installheader.pl
+++ b/source4/script/installheader.pl
@@ -75,8 +75,7 @@ foreach my $p (@ARGV)
 {
 	my $p2 = findmap($p);
 	unless ($p2) {
-	    warn("Unable to map $p");
-	    next;
+	    die("Unable to map $p");
 	}
  	print "Installing $p as $includedir/$p2\n";
 
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 061893d5a1..5ae94c5e13 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -25,7 +25,7 @@ PUBLIC_DEPENDENCIES = \
 
 [SUBSYSTEM::PIDFILE]
 OBJ_FILES = pidfile.o
-PUBLIC_PROTO_HEADER = pidfile.h
+PRIVATE_PROTO_HEADER = pidfile.h
 
 #################################
 # Start BINARY smbd
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index b37a9c8bd9..c093ea7b97 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -3,7 +3,7 @@
 DESCRIPTION = Samba torture (test) suite
 SO_VERSION = 0
 VERSION = 0.0.1
-PUBLIC_HEADERS = torture.h
+PUBLIC_HEADERS = torture.h ui.h
 PUBLIC_PROTO_HEADER = proto.h
 OBJ_FILES = \
 		torture.o \
-- 
cgit