diff options
| author | John Szakmeister <john@szakmeister.net> | 2014-02-28 21:32:25 -0500 |
|---|---|---|
| committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-03-01 16:53:14 -0300 |
| commit | a90c5aa2fcf8c697d4060f34fef46c2137f48d4b (patch) | |
| tree | 159f1d322c2e4d953e7463a0c15a12ca5652acd5 | |
| parent | 8cb10e8641fcba9547e02d7f8358ce6642477f1c (diff) | |
| download | rneovim-a90c5aa2fcf8c697d4060f34fef46c2137f48d4b.tar.gz rneovim-a90c5aa2fcf8c697d4060f34fef46c2137f48d4b.tar.bz2 rneovim-a90c5aa2fcf8c697d4060f34fef46c2137f48d4b.zip | |
Use $(MAKE) instead of ${MAKE}, and fixup two more make invocations.
Include a new SINGLE_MAKE which can be used to invoke make but using
only a single job, and in way that avoids any warnings from make.
Use SINGLE_MAKE to execute the tests, since they're meant to be run
serially.
Also, prefer the use of $(MAKE) to avoid invoking an extra subshell
(saves some time).
| -rw-r--r-- | Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -5,11 +5,15 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=.deps/usr -DLibUV_US # Extra CMake flags which extend the default set CMAKE_EXTRA_FLAGS := +# For use where we want to make sure only a single job is run. This also avoids +# any warnings from the sub-make. +SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE) + build/bin/nvim: deps - ${MAKE} -C build + $(MAKE) -C build test: build/bin/nvim - cd src/testdir && make + $(SINGLE_MAKE) -C src/testdir unittest: build/bin/nvim sh -e scripts/unittest.sh @@ -31,10 +35,10 @@ cmake: clean deps clean: rm -rf build - cd src/testdir && make clean + $(MAKE) -C src/testdir clean install: build/bin/nvim - ${MAKE} -C build install + $(MAKE) -C build install .PHONY: test unittest deps cmake install |