aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2014-06-15 10:34:28 +0400
committerJohn Szakmeister <john@szakmeister.net>2014-06-18 16:21:12 -0400
commit13027025862aa1a70accba6376c3d38b26ae13d9 (patch)
treef9b6a6b416a0a5989a749b6436296ca0ea348690
parent2653cebcd7bdab690cab833b5e64fd15c88317cc (diff)
downloadrneovim-13027025862aa1a70accba6376c3d38b26ae13d9.tar.gz
rneovim-13027025862aa1a70accba6376c3d38b26ae13d9.tar.bz2
rneovim-13027025862aa1a70accba6376c3d38b26ae13d9.zip
Make indentation consistent: use 2-space indent always
-rw-r--r--Makefile26
1 files changed, 13 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 1429b00a63..9cf4a58894 100644
--- a/Makefile
+++ b/Makefile
@@ -12,23 +12,23 @@ BUILD_TYPE ?= $(shell (type ninja > /dev/null 2>&1 && echo "Ninja") || \
ifeq (,$(BUILD_TOOL))
ifeq (Ninja,$(BUILD_TYPE))
- ifneq ($(shell cmake --help 2>/dev/null | grep Ninja),)
- BUILD_TOOL := ninja
- else
- # User's version of CMake doesn't support Ninja
- BUILD_TOOL = $(MAKE)
- BUILD_TYPE := Unix Makefiles
- endif
- else
+ ifneq ($(shell cmake --help 2>/dev/null | grep Ninja),)
+ BUILD_TOOL := ninja
+ else
+ # User's version of CMake doesn't support Ninja
BUILD_TOOL = $(MAKE)
+ BUILD_TYPE := Unix Makefiles
+ endif
+ else
+ BUILD_TOOL = $(MAKE)
endif
endif
ifneq ($(VERBOSE),)
- # Only need to handle Ninja here. Make will inherit the VERBOSE variable.
- ifeq ($(BUILD_TYPE),Ninja)
- VERBOSE_FLAG := -v
- endif
+ # 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)
@@ -39,7 +39,7 @@ DEPS_CMAKE_FLAGS ?=
USE_BUNDLED_DEPS ?=
ifneq (,$(USE_BUNDLED_DEPS))
- BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED_DEPS)
+ BUNDLED_CMAKE_FLAG := -DUSE_BUNDLED=$(USE_BUNDLED_DEPS)
endif
# For use where we want to make sure only a single job is run. This does issue