You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2014/01/17 23:08:36 UTC

[22/32] git commit: Refactor couch source tree

Refactor couch source tree


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

Branch: refs/heads/import
Commit: d83c669fbe4ea4051938f57bf72be7345099e2dc
Parents: 9cd9d34
Author: Paul J. Davis <pa...@gmail.com>
Authored: Tue Mar 5 13:51:39 2013 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Mar 20 00:28:57 2013 -0500

----------------------------------------------------------------------
 Makefile.am                   | 2 +-
 src/couch_index.erl           | 2 +-
 src/couch_index_compactor.erl | 2 +-
 src/couch_index_server.erl    | 2 +-
 src/couch_index_updater.erl   | 2 +-
 src/couch_index_util.erl      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/d83c669f/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index e547f13..945623a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,5 +34,5 @@ compiled_files = \
 
 ebin/%.beam: src/%.erl
 	@mkdir -p ebin/
-	$(ERLC) -I$(top_srcdir)/src/couchdb -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
+	$(ERLC) -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/d83c669f/src/couch_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_index.erl b/src/couch_index.erl
index 5bf322e..e8f27a9 100644
--- a/src/couch_index.erl
+++ b/src/couch_index.erl
@@ -24,7 +24,7 @@
 -export([handle_call/3, handle_cast/2, handle_info/2]).
 
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 
 -record(st, {

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/d83c669f/src/couch_index_compactor.erl
----------------------------------------------------------------------
diff --git a/src/couch_index_compactor.erl b/src/couch_index_compactor.erl
index 72bff51..10c3e14 100644
--- a/src/couch_index_compactor.erl
+++ b/src/couch_index_compactor.erl
@@ -22,7 +22,7 @@
 -export([handle_call/3, handle_cast/2, handle_info/2]).
 
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 
 -record(st, {

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/d83c669f/src/couch_index_server.erl
----------------------------------------------------------------------
diff --git a/src/couch_index_server.erl b/src/couch_index_server.erl
index bc1fce7..e385350 100644
--- a/src/couch_index_server.erl
+++ b/src/couch_index_server.erl
@@ -19,7 +19,7 @@
 -export([init/1, terminate/2, code_change/3]).
 -export([handle_call/3, handle_cast/2, handle_info/2]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -define(BY_SIG, couchdb_indexes_by_sig).
 -define(BY_PID, couchdb_indexes_by_pid).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/d83c669f/src/couch_index_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_index_updater.erl b/src/couch_index_updater.erl
index c6d3059..9f54a56 100644
--- a/src/couch_index_updater.erl
+++ b/src/couch_index_updater.erl
@@ -21,7 +21,7 @@
 -export([init/1, terminate/2, code_change/3]).
 -export([handle_call/3, handle_cast/2, handle_info/2]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 -record(st, {
     idx,

http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/d83c669f/src/couch_index_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_index_util.erl b/src/couch_index_util.erl
index 28ec8d2..cef05f5 100644
--- a/src/couch_index_util.erl
+++ b/src/couch_index_util.erl
@@ -15,7 +15,7 @@
 -export([root_dir/0, index_dir/2, index_file/3]).
 -export([load_doc/3, sort_lib/1, hexsig/1]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 
 
 root_dir() ->