couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [36/49] git commit: Refactor couch source tree
Date Fri, 17 Jan 2014 22:10:21 GMT
Refactor couch source tree


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

Branch: refs/heads/import
Commit: 22b5670c94ecb20c64cb63a739db66a54e76e031
Parents: fda4ebc
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Tue Mar 5 13:51:39 2013 -0600
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Wed Mar 20 00:28:57 2013 -0500

----------------------------------------------------------------------
 Makefile.am                    | 3 +--
 src/couch_mrview.erl           | 2 +-
 src/couch_mrview_cleanup.erl   | 2 +-
 src/couch_mrview_compactor.erl | 2 +-
 src/couch_mrview_http.erl      | 2 +-
 src/couch_mrview_index.erl     | 2 +-
 src/couch_mrview_show.erl      | 2 +-
 src/couch_mrview_test_util.erl | 2 +-
 src/couch_mrview_updater.erl   | 2 +-
 src/couch_mrview_util.erl      | 2 +-
 10 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/Makefile.am
----------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 2b9ef86..fa7d83b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -68,6 +68,5 @@ ebin/%.app: src/%.app.src
 
 ebin/%.beam: src/%.erl $(include_files)
 	@mkdir -p ebin/
-	$(ERLC) -Wall -I$(top_srcdir)/src -I$(top_srcdir)/src/couchdb \
-        -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
+	$(ERLC) -Wall -I$(top_srcdir)/src -o ebin/ $(ERLC_FLAGS) ${TEST} $<;
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview.erl b/src/couch_mrview.erl
index 2964fe9..d31ed18 100644
--- a/src/couch_mrview.erl
+++ b/src/couch_mrview.erl
@@ -18,7 +18,7 @@
 -export([compact/2, compact/3, cancel_compaction/2]).
 -export([cleanup/1]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 -record(mracc, {

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_cleanup.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_cleanup.erl b/src/couch_mrview_cleanup.erl
index d48de6f..3e6bcc6 100644
--- a/src/couch_mrview_cleanup.erl
+++ b/src/couch_mrview_cleanup.erl
@@ -15,7 +15,7 @@
 -export([run/1]).
 
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_compactor.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_compactor.erl b/src/couch_mrview_compactor.erl
index b500ce3..002d5ab 100644
--- a/src/couch_mrview_compactor.erl
+++ b/src/couch_mrview_compactor.erl
@@ -12,7 +12,7 @@
 
 -module(couch_mrview_compactor).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 -export([compact/3, swap_compacted/2]).

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_http.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_http.erl b/src/couch_mrview_http.erl
index 91587f1..cf81b33 100644
--- a/src/couch_mrview_http.erl
+++ b/src/couch_mrview_http.erl
@@ -23,7 +23,7 @@
 ]).
 
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_index.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl
index 6bcb63f..8566c96 100644
--- a/src/couch_mrview_index.erl
+++ b/src/couch_mrview_index.erl
@@ -18,7 +18,7 @@
 -export([start_update/3, purge/4, process_doc/3, finish_update/1, commit/1]).
 -export([compact/3, swap_compacted/2]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_show.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_show.erl b/src/couch_mrview_show.erl
index 98b2d63..1be96d5 100644
--- a/src/couch_mrview_show.erl
+++ b/src/couch_mrview_show.erl
@@ -18,7 +18,7 @@
     handle_view_list_req/3
 ]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 -record(lacc, {

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_test_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_test_util.erl b/src/couch_mrview_test_util.erl
index 338ae38..4109fd6 100644
--- a/src/couch_mrview_test_util.erl
+++ b/src/couch_mrview_test_util.erl
@@ -14,7 +14,7 @@
 
 -compile(export_all).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -define(ADMIN, #user_ctx{roles=[<<"_admin">>]}).
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_updater.erl b/src/couch_mrview_updater.erl
index 3014664..178cf3d 100644
--- a/src/couch_mrview_updater.erl
+++ b/src/couch_mrview_updater.erl
@@ -14,7 +14,7 @@
 
 -export([start_update/3, purge/4, process_doc/3, finish_update/1]).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 

http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/22b5670c/src/couch_mrview_util.erl
----------------------------------------------------------------------
diff --git a/src/couch_mrview_util.erl b/src/couch_mrview_util.erl
index ba4de2d..1925b7c 100644
--- a/src/couch_mrview_util.erl
+++ b/src/couch_mrview_util.erl
@@ -27,7 +27,7 @@
 
 -define(MOD, couch_mrview_index).
 
--include("couch_db.hrl").
+-include_lib("couch/include/couch_db.hrl").
 -include_lib("couch_mrview/include/couch_mrview.hrl").
 
 


Mime
View raw message