summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2017-01-15 12:47:38 +0000
committerMichael Drake <tlsa@netsurf-browser.org>2017-02-08 17:27:13 +0000
commit299a85fa7a4ee259e757b8ffd6e482410e6726f1 (patch)
treebbfdae84dbded0110671b269b18f32a01bde4b56
parentf1c98ccfa404f1890fa6299a69b165a226dc4d35 (diff)
downloadnetsurf-299a85fa7a4ee259e757b8ffd6e482410e6726f1.tar.gz
netsurf-299a85fa7a4ee259e757b8ffd6e482410e6726f1.tar.bz2
nusrl: Move into utils/nsurl directory.
-rw-r--r--Makefile14
-rw-r--r--utils/Makefile1
-rw-r--r--utils/nsurl/Makefile6
-rw-r--r--utils/nsurl/nsurl.c (renamed from utils/nsurl.c)0
4 files changed, 18 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 5f2697fdc..97a81280f 100644
--- a/Makefile
+++ b/Makefile
@@ -621,12 +621,22 @@ include utils/Makefile
# http utility sources
include utils/http/Makefile
+# nsurl utility sources
+include utils/nsurl/Makefile
+
# Desktop sources
include desktop/Makefile
# S_COMMON are sources common to all builds
-S_COMMON := $(S_CONTENT) $(S_FETCHERS) $(S_RENDER) $(S_UTILS) $(S_HTTP) \
- $(S_DESKTOP) $(S_JAVASCRIPT_BINDING)
+S_COMMON := \
+ $(S_CONTENT) \
+ $(S_FETCHERS) \
+ $(S_RENDER) \
+ $(S_UTILS) \
+ $(S_HTTP) \
+ $(S_NSURL) \
+ $(S_DESKTOP) \
+ $(S_JAVASCRIPT_BINDING)
# ----------------------------------------------------------------------------
diff --git a/utils/Makefile b/utils/Makefile
index 62b7e05e7..2f59501c2 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -12,7 +12,6 @@ S_UTILS := \
log.c \
messages.c \
nsoption.c \
- nsurl.c \
punycode.c \
talloc.c \
time.c \
diff --git a/utils/nsurl/Makefile b/utils/nsurl/Makefile
new file mode 100644
index 000000000..08656f300
--- /dev/null
+++ b/utils/nsurl/Makefile
@@ -0,0 +1,6 @@
+# nsurl utils sources
+
+S_NSURL := \
+ nsurl.c
+
+S_NSURL := $(addprefix utils/nsurl/,$(S_NSURL)) \ No newline at end of file
diff --git a/utils/nsurl.c b/utils/nsurl/nsurl.c
index c5c614c55..c5c614c55 100644
--- a/utils/nsurl.c
+++ b/utils/nsurl/nsurl.c