summaryrefslogtreecommitdiff
path: root/Emakefile
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2017-01-27 15:11:42 +0100
committerLinus Nordberg <linus@nordu.net>2017-02-01 11:14:41 +0100
commit829ab97fccb991832445862ec8246197a225ecec (patch)
tree8152c9e6855537661e7b1521ab45df62fd825e15 /Emakefile
parent9d3d360e9bde66c0b2c37a196635bcfe26872ebe (diff)
Parallelised merge, distribution phase.
Diffstat (limited to 'Emakefile')
-rw-r--r--Emakefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Emakefile b/Emakefile
index 0b2c07a..37b8c8d 100644
--- a/Emakefile
+++ b/Emakefile
@@ -1,6 +1,11 @@
%% erl -make (-*- erlang -*-)
{["src/*"],
[debug_info,
- {i, "../"}, % For hackney.
+ {i, "../"}, % For hackney.
{outdir, "ebin/"},
{parse_transform, lager_transform}]}.
+{["merge/src/*"],
+ [debug_info,
+ {i, "../"}, % For hackney.
+ {outdir, "merge/ebin/"},
+ {parse_transform, lager_transform}]}.