diff options
author | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2007-05-30 22:39:54 +0000 |
---|---|---|
committer | Daniel Silverstone <dsilvers@netsurf-browser.org> | 2007-05-30 22:39:54 +0000 |
commit | 6807b4208a27d9037229b16f31cc409d15a992f5 (patch) | |
tree | 1e62c423a96b7c92db82d6cc7dfc18c2177912a8 /css | |
parent | 25e22eb1f5046fdf9ef1d470b86faf640375de08 (diff) | |
download | netsurf-6807b4208a27d9037229b16f31cc409d15a992f5.tar.gz netsurf-6807b4208a27d9037229b16f31cc409d15a992f5.tar.bz2 |
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
Diffstat (limited to 'css')
-rw-r--r-- | css/css.c | 24 | ||||
-rw-r--r-- | css/css.h | 4 | ||||
-rw-r--r-- | css/parser.y | 4 | ||||
-rw-r--r-- | css/ruleset.c | 12 | ||||
-rw-r--r-- | css/scanner.l | 4 |
5 files changed, 24 insertions, 24 deletions
@@ -80,20 +80,20 @@ #include <strings.h> #define CSS_INTERNALS #undef NDEBUG -#include "netsurf/utils/config.h" -#include "netsurf/content/content.h" -#include "netsurf/content/fetch.h" -#include "netsurf/content/fetchcache.h" -#include "netsurf/css/css.h" -#include "netsurf/css/parser.h" +#include "utils/config.h" +#include "content/content.h" +#include "content/fetch.h" +#include "content/fetchcache.h" +#include "css/css.h" +#include "css/parser.h" #ifdef riscos -#include "netsurf/desktop/gui.h" +#include "desktop/gui.h" #endif -#include "netsurf/utils/log.h" -#include "netsurf/utils/messages.h" -#include "netsurf/utils/talloc.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "utils/log.h" +#include "utils/messages.h" +#include "utils/talloc.h" +#include "utils/url.h" +#include "utils/utils.h" struct css_working_stylesheet { @@ -25,8 +25,8 @@ #define _NETSURF_CSS_CSS_H_ #include <stdbool.h> -#include "libxml/HTMLparser.h" -#include "netsurf/css/css_enum.h" +#include <libxml/HTMLparser.h> +#include "css/css_enum.h" typedef unsigned long colour; /* 0xbbggrr */ diff --git a/css/parser.y b/css/parser.y index 49bf932fc..02d11a06d 100644 --- a/css/parser.y +++ b/css/parser.y @@ -400,8 +400,8 @@ any(A) ::= ASTERISK(B). %include { #include <strings.h> #define CSS_INTERNALS -#include "netsurf/css/css.h" -#include "netsurf/utils/utils.h" } +#include "css/css.h" +#include "utils/utils.h" } %name css_parser_ %token_type { struct css_parser_token } diff --git a/css/ruleset.c b/css/ruleset.c index 1a065cbc1..c45147594 100644 --- a/css/ruleset.c +++ b/css/ruleset.c @@ -26,12 +26,12 @@ #include <strings.h> #define CSS_INTERNALS #define NDEBUG -#include "netsurf/css/css.h" -#include "netsurf/content/content.h" -#include "netsurf/desktop/options.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/url.h" -#include "netsurf/utils/utils.h" +#include "css/css.h" +#include "content/content.h" +#include "desktop/options.h" +#include "utils/log.h" +#include "utils/url.h" +#include "utils/utils.h" diff --git a/css/scanner.l b/css/scanner.l index 6a5549a19..caac2c352 100644 --- a/css/scanner.l +++ b/css/scanner.l @@ -16,8 +16,8 @@ #include <stdbool.h> #define CSS_INTERNALS -#include "netsurf/css/css.h" -#include "netsurf/css/parser.h" +#include "css/css.h" +#include "css/parser.h" #define YYCTYPE unsigned char #define YYCURSOR (*buffer) |