r12216: Couple of small fixes: reduce include/includes.h a bit, simplify headers

in build/smb_build/, remove unused pstring macros
(This used to be commit 432296207400636dd81d0929ec7b1b4cebbcaa62)

8 files changed, 39 insertions, 47 deletions

diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index d3fcbd1370..8fe11bfc85 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -1,5 +1,8 @@
 - split up proto.h into headers with public or private prototypes. 
   Public prototypes can be marked with _PUBLIC_ in the source
+   - get rid of include/structs.h
+- install Samba-specific headers in $INCLUDEDIR/samba-4.0. talloc.h, tdb.h and 
+	ldb.h belong in $INCLUDEDIR
 - never install -rpath binaries / libraries, always relink before install
  - keep files without -rpath in bin/install
 - init functions may be called more then once as different libraries 
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index d7408a5f8f..3d55718541 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -1,10 +1,10 @@
-###########################################################
-### SMB Build System					###
-### - config.mk parsing functions			###
-###							###
-###  Copyright (C) Stefan (metze) Metzmacher 2004	###
-###  Released under the GNU GPL				###
-###########################################################
+# Samba Build System
+# - config.mk parsing functions
+#
+#  Copyright (C) Stefan (metze) Metzmacher 2004
+#  Copyright (C) Jelmer Vernooij 2005
+#  Released under the GNU GPL
+#
 
 package smb_build::config_mk;
 use smb_build::input;
diff --git a/source4/build/smb_build/env.pm b/source4/build/smb_build/env.pm
index 8acd7dd932..1ad8e23d36 100644
--- a/source4/build/smb_build/env.pm
+++ b/source4/build/smb_build/env.pm
@@ -1,4 +1,3 @@
-#
 # Environment class
 #
 # Samba Build Environment
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 5dcbb8c904..ebc91a9107 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -1,11 +1,9 @@
-###########################################################
-### SMB Build System					###
-### - the input checking functions			###
-###							###
-###  Copyright (C) Stefan (metze) Metzmacher 2004	###
-###  Copyright (C) Jelmer Vernooij 2004	###
-###  Released under the GNU GPL				###
-###########################################################
+# Samba Build System
+# - the input checking functions
+#
+#  Copyright (C) Stefan (metze) Metzmacher 2004
+#  Copyright (C) Jelmer Vernooij 2004
+#  Released under the GNU GPL
 
 use strict;
 package smb_build::input;
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 4c42c7a7c1..0c027facc3 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -1,11 +1,9 @@
-###########################################################
-### SMB Build System					###
-### - the main program					###
-###							###
-###  Copyright (C) Stefan (metze) Metzmacher 2004	###
-###  Copyright (C) Jelmer Vernooij 2005
-###  Released under the GNU GPL				###
-###########################################################
+# Samba Build System					
+# - the main program					
+#							
+#  Copyright (C) Stefan (metze) Metzmacher 2004	
+#  Copyright (C) Jelmer Vernooij 2005
+#  Released under the GNU GPL				
 
 use smb_build::makefile;
 use smb_build::smb_build_h;
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a84d336716..0543037fef 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -1,11 +1,9 @@
-###########################################################
-### SMB Build System					###
-### - create output for Makefile			###
-###							###
-###  Copyright (C) Stefan (metze) Metzmacher 2004	###
-###  Copyright (C) Jelmer Vernooij 2005			###
-###  Released under the GNU GPL				###
-###########################################################
+# Samba Build System
+# - create output for Makefile
+#
+#  Copyright (C) Stefan (metze) Metzmacher 2004
+#  Copyright (C) Jelmer Vernooij 2005
+#  Released under the GNU GPL
 
 package smb_build::makefile;
 use smb_build::env;
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index d7618766f6..92b2f05c62 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -1,11 +1,9 @@
-###########################################################
-### SMB Build System					###
-### - the output generating functions			###
-###							###
-###  Copyright (C) Stefan (metze) Metzmacher 2004	###
-###  Copyright (C) Jelmer Vernooij 2004	###
-###  Released under the GNU GPL				###
-###########################################################
+# SMB Build System
+# - the output generating functions
+#
+#  Copyright (C) Stefan (metze) Metzmacher 2004
+#  Copyright (C) Jelmer Vernooij 2004
+#  Released under the GNU GPL
 
 package output;
 use strict;
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index b31cf8b9d9..e06e965ac7 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -1,10 +1,8 @@
-###########################################################
-### SMB Build System					###
-### - create output for smb_build.h			###
-###							###
-###  Copyright (C) Stefan (metze) Metzmacher 2004	###
-###  Released under the GNU GPL				###
-###########################################################
+# SMB Build System
+# - create output for smb_build.h
+#
+#  Copyright (C) Stefan (metze) Metzmacher 2004
+#  Released under the GNU GPL
 
 package smb_build_h;
 use strict;