diff options
author | Jan Lehnardt <jan@apache.org> | 2013-10-07 17:28:06 +0200 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2013-10-07 17:28:06 +0200 |
commit | cf4f3c931edc3a14863f6fc0aa4ba4d1588389ec (patch) | |
tree | 9117ff9eec8e2a717479ca11a5d8ab0d88d310cf | |
parent | 18d5fd67c0c047bfc439c614eca6a94092d20b1b (diff) | |
download | couchdb-cf4f3c931edc3a14863f6fc0aa4ba4d1588389ec.tar.gz |
move build system edits for my-first-couchdb-plugin to src/
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | src/Makefile.am | 12 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/Makefile (renamed from src/my-first-couchdb-plugin/Makefile.dist) | 0 | ||||
-rw-r--r-- | src/my-first-couchdb-plugin/Makefile.am | 20 |
5 files changed, 11 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore index 2fdfb97ef..cc2398bab 100644 --- a/.gitignore +++ b/.gitignore @@ -107,6 +107,7 @@ src/ibrowse/ibrowse.app src/mochiweb/mochiweb.app src/mochiweb/mochiweb.app !src/my-first-couchdb-plugin/.gitignore +!src/my-first-couchdb-plugin/Makefile src/snappy/.deps/ src/snappy/.libs/ src/snappy/google-snappy/.deps/ diff --git a/configure.ac b/configure.ac index 09c34dce9..321c65109 100644 --- a/configure.ac +++ b/configure.ac @@ -737,7 +737,6 @@ AC_CONFIG_FILES([src/couch_mrview/Makefile]) AC_CONFIG_FILES([src/couch_plugins/Makefile]) AC_CONFIG_FILES([src/couch_replicator/Makefile]) AC_CONFIG_FILES([src/couchjs-node/Makefile]) -AC_CONFIG_FILES([src/my-first-couchdb-plugin/Makefile]) AC_CONFIG_FILES([src/couchdb/couch.app.tpl]) AC_CONFIG_FILES([src/couchdb/Makefile]) AC_CONFIG_FILES([src/couchdb/priv/Makefile]) diff --git a/src/Makefile.am b/src/Makefile.am index 13e73bf93..fe9b6d3ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,5 +23,13 @@ SUBDIRS = \ ibrowse \ mochiweb \ snappy \ - couchjs-node \ - my-first-couchdb-plugin + couchjs-node + +EXTRA_DIST = \ + 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
\ No newline at end of file diff --git a/src/my-first-couchdb-plugin/Makefile.dist b/src/my-first-couchdb-plugin/Makefile index 7806bd7b4..7806bd7b4 100644 --- a/src/my-first-couchdb-plugin/Makefile.dist +++ b/src/my-first-couchdb-plugin/Makefile diff --git a/src/my-first-couchdb-plugin/Makefile.am b/src/my-first-couchdb-plugin/Makefile.am deleted file mode 100644 index d8021dedc..000000000 --- a/src/my-first-couchdb-plugin/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## 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. - -EXTRA_DIST = \ - .gitignore \ - Makefile.dist \ - priv/default.d/my_first_couchdb_plugin.ini \ - README.md \ - src/my_first_couchdb_plugin.app.src \ - src/my_first_couchdb_plugin.erl \ - test/my_first_couchdb_plugin_tests.erl |