summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirkjan Ochtman <dirkjan@ochtman.nl>2014-04-15 10:20:31 +0200
committerDirkjan Ochtman <dirkjan@ochtman.nl>2014-04-15 10:23:45 +0200
commit6f067492d8a7ee1b863abde2bf55bb92c14dfd50 (patch)
tree954ef0e4948afd3c7846f438dfdd943db829f3cb
parentefc77b40a27c32767aa2b6d3f79a2c3c93d9670d (diff)
downloadcouchdb-6f067492d8a7ee1b863abde2bf55bb92c14dfd50.tar.gz
Add some more files to the build system
-rw-r--r--share/doc/build/Makefile.am1
-rw-r--r--src/Makefile.am2
-rw-r--r--test/etap/Makefile.am1
3 files changed, 4 insertions, 0 deletions
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 86351f469..92ec2ff7c 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -450,6 +450,7 @@ src_files_html = \
../templates/layout.html \
../templates/help.html \
../templates/searchbox.html \
+ ../templates/tracing.html \
../templates/utilities.html
sphinx_extensions = \
diff --git a/src/Makefile.am b/src/Makefile.am
index c574c6e17..a17674cc3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -326,12 +326,14 @@ FAUXTON_FILES = \
fauxton/assets/less/variables.less \
fauxton/bin/grunt \
fauxton/couchapp.js \
+ fauxton/extensions.md \
fauxton/favicon.ico \
fauxton/Gruntfile.js \
fauxton/index.html \
fauxton/package.json \
fauxton/readme.md \
fauxton/settings.json.default \
+ fauxton/settings.json.dev \
fauxton/settings.json.sample_external \
fauxton/tasks/addon/rename.json \
fauxton/tasks/addon/root/base.js.underscore \
diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am
index 66048a9b6..c9778ca6e 100644
--- a/test/etap/Makefile.am
+++ b/test/etap/Makefile.am
@@ -50,6 +50,7 @@ tap_files = \
041-uuid-gen-utc.ini \
041-uuid-gen.t \
042-work-queue.t \
+ 043-find-in-binary.t \
050-stream.t \
060-kt-merging.t \
061-kt-missing-leaves.t \