diff options
author | Loïc Hoguin <[email protected]> | 2013-08-22 16:14:35 +0200 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2013-08-22 16:14:35 +0200 |
commit | e297c0aa119e14f6ff90a6b03307769db8afd780 (patch) | |
tree | e9223c1757a5fab2a6f86e43e21892036d46f708 | |
parent | 38d85b76b4b8ee7c7ce0be52a293dee5960116d5 (diff) | |
parent | eb645d5b2e2dfdc041a452e31118a95aa566eda8 (diff) | |
download | erlang.mk-e297c0aa119e14f6ff90a6b03307769db8afd780.tar.gz erlang.mk-e297c0aa119e14f6ff90a6b03307769db8afd780.tar.bz2 erlang.mk-e297c0aa119e14f6ff90a6b03307769db8afd780.zip |
Merge branch 'master' of git://github.com/gegidoni/erlang.mk
-rw-r--r-- | erlang.mk | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -76,7 +76,7 @@ clean-all: clean clean-deps clean-docs $(gen_verbose) rm -rf .$(PROJECT).plt $(DEPS_DIR) logs app: ebin/$(PROJECT).app - $(eval MODULES := $(shell find ebin -name \*.beam \ + $(eval MODULES := $(shell find ebin -type f -name \*.beam \ | sed 's/ebin\///;s/\.beam/,/' | sed '$$s/.$$//')) $(appsrc_verbose) cat src/$(PROJECT).app.src \ | sed 's/{modules, \[\]}/{modules, \[$(MODULES)\]}/' \ @@ -104,11 +104,11 @@ define compile_dtl init:stop()' endef -ebin/$(PROJECT).app: $(shell find src -name \*.erl) \ - $(shell find src -name \*.core) \ - $(shell find src -name \*.xrl) \ - $(shell find src -name \*.yrl) \ - $(shell find templates -name \*.dtl 2>/dev/null) +ebin/$(PROJECT).app: $(shell find src -type f -name \*.erl) \ + $(shell find src -type f -name \*.core) \ + $(shell find src -type f -name \*.xrl) \ + $(shell find src -type f -name \*.yrl) \ + $(shell find templates -type f -name \*.dtl 2>/dev/null) @mkdir -p ebin/ $(if $(strip $(filter %.erl %.core,$?)), \ $(call compile_erl,$(filter %.erl %.core,$?))) |