Updated Branches: refs/heads/1964-feature-fauxton-build e85720943 -> 943df45b8
Wire up the Makefile.am chain Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/943df45b Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/943df45b Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/943df45b Branch: refs/heads/1964-feature-fauxton-build Commit: 943df45b8a8c3dc7cd36921797080957354c3cf4 Parents: e857209 Author: Noah Slater <[email protected]> Authored: Sat Dec 14 13:13:43 2013 +0100 Committer: Noah Slater <[email protected]> Committed: Sat Dec 14 13:13:43 2013 +0100 ---------------------------------------------------------------------- configure.ac | 2 ++ share/Makefile.am | 21 ++------------------- share/doc/Makefile.am | 1 - share/www/Makefile.am | 13 +++++++++++++ share/www/fauxton/Makefile.am | 32 ++++++++++++++++++++++++++++++++ 5 files changed, 49 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/943df45b/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 6c5ef5b..5fdb98f 100644 --- a/configure.ac +++ b/configure.ac @@ -730,6 +730,8 @@ AC_CONFIG_FILES([etc/Makefile]) AC_CONFIG_FILES([share/Makefile]) AC_CONFIG_FILES([share/doc/Makefile]) AC_CONFIG_FILES([share/doc/build/Makefile]) +AC_CONFIG_FILES([share/www/Makefile]) +AC_CONFIG_FILES([share/www/fauxton/Makefile]) AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([src/couch_dbupdates/Makefile]) AC_CONFIG_FILES([src/couch_index/Makefile]) http://git-wip-us.apache.org/repos/asf/couchdb/blob/943df45b/share/Makefile.am ---------------------------------------------------------------------- diff --git a/share/Makefile.am b/share/Makefile.am index be0188c..81530de 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -12,6 +12,8 @@ SUBDIRS = doc +SUBDIRS = www + JS_FILE = server/main.js JS_FILE_COMPONENTS = \ @@ -71,25 +73,6 @@ nobase_dist_localdata_DATA = \ www/dialog/_save_view_as.html \ www/dialog/_upload_attachment.html \ www/document.html \ - www/fauxton/css/index.css \ - www/fauxton/img/couchdb-site.png \ - www/fauxton/img/couchdblogo.png \ - www/fauxton/img/fontawesome-webfont.eot \ - www/fauxton/img/fontawesome-webfont.svg \ - www/fauxton/img/fontawesome-webfont.ttf \ - www/fauxton/img/fontawesome-webfont.woff \ - www/fauxton/img/FontAwesome.otf \ - www/fauxton/img/fontcustom_fauxton.eot \ - www/fauxton/img/fontcustom_fauxton.svg \ - www/fauxton/img/fontcustom_fauxton.ttf \ - www/fauxton/img/fontcustom_fauxton.woff \ - www/fauxton/img/glyphicons-halflings-white.png \ - www/fauxton/img/glyphicons-halflings.png \ - www/fauxton/img/linen.png \ - www/fauxton/img/loader.gif \ - www/fauxton/img/minilogo.png \ - www/fauxton/index.html \ - www/fauxton/js/require.js \ www/favicon.ico \ www/image/add.png \ www/image/apply.gif \ http://git-wip-us.apache.org/repos/asf/couchdb/blob/943df45b/share/doc/Makefile.am ---------------------------------------------------------------------- diff --git a/share/doc/Makefile.am b/share/doc/Makefile.am index 34b41a0..f36bc0a 100644 --- a/share/doc/Makefile.am +++ b/share/doc/Makefile.am @@ -11,4 +11,3 @@ ## the License. SUBDIRS = build - http://git-wip-us.apache.org/repos/asf/couchdb/blob/943df45b/share/www/Makefile.am ---------------------------------------------------------------------- diff --git a/share/www/Makefile.am b/share/www/Makefile.am new file mode 100644 index 0000000..a5d3d40 --- /dev/null +++ b/share/www/Makefile.am @@ -0,0 +1,13 @@ +## 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. + +SUBDIRS = fauxton http://git-wip-us.apache.org/repos/asf/couchdb/blob/943df45b/share/www/fauxton/Makefile.am ---------------------------------------------------------------------- diff --git a/share/www/fauxton/Makefile.am b/share/www/fauxton/Makefile.am new file mode 100644 index 0000000..b3df6e0 --- /dev/null +++ b/share/www/fauxton/Makefile.am @@ -0,0 +1,32 @@ +## 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. + +nobase_dist_localdata_DATA = \ + www/fauxton/css/index.css \ + www/fauxton/img/couchdb-site.png \ + www/fauxton/img/couchdblogo.png \ + www/fauxton/img/fontawesome-webfont.eot \ + www/fauxton/img/fontawesome-webfont.svg \ + www/fauxton/img/fontawesome-webfont.ttf \ + www/fauxton/img/fontawesome-webfont.woff \ + www/fauxton/img/FontAwesome.otf \ + www/fauxton/img/fontcustom_fauxton.eot \ + www/fauxton/img/fontcustom_fauxton.svg \ + www/fauxton/img/fontcustom_fauxton.ttf \ + www/fauxton/img/fontcustom_fauxton.woff \ + www/fauxton/img/glyphicons-halflings-white.png \ + www/fauxton/img/glyphicons-halflings.png \ + www/fauxton/img/linen.png \ + www/fauxton/img/loader.gif \ + www/fauxton/img/minilogo.png \ + www/fauxton/index.html \ + www/fauxton/js/require.js \
