diff options
| author | Steve Strong <[email protected]> | 2013-08-18 18:05:27 +0200 |
|---|---|---|
| committer | Steve Strong <[email protected]> | 2013-08-18 18:05:27 +0200 |
| commit | 1b6aa025514d131082ca10fca8c791af1bddaf8d (patch) | |
| tree | 5df278efb2aa0531e1e03414203093a9c841b6cc | |
| parent | e2d676f36eefb396c06442b490dcf0aa259152f7 (diff) | |
| download | erlang.mk-1b6aa025514d131082ca10fca8c791af1bddaf8d.tar.gz erlang.mk-1b6aa025514d131082ca10fca8c791af1bddaf8d.tar.bz2 erlang.mk-1b6aa025514d131082ca10fca8c791af1bddaf8d.zip | |
Allow higher level makefile to specify ERL_LIBS
| -rw-r--r-- | erlang.mk | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 \ |