summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorMichael Forney <mforney@mforney.org>2016-07-03 10:44:24 -0700
committerMichael Forney <mforney@mforney.org>2016-07-03 10:44:24 -0700
commit257e042bf28382e6f5dc3e2acf929a3fe01e1201 (patch)
treeea18427bb18adee46525932083f71ec62311db92 /extra
parent52b76cb615034dc8db23f3f76edcef8a150dd510 (diff)
Add sub helper function
Diffstat (limited to 'extra')
-rw-r--r--extra/efivar/gen.rc3
-rw-r--r--extra/transmission/gen.rc9
2 files changed, 4 insertions, 8 deletions
diff --git a/extra/efivar/gen.rc b/extra/efivar/gen.rc
index f8e0383b..68e4664a 100644
--- a/extra/efivar/gen.rc
+++ b/extra/efivar/gen.rc
@@ -14,8 +14,7 @@ cflags\
-I '$srcdir'/src/include/efivar
build '$outdir'/host-guid.c.o cc '$srcdir'/src/guid.c
exe makeguids src/makeguids.c host-guid.c.o
-} >tools.ninja
-subninja '$dir'/tools.ninja
+} | sub tools.ninja
rule makeguids '$outdir/makeguids $in $out'
outs='$outdir'/^(guids.bin names.bin guid-symbols.c include/efivar-guids.h)\
diff --git a/extra/transmission/gen.rc b/extra/transmission/gen.rc
index 4af2338b..2856410f 100644
--- a/extra/transmission/gen.rc
+++ b/extra/transmission/gen.rc
@@ -96,8 +96,7 @@ lib libdht.a third-party/dht/dht.c
set cflags '$orig_cflags' \
-D ENABLE_STRNATPMPERR
lib libnatpmp.a third-party/libnatpmp/^(getgateway.c natpmp.c wingettimeofday.c)
-} >libnatpmp.ninja
-subninja '$dir'/libnatpmp.ninja
+} | sub libnatpmp.ninja
{
set cflags '$orig_cflags' \
@@ -122,8 +121,7 @@ subninja '$dir'/libnatpmp.ninja
upnpcommands.c\
upnpreplyparse.c\
)
-} >libminiupnp.ninja
-subninja '$dir'/libminiupnp.ninja
+} | sub libminiupnp.ninja
{
set cc '$cxx'
@@ -135,8 +133,7 @@ subninja '$dir'/libminiupnp.ninja
-I '$srcdir'/third-party/libutp
lib libutp.a third-party/libutp/^(utp.cpp utp_utils.cpp)
-} >libutp.ninja
-subninja '$dir'/libutp.ninja
+} | sub libutp.ninja
libs=(\
libtransmission.a libb64.a libdht.a libminiupnp.a libnatpmp.a libutp.a\