From 6807b4208a27d9037229b16f31cc409d15a992f5 Mon Sep 17 00:00:00 2001 From: Daniel Silverstone 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 --- riscos/gui/progress_bar.c | 16 ++++++++-------- riscos/gui/progress_bar.h | 2 +- riscos/gui/status_bar.c | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) (limited to 'riscos/gui') diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c index 0ca2d28b0..072c43df0 100644 --- a/riscos/gui/progress_bar.c +++ b/riscos/gui/progress_bar.c @@ -15,16 +15,16 @@ #include #include "oslib/colourtrans.h" #include "oslib/os.h" -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/tinct.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/gui/progress_bar.h" +#include "desktop/plotters.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/tinct.h" +#include "riscos/wimp_event.h" +#include "riscos/gui/progress_bar.h" #define MARGIN 6 diff --git a/riscos/gui/progress_bar.h b/riscos/gui/progress_bar.h index b93a36d39..0bcf2bafc 100644 --- a/riscos/gui/progress_bar.h +++ b/riscos/gui/progress_bar.h @@ -10,7 +10,7 @@ */ #include -#include "oslib/osspriteop.h" +#include #include "oslib/wimp.h" #ifndef _NETSURF_RISCOS_PROGRESS_BAR_H_ diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c index 84ce994c8..ef7d5062f 100644 --- a/riscos/gui/status_bar.c +++ b/riscos/gui/status_bar.c @@ -17,14 +17,14 @@ #include "oslib/os.h" #include "oslib/wimp.h" #include "oslib/wimpspriteop.h" -#include "netsurf/desktop/plotters.h" -#include "netsurf/utils/log.h" -#include "netsurf/utils/utils.h" -#include "netsurf/riscos/gui.h" -#include "netsurf/riscos/wimp.h" -#include "netsurf/riscos/wimp_event.h" -#include "netsurf/riscos/gui/progress_bar.h" -#include "netsurf/riscos/gui/status_bar.h" +#include "desktop/plotters.h" +#include "utils/log.h" +#include "utils/utils.h" +#include "riscos/gui.h" +#include "riscos/wimp.h" +#include "riscos/wimp_event.h" +#include "riscos/gui/progress_bar.h" +#include "riscos/gui/status_bar.h" #define ICON_WIDGET 0 #define WIDGET_WIDTH 12 -- cgit v1.2.3