diff options
| author | Loïc Hoguin <[email protected]> | 2014-08-15 18:55:06 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2014-08-15 18:58:50 +0200 |
| commit | 813ce99c82dc7b0f1d3f34571d6426e412983c5a (patch) | |
| tree | 36db6e4477fadd6e5c6a3e14d49b07988664cfda | |
| parent | cabccd81400c635e5629b802df3b65a3df68b846 (diff) | |
| parent | 22fcb9c76a2c3e48a3a8233b99118a5bb59f2a4a (diff) | |
| download | erlang.mk-813ce99c82dc7b0f1d3f34571d6426e412983c5a.tar.gz erlang.mk-813ce99c82dc7b0f1d3f34571d6426e412983c5a.tar.bz2 erlang.mk-813ce99c82dc7b0f1d3f34571d6426e412983c5a.zip | |
Merge branch 'recompile_erl_on_hrl_change' of git://github.com/crownedgrouse/erlang.mk
Extra changes include:
* Not running the target if the ebin/ directory does not exist
* Moved the target in the appropriate section in the file
| -rw-r--r-- | core/erlc.mk | 7 | ||||
| -rw-r--r-- | erlang.mk | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index 8976e7e..c75c656 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -23,7 +23,7 @@ xyrl_verbose = $(xyrl_verbose_$(V)) # Core targets. -app:: ebin/$(PROJECT).app +app:: erlc-include ebin/$(PROJECT).app $(eval MODULES := $(shell find ebin -type f -name \*.beam \ | sed "s/ebin\//'/;s/\.beam/',/" | sed '$$s/.$$//')) @if [ -z "$$(grep -E '^[^%]*{modules,' src/$(PROJECT).app.src)" ]; then \ @@ -62,5 +62,10 @@ clean:: clean-app # Extra targets. +erlc-include: + -@if [ -d ebin/ ]; then \ + find include/ src/ -type f -name \*.hrl -newer ebin -exec touch $(shell find src/ -type f -name "*.erl") \; ; \ + fi + clean-app: $(gen_verbose) rm -rf ebin/ @@ -201,7 +201,7 @@ xyrl_verbose = $(xyrl_verbose_$(V)) # Core targets. -app:: ebin/$(PROJECT).app +app:: erlc-include ebin/$(PROJECT).app $(eval MODULES := $(shell find ebin -type f -name \*.beam \ | sed "s/ebin\//'/;s/\.beam/',/" | sed '$$s/.$$//')) @if [ -z "$$(grep -E '^[^%]*{modules,' src/$(PROJECT).app.src)" ]; then \ @@ -240,6 +240,11 @@ clean:: clean-app # Extra targets. +erlc-include: + -@if [ -d ebin/ ]; then \ + find include/ src/ -type f -name \*.hrl -newer ebin -exec touch $(shell find src/ -type f -name "*.erl") \; ; \ + fi + clean-app: $(gen_verbose) rm -rf ebin/ |