kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-23 20:55:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use $(MAKE) instead of ${MAKE}, and fixup two more make invocations.

Browse Source 
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).
This commit is contained in:
John Szakmeister 2014-02-28 21:32:25 -05:00 committed by Thiago de Arruda
parent 8cb10e8641
commit a90c5aa2fc
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -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 # Extra CMake flags which extend the default set
CMAKE_EXTRA_FLAGS := 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 build/bin/nvim: deps
${MAKE} -C build $(MAKE) -C build
test: build/bin/nvim test: build/bin/nvim
cd src/testdir && make $(SINGLE_MAKE) -C src/testdir
unittest: build/bin/nvim unittest: build/bin/nvim
sh -e scripts/unittest.sh sh -e scripts/unittest.sh
@ -31,10 +35,10 @@ cmake: clean deps
clean: clean:
rm -rf build rm -rf build
cd src/testdir && make clean $(MAKE) -C src/testdir clean
install: build/bin/nvim install: build/bin/nvim
${MAKE} -C build install $(MAKE) -C build install
.PHONY: test unittest deps cmake install .PHONY: test unittest deps cmake install