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 /core | |
| 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 'core')
| -rw-r--r-- | core/core.mk | 2 | ||||
| -rw-r--r-- | core/erlc.mk | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/core.mk b/core/core.mk index 6e15eeb..52a9472 100644 --- a/core/core.mk +++ b/core/core.mk @@ -76,8 +76,6 @@ endif # Core targets. -.NOTPARALLEL: - all:: deps app rel # Noop to avoid a Make warning when there's nothing to do. diff --git a/core/erlc.mk b/core/erlc.mk index 39ad574..42d0e32 100644 --- a/core/erlc.mk +++ b/core/erlc.mk @@ -45,10 +45,10 @@ ifneq ($(wildcard src/),) # Targets. ifeq ($(wildcard ebin/test),) -app:: $(PROJECT).d +app:: deps $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build else -app:: clean $(PROJECT).d +app:: clean deps $(PROJECT).d $(verbose) $(MAKE) --no-print-directory app-build endif |