Fix Makefile, finish separation of CouchDB/Fauxton compilation This closes #293
Signed-off-by: Alexander Shorin <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/09d074dc Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/09d074dc Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/09d074dc Branch: refs/heads/developer-preview-2.0 Commit: 09d074dca332af0e883e3f90dbf7624a5156bba1 Parents: ef75530 Author: Javier Candeira <[email protected]> Authored: Tue Jan 6 15:45:30 2015 +1100 Committer: Alexander Shorin <[email protected]> Committed: Tue Jan 13 01:59:10 2015 +0300 ---------------------------------------------------------------------- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/09d074dc/Makefile ---------------------------------------------------------------------- diff --git a/Makefile b/Makefile index 1efd466..1084d52 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
