diff options
| author | Loïc Hoguin <[email protected]> | 2015-09-29 15:03:34 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-09-29 15:03:34 +0200 |
| commit | fe5c42fb818acf9ad6ca6589ea182dfbfbaa5427 (patch) | |
| tree | 5ca924e351e7cb325e179be273febe52ab7f1208 /core/erlc.mk | |
| parent | 41ea5e7fe740625899cd9553f5d9faf25cf5425a (diff) | |
| download | erlang.mk-fe5c42fb818acf9ad6ca6589ea182dfbfbaa5427.tar.gz erlang.mk-fe5c42fb818acf9ad6ca6589ea182dfbfbaa5427.tar.bz2 erlang.mk-fe5c42fb818acf9ad6ca6589ea182dfbfbaa5427.zip | |
Add support for APPS_DIR
This changes adds Rebar-like "apps/" functionality.
From this commit onward, Erlang.mk supports 4 types of repositories:
- Repo with an Erlang app at root level + deps/
- Repo with an Erlang app at root level + apps/ deps/
- Repo with no app at root level + deps/
- Repo with no app at root level + apps/ deps/
Example usage:
- make new-app in=webchat
- make new t=gen_server n=my_chat in=webchat
- make
Replace new-app with new-lib to create an OTP library instead of
an OTP application.
Diffstat (limited to 'core/erlc.mk')
| -rw-r--r-- | core/erlc.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index fbba7ae..7ca24bb 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -60,7 +60,7 @@ define app_file $(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma)) {modules, [$(call comma_list,$(2))]}, {registered, []}, - {applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]} + {applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(DEPS))]} ]}. endef else @@ -71,7 +71,7 @@ define app_file $(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma)) {modules, [$(call comma_list,$(2))]}, {registered, [$(call comma_list,$(PROJECT)_sup $(PROJECT_REGISTERED))]}, - {applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(DEPS))]}, + {applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(DEPS))]}, {mod, {$(PROJECT)_app, []}} ]}. endef |