From aad5f6341edb8fbe950fcc7c9a2b04bc62da4d82 Mon Sep 17 00:00:00 2001 From: Rich Wareham Date: Mon, 24 Feb 2014 10:04:42 +0000 Subject: Makefile: refer to renamed compile-libuv.sh get-libuv.sh was renamed to compile-libuv.sh --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6e456022c2..634c0a839c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ test: build/src/vim 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 mkdir build -- cgit From be3ce617c718cee0cbd418cd1b014f9e9480a0b9 Mon Sep 17 00:00:00 2001 From: jdiez17 Date: Sat, 22 Feb 2014 15:30:50 +0000 Subject: Changed binary output directory from src/ to bin/ --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6e456022c2..ef609b0a49 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -build/src/vim: deps +build/bin/vim: deps cd build && make -test: build/src/vim +test: build/bin/vim cd src/testdir && make deps: .deps/usr/lib/libuv.a @@ -23,4 +23,4 @@ clean: .PHONY: test deps cmake -.DEFAULT: build/src/vim +.DEFAULT: build/bin/vim -- cgit From 9db0fc35823f648ea9ce8c56e24131db8e9444b9 Mon Sep 17 00:00:00 2001 From: scott-linder Date: Mon, 24 Feb 2014 14:57:47 -0500 Subject: Changed name of binary (vim -> nvim). Also updated affected config files and test49.vim --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ef609b0a49..c10f93c6b5 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -build/bin/vim: deps +build/bin/nvim: deps cd build && make -test: build/bin/vim +test: build/bin/nvim cd src/testdir && make deps: .deps/usr/lib/libuv.a @@ -23,4 +23,4 @@ clean: .PHONY: test deps cmake -.DEFAULT: build/bin/vim +.DEFAULT: build/bin/nvim -- cgit From de7d5cec8ed450b06efadf2151db43c378f9d5db Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Tue, 25 Feb 2014 11:55:36 -0300 Subject: Add local.mk include in makefile This can be used by devs that need their own custom targets --- Makefile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c10f93c6b5..29966619e6 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +-include local.mk + CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug build/bin/nvim: deps -- cgit From cf3322f8c2dc3c7a0a366546de0a6a25921d7165 Mon Sep 17 00:00:00 2001 From: Rich Wareham Date: Tue, 25 Feb 2014 00:04:51 +0000 Subject: Makefile: add install target This simply calls the install target in the build directory. IMHO I think it's looking a bit hacky having a separate Makefile target to do this rather than using the usual CMake workflow but mine is not to reason why... [Also, I've copied ``cd build && make ...`` although I'm sure ``$MAKE -C build/ ...`` is probably the Right Thing (TM).] Note that you'll have to set CMAKE_INSTALL_PREFIX on the cmake command line to change where this installs to. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 29966619e6..cfb1d15a13 100644 --- a/Makefile +++ b/Makefile @@ -23,6 +23,9 @@ clean: rm -f src/testdir/$$file.vim; \ done -.PHONY: test deps cmake +install: build/bin/nvim + cd build && make install + +.PHONY: test deps cmake install .DEFAULT: build/bin/nvim -- cgit From 0a15feee9d0ceb051a66ec31eee60f5477359ee2 Mon Sep 17 00:00:00 2001 From: Rich Wareham Date: Tue, 25 Feb 2014 00:22:48 +0000 Subject: Makefile: allow configuration of CMake flags Although CMAKE_FLAGS was already a Makefile variable, it didn't have an empty default value meaning that extending the flags to CMake in a clean way was difficult. Add a CMAKE_EXTRA_FLAGS variable which is appended to the default flags. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index cfb1d15a13..689f171cd1 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,9 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug +# Extra CMake flags which extend the default set +CMAKE_EXTRA_FLAGS := + build/bin/nvim: deps cd build && make @@ -15,7 +18,7 @@ deps: .deps/usr/lib/libuv.a cmake: clean mkdir build - cd build && cmake $(CMAKE_FLAGS) ../ + cd build && cmake $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) ../ clean: rm -rf build -- cgit From 8aa1d8c71a0437ff09872877107dab30ee0c44f0 Mon Sep 17 00:00:00 2001 From: Rich Wareham Date: Mon, 24 Feb 2014 20:56:00 +0000 Subject: Makefile: add .deps/ to CMake prefix path The CMake prefix path is the set of directories CMake searches for libraries, header files, etc. Use the .deps directory we create when building libuv as one of those locations. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ffc4a2c72c..8907eb1d1e 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -include local.mk -CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug +CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=.deps/usr # Extra CMake flags which extend the default set CMAKE_EXTRA_FLAGS := -- cgit From 598f9fba861beb7a208e03c3ba71e57deb31a43d Mon Sep 17 00:00:00 2001 From: Rich Wareham Date: Mon, 24 Feb 2014 21:00:39 +0000 Subject: Makefile: fetch deps before running CMake CMake now required libuv so fetch it first. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8907eb1d1e..fae3699746 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ deps: .deps/usr/lib/libuv.a .deps/usr/lib/libuv.a: sh -e scripts/compile-libuv.sh -cmake: clean +cmake: clean deps mkdir build cd build && cmake $(CMAKE_FLAGS) $(CMAKE_EXTRA_FLAGS) ../ -- cgit From d12322c5b72e908e6401be46f86d4f1950c084e9 Mon Sep 17 00:00:00 2001 From: Rich Wareham Date: Wed, 26 Feb 2014 10:30:05 +0000 Subject: Makefile: use "make -C build" idiom Change an explicit ``cd build && make`` into the more usual ``${MAKE} -C build`` style of invoking make in a subdirectory. This should mean that ``make -jN`` from the top-level Makefile should work. Closes #162. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fae3699746..41d26b69ec 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ CMAKE_FLAGS := -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=.deps/usr CMAKE_EXTRA_FLAGS := build/bin/nvim: deps - cd build && make + ${MAKE} -C build test: build/bin/nvim cd src/testdir && make @@ -27,7 +27,7 @@ clean: done install: build/bin/nvim - cd build && make install + ${MAKE} -C build install .PHONY: test deps cmake install -- cgit