You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2013/02/21 22:00:16 UTC

git commit: fixed build

Updated Branches:
  refs/heads/1.3.x 9b59c7ece -> 9c6ede8f5


fixed build


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9c6ede8f
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9c6ede8f
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9c6ede8f

Branch: refs/heads/1.3.x
Commit: 9c6ede8f5e89eb43b28782d8f7c4e546b9c78f43
Parents: 9b59c7e
Author: Noah Slater <ns...@apache.org>
Authored: Thu Feb 21 20:59:46 2013 +0000
Committer: Noah Slater <ns...@apache.org>
Committed: Thu Feb 21 20:59:46 2013 +0000

----------------------------------------------------------------------
 Makefile.am                 |    1 +
 src/couch_index/Makefile.am |    6 ++++--
 test/etap/Makefile.am       |   20 ++++++++++++++++----
 3 files changed, 21 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c6ede8f/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 22853fb..81e10ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,7 @@ EXTRA_DIST = \
     NOTICE \
     README \
     THANKS \
+    build-aux/dist-error \
     build-aux/sphinx-build \
     build-aux/sphinx-touch \
     license.skip

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c6ede8f/src/couch_index/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couch_index/Makefile.am b/src/couch_index/Makefile.am
index e547f13..2d4c593 100644
--- a/src/couch_index/Makefile.am
+++ b/src/couch_index/Makefile.am
@@ -20,17 +20,19 @@ CLEANFILES = $(compiled_files)
 
 source_files = \
     src/couch_index.erl \
+    src/couch_index_api.erl \
+    src/couch_index.app.src \
     src/couch_index_compactor.erl \
     src/couch_index_server.erl \
     src/couch_index_updater.erl \
-	src/couch_index_util.erl
+    src/couch_index_util.erl
 
 compiled_files = \
     ebin/couch_index.beam \
     ebin/couch_index_compactor.beam \
     ebin/couch_index_server.beam \
     ebin/couch_index_updater.beam \
-	ebin/couch_index_util.beam
+    ebin/couch_index_util.beam
 
 ebin/%.beam: src/%.erl
 	@mkdir -p ebin/

http://git-wip-us.apache.org/repos/asf/couchdb/blob/9c6ede8f/test/etap/Makefile.am
----------------------------------------------------------------------
diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am
index e13737f..238b4fa 100644
--- a/test/etap/Makefile.am
+++ b/test/etap/Makefile.am
@@ -28,11 +28,14 @@ run: run.tpl
 
 # @@ wildcards are NOT portable, please replace with clean-local rules
 CLEANFILES = run *.beam
+
 DISTCLEANFILES = temp.*
 
-EXTRA_DIST = \
-    run.tpl \
-    test_web.erl \
+fixture_files = \
+    fixtures/3b835456c235b1827e012e25666152f3.view \
+    fixtures/test.couch
+
+tap_files = \
     001-load.t \
     002-icu-driver.t \
     010-file-basics.t \
@@ -93,4 +96,13 @@ EXTRA_DIST = \
     201-view-group-shutdown.t \
     210-os-proc-pool.t \
     220-compaction-daemon.t \
-    231-cors.t
+    230-pbkfd2.t \
+    231-cors.t \
+    250-upgrade-legacy-view-files.t
+
+EXTRA_DIST = \
+    run.tpl \
+    test_web.erl \
+    $(fixture_files) \
+    $(tap_files)
+    
\ No newline at end of file