Remove the netsurf/ from the include paths and rationalise use of <> vs "" in includes

NetSurf includes are now done with ""s and other system includes with <>s as C intended.
The scandeps tool has been updated to only look for ""ed includes, and to verify that the
files exist in the tree before adding them to the dependency lines. The depend rule has
therefore been augmented to make sure the autogenerated files are built before it is run.

This is untested under self-hosted RISC OS builds. All else tested and works.


svn path=/trunk/netsurf/; revision=3307

12 files changed, 27 insertions, 27 deletions

diff --git a/utils/container.c b/utils/container.c
index c85e15ef1..eaeda5a98 100644
--- a/utils/container.c
+++ b/utils/container.c
@@ -20,8 +20,8 @@
 #include <string.h>
 #include <stdbool.h>
 #include <arpa/inet.h>
-#include "netsurf/utils/container.h"
-#include "netsurf/utils/config.h"
+#include "utils/container.h"
+#include "utils/config.h"
 #ifdef WITH_MMAP
 #include <sys/mman.h>
 #endif
diff --git a/utils/filename.c b/utils/filename.c
index 84b286dfc..85e0db4ab 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -17,10 +17,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/filename.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
 
 #define FULL_WORD (unsigned int)4294967295
 /* '0' + '0' * 10 */
diff --git a/utils/hashtable.c b/utils/hashtable.c
index 6c82be0b4..a06b5c45a 100644
--- a/utils/hashtable.c
+++ b/utils/hashtable.c
@@ -16,8 +16,8 @@
 #include <assert.h>
 #include <stdio.h>
 #endif
-#include "netsurf/utils/hashtable.h"
-#include "netsurf/utils/log.h"
+#include "utils/hashtable.h"
+#include "utils/log.h"
 
 
 struct hash_entry {
diff --git a/utils/log.h b/utils/log.h
index 86a933a40..db2c4caac 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -7,7 +7,7 @@
  */
 
 #include <stdio.h>
-#include "netsurf/desktop/netsurf.h"
+#include "desktop/netsurf.h"
 
 #ifndef _NETSURF_LOG_H_
 #define _NETSURF_LOG_H_
diff --git a/utils/messages.c b/utils/messages.c
index a10eec025..de5946423 100644
--- a/utils/messages.c
+++ b/utils/messages.c
@@ -18,10 +18,10 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <string.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
-#include "netsurf/utils/hashtable.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
+#include "utils/hashtable.h"
 
 /** We store the messages in a fixed-size hash table. */
 #define HASH_SIZE 101
diff --git a/utils/messages.h b/utils/messages.h
index db1f713c8..183d8bb0f 100644
--- a/utils/messages.h
+++ b/utils/messages.h
@@ -22,7 +22,7 @@
 #ifndef _NETSURF_UTILS_MESSAGES_H_
 #define _NETSURF_UTILS_MESSAGES_H_
 
-#include "netsurf/utils/hashtable.h"
+#include "utils/hashtable.h"
 
 void messages_load(const char *path);
 struct hash_table *messages_load_ctx(const char *path, struct hash_table *ctx);
diff --git a/utils/themes.c b/utils/themes.c
index 0387a1d1d..cedf82d5b 100644
--- a/utils/themes.c
+++ b/utils/themes.c
@@ -5,7 +5,7 @@
  * Copyright 2006 Rob Kendrick <rjek@rjek.com>
  */
 
-#include "netsurf/utils/themes.h"
+#include "utils/themes.h"
 
 struct theme_descriptor;
 
diff --git a/utils/themes.h b/utils/themes.h
index bbebec381..7b2ebba9e 100644
--- a/utils/themes.h
+++ b/utils/themes.h
@@ -8,7 +8,7 @@
 #ifndef __THEMES_H__
 #define __THEMES_H__
 
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
 
 struct theme_descriptor;
 
diff --git a/utils/tt2code b/utils/tt2code
index 8012f31e6..170954da1 100755
--- a/utils/tt2code
+++ b/utils/tt2code
@@ -8,7 +8,7 @@ print <<END;
  * Copyright 2003 James Bursa <bursa\@users.sourceforge.net>
  */
  
-#include "netsurf/utils/utils.h"
+#include "utils/utils.h"
 
 void unicode_transliterate(unsigned int c, char **r)
 {
diff --git a/utils/url.c b/utils/url.c
index 8edd373b6..aafc88c22 100644
--- a/utils/url.c
+++ b/utils/url.c
@@ -19,9 +19,9 @@
 #include <strings.h>
 #include <sys/types.h>
 #include <regex.h>
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/url.h"
+#include "utils/utils.h"
 
 struct url_components_internal {
 	char *buffer;	/* buffer used for all the following data */
diff --git a/utils/utf8.c b/utils/utf8.c
index b811a6595..69414400e 100644
--- a/utils/utf8.c
+++ b/utils/utf8.c
@@ -17,8 +17,8 @@
 
 #include <iconv.h>
 
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utf8.h"
+#include "utils/log.h"
+#include "utils/utf8.h"
 
 static utf8_convert_ret utf8_convert(const char *string, size_t len,
 		const char *from, const char *to, char **result);
diff --git a/utils/utils.c b/utils/utils.c
index cfd7d68aa..f2250b7fa 100644
--- a/utils/utils.c
+++ b/utils/utils.c
@@ -19,12 +19,12 @@
 #include <sys/time.h>
 #include <regex.h>
 #include <time.h>
-#include "netsurf/utils/config.h"
+#include "utils/config.h"
 #define NDEBUG
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utf8.h"
-#include "netsurf/utils/utils.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utf8.h"
+#include "utils/utils.h"
 
 
 char * strip(char * const s)