r2835: Since we always have -I. and -I$(srcdir) in CFLAGS, we can get rid of

'..' from all #include preprocessor commands.   This fixes bugzilla #1880
where OpenVMS gets confused about the '.' characters.
(This used to be commit 7f161702fa4916979602cc0295919b541912acd6)

33 files changed, 35 insertions, 35 deletions

diff --git a/source3/aparser/parser.h b/source3/aparser/parser.h
index 319aeb5d138..24b0cd19305 100644
--- a/source3/aparser/parser.h
+++ b/source3/aparser/parser.h
@@ -4,7 +4,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "../include/byteorder.h"
+#include "include/byteorder.h"
 
 #define PARSE_SCALARS (1<<0)
 #define PARSE_BUFFERS (1<<1)
diff --git a/source3/client/client.c b/source3/client/client.c
index 42db009c58a..c2fec17d7ec 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -23,7 +23,7 @@
 #define NO_SYSLOG
 
 #include "includes.h"
-#include "../client/client_proto.h"
+#include "client/client_proto.h"
 #ifndef REGISTER
 #define REGISTER 0
 #endif
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 4cadef558d6..b4d6273f7bb 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -37,7 +37,7 @@
 
 #include "includes.h"
 #include "clitar.h"
-#include "../client/client_proto.h"
+#include "client/client_proto.h"
 
 static int clipfind(char **aret, int ret, char *tok);
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 3ea4eaa35a9..d51e4c53f1a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -793,9 +793,9 @@ extern int errno;
 #include "ubi_sLinkList.h"
 #include "ubi_dLinkList.h"
 #include "dlinklist.h"
-#include "../tdb/tdb.h"
-#include "../tdb/spinlock.h"
-#include "../tdb/tdbutil.h"
+#include "tdb/tdb.h"
+#include "tdb/spinlock.h"
+#include "tdb/tdbutil.h"
 #include "talloc.h"
 #include "nt_status.h"
 #include "ads.h"
diff --git a/source3/include/libsmb_internal.h b/source3/include/libsmb_internal.h
index 21fe47d4b29..9111f36eaf7 100644
--- a/source3/include/libsmb_internal.h
+++ b/source3/include/libsmb_internal.h
@@ -6,7 +6,7 @@
 #define SMBC_DIR_MODE  (S_IFDIR | 0555)
 
 
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 
 struct _SMBCSRV {
diff --git a/source3/libsmb/libsmb_cache.c b/source3/libsmb/libsmb_cache.c
index cb40b4aaa6b..caf226c5a6a 100644
--- a/source3/libsmb/libsmb_cache.c
+++ b/source3/libsmb/libsmb_cache.c
@@ -27,7 +27,7 @@
  * Define this to get the real SMBCFILE and SMBCSRV structures 
  */
 #define _SMBC_INTERNAL
-#include "../include/libsmbclient.h"
+#include "include/libsmbclient.h"
 
 /*
  * Structure we use if internal caching mechanism is used 
diff --git a/source3/libsmb/libsmb_compat.c b/source3/libsmb/libsmb_compat.c
index cc23835ae3d..c4be848cc17 100644
--- a/source3/libsmb/libsmb_compat.c
+++ b/source3/libsmb/libsmb_compat.c
@@ -25,7 +25,7 @@
 
 #include "includes.h"
 
-#include "../include/libsmb_internal.h"
+#include "include/libsmb_internal.h"
 
 struct smbc_compat_fdlist {
 	SMBCFILE * file;
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index e44bdea2d3d..2c813a8481c 100644
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 
-#include "../include/libsmb_internal.h"
+#include "include/libsmb_internal.h"
 
 /*
  * Internal flags for extended attributes
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index 751f6f3700f..477d2e0f682 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -230,7 +230,7 @@ struct winbindd_idmap_methods {
   void (*status)(void);
 };
 
-#include "../nsswitch/winbindd_proto.h"
+#include "nsswitch/winbindd_proto.h"
 
 #include "rpc_parse.h"
 #include "rpc_client.h"
diff --git a/source3/utils/net.c b/source3/utils/net.c
index 2bf8ac286dd..9a022b2d38d 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -38,7 +38,7 @@
 /*****************************************************/
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /***********************************************************************/
 /* Beginning of internationalization section.  Translatable constants  */
diff --git a/source3/utils/net.h b/source3/utils/net.h
index d75a19e498e..5e65ca0d4cd 100644
--- a/source3/utils/net.h
+++ b/source3/utils/net.h
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "../utils/net_proto.h"
+#include "utils/net_proto.h"
  
 #define NET_FLAGS_MASTER 1
 #define NET_FLAGS_DMB 2
diff --git a/source3/utils/net_ads.c b/source3/utils/net_ads.c
index 8afc42c456b..19311cde654 100644
--- a/source3/utils/net_ads.c
+++ b/source3/utils/net_ads.c
@@ -21,7 +21,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/utils/net_ads_cldap.c b/source3/utils/net_ads_cldap.c
index f3c6c5ff4d2..9585a8bc760 100644
--- a/source3/utils/net_ads_cldap.c
+++ b/source3/utils/net_ads_cldap.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 #ifdef HAVE_ADS
 
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c
index 0ad1d519531..3431196b1e6 100644
--- a/source3/utils/net_groupmap.c
+++ b/source3/utils/net_groupmap.c
@@ -22,7 +22,7 @@
 
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /*********************************************************
diff --git a/source3/utils/net_help.c b/source3/utils/net_help.c
index d6ef5e8a6c3..859bb949c73 100644
--- a/source3/utils/net_help.c
+++ b/source3/utils/net_help.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 int net_common_methods_usage(int argc, const char**argv)
 {
diff --git a/source3/utils/net_idmap.c b/source3/utils/net_idmap.c
index f5b4bf1b4a7..35892e8b52c 100644
--- a/source3/utils/net_idmap.c
+++ b/source3/utils/net_idmap.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /***********************************************************
diff --git a/source3/utils/net_lookup.c b/source3/utils/net_lookup.c
index cef0ea5fbed..7e5f12da454 100644
--- a/source3/utils/net_lookup.c
+++ b/source3/utils/net_lookup.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 int net_lookup_usage(int argc, const char **argv)
 {
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c
index 39254641abf..cae0a7f7da8 100644
--- a/source3/utils/net_rap.c
+++ b/source3/utils/net_rap.c
@@ -24,7 +24,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* The following messages were for error checking that is not properly 
    reported at the moment.  Which should be reinstated? */
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index a6e4c61d459..9b96ad13717 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /**
  * @file net_rpc.c
diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index 52e295949e0..cb8a5ee4d4f 100644
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -19,7 +19,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 /* Macro for checking RPC error codes to make things more readable */
 
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index 732af254d0d..50d0d4e7df9 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
  
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 struct table_node {
 	const char *long_archi;
diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c
index 882f3a02bc2..2e7c053ac3f 100644
--- a/source3/utils/net_rpc_samsync.c
+++ b/source3/utils/net_rpc_samsync.c
@@ -22,7 +22,7 @@
 */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 extern DOM_SID global_sid_Builtin; 
 
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index 0543f457cfc..21e6bffb2cf 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 static int show_session(TDB_CONTEXT *tdb, TDB_DATA kbuf, TDB_DATA dbuf,
 			void *state)
diff --git a/source3/utils/net_time.c b/source3/utils/net_time.c
index 45c17838055..691adcea00e 100644
--- a/source3/utils/net_time.c
+++ b/source3/utils/net_time.c
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "includes.h"
-#include "../utils/net.h"
+#include "utils/net.h"
 
 
 /*
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index ea7db55e2dd..b2c155dfb2a 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../utils/ntlm_auth.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/utils/ntlm_auth.h b/source3/utils/ntlm_auth.h
index a96067fbbb8..5e49b862a20 100644
--- a/source3/utils/ntlm_auth.h
+++ b/source3/utils/ntlm_auth.h
@@ -17,7 +17,7 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#include "../utils/ntlm_auth_proto.h"
+#include "utils/ntlm_auth_proto.h"
  
 /* Some of the popt variables are needed in the diagnostics code */
 extern const char *opt_username;
diff --git a/source3/utils/ntlm_auth_diagnostics.c b/source3/utils/ntlm_auth_diagnostics.c
index 3489dbca7c8..7fae0ede978 100644
--- a/source3/utils/ntlm_auth_diagnostics.c
+++ b/source3/utils/ntlm_auth_diagnostics.c
@@ -23,7 +23,7 @@
 */
 
 #include "includes.h"
-#include "../utils/ntlm_auth.h"
+#include "utils/ntlm_auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index 93731d1d3f9..cf309c364e2 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -19,7 +19,7 @@
 
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define MAX_VARIABLES 10000
 
diff --git a/source3/web/diagnose.c b/source3/web/diagnose.c
index 46432c41f85..a4907860685 100644
--- a/source3/web/diagnose.c
+++ b/source3/web/diagnose.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #ifdef WITH_WINBIND
 
diff --git a/source3/web/neg_lang.c b/source3/web/neg_lang.c
index da974f78a4a..aa285745d6c 100644
--- a/source3/web/neg_lang.c
+++ b/source3/web/neg_lang.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 /*
   during a file download we first check to see if there is a language
diff --git a/source3/web/startstop.c b/source3/web/startstop.c
index 93e8650c2bc..9ffda5bb941 100644
--- a/source3/web/startstop.c
+++ b/source3/web/startstop.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 #include "dynconfig.h"
 
 
diff --git a/source3/web/statuspage.c b/source3/web/statuspage.c
index 2c645de248e..953222c2fc1 100644
--- a/source3/web/statuspage.c
+++ b/source3/web/statuspage.c
@@ -19,7 +19,7 @@
 */
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 #define PIDMAP		struct PidMap
 
diff --git a/source3/web/swat.c b/source3/web/swat.c
index 40f9f059912..48537d1d049 100644
--- a/source3/web/swat.c
+++ b/source3/web/swat.c
@@ -29,7 +29,7 @@
  **/
 
 #include "includes.h"
-#include "../web/swat_proto.h"
+#include "web/swat_proto.h"
 
 static BOOL demo_mode = False;
 static BOOL have_write_access = False;