aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorThomas Winget <tewinget@gmail.com>2015-02-01 06:05:16 -0500
committerThomas Winget <tewinget@gmail.com>2015-02-01 06:05:16 -0500
commiteeb0634f60002cb0a5de1a5f835b4b2abdaa5cab (patch)
treedb8f52edcd81c8c8dce3c6ae9ff7346ea8dced21 /Makefile
parentMerge to keep up with upstream (diff)
parentMerge upstream (diff)
downloadmonero-eeb0634f60002cb0a5de1a5f835b4b2abdaa5cab.tar.xz
Merge remote-tracking branch 'origin/pr/24' into blockchain
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index 4e3397230..232842a45 100644
--- a/Makefile
+++ b/Makefile
@@ -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