From 51f43ba36e12ab1a667f60e418ff0ad176a36b24 Mon Sep 17 00:00:00 2001 From: Paul Bonser Date: Tue, 11 Jun 2013 16:15:09 -0500 Subject: Use the latest erlang.mk so it works with make 3.81 --- erlang.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/erlang.mk b/erlang.mk index 8df7ee2..96ab28c 100644 --- a/erlang.mk +++ b/erlang.mk @@ -52,18 +52,18 @@ clean-all: clean clean-deps clean-docs $(gen_verbose) rm -rf .$(PROJECT).plt $(DEPS_DIR) logs app: ebin/$(PROJECT).app - $(eval MODULES := $(shell ls ebin/*.beam \ + $(eval MODULES := $(shell find ebin -name \*.beam \ | sed 's/ebin\///;s/\.beam/,/' | sed '$$s/.$$//')) $(appsrc_verbose) cat src/$(PROJECT).app.src \ | sed 's/{modules, \[\]}/{modules, \[$(MODULES)\]}/' \ > ebin/$(PROJECT).app -define compile_erl = +define compile_erl $(erlc_verbose) ERL_LIBS=deps erlc -v $(ERLC_OPTS) -o ebin/ -pa ebin/ \ $(COMPILE_FIRST_PATHS) $(1) endef -define compile_dtl = +define compile_dtl $(dtl_verbose) erl -noshell -pa ebin/ deps/erlydtl/ebin/ -eval ' \ Compile = fun(F) -> \ Module = list_to_atom( \ @@ -86,13 +86,13 @@ clean: # Dependencies. -define get_dep = +define get_dep @mkdir -p $(DEPS_DIR) git clone -n -- $(word 1,$(dep_$(1))) $(DEPS_DIR)/$(1) cd $(DEPS_DIR)/$(1) ; git checkout -q $(word 2,$(dep_$(1))) endef -define dep_target = +define dep_target $(DEPS_DIR)/$(1): $(call get_dep,$(1)) endef -- cgit v1.2.3