KAZOO-4362: remove deps/merl as it is part of OTP since 18

ronexvoip · Jan 26, 2016 · b34eadf · b34eadf
1 parent 335dabe
commit b34eadf
Show file tree

Hide file tree

Showing 17 changed files with 3 additions and 2,369 deletions.
diff --git a/README.md b/README.md
@@ -144,8 +144,7 @@ If you have a non-US deployment, please consider sharing your system configurati
 
 ## Build Dependencies
 
-* R15B ≤ erlang ≤ 18.2
-    * Note: due to an issue with `parse_transform`s, R16B03 won't build ([merl](deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280) needs update)
+* erlang ≥ 18.2
 * python2
 * libxslt
 * gcc-c++

diff --git a/core/Makefile b/core/Makefile
@@ -1,6 +1,7 @@
 ROOT = ..
 
-MAKEDIRS = */Makefile
+MAKEDIRS = amqp_leader-*/Makefile \
+	*/Makefile
 
 .PHONY: all compile clean test $(MAKEDIRS)
 

diff --git a/deps/Makefile b/deps/Makefile
@@ -4,7 +4,6 @@ MAKEDIRS = lager-*/Makefile \
 	ibrowse-*/Makefile \
 	cowlib-*/Makefile \
 	wsock-*/Makefile \
-	merl-*/Makefile \
 	*/Makefile
 
 .PHONY: all compile clean $(MAKEDIRS)

diff --git a/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/LICENSE b/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/LICENSE
diff --git a/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/Makefile b/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/Makefile
diff --git a/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/README.md b/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/README.md
diff --git a/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/doc/.gitignore b/deps/merl-28e5b3829168199e8475fa91b997e0c03b90d280/doc/.gitignore