Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/8861923455a294927398c3207c12ed3e2d6f350e
...commit
http://git.netsurf-browser.org/netsurf.git/commit/8861923455a294927398c3207c12ed3e2d6f350e
...tree
http://git.netsurf-browser.org/netsurf.git/tree/8861923455a294927398c3207c12ed3e2d6f350e
The branch, master has been updated
via 8861923455a294927398c3207c12ed3e2d6f350e (commit)
from cba3a1468c07d4bd192967e43b05edc567306dd0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=8861923455a294927398c3207c12ed3e2d6f350e
commit 8861923455a294927398c3207c12ed3e2d6f350e
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
Allow include directories to be added by sub makefiles
diff --git a/Makefile b/Makefile
index fe97f1c..6b19007 100644
--- a/Makefile
+++ b/Makefile
@@ -538,9 +538,8 @@ $(eval $(call
pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
-# add top level and build directory to include search path
-CFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
-CXXFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
+# List of directories in which headers are searched for
+INCLUDE_DIRS :=. include $(OBJROOT)
# export the user agent format
CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
@@ -605,6 +604,9 @@ S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS)
$(S_RENDER) $(S_UTILS) \
$(S_HTTP) $(S_DESKTOP) $(S_JAVASCRIPT)
+# Include directory flags
+IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
+
# ----------------------------------------------------------------------------
# Message targets
# ----------------------------------------------------------------------------
@@ -735,12 +737,12 @@ define compile_target_c
$$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " DEP: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
- $$(Q)$$(CC) $$(CFLAGS) -MM \
+ $$(Q)$$(CC) $$(IFLAGS) $$(CFLAGS) -MM \
$(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \
> $$(DEPROOT)/$(3)
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(OBJROOT)/$(2)
- $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
+ $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
endef
else
@@ -749,7 +751,7 @@ $$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
$$(Q)$$(RM) $$(OBJROOT)/$(2)
- $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) \
+ $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) \
-MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \
-MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1)
@@ -760,12 +762,12 @@ define compile_target_cpp
$$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " DEP: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
- $$(Q)$$(CC) $$(CFLAGS) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) -MM \
+ $$(Q)$$(CC) $$(IFLAGS) $$(CXXFLAGS) $$(COMMON_WARNFLAGS)
$$(CXXWARNFLAGS) -MM \
$(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \
> $$(DEPROOT)/$(3)
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(OBJROOT)/$(2)
- $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(CXXFLAGS)
$(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
+ $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(IFLAGS)
$$(CXXFLAGS) $(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
endef
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index 5fbdd22..4d14020 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 a12d8cc..e57fc11 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 4c0cb7a..997eb51 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 125b133..1ad188c 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 f394ea8..fd25d53 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 d66b87a..14ad00c 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 ea324e7..6af2014 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 59ad412..5c7cbd9 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 8f787de..e552cdf 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 2a8ce3d..c4f0394 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 7b1e127..b14ea7f 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 0b1ddc0..e7cc921 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 dcb01dd..3eb27ac 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 e3af00f..278d9e6 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 9c4717f..c902fc3 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 45f415a..93185c1 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 ad8e3fa..1bf4b44 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 b453264..94c4858 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 53b6543..707d39d 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;
diff --git a/desktop/browser.c b/desktop/browser.c
index 47b7341..453db2f 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -55,7 +55,7 @@
#include "content/fetch.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/form_internal.h"
#include "render/html.h"
#include "render/box.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 1ca2ea9..ffcec04 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -37,9 +37,9 @@
#include "content/hlcache.h"
#include "content/mimesniff.h"
#include "content/urldb.h"
-#include "content/handlers/css/css.h"
-#include "content/handlers/image/image.h"
-#include "content/handlers/image/image_cache.h"
+#include "css/css.h"
+#include "image/image.h"
+#include "image/image_cache.h"
#include "javascript/js.h"
#include "render/html.h"
#include "render/textplain.h"
diff --git a/desktop/print.c b/desktop/print.c
index 2d9a0d5..e7c8cf2 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -33,7 +33,7 @@
#include "netsurf/content.h"
#include "netsurf/plotters.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/box.h"
#include "desktop/print.h"
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index a1c71a4..314fbfc 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -42,7 +42,7 @@
#include "utils/messages.h"
#include "netsurf/content.h"
#include "content/hlcache.h"
-#include "content/handlers/css/css.h"
+#include "css/css.h"
#include "render/box.h"
#include "render/html.h"
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 5d18709..80a2acf 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 0512419..b8d3d13 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -27,7 +27,7 @@
#include "netsurf/bitmap.h"
#include "netsurf/content.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/system_colour.h"
#include "desktop/knockout.h"
diff --git a/frontends/Makefile b/frontends/Makefile
index da6fe20..f0f9145 100644
--- a/frontends/Makefile
+++ b/frontends/Makefile
@@ -7,3 +7,5 @@ FRONTEND_RESOURCES_DIR := frontends/$(TARGET)/res
include frontends/$(TARGET)/Makefile
S_FRONTEND := $(addprefix frontends/$(TARGET)/,$(S_FRONTEND))
+
+INCLUDE_DIRS += frontends
diff --git a/render/box.c b/render/box.c
index fa3e52d..f83bbb2 100644
--- a/render/box.c
+++ b/render/box.c
@@ -36,8 +36,8 @@
#include "netsurf/misc.h"
#include "netsurf/content.h"
#include "netsurf/mouse.h"
-#include "content/handlers/css/utils.h"
-#include "content/handlers/css/dump.h"
+#include "css/utils.h"
+#include "css/dump.h"
#include "desktop/scrollbar.h"
#include "desktop/gui_internal.h"
diff --git a/render/box_construct.c b/render/box_construct.c
index 372dcb3..49bb794 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -43,8 +43,8 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "content/content_protected.h"
-#include "content/handlers/css/hints.h"
-#include "content/handlers/css/select.h"
+#include "css/hints.h"
+#include "css/select.h"
#include "netsurf/css.h"
#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
diff --git a/render/box_normalise.c b/render/box_normalise.c
index 76767a2..5d36b99 100644
--- a/render/box_normalise.c
+++ b/render/box_normalise.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/errors.h"
-#include "content/handlers/css/select.h"
+#include "css/select.h"
#include "render/box.h"
#include "render/html_internal.h"
diff --git a/render/font.c b/render/font.c
index 831097e..8128269 100644
--- a/render/font.c
+++ b/render/font.c
@@ -23,7 +23,7 @@
*/
#include "utils/nsoption.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/font.h"
diff --git a/render/form.c b/render/form.c
index af571ae..a994426 100644
--- a/render/form.c
+++ b/render/form.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "content/fetch.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/knockout.h"
diff --git a/render/html_css.c b/render/html_css.c
index ae0e8f6..ba88716 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -34,7 +34,7 @@
#include "netsurf/misc.h"
#include "netsurf/content.h"
#include "content/hlcache.h"
-#include "content/handlers/css/css.h"
+#include "css/css.h"
#include "desktop/gui_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_object.c b/render/html_object.c
index 51c18e2..bc35124 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -35,7 +35,7 @@
#include "netsurf/content.h"
#include "netsurf/misc.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/scrollbar.h"
#include "desktop/gui_internal.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index bc0f462..7e0f7c2 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -46,7 +46,7 @@
#include "netsurf/bitmap.h"
#include "netsurf/layout.h"
#include "content/content_protected.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/selection.h"
#include "desktop/print.h"
#include "desktop/scrollbar.h"
diff --git a/render/layout.c b/render/layout.c
index 0cf829a..c92089f 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -51,7 +51,7 @@
#include "netsurf/browser_window.h"
#include "netsurf/layout.h"
#include "content/content_protected.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
diff --git a/render/table.c b/render/table.c
index 62553ec..acf00c7 100644
--- a/render/table.c
+++ b/render/table.c
@@ -26,7 +26,7 @@
#include "utils/log.h"
#include "utils/talloc.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/box.h"
#include "render/table.h"
diff --git a/render/textplain.c b/render/textplain.c
index 5f37d40..b008ab8 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -40,7 +40,7 @@
#include "netsurf/content.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "netsurf/browser_window.h"
#include "utils/nsoption.h"
#include "netsurf/plotters.h"
-----------------------------------------------------------------------
Summary of changes:
Makefile | 18 ++++++++++--------
content/fetchers/about.c | 2 +-
content/handlers/Makefile | 2 ++
content/handlers/css/css.c | 6 +++---
content/handlers/css/dump.c | 2 +-
content/handlers/css/hints.c | 4 ++--
content/handlers/css/internal.c | 2 +-
content/handlers/css/select.c | 10 +++++-----
content/handlers/css/utils.c | 2 +-
content/handlers/image/bmp.c | 2 +-
content/handlers/image/gif.c | 4 ++--
content/handlers/image/ico.c | 4 ++--
content/handlers/image/image.c | 18 +++++++++---------
content/handlers/image/image_cache.c | 4 ++--
content/handlers/image/jpeg.c | 2 +-
content/handlers/image/nssprite.c | 2 +-
content/handlers/image/png.c | 4 ++--
content/handlers/image/rsvg.c | 2 +-
content/handlers/image/svg.c | 2 +-
content/handlers/image/video.c | 2 +-
desktop/browser.c | 2 +-
desktop/netsurf.c | 6 +++---
desktop/print.c | 2 +-
desktop/save_complete.c | 2 +-
desktop/textarea.c | 2 +-
desktop/treeview.c | 2 +-
frontends/Makefile | 2 ++
render/box.c | 4 ++--
render/box_construct.c | 4 ++--
render/box_normalise.c | 2 +-
render/font.c | 2 +-
render/form.c | 2 +-
render/html_css.c | 2 +-
render/html_object.c | 2 +-
render/html_redraw.c | 2 +-
render/layout.c | 2 +-
render/table.c | 2 +-
render/textplain.c | 2 +-
38 files changed, 72 insertions(+), 66 deletions(-)
diff --git a/Makefile b/Makefile
index fe97f1c..6b19007 100644
--- a/Makefile
+++ b/Makefile
@@ -538,9 +538,8 @@ $(eval $(call
pkg_config_find_and_add_enabled,GIF,libnsgif,GIF))
$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG))
$(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite))
-# add top level and build directory to include search path
-CFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
-CXXFLAGS += -I. -Iinclude -Ifrontends -I$(OBJROOT)
+# List of directories in which headers are searched for
+INCLUDE_DIRS :=. include $(OBJROOT)
# export the user agent format
CFLAGS += -DNETSURF_UA_FORMAT_STRING=\"$(NETSURF_UA_FORMAT_STRING)\"
@@ -605,6 +604,9 @@ S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_CSS)
$(S_RENDER) $(S_UTILS) \
$(S_HTTP) $(S_DESKTOP) $(S_JAVASCRIPT)
+# Include directory flags
+IFLAGS = $(addprefix -I,$(INCLUDE_DIRS))
+
# ----------------------------------------------------------------------------
# Message targets
# ----------------------------------------------------------------------------
@@ -735,12 +737,12 @@ define compile_target_c
$$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " DEP: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
- $$(Q)$$(CC) $$(CFLAGS) -MM \
+ $$(Q)$$(CC) $$(IFLAGS) $$(CFLAGS) -MM \
$(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \
> $$(DEPROOT)/$(3)
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(OBJROOT)/$(2)
- $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
+ $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
endef
else
@@ -749,7 +751,7 @@ $$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
$$(Q)$$(RM) $$(OBJROOT)/$(2)
- $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) \
+ $$(Q)$$(CC) $$(COMMON_WARNFLAGS) $$(CWARNFLAGS) $$(IFLAGS) $$(CFLAGS)
$(CFLAGS_ENV) \
-MMD -MT '$$(DEPROOT)/$(3) $$(OBJROOT)/$(2)' \
-MF $$(DEPROOT)/$(3) -o $$(OBJROOT)/$(2) -c $(1)
@@ -760,12 +762,12 @@ define compile_target_cpp
$$(DEPROOT)/$(3) $$(OBJROOT)/$(2): $$(OBJROOT)/created
$$(VQ)echo " DEP: $(1)"
$$(Q)$$(RM) $$(DEPROOT)/$(3)
- $$(Q)$$(CC) $$(CFLAGS) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) -MM \
+ $$(Q)$$(CC) $$(IFLAGS) $$(CXXFLAGS) $$(COMMON_WARNFLAGS)
$$(CXXWARNFLAGS) -MM \
$(1) | sed 's,^.*:,$$(DEPROOT)/$(3) $$(OBJROOT)/$(2):,' \
> $$(DEPROOT)/$(3)
$$(VQ)echo " COMPILE: $(1)"
$$(Q)$$(RM) $$(OBJROOT)/$(2)
- $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(CXXFLAGS)
$(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
+ $$(Q)$$(CXX) $$(COMMON_WARNFLAGS) $$(CXXWARNFLAGS) $$(IFLAGS)
$$(CXXFLAGS) $(CXXFLAGS_ENV) -o $$(OBJROOT)/$(2) -c $(1)
endef
diff --git a/content/fetchers/about.c b/content/fetchers/about.c
index 5fbdd22..4d14020 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 a12d8cc..e57fc11 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 4c0cb7a..997eb51 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 125b133..1ad188c 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 f394ea8..fd25d53 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 d66b87a..14ad00c 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 ea324e7..6af2014 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 59ad412..5c7cbd9 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 8f787de..e552cdf 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 2a8ce3d..c4f0394 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 7b1e127..b14ea7f 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 0b1ddc0..e7cc921 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 dcb01dd..3eb27ac 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 e3af00f..278d9e6 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 9c4717f..c902fc3 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 45f415a..93185c1 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 ad8e3fa..1bf4b44 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 b453264..94c4858 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 53b6543..707d39d 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;
diff --git a/desktop/browser.c b/desktop/browser.c
index 47b7341..453db2f 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -55,7 +55,7 @@
#include "content/fetch.h"
#include "content/hlcache.h"
#include "content/urldb.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/form_internal.h"
#include "render/html.h"
#include "render/box.h"
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 1ca2ea9..ffcec04 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -37,9 +37,9 @@
#include "content/hlcache.h"
#include "content/mimesniff.h"
#include "content/urldb.h"
-#include "content/handlers/css/css.h"
-#include "content/handlers/image/image.h"
-#include "content/handlers/image/image_cache.h"
+#include "css/css.h"
+#include "image/image.h"
+#include "image/image_cache.h"
#include "javascript/js.h"
#include "render/html.h"
#include "render/textplain.h"
diff --git a/desktop/print.c b/desktop/print.c
index 2d9a0d5..e7c8cf2 100644
--- a/desktop/print.c
+++ b/desktop/print.c
@@ -33,7 +33,7 @@
#include "netsurf/content.h"
#include "netsurf/plotters.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/box.h"
#include "desktop/print.h"
diff --git a/desktop/save_complete.c b/desktop/save_complete.c
index a1c71a4..314fbfc 100644
--- a/desktop/save_complete.c
+++ b/desktop/save_complete.c
@@ -42,7 +42,7 @@
#include "utils/messages.h"
#include "netsurf/content.h"
#include "content/hlcache.h"
-#include "content/handlers/css/css.h"
+#include "css/css.h"
#include "render/box.h"
#include "render/html.h"
diff --git a/desktop/textarea.c b/desktop/textarea.c
index 5d18709..80a2acf 100644
--- a/desktop/textarea.c
+++ b/desktop/textarea.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/utf8.h"
#include "utils/utils.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 0512419..b8d3d13 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -27,7 +27,7 @@
#include "netsurf/bitmap.h"
#include "netsurf/content.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/system_colour.h"
#include "desktop/knockout.h"
diff --git a/frontends/Makefile b/frontends/Makefile
index da6fe20..f0f9145 100644
--- a/frontends/Makefile
+++ b/frontends/Makefile
@@ -7,3 +7,5 @@ FRONTEND_RESOURCES_DIR := frontends/$(TARGET)/res
include frontends/$(TARGET)/Makefile
S_FRONTEND := $(addprefix frontends/$(TARGET)/,$(S_FRONTEND))
+
+INCLUDE_DIRS += frontends
diff --git a/render/box.c b/render/box.c
index fa3e52d..f83bbb2 100644
--- a/render/box.c
+++ b/render/box.c
@@ -36,8 +36,8 @@
#include "netsurf/misc.h"
#include "netsurf/content.h"
#include "netsurf/mouse.h"
-#include "content/handlers/css/utils.h"
-#include "content/handlers/css/dump.h"
+#include "css/utils.h"
+#include "css/dump.h"
#include "desktop/scrollbar.h"
#include "desktop/gui_internal.h"
diff --git a/render/box_construct.c b/render/box_construct.c
index 372dcb3..49bb794 100644
--- a/render/box_construct.c
+++ b/render/box_construct.c
@@ -43,8 +43,8 @@
#include "utils/utils.h"
#include "utils/string.h"
#include "content/content_protected.h"
-#include "content/handlers/css/hints.h"
-#include "content/handlers/css/select.h"
+#include "css/hints.h"
+#include "css/select.h"
#include "netsurf/css.h"
#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
diff --git a/render/box_normalise.c b/render/box_normalise.c
index 76767a2..5d36b99 100644
--- a/render/box_normalise.c
+++ b/render/box_normalise.c
@@ -29,7 +29,7 @@
#include "utils/log.h"
#include "utils/errors.h"
-#include "content/handlers/css/select.h"
+#include "css/select.h"
#include "render/box.h"
#include "render/html_internal.h"
diff --git a/render/font.c b/render/font.c
index 831097e..8128269 100644
--- a/render/font.c
+++ b/render/font.c
@@ -23,7 +23,7 @@
*/
#include "utils/nsoption.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/font.h"
diff --git a/render/form.c b/render/form.c
index af571ae..a994426 100644
--- a/render/form.c
+++ b/render/form.c
@@ -42,7 +42,7 @@
#include "utils/utils.h"
#include "content/fetch.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "netsurf/browser_window.h"
#include "netsurf/mouse.h"
#include "desktop/knockout.h"
diff --git a/render/html_css.c b/render/html_css.c
index ae0e8f6..ba88716 100644
--- a/render/html_css.c
+++ b/render/html_css.c
@@ -34,7 +34,7 @@
#include "netsurf/misc.h"
#include "netsurf/content.h"
#include "content/hlcache.h"
-#include "content/handlers/css/css.h"
+#include "css/css.h"
#include "desktop/gui_internal.h"
#include "render/html_internal.h"
diff --git a/render/html_object.c b/render/html_object.c
index 51c18e2..bc35124 100644
--- a/render/html_object.c
+++ b/render/html_object.c
@@ -35,7 +35,7 @@
#include "netsurf/content.h"
#include "netsurf/misc.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/scrollbar.h"
#include "desktop/gui_internal.h"
diff --git a/render/html_redraw.c b/render/html_redraw.c
index bc0f462..7e0f7c2 100644
--- a/render/html_redraw.c
+++ b/render/html_redraw.c
@@ -46,7 +46,7 @@
#include "netsurf/bitmap.h"
#include "netsurf/layout.h"
#include "content/content_protected.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/selection.h"
#include "desktop/print.h"
#include "desktop/scrollbar.h"
diff --git a/render/layout.c b/render/layout.c
index 0cf829a..c92089f 100644
--- a/render/layout.c
+++ b/render/layout.c
@@ -51,7 +51,7 @@
#include "netsurf/browser_window.h"
#include "netsurf/layout.h"
#include "content/content_protected.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "desktop/scrollbar.h"
#include "desktop/textarea.h"
diff --git a/render/table.c b/render/table.c
index 62553ec..acf00c7 100644
--- a/render/table.c
+++ b/render/table.c
@@ -26,7 +26,7 @@
#include "utils/log.h"
#include "utils/talloc.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "render/box.h"
#include "render/table.h"
diff --git a/render/textplain.c b/render/textplain.c
index 5f37d40..b008ab8 100644
--- a/render/textplain.c
+++ b/render/textplain.c
@@ -40,7 +40,7 @@
#include "netsurf/content.h"
#include "content/content_protected.h"
#include "content/hlcache.h"
-#include "content/handlers/css/utils.h"
+#include "css/utils.h"
#include "netsurf/browser_window.h"
#include "utils/nsoption.h"
#include "netsurf/plotters.h"
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
