diff options
author | Loïc Hoguin <[email protected]> | 2015-11-18 16:24:36 +0100 |
---|---|---|
committer | Loïc Hoguin <[email protected]> | 2015-11-18 17:25:56 +0100 |
commit | d514facbb41c1b76d76ffe435ccd5174d8c749c2 (patch) | |
tree | 66db51d1d878e11aa2ea37c3ec93aa7eaf8430c0 /plugins/relx.mk | |
parent | 5ebdaa80c8b6f0e2c0431a1000b50fee87a62fb4 (diff) | |
download | erlang.mk-d514facbb41c1b76d76ffe435ccd5174d8c749c2.tar.gz erlang.mk-d514facbb41c1b76d76ffe435ccd5174d8c749c2.tar.bz2 erlang.mk-d514facbb41c1b76d76ffe435ccd5174d8c749c2.zip |
Fix target dependencies and enable parallel again2.0.0-pre.2
We can now use 'make -j 32' again. All tests pass. There might
be some issues left with the areas that are not fully tested
yet (some plugins).
A few changes in behavior:
* 'make app' will also do 'make deps' unless SKIP_DEPS is set.
You can use 'make app-build' instead to just build the application.
* 'make rel' will also do 'make app' (and therefore deps). There
are no alternative target to keep the old behavior at this time.
Diffstat (limited to 'plugins/relx.mk')
-rw-r--r-- | plugins/relx.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/relx.mk b/plugins/relx.mk index 5aa6196..a27992d 100644 --- a/plugins/relx.mk +++ b/plugins/relx.mk @@ -22,7 +22,7 @@ endif ifeq ($(IS_DEP),) ifneq ($(wildcard $(RELX_CONFIG)),) -rel:: distclean-relx-rel relx-rel +rel:: relx-rel endif endif @@ -34,7 +34,7 @@ $(RELX): $(gen_verbose) $(call core_http_get,$(RELX),$(RELX_URL)) $(verbose) chmod +x $(RELX) -relx-rel: $(RELX) rel-deps +relx-rel: $(RELX) rel-deps app $(verbose) $(RELX) -c $(RELX_CONFIG) $(RELX_OPTS) distclean-relx-rel: |