diff options
| author | Loïc Hoguin <[email protected]> | 2013-06-13 12:00:47 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2013-06-13 12:00:47 +0200 |
| commit | ad52e7e6771820c076c715cc8d72adca10c2b89f (patch) | |
| tree | af0b2b961a4691f07ea5bb128b7f4402d3aec009 | |
| parent | 4b13eb4bc64d7f04291fcb62ee4794a672d8d3b5 (diff) | |
| parent | 51f43ba36e12ab1a667f60e418ff0ad176a36b24 (diff) | |
| download | ct_helper-ad52e7e6771820c076c715cc8d72adca10c2b89f.tar.gz ct_helper-ad52e7e6771820c076c715cc8d72adca10c2b89f.tar.bz2 ct_helper-ad52e7e6771820c076c715cc8d72adca10c2b89f.zip | |
Merge branch 'make_3.81_fix' of git://github.com/pib/ct_helper
| -rw-r--r-- | erlang.mk | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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 |