Updated Branches: refs/heads/1994-merge-rcouch [created] 9e3ea2c40
Merge branch '1988-move-my_first_plugin-to-examples' into rcouch-1.0.x Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9e3ea2c4 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9e3ea2c4 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9e3ea2c4 Branch: refs/heads/1994-merge-rcouch Commit: 9e3ea2c40b8e81d9b7292689715f7bc04b633ea3 Parents: 6d66d5b f184c53 Author: Benoit Chesneau <[email protected]> Authored: Sun Jan 5 10:32:26 2014 +0100 Committer: Benoit Chesneau <[email protected]> Committed: Sun Jan 5 10:32:26 2014 +0100 ---------------------------------------------------------------------- configure.ac | 1 + license.skip | 10 +- share/Makefile.am | 2 +- share/examples/Makefile.am | 22 +++ .../examples/my-first-couchdb-plugin/README.md | 196 +++++++++++++++++++ .../priv/default.d/my_first_couchdb_plugin.ini | 0 .../src/my_first_couchdb_plugin.app.src | 21 ++ .../src/my_first_couchdb_plugin.erl | 18 ++ .../test/my_first_couchdb_plugin_tests.erl | 15 ++ src/Makefile.am | 13 +- src/my-first-couchdb-plugin/.gitignore | 1 - src/my-first-couchdb-plugin/Makefile | 38 ---- src/my-first-couchdb-plugin/README.md | 196 ------------------- .../priv/default.d/my_first_couchdb_plugin.ini | 0 .../src/my_first_couchdb_plugin.app.src | 21 -- .../src/my_first_couchdb_plugin.erl | 18 -- .../test/my_first_couchdb_plugin_tests.erl | 15 -- 17 files changed, 280 insertions(+), 307 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e3ea2c4/configure.ac ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e3ea2c4/license.skip ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e3ea2c4/src/Makefile.am ---------------------------------------------------------------------- diff --cc src/Makefile.am index c06a091,fc0e62d..de6ec21 --- a/src/Makefile.am +++ b/src/Makefile.am @@@ -22,20 -22,10 +22,9 @@@ SUBDIRS = etap \ ibrowse \ mochiweb \ - snappy \ - couchjs-node + snappy - EXTRA_DIST = \ - $(MY_FIRST_COUCHDB_PLUGIN_FILES) \ - $(FAUXTON_FILES) - - MY_FIRST_COUCHDB_PLUGIN_FILES = \ - my-first-couchdb-plugin/.gitignore \ - my-first-couchdb-plugin/Makefile \ - my-first-couchdb-plugin/priv/default.d/my_first_couchdb_plugin.ini \ - my-first-couchdb-plugin/README.md \ - my-first-couchdb-plugin/src/my_first_couchdb_plugin.app.src \ - my-first-couchdb-plugin/src/my_first_couchdb_plugin.erl \ - my-first-couchdb-plugin/test/my_first_couchdb_plugin_tests.erl + EXTRA_DIST = $(FAUXTON_FILES) FAUXTON_FILES = \ fauxton/app/addons/activetasks/assets/less/activetasks.less \
