Make it easy to get a verbose build of Neovim.

This allows you to do

    make VERBOSE=1

from the top-level and see the actual compile lines.
This commit is contained in:
John Szakmeister
2014-04-23 04:59:25 -04:00
parent 557e41b119
commit 247984d132

View File

@@ -19,6 +19,15 @@ ifeq (,$(BUILD_TOOL))
endif endif
endif endif
ifneq ($(VERBOSE),)
# Only need to handle Ninja here. Make will inherit the VERBOSE variable.
ifeq ($(BUILD_TYPE),Ninja)
VERBOSE_FLAG := -v
endif
endif
BUILD_CMD = $(BUILD_TOOL) $(VERBOSE_FLAG)
# Extra CMake flags which extend the default set # Extra CMake flags which extend the default set
CMAKE_EXTRA_FLAGS ?= CMAKE_EXTRA_FLAGS ?=
DEPS_CMAKE_FLAGS ?= DEPS_CMAKE_FLAGS ?=
@@ -30,7 +39,7 @@ SINGLE_MAKE = export MAKEFLAGS= ; $(MAKE)
all: nvim all: nvim
nvim: build/.ran-cmake deps nvim: build/.ran-cmake deps
+$(BUILD_TOOL) -C build +$(BUILD_CMD) -C build
cmake: cmake:
touch CMakeLists.txt touch CMakeLists.txt
@@ -42,7 +51,7 @@ build/.ran-cmake: | deps
touch $@ touch $@
deps: | .deps/build/third-party/.ran-cmake deps: | .deps/build/third-party/.ran-cmake
+$(BUILD_TOOL) -C .deps/build/third-party +$(BUILD_CMD) -C .deps/build/third-party
.deps/build/third-party/.ran-cmake: .deps/build/third-party/.ran-cmake:
mkdir -p .deps/build/third-party mkdir -p .deps/build/third-party
@@ -54,16 +63,16 @@ test: | nvim
+$(SINGLE_MAKE) -C src/testdir +$(SINGLE_MAKE) -C src/testdir
unittest: | nvim unittest: | nvim
+$(BUILD_TOOL) -C build unittest +$(BUILD_CMD) -C build unittest
clean: clean:
+test -d build && $(BUILD_TOOL) -C build clean || true +test -d build && $(BUILD_CMD) -C build clean || true
$(MAKE) -C src/testdir clean $(MAKE) -C src/testdir clean
distclean: clean distclean: clean
rm -rf .deps build rm -rf .deps build
install: | nvim install: | nvim
+$(BUILD_TOOL) -C build install +$(BUILD_CMD) -C build install
.PHONY: test unittest clean distclean nvim cmake deps install .PHONY: test unittest clean distclean nvim cmake deps install