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

11 files changed, 116 insertions, 116 deletions

diff --git a/riscos/configure/con_cache.c b/riscos/configure/con_cache.c
index 1835ea607..4fb8283eb 100644
--- a/riscos/configure/con_cache.c
+++ b/riscos/configure/con_cache.c
@@ -6,17 +6,17 @@
  */
 
 #include "oslib/hourglass.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/filename.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/filename.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define CACHE_MEMORY_SIZE 3
diff --git a/riscos/configure/con_connect.c b/riscos/configure/con_connect.c
index 42dac5f72..f47e7ddb8 100644
--- a/riscos/configure/con_connect.c
+++ b/riscos/configure/con_connect.c
@@ -7,18 +7,18 @@
 
 #include <stdbool.h>
 #include <swis.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
 #include "oslib/wimp.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/configure/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/tinct.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utils.h"
 
 
 #define CONNECTION_PROXY_FIELD 3
diff --git a/riscos/configure/con_content.c b/riscos/configure/con_content.c
index 6e762eeb0..7bbc6f928 100644
--- a/riscos/configure/con_content.c
+++ b/riscos/configure/con_content.c
@@ -5,16 +5,16 @@
  * Copyright 2006 Richard Wilson <info@tinct.net>
  */
 
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define CONTENT_BLOCK_ADVERTISEMENTS 2
diff --git a/riscos/configure/con_fonts.c b/riscos/configure/con_fonts.c
index 81d9a576d..be767f730 100644
--- a/riscos/configure/con_fonts.c
+++ b/riscos/configure/con_fonts.c
@@ -5,18 +5,18 @@
  * Copyright 2005 Richard Wilson <info@tinct.net>
  */
 
-#include "netsurf/css/css.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "css/css.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define FONT_SANS_FIELD 3
diff --git a/riscos/configure/con_home.c b/riscos/configure/con_home.c
index 26d104ebf..a2e3ab958 100644
--- a/riscos/configure/con_home.c
+++ b/riscos/configure/con_home.c
@@ -5,17 +5,17 @@
  * Copyright 2005 Richard Wilson <info@tinct.net>
  */
 
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define HOME_URL_FIELD 3
diff --git a/riscos/configure/con_image.c b/riscos/configure/con_image.c
index 3d67fc1f4..6892fd758 100644
--- a/riscos/configure/con_image.c
+++ b/riscos/configure/con_image.c
@@ -7,18 +7,18 @@
 
 #include <stdbool.h>
 #include <swis.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
 #include "oslib/wimp.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/tinct.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/configure/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/tinct.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/utils.h"
 
 
 #define IMAGE_FOREGROUND_FIELD 3
diff --git a/riscos/configure/con_inter.c b/riscos/configure/con_inter.c
index a649270a5..186874e61 100644
--- a/riscos/configure/con_inter.c
+++ b/riscos/configure/con_inter.c
@@ -5,13 +5,13 @@
  * Copyright 2006 Adrian Lees <adrianl@users.sourceforge.net>
  */
 
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
 
 
 #define INTERFACE_STRIP_EXTNS_OPTION 2
diff --git a/riscos/configure/con_language.c b/riscos/configure/con_language.c
index 637f84ac9..f458f6df8 100644
--- a/riscos/configure/con_language.c
+++ b/riscos/configure/con_language.c
@@ -6,18 +6,18 @@
  * Copyright 2006 Richard Wilson <info@tinct.net>
  */
 
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define LANGUAGE_INTERFACE_FIELD 3
diff --git a/riscos/configure/con_memory.c b/riscos/configure/con_memory.c
index c5c7466e1..1bfa8d567 100644
--- a/riscos/configure/con_memory.c
+++ b/riscos/configure/con_memory.c
@@ -5,13 +5,13 @@
  * Copyright 2006 Richard Wilson <info@tinct.net>
  */
 
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/bitmap.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/configure/configure.h"
+#include "desktop/options.h"
+#include "riscos/bitmap.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/dialog.h"
+#include "riscos/configure/configure.h"
 
 
 #define MEMORY_DIRECT_FIELD 3
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c
index 2b16f3116..46f30bd0f 100644
--- a/riscos/configure/con_secure.c
+++ b/riscos/configure/con_secure.c
@@ -5,16 +5,16 @@
  * Copyright 2006 Richard Wilson <info@tinct.net>
  */
 
-#include "netsurf/desktop/options.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/gui.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "desktop/options.h"
+#include "riscos/dialog.h"
+#include "riscos/gui.h"
+#include "riscos/options.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "riscos/configure.h"
+#include "riscos/configure/configure.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define SECURITY_REFERRER 2
diff --git a/riscos/configure/con_theme.c b/riscos/configure/con_theme.c
index de0a10583..d8dfda6fb 100644
--- a/riscos/configure/con_theme.c
+++ b/riscos/configure/con_theme.c
@@ -8,22 +8,22 @@
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
-#include "oslib/osspriteop.h"
+#include <oslib/osspriteop.h>
 #include "oslib/wimp.h"
 #include "oslib/wimpspriteop.h"
-#include "netsurf/utils/config.h"
-#include "netsurf/riscos/configure/configure.h"
-#include "netsurf/riscos/configure.h"
-#include "netsurf/riscos/dialog.h"
-#include "netsurf/riscos/menus.h"
-#include "netsurf/riscos/options.h"
-#include "netsurf/riscos/theme.h"
-#include "netsurf/riscos/url_complete.h"
-#include "netsurf/riscos/wimp.h"
-#include "netsurf/riscos/wimp_event.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "riscos/configure/configure.h"
+#include "riscos/configure.h"
+#include "riscos/dialog.h"
+#include "riscos/menus.h"
+#include "riscos/options.h"
+#include "riscos/theme.h"
+#include "riscos/url_complete.h"
+#include "riscos/wimp.h"
+#include "riscos/wimp_event.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/utils.h"
 
 
 #define THEME_PANE_AREA 0