diff options
| -rw-r--r-- | core/erlc.mk | 2 | ||||
| -rw-r--r-- | plugins/erlydtl.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index 2cc0e77..a8ab8fe 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -199,7 +199,7 @@ ebin/$(PROJECT).app:: $(ERL_FILES) $(CORE_FILES) $(if $(strip $?),$(call compile_erl,$?)) $(eval GITDESCRIBE := $(shell git describe --dirty --abbrev=7 --tags --always --first-parent 2>/dev/null || true)) $(eval MODULES := $(patsubst %,'%',$(sort $(notdir $(basename \ - $(filter-out $(ERLC_EXCLUDE_PATHS),$(ERL_FILES) $(CORE_FILES))))))) + $(filter-out $(ERLC_EXCLUDE_PATHS),$(ERL_FILES) $(CORE_FILES) $(BEAM_FILES))))))) ifeq ($(wildcard src/$(PROJECT).app.src),) $(app_verbose) printf "$(subst $(newline),\n,$(subst ",\",$(call app_file,$(GITDESCRIBE),$(MODULES))))" \ > ebin/$(PROJECT).app diff --git a/plugins/erlydtl.mk b/plugins/erlydtl.mk index 430ce5a..67dd5b9 100644 --- a/plugins/erlydtl.mk +++ b/plugins/erlydtl.mk @@ -35,8 +35,7 @@ endef ifneq ($(wildcard src/),) DTL_FILES = $(sort $(call core_find,$(DTL_PATH),*.dtl)) -DTL_ERL_FILES = $(addprefix src/,$(patsubst %.dtl,%_dtl.erl,$(notdir $(DTL_FILES)))) -ERL_FILES += $(DTL_ERL_FILES) +BEAM_FILES += $(addprefix ebin/,$(patsubst %.dtl,%_dtl.beam,$(notdir $(DTL_FILES)))) ebin/$(PROJECT).app:: $(DTL_FILES) $(if $(strip $?),\ |