Build with rebar
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index fa7d83b..0000000
--- a/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-## Licensed under the Apache License, Version 2.0 (the "License"); you may not
-## use this file except in compliance with the License. You may obtain a copy of
-## the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-## License for the specific language governing permissions and limitations under
-## the License.
-
-couch_mrviewlibdir = $(localerlanglibdir)/couch_mrview-0.1
-couch_mrviewincludedir = $(couch_mrviewlibdir)/include
-couch_mrviewebindir = $(couch_mrviewlibdir)/ebin
-
-couch_mrviewinclude_DATA = $(include_files)
-couch_mrviewebin_DATA = $(compiled_files)
-
-include_files = \
- include/couch_mrview.hrl
-
-source_files = \
- src/couch_mrview.app.src \
- src/couch_mrview.erl \
- src/couch_mrview_cleanup.erl \
- src/couch_mrview_compactor.erl \
- src/couch_mrview_http.erl \
- src/couch_mrview_index.erl \
- src/couch_mrview_show.erl \
- src/couch_mrview_test_util.erl \
- src/couch_mrview_updater.erl \
- src/couch_mrview_util.erl
-
-test_files = \
- test/01-load.t \
- test/02-map-views.t \
- test/03-red-views.t \
- test/04-index-info.t \
- test/05-collation.t \
- test/06-all-docs.t \
- test/07-compact-swap.t
-
-compiled_files = \
- ebin/couch_mrview.app \
- ebin/couch_mrview.beam \
- ebin/couch_mrview_cleanup.beam \
- ebin/couch_mrview_compactor.beam \
- ebin/couch_mrview_http.beam \
- ebin/couch_mrview_index.beam \
- ebin/couch_mrview_show.beam \
- ebin/couch_mrview_test_util.beam \
- ebin/couch_mrview_updater.beam \
- ebin/couch_mrview_util.beam
-
-EXTRA_DIST = $(include_files) $(source_files) $(test_files)
-CLEANFILES = $(compiled_files)
-
-check:
-if TESTS
- $(abs_top_builddir)/test/etap/run $(abs_top_srcdir)/src/couch_mrview/test
-endif
-
-ebin/%.app: src/%.app.src
- @mkdir -p ebin/
- sed -e "s|%version%|@version@|g" \
- < $< > $@
-
-ebin/%.beam: src/%.erl $(include_files)
- @mkdir -p ebin/
- $(ERLC) -Wall -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
-
diff --git a/include/couch_mrview.hrl b/include/couch_mrview.hrl
index 0d59066..6a0dfd0 100644
--- a/include/couch_mrview.hrl
+++ b/include/couch_mrview.hrl
@@ -70,11 +70,13 @@
skip = 0,
group_level = 0,
stale = false,
+ multi_get = false,
inclusive_end = true,
include_docs = false,
update_seq=false,
conflicts,
callback,
list,
+ sorted = true,
extra = []
}).
diff --git a/src/couch_mrview.app.src b/src/couch_mrview.app.src
index 52898a6..99c52f0 100644
--- a/src/couch_mrview.app.src
+++ b/src/couch_mrview.app.src
@@ -12,7 +12,7 @@
{application, couch_mrview, [
{description, "CouchDB Map/Reduce Views"},
- {vsn, "%version%"},
+ {vsn, git},
{modules, [
couch_mrview,
couch_mrview_compactor,
