diff options
| author | ashleyh <gh@ashleyh.eu> | 2014-02-26 22:10:25 +0000 |
|---|---|---|
| committer | ashleyh <gh@ashleyh.eu> | 2014-02-26 22:10:25 +0000 |
| commit | 00ba300d3941d5e9d59ffffcb760eb0f9d1079ef (patch) | |
| tree | 2b22d404b040adf2441af3b8369db44b800ac5ab /Makefile | |
| parent | 14cbd618ec4930878afc6f9073d9ebb9e514fd75 (diff) | |
| parent | 314791dca7b80e167165694222dfc0f70dd77e5c (diff) | |
| download | rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.tar.gz rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.tar.bz2 rneovim-00ba300d3941d5e9d59ffffcb760eb0f9d1079ef.zip | |
Merge branch 'master' into pr36
Conflicts:
README.md
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 26 |
1 files changed, 17 insertions, 9 deletions
@@ -1,19 +1,24 @@ -CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug +-include local.mk -build/src/vim: deps - cd build && make +CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=.deps/usr -test: build/src/vim +# Extra CMake flags which extend the default set +CMAKE_EXTRA_FLAGS := + +build/bin/nvim: deps + ${MAKE} -C build + +test: build/bin/nvim cd src/testdir && make deps: .deps/usr/lib/libuv.a .deps/usr/lib/libuv.a: - sh -e scripts/get-libuv.sh + sh -e scripts/compile-libuv.sh -cmake: clean +cmake: clean deps mkdir build - cd build && cmake $(CMAKE_FLAGS) ../ + cd build && cmake $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) ../ clean: rm -rf build @@ -21,6 +26,9 @@ clean: rm -f src/testdir/$$file.vim; \ done -.PHONY: test deps cmake +install: build/bin/nvim + ${MAKE} -C build install + +.PHONY: test deps cmake install -.DEFAULT: build/src/vim +.DEFAULT: build/bin/nvim |