From 1b6aa025514d131082ca10fca8c791af1bddaf8d Mon Sep 17 00:00:00 2001
From: Steve Strong <steve@srstrong.com>
Date: Sun, 18 Aug 2013 18:05:27 +0200
Subject: Allow higher level makefile to specify ERL_LIBS

---
 erlang.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/erlang.mk b/erlang.mk
index 8cc8b03..dc0c3ed 100644
--- a/erlang.mk
+++ b/erlang.mk
@@ -60,6 +60,9 @@ ALL_TEST_DEPS_DIRS = $(addprefix $(DEPS_DIR)/,$(TEST_DEPS))
 
 # Application.
 
+ERL_LIBS ?= $(DEPS)
+export ERL_LIBS
+
 ERLC_OPTS ?= -Werror +debug_info +warn_export_all +warn_export_vars \
 	+warn_shadow_vars +warn_obsolete_guard # +bin_opt_info +warn_missing_spec
 COMPILE_FIRST ?=
@@ -78,7 +81,7 @@ app: ebin/$(PROJECT).app
 		> ebin/$(PROJECT).app
 
 define compile_erl
-	$(erlc_verbose) ERL_LIBS=$(DEPS_DIR) erlc -v $(ERLC_OPTS) -o ebin/ \
+	$(erlc_verbose) erlc -v $(ERLC_OPTS) -o ebin/ \
 		-pa ebin/ -I include/ $(COMPILE_FIRST_PATHS) $(1)
 endef
 
@@ -164,7 +167,7 @@ build-test-deps: $(ALL_TEST_DEPS_DIRS)
 	@for dep in $(ALL_TEST_DEPS_DIRS) ; do $(MAKE) -C $$dep; done
 
 build-tests: build-test-deps
-	$(gen_verbose) ERL_LIBS=$(DEPS_DIR) erlc -v $(ERLC_OPTS) -o test/ \
+	$(gen_verbose) erlc -v $(ERLC_OPTS) -o test/ \
 		$(wildcard test/*.erl test/*/*.erl) -pa ebin/
 
 CT_RUN = ct_run \
-- 
cgit v1.2.3