summaryrefslogtreecommitdiff
path: root/content
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-06-06 14:47:27 +0100
committerVincent Sanders <vince@kyllikki.org>2016-06-06 14:47:27 +0100
commit8861923455a294927398c3207c12ed3e2d6f350e (patch)
tree8b8dd664815becb2c64457d5e7a98fea57ed0b50 /content
parentcba3a1468c07d4bd192967e43b05edc567306dd0 (diff)
downloadnetsurf-8861923455a294927398c3207c12ed3e2d6f350e.tar.gz
netsurf-8861923455a294927398c3207c12ed3e2d6f350e.tar.bz2
Allow include directories to be added by sub makefiles
Diffstat (limited to 'content')
-rw-r--r--content/fetchers/about.c2
-rw-r--r--content/handlers/Makefile2
-rw-r--r--content/handlers/css/css.c6
-rw-r--r--content/handlers/css/dump.c2
-rw-r--r--content/handlers/css/hints.c4
-rw-r--r--content/handlers/css/internal.c2
-rw-r--r--content/handlers/css/select.c10
-rw-r--r--content/handlers/css/utils.c2
-rw-r--r--content/handlers/image/bmp.c2
-rw-r--r--content/handlers/image/gif.c4
-rw-r--r--content/handlers/image/ico.c4
-rw-r--r--content/handlers/image/image.c18
-rw-r--r--content/handlers/image/image_cache.c4
-rw-r--r--content/handlers/image/jpeg.c2
-rw-r--r--content/handlers/image/nssprite.c2
-rw-r--r--content/handlers/image/png.c4
-rw-r--r--content/handlers/image/rsvg.c2
-rw-r--r--content/handlers/image/svg.c2
-rw-r--r--content/handlers/image/video.c2
19 files changed, 39 insertions, 37 deletions
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index 5fbdd225e..4d14020b0 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about.c
@@ -40,7 +40,7 @@
#include "content/fetch.h"
#include "content/fetchers.h"
#include "content/fetchers/about.h"
-#include "content/handlers/image/image_cache.h"
+#include "image/image_cache.h"
struct fetch_about_context;
diff --git a/content/handlers/Makefile b/content/handlers/Makefile
index a12d8cc21..e57fc1119 100644
--- a/content/handlers/Makefile
+++ b/content/handlers/Makefile
@@ -7,3 +7,5 @@ S_IMAGE := $(addprefix content/handlers/image/,$(S_IMAGE))
include content/handlers/css/Makefile
S_CSS := $(addprefix content/handlers/css/,$(S_CSS))
+
+INCLUDE_DIRS += content/handlers
diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
index 4c0cb7a4c..997eb5115 100644
--- a/content/handlers/css/css.c
+++ b/content/handlers/css/css.c
@@ -30,9 +30,9 @@
#include "utils/log.h"
#include "utils/messages.h"
-#include "css.h"
-#include "hints.h"
-#include "internal.h"
+#include "css/css.h"
+#include "css/hints.h"
+#include "css/internal.h"
/* Define to trace import fetches */
#undef NSCSS_IMPORT_TRACE
diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c
index 125b133cf..1ad188cb8 100644
--- a/content/handlers/css/dump.c
+++ b/content/handlers/css/dump.c
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <libcss/libcss.h>
-#include "dump.h"
+#include "css/dump.h"
/**
* Dump a fixed point value to the stream in a textual form.
diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c
index f394ea836..fd25d5397 100644
--- a/content/handlers/css/hints.c
+++ b/content/handlers/css/hints.c
@@ -25,8 +25,8 @@
#include "utils/nsurl.h"
#include "utils/utils.h"
-#include "hints.h"
-#include "select.h"
+#include "css/hints.h"
+#include "css/select.h"
#define LOG_STATS
#undef LOG_STATS
diff --git a/content/handlers/css/internal.c b/content/handlers/css/internal.c
index d66b87a54..14ad00c4f 100644
--- a/content/handlers/css/internal.c
+++ b/content/handlers/css/internal.c
@@ -21,7 +21,7 @@
#include "utils/nsurl.h"
-#include "internal.h"
+#include "css/internal.h"
/* exported interface documented in content/handlers/css/internal.h */
css_error nscss_resolve_url(void *pw, const char *base,
diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c
index ea324e773..6af20145a 100644
--- a/content/handlers/css/select.c
+++ b/content/handlers/css/select.c
@@ -20,15 +20,15 @@
#include <string.h>
#include <strings.h>
-#include "content/urldb.h"
-#include "desktop/system_colour.h"
#include "utils/nsoption.h"
#include "utils/corestrings.h"
#include "utils/log.h"
+#include "content/urldb.h"
+#include "desktop/system_colour.h"
-#include "internal.h"
-#include "hints.h"
-#include "select.h"
+#include "css/internal.h"
+#include "css/hints.h"
+#include "css/select.h"
static css_error node_name(void *pw, void *node, css_qname *qname);
static css_error node_classes(void *pw, void *node,
diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c
index 59ad41216..5c7cbd9a7 100644
--- a/content/handlers/css/utils.c
+++ b/content/handlers/css/utils.c
@@ -22,7 +22,7 @@
#include "utils/nsoption.h"
#include "utils/log.h"
-#include "utils.h"
+#include "css/utils.h"
/** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */
css_fixed nscss_screen_dpi = F_90;
diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c
index 8f787de37..e552cdf94 100644
--- a/content/handlers/image/bmp.c
+++ b/content/handlers/image/bmp.c
@@ -35,7 +35,7 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "bmp.h"
+#include "image/bmp.h"
/** bmp context. */
typedef struct nsbmp_content {
diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c
index 2a8ce3d20..c4f039490 100644
--- a/content/handlers/image/gif.c
+++ b/content/handlers/image/gif.c
@@ -46,8 +46,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image.h"
-#include "gif.h"
+#include "image/image.h"
+#include "image/gif.h"
typedef struct nsgif_content {
struct content base;
diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c
index 7b1e1271c..b14ea7fe1 100644
--- a/content/handlers/image/ico.c
+++ b/content/handlers/image/ico.c
@@ -33,8 +33,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image.h"
-#include "ico.h"
+#include "image/image.h"
+#include "image/ico.h"
typedef struct nsico_content {
struct content base;
diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c
index 0b1ddc0e0..e7cc9218f 100644
--- a/content/handlers/image/image.c
+++ b/content/handlers/image/image.c
@@ -27,15 +27,15 @@
#include "netsurf/content.h"
#include "desktop/gui_internal.h"
-#include "bmp.h"
-#include "gif.h"
-#include "ico.h"
-#include "jpeg.h"
-#include "nssprite.h"
-#include "png.h"
-#include "rsvg.h"
-#include "svg.h"
-#include "image.h"
+#include "image/bmp.h"
+#include "image/gif.h"
+#include "image/ico.h"
+#include "image/jpeg.h"
+#include "image/nssprite.h"
+#include "image/png.h"
+#include "image/rsvg.h"
+#include "image/svg.h"
+#include "image/image.h"
/**
* Initialise image content handlers
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c
index dcb01dd87..3eb27ac45 100644
--- a/content/handlers/image/image_cache.c
+++ b/content/handlers/image/image_cache.c
@@ -31,8 +31,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image_cache.h"
-#include "image.h"
+#include "image/image_cache.h"
+#include "image/image.h"
/** Age of an entry within the cache
*
diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c
index e3af00f9f..278d9e618 100644
--- a/content/handlers/image/jpeg.c
+++ b/content/handlers/image/jpeg.c
@@ -35,7 +35,7 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image_cache.h"
+#include "image/image_cache.h"
#define JPEG_INTERNAL_OPTIONS
#include "jpeglib.h"
diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c
index 9c4717fd6..c902fc3e2 100644
--- a/content/handlers/image/nssprite.c
+++ b/content/handlers/image/nssprite.c
@@ -35,7 +35,7 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "nssprite.h"
+#include "image/nssprite.h"
typedef struct nssprite_content {
struct content base;
diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c
index 45f415a6b..93185c12f 100644
--- a/content/handlers/image/png.c
+++ b/content/handlers/image/png.c
@@ -30,8 +30,8 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "image_cache.h"
-#include "png.h"
+#include "image/image_cache.h"
+#include "image/png.h"
/* accommodate for old versions of libpng (beware security holes!) */
diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c
index ad8e3fa17..1bf4b4403 100644
--- a/content/handlers/image/rsvg.c
+++ b/content/handlers/image/rsvg.c
@@ -48,7 +48,7 @@
#include "content/content_protected.h"
#include "desktop/gui_internal.h"
-#include "rsvg.h"
+#include "image/rsvg.h"
typedef struct rsvg_content {
struct content base;
diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c
index b4532646c..94c485822 100644
--- a/content/handlers/image/svg.c
+++ b/content/handlers/image/svg.c
@@ -33,7 +33,7 @@
#include "netsurf/content.h"
#include "content/content_protected.h"
-#include "svg.h"
+#include "image/svg.h"
typedef struct svg_content {
struct content base;
diff --git a/content/handlers/image/video.c b/content/handlers/image/video.c
index 53b654337..707d39d9b 100644
--- a/content/handlers/image/video.c
+++ b/content/handlers/image/video.c
@@ -21,7 +21,7 @@
#include "content/content_factory.h"
#include "content/content_protected.h"
-#include "video.h"
+#include "image/video.h"
typedef struct nsvideo_content {
struct content base;