summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Candeira <javier@candeira.com>2015-01-06 15:45:30 +1100
committerAlexander Shorin <kxepal@apache.org>2015-01-13 01:59:10 +0300
commit09d074dca332af0e883e3f90dbf7624a5156bba1 (patch)
treec417e36065d6fb4ec11167c627f44584f937183c
parentef755300c11043539309fcf09916bb20d86fb050 (diff)
downloadcouchdb-09d074dca332af0e883e3f90dbf7624a5156bba1.tar.gz
Fix Makefile, finish separation of CouchDB/Fauxton compilation
This closes #293 Signed-off-by: Alexander Shorin <kxepal@apache.org>
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1efd466d1..1084d52b7 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations under
# the License.
-all: config.erl couch fauxton
+all: couch fauxton
config.erl:
@echo "Apache CouchDB has not been configured."
@@ -18,7 +18,7 @@ config.erl:
@echo
@false
-couch:
+couch: config.erl
@rebar compile
@cp src/couch/priv/couchjs bin/
@@ -28,7 +28,7 @@ clean:
check: javascript eunit
-dist: compile
+dist: all
@rm -rf rel/couchdb
@rebar generate
@@ -64,11 +64,11 @@ docker-stop:
@docker stop `cat .docker-id`
eunit: export BUILDDIR = $(shell pwd)
-eunit: compile
+eunit: couch
@rebar setup_eunit
@rebar -r eunit skip_deps=meck,mochiweb,lager,snappy,couch_replicator,fabric,folsom
-javascript: compile
+javascript: all
@dev/run -q test/javascript/run
fauxton: share/www