diff options
| author | warptangent <warptangent@inbox.com> | 2015-01-30 16:19:22 -0800 |
|---|---|---|
| committer | warptangent <warptangent@inbox.com> | 2015-01-30 16:19:22 -0800 |
| commit | 79ea1f6ff0ae122ae2008cc1a5d6ab38683a40ba (patch) | |
| tree | db8f52edcd81c8c8dce3c6ae9ff7346ea8dced21 /Makefile | |
| parent | Merge to keep up with upstream (diff) | |
| parent | Merge pull request #220 (diff) | |
| download | monero-79ea1f6ff0ae122ae2008cc1a5d6ab38683a40ba.tar.xz | |
Merge upstream
Merge branch 'monero-project/master' into blockchain
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -1,17 +1,17 @@ -all: all-release +all: release-all cmake-debug: mkdir -p build/debug cd build/debug && cmake -D CMAKE_BUILD_TYPE=Debug ../.. -build-debug: cmake-debug +debug: cmake-debug cd build/debug && $(MAKE) -test-debug: build-debug +debug-test: debug mkdir -p build/debug cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE) test -all-debug: +debug-all: mkdir -p build/debug cd build/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug ../.. && $(MAKE) @@ -19,14 +19,14 @@ cmake-release: mkdir -p build/release cd build/release && cmake -D CMAKE_BUILD_TYPE=Release ../.. -build-release: cmake-release +release: cmake-release cd build/release && $(MAKE) -test-release: build-release +release-test: release mkdir -p build/release cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) test -all-release: +release-all: mkdir -p build/release cd build/release && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=release ../.. && $(MAKE) @@ -43,4 +43,4 @@ clean: tags: ctags -R --sort=1 --c++-kinds=+p --fields=+iaS --extra=+q --language-force=C++ src contrib tests/gtest -.PHONY: all cmake-debug build-debug test-debug all-debug cmake-release build-release test-release all-release clean tags +.PHONY: all cmake-debug debug debug-test debug-all cmake-release release release-test release-all clean tags |