From 829ab97fccb991832445862ec8246197a225ecec Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 27 Jan 2017 15:11:42 +0100
Subject: Parallelised merge, distribution phase.

---
 Emakefile | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'Emakefile')

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}]}.
-- 
cgit v1.1