summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2020-09-20 10:54:48 +0100
committerVincent Sanders <vince@kyllikki.org>2020-09-20 10:54:48 +0100
commitc74509cdf58fb2473290fcacb8b1cc885b53df87 (patch)
treef4d0230ffa6ebdc9772f488dc66911403be02cba
parent7997182cc0748ce449e29460b0534aed8013b6e8 (diff)
downloadnetsurf-c74509cdf58fb2473290fcacb8b1cc885b53df87.tar.gz
netsurf-c74509cdf58fb2473290fcacb8b1cc885b53df87.tar.bz2
move about fetcher into its own directory
-rw-r--r--content/fetch.c2
-rw-r--r--content/fetchers/Makefile12
-rw-r--r--content/fetchers/about/Makefile6
-rw-r--r--content/fetchers/about/about.c (renamed from content/fetchers/about.c)3
-rw-r--r--content/fetchers/about/about.h (renamed from content/fetchers/about.h)0
5 files changed, 15 insertions, 8 deletions
diff --git a/content/fetch.c b/content/fetch.c
index a26079965..533f75e87 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -53,7 +53,7 @@
#include "content/fetch.h"
#include "content/fetchers.h"
#include "content/fetchers/resource.h"
-#include "content/fetchers/about.h"
+#include "content/fetchers/about/about.h"
#include "content/fetchers/curl.h"
#include "content/fetchers/data.h"
#include "content/fetchers/file/file.h"
diff --git a/content/fetchers/Makefile b/content/fetchers/Makefile
index e87a4e891..8f6e5211f 100644
--- a/content/fetchers/Makefile
+++ b/content/fetchers/Makefile
@@ -1,15 +1,15 @@
# Content fetchers sources
-S_FETCHERS_YES := data.c about.c resource.c
+S_FETCHERS_YES := data.c resource.c
S_FETCHERS_NO :=
S_FETCHERS_$(NETSURF_USE_CURL) += curl.c
S_FETCHERS := $(addprefix fetchers/,$(S_FETCHERS_YES))
-# File fetcher
-include content/fetchers/file/Makefile
+# about fetcher
+include content/fetchers/about/Makefile
+S_FETCHERS += $(addprefix fetchers/about/,$(S_FETCHER_ABOUT))
+# file fetcher
+include content/fetchers/file/Makefile
S_FETCHERS += $(addprefix fetchers/file/,$(S_FETCHER_FILE))
-
-# The following files depend on the testament
-content/fetchers/about.c: testament $(OBJROOT)/testament.h
diff --git a/content/fetchers/about/Makefile b/content/fetchers/about/Makefile
new file mode 100644
index 000000000..88786ec5b
--- /dev/null
+++ b/content/fetchers/about/Makefile
@@ -0,0 +1,6 @@
+# about fetcher sources
+
+S_FETCHER_ABOUT := about.c
+
+# The following files depend on the testament
+content/fetchers/about/about.c: testament $(OBJROOT)/testament.h
diff --git a/content/fetchers/about.c b/content/fetchers/about/about.c
index 28f0d1ee4..e2fbd4d85 100644
--- a/content/fetchers/about.c
+++ b/content/fetchers/about/about.c
@@ -45,11 +45,12 @@
#include "content/fetch.h"
#include "content/fetchers.h"
-#include "content/fetchers/about.h"
#include "image/image_cache.h"
#include "desktop/system_colour.h"
+#include "about.h"
+
struct fetch_about_context;
typedef bool (*fetch_about_handler)(struct fetch_about_context *);
diff --git a/content/fetchers/about.h b/content/fetchers/about/about.h
index 944f84a59..944f84a59 100644
--- a/content/fetchers/about.h
+++ b/content/fetchers/about/about.h