From 6807b4208a27d9037229b16f31cc409d15a992f5 Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@netsurf-browser.org>
Date: Wed, 30 May 2007 22:39:54 +0000
Subject: 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
---
 debug/debug_bitmap.c |  2 +-
 debug/filetyped.c    |  6 +++---
 debug/fontd.c        |  4 ++--
 debug/netsurfd.c     | 36 ++++++++++++++++++------------------
 4 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'debug')

diff --git a/debug/debug_bitmap.c b/debug/debug_bitmap.c
index e3b56922a..54ab79a9a 100644
--- a/debug/debug_bitmap.c
+++ b/debug/debug_bitmap.c
@@ -15,7 +15,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include "netsurf/image/bitmap.h"
+#include "image/bitmap.h"
 
 
 struct bitmap {
diff --git a/debug/filetyped.c b/debug/filetyped.c
index 950b626c5..c2798b3b1 100644
--- a/debug/filetyped.c
+++ b/debug/filetyped.c
@@ -7,9 +7,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "netsurf/content/fetch.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/utils.h"
+#include "content/fetch.h"
+#include "utils/log.h"
+#include "utils/utils.h"
 
 /**
  * filetype -- determine the MIME type of a local file
diff --git a/debug/fontd.c b/debug/fontd.c
index 82115fa13..f2c0c4b53 100644
--- a/debug/fontd.c
+++ b/debug/fontd.c
@@ -6,8 +6,8 @@
  */
 
 #include <assert.h>
-#include "netsurf/css/css.h"
-#include "netsurf/render/font.h"
+#include "css/css.h"
+#include "render/font.h"
 
 
 bool nsfont_width(const struct css_style *style,
diff --git a/debug/netsurfd.c b/debug/netsurfd.c
index c5883c1ac..847b2e24d 100644
--- a/debug/netsurfd.c
+++ b/debug/netsurfd.c
@@ -9,24 +9,24 @@
 #include <stdbool.h>
 #include <string.h>
 #include <time.h>
-#include "netsurf/utils/config.h"
-#include "netsurf/content/fetch.h"
-#include "netsurf/content/content.h"
-#include "netsurf/content/fetchcache.h"
-#include "netsurf/content/urldb.h"
-#include "netsurf/desktop/cookies.h"
-#include "netsurf/desktop/gui.h"
-#include "netsurf/desktop/options.h"
-#include "netsurf/desktop/selection.h"
-#include "netsurf/desktop/textinput.h"
-#include "netsurf/desktop/tree.h"
-#include "netsurf/image/bitmap.h"
-#include "netsurf/render/box.h"
-#include "netsurf/riscos/save_complete.h"
-#include "netsurf/utils/log.h"
-#include "netsurf/utils/messages.h"
-#include "netsurf/utils/url.h"
-#include "netsurf/utils/utils.h"
+#include "utils/config.h"
+#include "content/fetch.h"
+#include "content/content.h"
+#include "content/fetchcache.h"
+#include "content/urldb.h"
+#include "desktop/cookies.h"
+#include "desktop/gui.h"
+#include "desktop/options.h"
+#include "desktop/selection.h"
+#include "desktop/textinput.h"
+#include "desktop/tree.h"
+#include "image/bitmap.h"
+#include "render/box.h"
+#include "riscos/save_complete.h"
+#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/url.h"
+#include "utils/utils.h"
 
 int done, destroyed;
 bool print_active = false;
-- 
cgit v1.2.3