diff options
| author | Loïc Hoguin <[email protected]> | 2015-09-29 15:58:50 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2015-09-29 15:58:50 +0200 |
| commit | 074453dc954bd5188bc85077b6de728df3cbc6e2 (patch) | |
| tree | d4c95cb6f620553311bc994ff66615ab4062a4b5 /core/erlc.mk | |
| parent | c148e886257b695d8c61a4aaf10aee3cf4a770d1 (diff) | |
| parent | 2e54f1a1fa85937e960081247536cc1dd9bd8843 (diff) | |
| download | erlang.mk-074453dc954bd5188bc85077b6de728df3cbc6e2.tar.gz erlang.mk-074453dc954bd5188bc85077b6de728df3cbc6e2.tar.bz2 erlang.mk-074453dc954bd5188bc85077b6de728df3cbc6e2.zip | |
Merge branch 'app_file_newlines' of https://github.com/ingwinlu/erlang.mk
Diffstat (limited to 'core/erlc.mk')
| -rw-r--r-- | core/erlc.mk | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index 7ca24bb..2cc0e77 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -56,8 +56,8 @@ ifeq ($(wildcard src/$(PROJECT)_app.erl),) define app_file {application, $(PROJECT), [ {description, "$(PROJECT_DESCRIPTION)"}, - {vsn, "$(PROJECT_VERSION)"}, - $(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma)) + {vsn, "$(PROJECT_VERSION)"},$(if $(IS_DEP), + {id$(comma)$(space)"$(1)"}$(comma)) {modules, [$(call comma_list,$(2))]}, {registered, []}, {applications, [$(call comma_list,kernel stdlib $(OTP_DEPS) $(LOCAL_DEPS) $(DEPS))]} @@ -67,8 +67,8 @@ else define app_file {application, $(PROJECT), [ {description, "$(PROJECT_DESCRIPTION)"}, - {vsn, "$(PROJECT_VERSION)"}, - $(if $(IS_DEP),{id$(comma)$(space)"$(1)"}$(comma)) + {vsn, "$(PROJECT_VERSION)"},$(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) $(LOCAL_DEPS) $(DEPS))]}, @@ -201,7 +201,7 @@ ebin/$(PROJECT).app:: $(ERL_FILES) $(CORE_FILES) $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename \ $(filter-out $(ERLC_EXCLUDE_PATHS),$(ERL_FILES) $(CORE_FILES))))))) ifeq ($(wildcard src/$(PROJECT).app.src),) - $(app_verbose) echo "$(subst $(newline),,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ + $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ > ebin/$(PROJECT).app else $(verbose) if [ -z "$$(grep -E '^[^%]*{\s*modules\s*,' src/$(PROJECT).app.src)" ]; then \ |