diff options
author | Loïc Hoguin <[email protected]> | 2015-01-06 20:49:15 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2015-01-06 20:49:15 +0100 |
commit | 7b22547a43c843d86e72e8e78f82257dd0326bcf (patch) | |
tree | 104fd41ab924850eff7176436e2fe4524497c257 | |
parent | 366a0c9d770f8701131213bd4ad0edf579cacc87 (diff) | |
parent | c09d3dcc218a49aacb1ccfb6f8a6059186aa1b6b (diff) | |
download | erlang.mk-7b22547a43c843d86e72e8e78f82257dd0326bcf.tar.gz erlang.mk-7b22547a43c843d86e72e8e78f82257dd0326bcf.tar.bz2 erlang.mk-7b22547a43c843d86e72e8e78f82257dd0326bcf.zip |
Merge branch 'deps_app_rel_order' of https://github.com/stolen/erlang.mk
-rw-r--r-- | core/erlc.mk | 4 | ||||
-rw-r--r-- | erlang.mk | 6 | ||||
-rw-r--r-- | plugins/relx.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/core/erlc.mk b/core/erlc.mk index 8d720aa..01bd6e0 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -75,11 +75,11 @@ ebin/$(PROJECT).app:: $(shell find mibs -type f -name \*.mib) endif ebin/$(PROJECT).app:: $(shell find src -type f -name \*.erl) \ - $(shell find src -type f -name \*.core) + $(shell find src -type f -name \*.core) | deps $(if $(strip $?),$(call compile_erl,$?)) ebin/$(PROJECT).app:: $(shell find src -type f -name \*.xrl) \ - $(shell find src -type f -name \*.yrl) + $(shell find src -type f -name \*.yrl) | deps $(if $(strip $?),$(call compile_xyrl,$?)) endif @@ -278,11 +278,11 @@ ebin/$(PROJECT).app:: $(shell find mibs -type f -name \*.mib) endif ebin/$(PROJECT).app:: $(shell find src -type f -name \*.erl) \ - $(shell find src -type f -name \*.core) + $(shell find src -type f -name \*.core) | deps $(if $(strip $?),$(call compile_erl,$?)) ebin/$(PROJECT).app:: $(shell find src -type f -name \*.xrl) \ - $(shell find src -type f -name \*.yrl) + $(shell find src -type f -name \*.yrl) | deps $(if $(strip $?),$(call compile_xyrl,$?)) endif @@ -1124,7 +1124,7 @@ endef $(RELX): @$(call relx_fetch) -relx-rel: $(RELX) +relx-rel: $(RELX) | deps app @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) distclean-relx-rel: diff --git a/plugins/relx.mk b/plugins/relx.mk index 8b66277..9e6f556 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -38,7 +38,7 @@ endef $(RELX): @$(call relx_fetch) -relx-rel: $(RELX) +relx-rel: $(RELX) | deps app @$(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) distclean-relx-rel: |