# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2016-12-12 21:03:30
# Node ID 03da085ce5e297c1f0076511bc1052f0d88d8bf1
# Parent  57b5baf23cab76faef5042c2fb5cd4091d4e8783

makefile: updated makefile to standard layout

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,25 @@
+
+.PHONY: clean docs docs-clean docs-cleanup test test-clean test-only web-build
 
 WEBPACK=./node_modules/webpack/bin/webpack.js
 GRUNT=grunt
 NODE_PATH=./node_modules
-CI_PREFIX=enterprise
+
+
+clean:
+	make test-clean
+	find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' \) -exec rm '{}' ';'
 
-.PHONY: docs docs-clean ci-docs clean test test-clean test-lint test-only
+test:
+	make test-clean
+	make test-only
 
+test-clean:
+	rm -rf coverage.xml htmlcov junit.xml pylint.log result
+	find . -type d -name "__pycache__" -prune -exec rm -rf '{}' ';'
+
+test-only:
+	PYTHONHASHSEED=random py.test -vv -r xw --cov=rhodecode --cov-report=term-missing --cov-report=html rhodecode
 
 docs:
 	(cd docs; nix-build default.nix -o result; make clean html)
@@ -16,27 +30,6 @@ docs-clean:
 docs-cleanup:
 	(cd docs; make cleanup)
 
-ci-docs: docs;
-
-
-clean: test-clean
-	find . -type f \( -iname '*.c' -o -iname '*.pyc' -o -iname '*.so' \) -exec rm '{}' ';'
-
-test: test-clean test-only
-
-test-clean:
-	rm -rf coverage.xml htmlcov junit.xml pylint.log result
-
-test-only:
-	PYTHONHASHSEED=random py.test -vv -r xw --cov=rhodecode --cov-report=term-missing --cov-report=html rhodecode/tests/
-
 web-build:
 	NODE_PATH=$(NODE_PATH) $(GRUNT)
 
-web-test:
-	@echo "no test for our javascript, yet!"
-
-docs-bootstrap:
-	(cd docs; nix-build default.nix -o result)
-	@echo "Please go to docs folder and run make html"
-