commit: e5cfa84477427cc8233ff18ab235c4eb88c1d7d2
parent 6026883449f412761b4cf066585c2ec1d1f28f6f
Author: Michael Forney <mforney@mforney.org>
Date: Sun, 22 Oct 2017 18:30:19 -0700
Move $outdir/fetch.stamp -> $dir/fetch
Diffstat:
28 files changed, 66 insertions(+), 62 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
/config.ninja
/config.lua
/out
+fetch
local.ninja
local.perms
.*.swp
diff --git a/ninja.lua b/ninja.lua
@@ -357,9 +357,9 @@ function waylandproto(proto, client, server, code)
end
function fetch(method, args)
- build('fetch'..method, '$outdir/fetch.stamp', {'|', '$dir/rev'}, {args=args})
+ build('fetch'..method, '$dir/fetch', {'|', '$dir/rev'}, {args=args})
if next(pkg.inputs.fetch) then
- build('phony', table.keys(pkg.inputs.fetch), '$outdir/fetch.stamp')
+ build('phony', table.keys(pkg.inputs.fetch), '$dir/fetch')
end
end
diff --git a/pkg/dmenu/gen.lua b/pkg/dmenu/gen.lua
@@ -10,8 +10,8 @@ cflags{
}
pkg.deps = {
- '$builddir/pkg/fontconfig/fetch.stamp',
- '$builddir/pkg/libxkbcommon/fetch.stamp',
+ 'pkg/fontconfig/fetch',
+ 'pkg/libxkbcommon/fetch',
'pkg/pixman/headers',
'pkg/swc/headers',
'pkg/wayland/headers',
diff --git a/pkg/fontconfig/gen.lua b/pkg/fontconfig/gen.lua
@@ -8,7 +8,10 @@ cflags{
'-I $builddir/pkg/expat/include',
}
-pkg.deps = {'pkg/expat/headers', '$builddir/pkg/freetype/fetch.stamp'}
+pkg.deps = {
+ 'pkg/expat/headers',
+ 'pkg/freetype/fetch',
+}
rule('makealias', '$srcdir/src/makealias $srcdir/src $out $in')
local function makealias(name, srcs)
diff --git a/pkg/libass/gen.lua b/pkg/libass/gen.lua
@@ -15,7 +15,7 @@ set('nasmflags', {
pkg.hdrs = copy('$outdir/include/ass', '$srcdir/libass', {'ass.h', 'ass_types.h'})
pkg.deps = {
- '$builddir/pkg/freetype/fetch.stamp',
+ 'pkg/freetype/fetch',
'pkg/fribidi/headers',
}
diff --git a/pkg/libdrm/gen.lua b/pkg/libdrm/gen.lua
@@ -15,7 +15,7 @@ lib('libdrm.a', {
if config.video_drivers and config.video_drivers['intel'] then
cflags{'-D HAVE_INTEL=1', '-I pkg/libpciaccess/src/include'}
- pkg.deps = {'$builddir/pkg/libpciaccess/fetch.stamp'}
+ pkg.deps = {'pkg/libpciaccess/fetch'}
lib('libdrm_intel.a', [[
intel/(
intel_bufmgr.c
diff --git a/pkg/libevent/gen.lua b/pkg/libevent/gen.lua
@@ -15,7 +15,7 @@ pkg.hdrs = {
}
pkg.deps = {
'$dir/headers',
- '$builddir/pkg/openbsd/fetch.stamp',
+ 'pkg/openbsd/fetch',
}
lib('libevent.a', {
diff --git a/pkg/libinput/gen.lua b/pkg/libinput/gen.lua
@@ -8,8 +8,8 @@ cflags{
}
pkg.deps = {
- '$builddir/pkg/libevdev/fetch.stamp',
- '$builddir/pkg/mtdev/fetch.stamp',
+ 'pkg/libevdev/fetch',
+ 'pkg/mtdev/fetch',
}
lib('libinput.a', [[
diff --git a/pkg/loksh/gen.lua b/pkg/loksh/gen.lua
@@ -4,7 +4,7 @@ cflags{
'-idirafter pkg/openbsd/src/sys',
}
-cc('emacs.c', {'$builddir/pkg/openbsd/fetch.stamp'})
+cc('emacs.c', {'pkg/openbsd/fetch'})
exe('ksh', {
'alloc.c',
'c_ksh.c',
diff --git a/pkg/lpeg/gen.lua b/pkg/lpeg/gen.lua
@@ -9,6 +9,6 @@ lib('liblpeg.a', {
'lptree.c',
'lpcode.c',
'lpprint.c',
-}, {'$builddir/pkg/lua/fetch.stamp'})
+}, {'pkg/lua/fetch'})
fetch 'curl'
diff --git a/pkg/mc/myr.ninja b/pkg/mc/myr.ninja
@@ -233,4 +233,4 @@ build $outdir/bench/mandelbrot.o | $outdir/bench/mandelbrot.use: mc $srcdir/benc
build $outdir/bench/mandelbrot: ld $outdir/_myrrt.o $outdir/bench/mandelbrot.o $outdir/lib/testr/libtestr.a $outdir/lib/bio/libbio.a $outdir/lib/std/libstd.a $outdir/lib/sys/libsys.a
build $outdir/bench/regex-match.o | $outdir/bench/regex-match.use: mc $srcdir/bench/regex-match.myr | $outdir/lib/std/libstd.use $outdir/lib/regex/libregex.use $outdir/lib/testr/libtestr.use $outdir/lib/std/libstd.use $outdir/lib/sys/libsys.use $outdir/lib/regex/libregex.use $outdir/lib/testr/libtestr.use
build $outdir/bench/regex-match: ld $outdir/_myrrt.o $outdir/bench/regex-match.o $outdir/lib/testr/libtestr.a $outdir/lib/regex/libregex.a $outdir/lib/std/libstd.a $outdir/lib/sys/libsys.a
-build $srcdir/lib/regex/ranges.myr $srcdir/lib/sys/sys+linux-x64.myr $srcdir/lib/sys/syserrno+linux.myr $srcdir/lib/sys/util+posixy-x64.s $srcdir/lib/sys/systypes.myr $srcdir/lib/sys/ifreq+linux.myr $srcdir/lib/sys/syscall+linux-x64.s $srcdir/lib/std/resolve+posixy.myr $srcdir/lib/std/result.myr $srcdir/lib/std/try.myr $srcdir/lib/std/ipparse.myr $srcdir/lib/std/alloc.myr $srcdir/lib/std/iterutil.myr $srcdir/lib/std/putint.myr $srcdir/lib/std/sleq.myr $srcdir/lib/std/sljoin.myr $srcdir/lib/std/slpop.myr $srcdir/lib/std/syswrap+posixy.myr $srcdir/lib/std/getint.myr $srcdir/lib/std/strsplit.myr $srcdir/lib/std/slfill.myr $srcdir/lib/std/writeall.myr $srcdir/lib/std/fltfmt.myr $srcdir/lib/std/hasprefix.myr $srcdir/lib/std/swap.myr $srcdir/lib/std/fmt.myr $srcdir/lib/std/netaddr.myr $srcdir/lib/std/varargs.myr $srcdir/lib/std/diriter.myr $srcdir/lib/std/getcwd.myr $srcdir/lib/std/blat.myr $srcdir/lib/std/optparse.myr $srcdir/lib/std/pathjoin.myr $srcdir/lib/std/readall.myr $srcdir/lib/std/strjoin.myr $srcdir/lib/std/threadhooks.myr $srcdir/lib/std/sjlj.myr $srcdir/lib/std/extremum.myr $srcdir/lib/std/endian.myr $srcdir/lib/std/rand.myr $srcdir/lib/std/sldup.myr $srcdir/lib/std/sleep.myr $srcdir/lib/std/wait+posixy.myr $srcdir/lib/std/introspect.myr $srcdir/lib/std/fltparse.myr $srcdir/lib/std/fndup.myr $srcdir/lib/std/strbuf.myr $srcdir/lib/std/assert.myr $srcdir/lib/std/spork.myr $srcdir/lib/std/slpush.myr $srcdir/lib/std/strstrip.myr $srcdir/lib/std/htab.myr $srcdir/lib/std/hashfuncs.myr $srcdir/lib/std/slput.myr $srcdir/lib/std/sjlj-impl+posixy-x64.s $srcdir/lib/std/fltbits.myr $srcdir/lib/std/striter.myr $srcdir/lib/std/types.myr $srcdir/lib/std/cstrconv.myr $srcdir/lib/std/units.myr $srcdir/lib/std/backtrace+x64.myr $srcdir/lib/std/syswrap-ss+linux.myr $srcdir/lib/std/die.myr $srcdir/lib/std/mk.myr $srcdir/lib/std/hassuffix.myr $srcdir/lib/std/memops-impl+posixy-x64.s $srcdir/lib/std/utf.myr $srcdir/lib/std/slurp.myr $srcdir/lib/std/dialparse+posixy.myr $srcdir/lib/std/bytealloc.myr $srcdir/lib/std/mktemp.myr $srcdir/lib/std/consts.myr $srcdir/lib/std/chomp.myr $srcdir/lib/std/dir+linux.myr $srcdir/lib/std/search.myr $srcdir/lib/std/memops.myr $srcdir/lib/std/fmtfuncs.myr $srcdir/lib/std/strfind.myr $srcdir/lib/std/env+posixy.myr $srcdir/lib/std/dirname.myr $srcdir/lib/std/clear.myr $srcdir/lib/std/listen+posixy.myr $srcdir/lib/std/sort.myr $srcdir/lib/std/cmp.myr $srcdir/lib/std/now.myr $srcdir/lib/std/intparse.myr $srcdir/lib/std/mkpath.myr $srcdir/lib/std/option.myr $srcdir/lib/std/dial+posixy.myr $srcdir/lib/std/errno.myr $srcdir/lib/std/chartype.myr $srcdir/lib/std/bigint.myr $srcdir/lib/std/bitset.myr $srcdir/lib/std/getbp+posixy-x64.s $srcdir/lib/std/slcp.myr $srcdir/lib/std/execvp.myr $srcdir/lib/thread/mutex+linux.myr $srcdir/lib/thread/atomic.myr $srcdir/lib/thread/atomic-impl+x64.s $srcdir/lib/thread/hookstd.myr $srcdir/lib/thread/common.myr $srcdir/lib/thread/ncpu+linux.myr $srcdir/lib/thread/exit+linux-x64.s $srcdir/lib/thread/spawn+linux.myr $srcdir/lib/crypto/chacha20.myr $srcdir/lib/crypto/md5.myr $srcdir/lib/crypto/aes.myr $srcdir/lib/crypto/sha256.myr $srcdir/lib/crypto/entropy.myr $srcdir/lib/crypto/rand.myr $srcdir/lib/crypto/sha512.myr $srcdir/lib/crypto/sha1.myr $srcdir/lib/crypto/sha3.myr $srcdir/lib/testr/testr.myr $srcdir/bench/hashit.myr $srcdir/lib/bio/puti.myr $srcdir/lib/bio/geti.myr $srcdir/lib/bio/mem.myr $srcdir/lib/bio/bio.myr $srcdir/lib/bio/iter.myr $srcdir/lib/bio/test/bio-endianwr.myr $srcdir/lib/http/client.myr $srcdir/lib/http/session.myr $srcdir/lib/http/types.myr $srcdir/lib/http/server.myr $srcdir/lib/http/url.myr $srcdir/lib/http/status.myr $srcdir/lib/http/parse.myr $srcdir/lib/http/srvdot.myr $srcdir/lib/regex/interp.myr $srcdir/lib/regex/types.myr $srcdir/lib/regex/compile.myr $srcdir/lib/regex/redump.myr $srcdir/bench/bigfactorial.myr $srcdir/lib/regex/test/testmatch.myr $srcdir/lib/regex/test/basic.myr $srcdir/lib/bio/test/bio-read.myr $srcdir/support/dumpleak.myr $srcdir/lib/regex/test/class.myr $srcdir/bench/intsort.myr $srcdir/lib/bio/test/bio-endianrd.myr $srcdir/lib/bio/test/bio-unitwr.myr $srcdir/lib/bio/test/bio-write.myr $srcdir/lib/inifile/write.myr $srcdir/lib/inifile/types.myr $srcdir/lib/inifile/access.myr $srcdir/lib/inifile/parse.myr $srcdir/lib/regex/test/boundaries.myr $srcdir/lib/regex/test/subst.myr $srcdir/bench/many-memcpy.myr $srcdir/lib/fileutil/walk.myr $srcdir/lib/fileutil/loopcheck+posixy.myr $srcdir/lib/fileutil/homedir.myr $srcdir/lib/fileutil/tmpdir.myr $srcdir/lib/regex/test/unicode.myr $srcdir/lib/bio/test/bio-peek.myr $srcdir/bench/copious-allocs.myr $srcdir/lib/regex/test/search.myr $srcdir/lib/regex/test/failmatch.myr $srcdir/lib/regex/test/negclass.myr $srcdir/lib/http/h.myr $srcdir/lib/inifile/test/inifile.myr $srcdir/lib/json/fmt.myr $srcdir/lib/json/types.myr $srcdir/lib/json/parse.myr $srcdir/lib/escfmt/escre.myr $srcdir/lib/escfmt/eschtml.myr $srcdir/lib/escfmt/escsh.myr $srcdir/lib/escfmt/escurl.myr $srcdir/lib/bio/test/bio-delim.myr $srcdir/lib/thread/util.myr $srcdir/lib/crypto/util.myr $srcdir/lib/regex/test/idxmatch.myr $srcdir/mbld/deps.myr $srcdir/mbld/main.myr $srcdir/mbld/util.myr $srcdir/mbld/libs.myr $srcdir/mbld/syssel.myr $srcdir/mbld/opts.myr $srcdir/mbld/subtest.myr $srcdir/mbld/types.myr $srcdir/mbld/test.myr $srcdir/mbld/install.myr $srcdir/mbld/parse.myr $srcdir/mbld/build.myr $srcdir/lib/regex/test/capture.myr $srcdir/lib/date/date.myr $srcdir/lib/date/names.myr $srcdir/lib/date/zoneinfo+posixy.myr $srcdir/lib/date/fmt.myr $srcdir/lib/date/types.myr $srcdir/lib/date/parse.myr $srcdir/lib/bio/test/bio-create.myr $srcdir/bench/sha1-compute.myr $srcdir/bench/mandelbrot.myr $srcdir/bench/regex-match.myr $srcdir/lib/std/test/try.myr $srcdir/lib/std/test/ipparse.myr $srcdir/lib/std/test/iterutil.myr $srcdir/lib/std/test/strsplit.myr $srcdir/lib/std/test/fmt.myr $srcdir/lib/std/test/netaddr.myr $srcdir/lib/std/test/pathjoin.myr $srcdir/lib/std/test/sjlj.myr $srcdir/lib/std/test/rand.myr $srcdir/lib/std/test/fltparse.myr $srcdir/lib/std/test/strbuf.myr $srcdir/lib/std/test/htab.myr $srcdir/lib/std/test/hashfuncs.myr $srcdir/lib/std/test/fltbits.myr $srcdir/lib/std/test/striter.myr $srcdir/lib/std/test/bytealloc.myr $srcdir/lib/std/test/chomp.myr $srcdir/lib/std/test/search.myr $srcdir/lib/std/test/dirname.myr $srcdir/lib/std/test/sort.myr $srcdir/lib/std/test/cmp.myr $srcdir/lib/std/test/option.myr $srcdir/lib/std/test/chartype.myr $srcdir/lib/std/test/bigint.myr $srcdir/lib/std/test/bitset.myr $srcdir/lib/std/test/slcp.myr $srcdir/lib/thread/test/mutex.myr $srcdir/lib/thread/test/atomic.myr $srcdir/lib/thread/test/spawn.myr $srcdir/lib/crypto/test/chacha20.myr $srcdir/lib/crypto/test/md5.myr $srcdir/lib/crypto/test/aes.myr $srcdir/lib/crypto/test/sha256.myr $srcdir/lib/crypto/test/sha512.myr $srcdir/lib/crypto/test/sha1.myr $srcdir/lib/crypto/test/sha3.myr $srcdir/lib/bio/test/mem.myr $srcdir/lib/json/test/parse.myr $srcdir/lib/escfmt/test/escre.myr $srcdir/lib/escfmt/test/eschtml.myr $srcdir/lib/escfmt/test/escsh.myr $srcdir/lib/escfmt/test/escurl.myr $srcdir/lib/date/test/fmt.myr $srcdir/lib/date/test/parse.myr: phony $outdir/fetch.stamp
+build $srcdir/lib/regex/ranges.myr $srcdir/lib/sys/sys+linux-x64.myr $srcdir/lib/sys/syserrno+linux.myr $srcdir/lib/sys/util+posixy-x64.s $srcdir/lib/sys/systypes.myr $srcdir/lib/sys/ifreq+linux.myr $srcdir/lib/sys/syscall+linux-x64.s $srcdir/lib/std/resolve+posixy.myr $srcdir/lib/std/result.myr $srcdir/lib/std/try.myr $srcdir/lib/std/ipparse.myr $srcdir/lib/std/alloc.myr $srcdir/lib/std/iterutil.myr $srcdir/lib/std/putint.myr $srcdir/lib/std/sleq.myr $srcdir/lib/std/sljoin.myr $srcdir/lib/std/slpop.myr $srcdir/lib/std/syswrap+posixy.myr $srcdir/lib/std/getint.myr $srcdir/lib/std/strsplit.myr $srcdir/lib/std/slfill.myr $srcdir/lib/std/writeall.myr $srcdir/lib/std/fltfmt.myr $srcdir/lib/std/hasprefix.myr $srcdir/lib/std/swap.myr $srcdir/lib/std/fmt.myr $srcdir/lib/std/netaddr.myr $srcdir/lib/std/varargs.myr $srcdir/lib/std/diriter.myr $srcdir/lib/std/getcwd.myr $srcdir/lib/std/blat.myr $srcdir/lib/std/optparse.myr $srcdir/lib/std/pathjoin.myr $srcdir/lib/std/readall.myr $srcdir/lib/std/strjoin.myr $srcdir/lib/std/threadhooks.myr $srcdir/lib/std/sjlj.myr $srcdir/lib/std/extremum.myr $srcdir/lib/std/endian.myr $srcdir/lib/std/rand.myr $srcdir/lib/std/sldup.myr $srcdir/lib/std/sleep.myr $srcdir/lib/std/wait+posixy.myr $srcdir/lib/std/introspect.myr $srcdir/lib/std/fltparse.myr $srcdir/lib/std/fndup.myr $srcdir/lib/std/strbuf.myr $srcdir/lib/std/assert.myr $srcdir/lib/std/spork.myr $srcdir/lib/std/slpush.myr $srcdir/lib/std/strstrip.myr $srcdir/lib/std/htab.myr $srcdir/lib/std/hashfuncs.myr $srcdir/lib/std/slput.myr $srcdir/lib/std/sjlj-impl+posixy-x64.s $srcdir/lib/std/fltbits.myr $srcdir/lib/std/striter.myr $srcdir/lib/std/types.myr $srcdir/lib/std/cstrconv.myr $srcdir/lib/std/units.myr $srcdir/lib/std/backtrace+x64.myr $srcdir/lib/std/syswrap-ss+linux.myr $srcdir/lib/std/die.myr $srcdir/lib/std/mk.myr $srcdir/lib/std/hassuffix.myr $srcdir/lib/std/memops-impl+posixy-x64.s $srcdir/lib/std/utf.myr $srcdir/lib/std/slurp.myr $srcdir/lib/std/dialparse+posixy.myr $srcdir/lib/std/bytealloc.myr $srcdir/lib/std/mktemp.myr $srcdir/lib/std/consts.myr $srcdir/lib/std/chomp.myr $srcdir/lib/std/dir+linux.myr $srcdir/lib/std/search.myr $srcdir/lib/std/memops.myr $srcdir/lib/std/fmtfuncs.myr $srcdir/lib/std/strfind.myr $srcdir/lib/std/env+posixy.myr $srcdir/lib/std/dirname.myr $srcdir/lib/std/clear.myr $srcdir/lib/std/listen+posixy.myr $srcdir/lib/std/sort.myr $srcdir/lib/std/cmp.myr $srcdir/lib/std/now.myr $srcdir/lib/std/intparse.myr $srcdir/lib/std/mkpath.myr $srcdir/lib/std/option.myr $srcdir/lib/std/dial+posixy.myr $srcdir/lib/std/errno.myr $srcdir/lib/std/chartype.myr $srcdir/lib/std/bigint.myr $srcdir/lib/std/bitset.myr $srcdir/lib/std/getbp+posixy-x64.s $srcdir/lib/std/slcp.myr $srcdir/lib/std/execvp.myr $srcdir/lib/thread/mutex+linux.myr $srcdir/lib/thread/atomic.myr $srcdir/lib/thread/atomic-impl+x64.s $srcdir/lib/thread/hookstd.myr $srcdir/lib/thread/common.myr $srcdir/lib/thread/ncpu+linux.myr $srcdir/lib/thread/exit+linux-x64.s $srcdir/lib/thread/spawn+linux.myr $srcdir/lib/crypto/chacha20.myr $srcdir/lib/crypto/md5.myr $srcdir/lib/crypto/aes.myr $srcdir/lib/crypto/sha256.myr $srcdir/lib/crypto/entropy.myr $srcdir/lib/crypto/rand.myr $srcdir/lib/crypto/sha512.myr $srcdir/lib/crypto/sha1.myr $srcdir/lib/crypto/sha3.myr $srcdir/lib/testr/testr.myr $srcdir/bench/hashit.myr $srcdir/lib/bio/puti.myr $srcdir/lib/bio/geti.myr $srcdir/lib/bio/mem.myr $srcdir/lib/bio/bio.myr $srcdir/lib/bio/iter.myr $srcdir/lib/bio/test/bio-endianwr.myr $srcdir/lib/http/client.myr $srcdir/lib/http/session.myr $srcdir/lib/http/types.myr $srcdir/lib/http/server.myr $srcdir/lib/http/url.myr $srcdir/lib/http/status.myr $srcdir/lib/http/parse.myr $srcdir/lib/http/srvdot.myr $srcdir/lib/regex/interp.myr $srcdir/lib/regex/types.myr $srcdir/lib/regex/compile.myr $srcdir/lib/regex/redump.myr $srcdir/bench/bigfactorial.myr $srcdir/lib/regex/test/testmatch.myr $srcdir/lib/regex/test/basic.myr $srcdir/lib/bio/test/bio-read.myr $srcdir/support/dumpleak.myr $srcdir/lib/regex/test/class.myr $srcdir/bench/intsort.myr $srcdir/lib/bio/test/bio-endianrd.myr $srcdir/lib/bio/test/bio-unitwr.myr $srcdir/lib/bio/test/bio-write.myr $srcdir/lib/inifile/write.myr $srcdir/lib/inifile/types.myr $srcdir/lib/inifile/access.myr $srcdir/lib/inifile/parse.myr $srcdir/lib/regex/test/boundaries.myr $srcdir/lib/regex/test/subst.myr $srcdir/bench/many-memcpy.myr $srcdir/lib/fileutil/walk.myr $srcdir/lib/fileutil/loopcheck+posixy.myr $srcdir/lib/fileutil/homedir.myr $srcdir/lib/fileutil/tmpdir.myr $srcdir/lib/regex/test/unicode.myr $srcdir/lib/bio/test/bio-peek.myr $srcdir/bench/copious-allocs.myr $srcdir/lib/regex/test/search.myr $srcdir/lib/regex/test/failmatch.myr $srcdir/lib/regex/test/negclass.myr $srcdir/lib/http/h.myr $srcdir/lib/inifile/test/inifile.myr $srcdir/lib/json/fmt.myr $srcdir/lib/json/types.myr $srcdir/lib/json/parse.myr $srcdir/lib/escfmt/escre.myr $srcdir/lib/escfmt/eschtml.myr $srcdir/lib/escfmt/escsh.myr $srcdir/lib/escfmt/escurl.myr $srcdir/lib/bio/test/bio-delim.myr $srcdir/lib/thread/util.myr $srcdir/lib/crypto/util.myr $srcdir/lib/regex/test/idxmatch.myr $srcdir/mbld/deps.myr $srcdir/mbld/main.myr $srcdir/mbld/util.myr $srcdir/mbld/libs.myr $srcdir/mbld/syssel.myr $srcdir/mbld/opts.myr $srcdir/mbld/subtest.myr $srcdir/mbld/types.myr $srcdir/mbld/test.myr $srcdir/mbld/install.myr $srcdir/mbld/parse.myr $srcdir/mbld/build.myr $srcdir/lib/regex/test/capture.myr $srcdir/lib/date/date.myr $srcdir/lib/date/names.myr $srcdir/lib/date/zoneinfo+posixy.myr $srcdir/lib/date/fmt.myr $srcdir/lib/date/types.myr $srcdir/lib/date/parse.myr $srcdir/lib/bio/test/bio-create.myr $srcdir/bench/sha1-compute.myr $srcdir/bench/mandelbrot.myr $srcdir/bench/regex-match.myr $srcdir/lib/std/test/try.myr $srcdir/lib/std/test/ipparse.myr $srcdir/lib/std/test/iterutil.myr $srcdir/lib/std/test/strsplit.myr $srcdir/lib/std/test/fmt.myr $srcdir/lib/std/test/netaddr.myr $srcdir/lib/std/test/pathjoin.myr $srcdir/lib/std/test/sjlj.myr $srcdir/lib/std/test/rand.myr $srcdir/lib/std/test/fltparse.myr $srcdir/lib/std/test/strbuf.myr $srcdir/lib/std/test/htab.myr $srcdir/lib/std/test/hashfuncs.myr $srcdir/lib/std/test/fltbits.myr $srcdir/lib/std/test/striter.myr $srcdir/lib/std/test/bytealloc.myr $srcdir/lib/std/test/chomp.myr $srcdir/lib/std/test/search.myr $srcdir/lib/std/test/dirname.myr $srcdir/lib/std/test/sort.myr $srcdir/lib/std/test/cmp.myr $srcdir/lib/std/test/option.myr $srcdir/lib/std/test/chartype.myr $srcdir/lib/std/test/bigint.myr $srcdir/lib/std/test/bitset.myr $srcdir/lib/std/test/slcp.myr $srcdir/lib/thread/test/mutex.myr $srcdir/lib/thread/test/atomic.myr $srcdir/lib/thread/test/spawn.myr $srcdir/lib/crypto/test/chacha20.myr $srcdir/lib/crypto/test/md5.myr $srcdir/lib/crypto/test/aes.myr $srcdir/lib/crypto/test/sha256.myr $srcdir/lib/crypto/test/sha512.myr $srcdir/lib/crypto/test/sha1.myr $srcdir/lib/crypto/test/sha3.myr $srcdir/lib/bio/test/mem.myr $srcdir/lib/json/test/parse.myr $srcdir/lib/escfmt/test/escre.myr $srcdir/lib/escfmt/test/eschtml.myr $srcdir/lib/escfmt/test/escsh.myr $srcdir/lib/escfmt/test/escurl.myr $srcdir/lib/date/test/fmt.myr $srcdir/lib/date/test/parse.myr: phony $dir/fetch
diff --git a/pkg/mpv/gen.lua b/pkg/mpv/gen.lua
@@ -82,7 +82,7 @@ if options['HAVE_DRM'] then
'-I pkg/libdrm/src/include/drm',
}
table.insert(libs, 'libdrm/libdrm.a')
- table.insert(pkg.deps, '$builddir/pkg/libdrm/fetch.stamp')
+ table.insert(pkg.deps, 'pkg/libdrm/fetch')
end
if options['HAVE_LIBASS'] then
cflags{'-I $builddir/pkg/libass/include'}
@@ -92,7 +92,7 @@ end
if options['HAVE_LUA'] then
cflags{'-I pkg/lua/src/src'}
table.insert(libs, 'lua/liblua.a')
- table.insert(pkg.deps, '$builddir/pkg/lua/fetch.stamp')
+ table.insert(pkg.deps, 'pkg/lua/fetch')
end
if options['HAVE_WAYLAND'] then
cflags{
@@ -106,7 +106,7 @@ if options['HAVE_WAYLAND'] then
})
table.insert(pkg.deps, {
'pkg/wayland/headers',
- '$builddir/pkg/libxkbcommon/fetch.stamp',
+ 'pkg/libxkbcommon/fetch',
})
end
diff --git a/pkg/mupdf/gen.lua b/pkg/mupdf/gen.lua
@@ -39,12 +39,12 @@ for _, font in ipairs(fonts) do
end
pkg.deps = {
+ '$outdir/mupdf/pdf/name-table.h',
'pkg/curl/headers',
+ 'pkg/freetype/fetch',
+ 'pkg/jbig2dec/fetch',
'pkg/libjpeg-turbo/headers',
'pkg/zlib/headers',
- '$builddir/pkg/freetype/fetch.stamp',
- '$builddir/pkg/jbig2dec/fetch.stamp',
- '$outdir/mupdf/pdf/name-table.h',
}
lib('libmupdf.a', {
@@ -71,7 +71,7 @@ cc('platform/x11/curl_stream.c', {'pkg/curl/headers'}, {
})
cc('platform/x11/wl_main.c', {
'$dir/deps',
- '$builddir/pkg/libxkbcommon/fetch.stamp',
+ 'pkg/libxkbcommon/fetch',
'pkg/pixman/headers',
'pkg/wayland/headers',
'pkg/wayland-protocols/headers',
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/(
diff --git a/pkg/nginx/gen.lua b/pkg/nginx/gen.lua
@@ -52,7 +52,7 @@ end
build('awk', '$outdir/ngx_modules.c', {'$dir/modules.txt', '|', '$dir/modules.awk', '$dir/sources.txt'}, {
expr='-f $dir/modules.awk -v sources=$dir/sources.txt'
})
-cc('$outdir/ngx_modules.c', {'$outdir/fetch.stamp'})
+cc('$outdir/ngx_modules.c', {'$dir/fetch'})
local sources = paths[[src/(
core/(
diff --git a/pkg/sshfs/gen.lua b/pkg/sshfs/gen.lua
@@ -6,7 +6,7 @@ cflags{
exe('sshfs', {
'sshfs.c', 'nocache.c', '$builddir/pkg/libfuse/libfuse.a',
-}, {'$builddir/pkg/libfuse/fetch.stamp'})
+}, {'pkg/libfuse/fetch'})
file('bin/sshfs', '755', '$outdir/sshfs')
man{'$dir/sshfs.1'}
diff --git a/pkg/st/gen.lua b/pkg/st/gen.lua
@@ -10,8 +10,8 @@ cflags{
}
pkg.deps = {
- '$builddir/pkg/fontconfig/fetch.stamp',
- '$builddir/pkg/libxkbcommon/fetch.stamp',
+ 'pkg/fontconfig/fetch',
+ 'pkg/libxkbcommon/fetch',
'pkg/pixman/headers',
'pkg/wayland/headers',
'pkg/wayland-protocols/headers',
diff --git a/pkg/swc/gen.lua b/pkg/swc/gen.lua
@@ -41,10 +41,10 @@ pkg.deps = {
'$outdir/wayland-drm-server-protocol.h',
'$outdir/include/swc-server-protocol.h',
'$outdir/cursor/cursor_data.h',
- '$builddir/pkg/fontconfig/fetch.stamp',
- '$builddir/pkg/libdrm/fetch.stamp',
- '$builddir/pkg/libinput/fetch.stamp',
- '$builddir/pkg/libxkbcommon/fetch.stamp',
+ 'pkg/fontconfig/fetch',
+ 'pkg/libdrm/fetch',
+ 'pkg/libinput/fetch',
+ 'pkg/libxkbcommon/fetch',
'pkg/pixman/headers',
'pkg/wayland/headers',
'pkg/wayland-protocols/headers',
diff --git a/pkg/transmission/gen.lua b/pkg/transmission/gen.lua
@@ -27,7 +27,7 @@ sub('libminiupnp.ninja', function()
upnpcommands.c
upnpreplyparse.c
)
- ]], {'$outdir/miniupnp/miniupnpcstrings.h', '$builddir/pkg/openbsd/fetch.stamp'})
+ ]], {'$outdir/miniupnp/miniupnpcstrings.h', 'pkg/openbsd/fetch'})
end)
sub('libutp.ninja', function()
set('cc', '$cxx')
@@ -65,8 +65,8 @@ pkg.deps = {
'pkg/curl/headers',
'pkg/libevent/headers',
'pkg/libressl/headers',
+ 'pkg/openbsd/fetch',
'pkg/zlib/headers',
- '$builddir/pkg/openbsd/fetch.stamp',
}
lib('libtransmission.a', [[
diff --git a/pkg/unzip/gen.lua b/pkg/unzip/gen.lua
@@ -10,7 +10,7 @@ exe('unzip', [[
process.c ttyio.c ubz2err.c unreduce.c unshrink.c zipinfo.c
unix/unix.c
$builddir/pkg/bzip2/libbz2.a
-]], {'$builddir/pkg/bzip2/fetch.stamp'})
+]], {'pkg/bzip2/fetch'})
file('bin/unzip', '755', '$outdir/unzip')
man{'man/unzip.1'}
diff --git a/pkg/velox/gen.lua b/pkg/velox/gen.lua
@@ -19,10 +19,10 @@ pkg.deps = {
'$outdir/protocol/swc-client-protocol.h',
'$outdir/protocol/velox-client-protocol.h',
'$outdir/protocol/velox-server-protocol.h',
- '$builddir/pkg/fontconfig/fetch.stamp',
- '$builddir/pkg/libxkbcommon/fetch.stamp',
- '$builddir/pkg/swc/fetch.stamp',
+ 'pkg/fontconfig/fetch',
+ 'pkg/libxkbcommon/fetch',
'pkg/pixman/headers',
+ 'pkg/swc/fetch',
'pkg/swc/headers',
'pkg/wayland/headers',
'pkg/wld/headers',
diff --git a/pkg/vis/gen.lua b/pkg/vis/gen.lua
@@ -24,8 +24,8 @@ build('copy', '$outdir/config.h', '$srcdir/config.def.h')
pkg.deps = {
'$outdir/config.h',
- '$builddir/pkg/libtermkey/fetch.stamp',
- '$builddir/pkg/lua/fetch.stamp',
+ 'pkg/libtermkey/fetch',
+ 'pkg/lua/fetch',
'pkg/ncurses/headers',
}
diff --git a/pkg/wld/gen.lua b/pkg/wld/gen.lua
@@ -55,10 +55,10 @@ waylandproto('protocol/wayland-drm.xml',
)
pkg.deps = {
- '$builddir/pkg/fontconfig/fetch.stamp',
- '$builddir/pkg/freetype/fetch.stamp',
- '$builddir/pkg/libdrm/fetch.stamp',
'$outdir/protocol/wayland-drm-client-protocol.h',
+ 'pkg/fontconfig/fetch',
+ 'pkg/freetype/fetch',
+ 'pkg/libdrm/fetch',
'pkg/pixman/headers',
'pkg/wayland/headers',
}
