Move $outdir/fetch.stamp -> $dir/fetch

6 files changed, 23 insertions, 23 deletions

diff --git a/pkg/netsurf/gen.lua b/pkg/netsurf/gen.lua
index dfd71dc2..5bb452cd 100644
--- a/pkg/netsurf/gen.lua
+++ b/pkg/netsurf/gen.lua
@@ -62,24 +62,24 @@ build('nsgenbind', nsgenbind, {
 })
 
 pkg.deps = {
-	'$builddir/pkg/freetype/fetch.stamp',
-	'$builddir/pkg/libxkbcommon/fetch.stamp',
-	'$builddir/pkg/utf8proc/fetch.stamp',
+	'$dir/libcss/fetch',
+	'$dir/libdom/fetch',
 	'$dir/libdom/headers',
+	'$dir/libhubbub/fetch',
+	'$dir/libnsbmp/fetch',
+	'$dir/libnsgif/fetch',
+	'$dir/libnsutils/fetch',
+	'$dir/libparserutils/fetch',
+	'$dir/libsvgtiny/fetch',
+	'$dir/libwapcaplet/fetch',
 	'$outdir/duktape/binding.c',
-	'$outdir/libcss/fetch.stamp',
-	'$outdir/libdom/fetch.stamp',
-	'$outdir/libhubbub/fetch.stamp',
-	'$outdir/libnsbmp/fetch.stamp',
-	'$outdir/libnsgif/fetch.stamp',
-	'$outdir/libnsutils/fetch.stamp',
-	'$outdir/libparserutils/fetch.stamp',
-	'$outdir/libsvgtiny/fetch.stamp',
-	'$outdir/libwapcaplet/fetch.stamp',
 	'pkg/curl/headers',
+	'pkg/freetype/fetch',
 	'pkg/libjpeg-turbo/headers',
 	'pkg/libpng/headers',
 	'pkg/libressl/headers',
+	'pkg/libxkbcommon/fetch',
+	'pkg/utf8proc/fetch',
 	'pkg/zlib/headers',
 }
 
diff --git a/pkg/netsurf/libcss/gen.lua b/pkg/netsurf/libcss/gen.lua
index c3f75da8..385473ed 100644
--- a/pkg/netsurf/libcss/gen.lua
+++ b/pkg/netsurf/libcss/gen.lua
@@ -16,8 +16,8 @@ build('awk', '$outdir/prop_parsers.c', {
 }, {expr='-f $dir/prop_parsers.awk gen_prop_parser=$outdir/gen_prop_parser'})
 
 pkg.deps = {
-	'$builddir/pkg/netsurf/libparserutils/fetch.stamp',
-	'$builddir/pkg/netsurf/libwapcaplet/fetch.stamp',
+	'pkg/netsurf/libparserutils/fetch',
+	'pkg/netsurf/libwapcaplet/fetch',
 }
 
 lib('libcss.a', [[src/(
diff --git a/pkg/netsurf/libdom/gen.lua b/pkg/netsurf/libdom/gen.lua
index 83063c7b..9f4c2fb2 100644
--- a/pkg/netsurf/libdom/gen.lua
+++ b/pkg/netsurf/libdom/gen.lua
@@ -15,9 +15,9 @@ pkg.hdrs = copy('$outdir/include/dom', '$srcdir', {
 })
 pkg.deps = {
 	'pkg/expat/headers',
-	'$builddir/pkg/netsurf/libhubbub/fetch.stamp',
-	'$builddir/pkg/netsurf/libparserutils/fetch.stamp',
-	'$builddir/pkg/netsurf/libwapcaplet/fetch.stamp',
+	'pkg/netsurf/libhubbub/fetch',
+	'pkg/netsurf/libparserutils/fetch',
+	'pkg/netsurf/libwapcaplet/fetch',
 }
 
 lib('libdom.a', [[
diff --git a/pkg/netsurf/libhubbub/gen.lua b/pkg/netsurf/libhubbub/gen.lua
index a2522fe8..cc932ddd 100644
--- a/pkg/netsurf/libhubbub/gen.lua
+++ b/pkg/netsurf/libhubbub/gen.lua
@@ -13,9 +13,9 @@ build('awk', '$outdir/entities.inc', {'$srcdir/build/Entities', '|', '$dir/entit
 
 pkg.deps = {
 	'$outdir/entities.inc',
-	'$builddir/pkg/netsurf/libdom/fetch.stamp',
-	'$builddir/pkg/netsurf/libparserutils/fetch.stamp',
-	'$builddir/pkg/netsurf/libwapcaplet/fetch.stamp',
+	'pkg/netsurf/libdom/fetch',
+	'pkg/netsurf/libparserutils/fetch',
+	'pkg/netsurf/libwapcaplet/fetch',
 }
 
 lib('libhubbub.a', [[src/(
diff --git a/pkg/netsurf/libsvgtiny/gen.lua b/pkg/netsurf/libsvgtiny/gen.lua
index db3bfa60..80f4737a 100644
--- a/pkg/netsurf/libsvgtiny/gen.lua
+++ b/pkg/netsurf/libsvgtiny/gen.lua
@@ -8,9 +8,9 @@ cflags{
 }
 
 pkg.deps = {
+	'pkg/netsurf/libdom/fetch',
 	'pkg/netsurf/libdom/headers',
-	'$builddir/pkg/netsurf/libdom/fetch.stamp',
-	'$builddir/pkg/netsurf/libwapcaplet/fetch.stamp',
+	'pkg/netsurf/libwapcaplet/fetch',
 }
 
 lib('libsvgtiny.a', [[
diff --git a/pkg/netsurf/nsgenbind/gen.lua b/pkg/netsurf/nsgenbind/gen.lua
index 39524aee..5d8be42e 100644
--- a/pkg/netsurf/nsgenbind/gen.lua
+++ b/pkg/netsurf/nsgenbind/gen.lua
@@ -8,7 +8,7 @@ local generated = {
 	'webidl-parser.c',
 }
 for _, src in ipairs(generated) do
-	build('cc', '$outdir/src/'..src..'.o', {'$dir/'..src, '||', '$outdir/fetch.stamp'})
+	build('cc', '$outdir/src/'..src..'.o', {'$dir/'..src, '||', '$dir/fetch'})
 end
 
 exe('nsgenbind', [[src/(