replace autotools with rebar

author: Adam Kocoloski <adam@cloudant.com> 2010-08-11 16:56:51 -0400
committer: Adam Kocoloski <adam@cloudant.com> 2010-08-11 17:39:38 -0400
commit: 35da277fe75b2786952dbfb867cf60bdaab5f65d (patch)
tree: 928e44620e2a3248550509c4571d791a393f5f36
parent: ad7099a4e3f3d2035e3e26419a633b4bb1ce7b7c (diff)
33 files changed, 48 insertions, 1776 deletions
diff --git a/.gitignore b/.gitignore
index 27e9d25e..62e83a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -100,5 +100,5 @@ INSTALL
 # for rebar
 
 apps/*/ebin
-apps/couch/priv/couch_drv.so
+apps/couch/priv/couch_icu_driver.so
 
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 8d783249..00000000
--- a/Makefile.am
+++ /dev/null
@@ -1,147 +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.
-
-SUBDIRS = bin etc src share test var utils
-
-ACLOCAL_AMFLAGS = -I m4
-
-localdoc_DATA = \
-    AUTHORS.gz \
-    BUGS.gz \
-    CHANGES.gz \
-    DEVELOPERS.gz \
-    INSTALL.gz \
-    INSTALL.Unix.gz \
-    INSTALL.Windows.gz \
-    LICENSE.gz \
-    NEWS.gz \
-    NOTICE.gz \
-    README.gz \
-    THANKS.gz
-
-DISTCLEANFILES = $(localdoc_DATA)
-
-EXTRA_DIST = \
-    AUTHORS \
-    BUGS \
-    CHANGES \
-    DEVELOPERS \
-    INSTALL \
-    INSTALL.Unix \
-    INSTALL.Windows \
-    LICENSE \
-    NEWS \
-    NOTICE \
-    README \
-    THANKS \
-    license.skip
-
-AUTHORS.gz: $(top_srcdir)/AUTHORS
-	-gzip -9 < $< > $@
-
-BUGS.gz: $(top_srcdir)/BUGS
-	-gzip -9 < $< > $@
-
-CHANGES.gz: $(top_srcdir)/CHANGES
-	-gzip -9 < $< > $@
-
-DEVELOPERS.gz: $(top_srcdir)/DEVELOPERS
-	-gzip -9 < $< > $@
-
-INSTALL.gz: $(top_srcdir)/INSTALL
-	-gzip -9 < $< > $@
-
-INSTALL.Unix.gz: $(top_srcdir)/INSTALL.Unix
-	-gzip -9 < $< > $@
-
-INSTALL.Windows.gz: $(top_srcdir)/INSTALL.Windows
-	-gzip -9 < $< > $@
-
-LICENSE.gz: $(top_srcdir)/LICENSE
-	-gzip -9 < $< > $@
-
-NEWS.gz: $(top_srcdir)/NEWS
-	-gzip -9 < $< > $@
-
-NOTICE.gz: $(top_srcdir)/NOTICE
-	-gzip -9 < $< > $@
-
-README.gz: $(top_srcdir)/README
-	-gzip -9 < $< > $@
-
-THANKS.gz: $(top_srcdir)/THANKS
-	-gzip -9 < $< > $@
-
-check: dev
-	$(top_builddir)/test/etap/run
-
-cover: dev
-	rm -f cover/*.coverdata
-	COVER=1 COVER_BIN=./src/couchdb/ $(top_builddir)/test/etap/run
-	SRC=./src/couchdb/ \
-	    $(ERL) -noshell \
-		-pa src/etap \
-		-eval 'etap_report:create()' \
-	    -s init stop > /dev/null 2>&1
-
-dev: all
-	@echo "This command is intended for developers to use;"
-	@echo "it creates development ini files as well as a"
-	@echo "$(top_builddir)/tmp structure for development runtime files."
-	@echo "Use ./utils/run to launch CouchDB from the source tree."
-	mkdir -p $(top_builddir)/etc/couchdb/default.d
-	mkdir -p $(top_builddir)/etc/couchdb/local.d
-	mkdir -p $(top_builddir)/tmp/lib
-	mkdir -p $(top_builddir)/tmp/log
-	mkdir -p $(top_builddir)/tmp/run/couchdb
-
-install-data-hook:
-	@echo
-	@echo "You have installed Apache CouchDB, time to relax."
-
-distclean-local:
-	rm -fr $(top_builddir)/tmp
-
-.PHONY: local-clean
-local-clean: maintainer-clean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may need special tools to rebuild."
-	rm -f $(top_srcdir)/INSTALL
-	rm -f $(top_srcdir)/acinclude.m4
-	rm -f $(top_srcdir)/aclocal.m4
-	rm -f $(top_srcdir)/config.h.in
-	rm -f $(top_srcdir)/configure
-	rm -f $(top_srcdir)/test/etap/temp.*
-	rm -f $(top_srcdir)/*.tar.gz
-	rm -f $(top_srcdir)/*.tar.gz.*
-	find $(top_srcdir) -name Makefile.in -exec rm -f {} \;
-
-dist-hook:
-	find $(top_srcdir) -type f -name "._*" -exec rm -f {} \;
-	find $(top_builddir) -type f -name "._*" -exec rm -f {} \;
-
-distcheck-hook:
-	grep -rL 'http://www.apache.org/licenses/LICENSE-2.0' * \
-            | grep -vEf license.skip; \
-        test "$$?" -eq 1
-
-.PHONY: distsign
-distsign: distcheck check
-	@# @@ unpack archive and run diff -r to double check missing files
-	@# @@ does automake have anything that does this?
-	gpg --armor --detach-sig --default-key 8FBFCFBF \
-	    < $(top_srcdir)/$(distdir).tar.gz \
-	    > $(top_srcdir)/$(distdir).tar.gz.asc
-	md5sum $(top_srcdir)/$(distdir).tar.gz \
-	    > $(top_srcdir)/$(distdir).tar.gz.md5
-	sha1sum $(top_srcdir)/$(distdir).tar.gz \
-	    > $(top_srcdir)/$(distdir).tar.gz.sha
diff --git a/acinclude.m4.in b/acinclude.m4.in
deleted file mode 100644
index fb92b3f4..00000000
--- a/acinclude.m4.in
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl Licensed under the Apache License, Version 2.0 (the "License"); you may not
-dnl use this file except in compliance with the License.  dnl You may obtain a
-dnl copy of the License at
-dnl
-dnl   http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-dnl WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-dnl License for the specific language governing permissions and limitations
-dnl under the License.
-
-m4_define([LOCAL_PACKAGE_AUTHOR_NAME], [The Apache Software Foundation])
-m4_define([LOCAL_PACKAGE_AUTHOR_ADDRESS], [dev@couchdb.apache.org])
-m4_define([LOCAL_PACKAGE_IDENTIFIER], [couchdb])
-m4_define([LOCAL_PACKAGE_TARNAME], [apache-couchdb])
-m4_define([LOCAL_PACKAGE_NAME], [Apache CouchDB])
-m4_define([LOCAL_BUG_URI], [https://issues.apache.org/jira/browse/COUCHDB])
-m4_define([LOCAL_VERSION_MAJOR], [1])
-m4_define([LOCAL_VERSION_MINOR], [0])
-m4_define([LOCAL_VERSION_REVISION], [1])
-m4_define([LOCAL_VERSION_STAGE], [])
-m4_define([LOCAL_VERSION_RELEASE], [])
-m4_define([LOCAL_VERSION_PRIMARY],
-    [LOCAL_VERSION_MAJOR.LOCAL_VERSION_MINOR.LOCAL_VERSION_REVISION])
-m4_define([LOCAL_VERSION_SECONDARY],
-    [LOCAL_VERSION_STAGE[]LOCAL_VERSION_RELEASE])
-m4_define([LOCAL_VERSION],
-    [LOCAL_VERSION_PRIMARY[]LOCAL_VERSION_SECONDARY])
-
diff --git a/apps/couch/rebar.config b/apps/couch/rebar.config
new file mode 100644
index 00000000..787e0337
--- /dev/null
+++ b/apps/couch/rebar.config
@@ -0,0 +1,7 @@
+{so_name, "couch_icu_driver.so"}.
+{port_envs, [
+  {"DRV_CFLAGS",  "$DRV_CFLAGS -DPIC -O2 -fno-common"},
+  {"DRV_LDFLAGS", "$DRV_LDFLAGS -lm -licuuc -licudata -licui18n -lpthread"},
+  {"linux", "DRV_LDFLAGS", "$DRV_LDFLAGS -lcrypt"}
+]}.
+{lib_dirs, ["../"]}.
diff --git a/bin/Makefile.am b/bin/Makefile.am
deleted file mode 100644
index b8b818cb..00000000
--- a/bin/Makefile.am
+++ /dev/null
@@ -1,98 +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.
-
-if WINDOWS
-bin_SCRIPTS = couchdb.bat
-else
-bin_SCRIPTS = couchdb couchjs
-endif
-
-noinst_SCRIPTS = couchjs_dev
-
-if HELP2MAN
-dist_man1_MANS = couchdb.1 couchjs.1
-endif
-
-CLEANFILES = $(bin_SCRIPTS) $(dist_man1_MANS) $(noinst_SCRIPTS)
-
-transform = @program_transform_name@
-couchdb_command_name = `echo couchdb | sed '$(transform)'`
-couchjs_command_name = `echo couchjs | sed '$(transform)'`
-
-couchdb: couchdb.tpl
-	sed -e "s|%ERL%|$(ERL)|g" \
-	    -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-	    -e "s|%bindir%|@bindir@|g" \
-	    -e "s|%localerlanglibdir%|@localerlanglibdir@|g" \
-	    -e "s|%defaultini%|default.ini|g" \
-	    -e "s|%localini%|local.ini|g" \
-	    -e "s|%localconfdir%|@localconfdir@|g" \
-	    -e "s|%localstatelogdir%|@localstatelogdir@|g" \
-	    -e "s|%localstatelibdir%|@localstatelibdir@|g" \
-	    -e "s|%localstatedir%|@localstatedir@|g" \
-	    -e "s|%bug_uri%|@bug_uri@|g" \
-	    -e "s|%package_author_address%|@package_author_address@|g" \
-	    -e "s|%package_author_name%|@package_author_name@|g" \
-	    -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
-	$@ < $<
-	chmod +x $@
-
-couchjs: couchjs.tpl
-	sed -e "s|%locallibbindir%|@locallibbindir@|g" \
-	    -e "s|%bug_uri%|@bug_uri@|g" \
-	    -e "s|%package_author_address%|@package_author_address@|g" \
-	    -e "s|%package_author_name%|@package_author_name@|g" \
-	    -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" > \
-	$@ < $<
-	chmod +x $@
-
-couchjs_dev: couchjs.tpl
-	sed -e "s|%locallibbindir%|$(abs_top_builddir)/src/couchdb/priv|g" \
-	    -e "s|%bug_uri%|@bug_uri@|g" \
-	    -e "s|%package_author_address%|@package_author_address@|g" \
-	    -e "s|%package_author_name%|@package_author_name@|g" \
-	    -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" > \
-	$@ < $<
-	chmod +x $@
-
-couchdb.bat: couchdb.bat.tpl
-	sed -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-	    -e "s|%version%|@version@|g" \
-	$< > $@
-
-HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
-
-# XXX: Because the scripts are made at build time for the user we need to
-# XXX: depend on the original templates so as not to cause the rebuilding of
-# XXX: the man pages.
-
-couchdb.1: couchdb.tpl.in
-	touch $@
-	if test -x "$(HELP2MAN_EXECUTABLE)"; then \
-	    $(MAKE) -f Makefile couchdb; \
-	    $(HELP2MAN_EXECUTABLE) $(HELP2MAN_OPTION) \
-	        --name="Apache CouchDB database server" ./couchdb --output $@; \
-	fi
-
-couchjs.1: couchjs.tpl.in
-	touch $@
-	if test -x "$(HELP2MAN_EXECUTABLE)"; then \
-	    $(MAKE) -f Makefile couchjs; \
-	    $(HELP2MAN_EXECUTABLE) $(HELP2MAN_OPTION) \
-	        --name="Apache CouchDB JavaScript interpreter" ./couchjs --output $@; \
-	fi
diff --git a/bootstrap b/bootstrap
deleted file mode 100755
index 0c576c40..00000000
--- a/bootstrap
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/sh -e
-
-# 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.
-
-get () {
-    variable_name=$1
-    echo "changequote(\`[', \`]')" > acinclude.m4.tmp
-    sed -e "s/m4_//" < acinclude.m4.in >> acinclude.m4.tmp
-    echo $variable_name >> acinclude.m4.tmp
-    if test -x "`which gm4 2> /dev/null || true`"; then
-        gm4 acinclude.m4.tmp | grep -v "^$" || true
-    else
-        if test -x "`which m4 2> /dev/null || true`"; then
-            m4 acinclude.m4.tmp | grep -v "^$" || true
-        else
-            echo unknown
-        fi
-    fi
-    rm -f acinclude.m4.tmp
-}
-
-mkdir -p build-aux
-
-if test -z "$REVISION"; then
-    if test -d .git; then
-        REVISION=`git log --pretty="format:%h" | head -1`-git
-    else
-        # default to svn
-        REVISION=`\`which svn\` info . 2> /dev/null | awk "/Revision:/{print \\$2}"`
-    fi
-fi
-if test -z "`get LOCAL_VERSION_STAGE`" -o -z "$REVISION"; then
-    sed "s/%release%//" < acinclude.m4.in > acinclude.m4
-else
-    sed "s/%release%/$REVISION/" < acinclude.m4.in > acinclude.m4
-fi
-
-gunzip -c m4/ac_check_icu.m4.gz > m4/ac_check_icu.m4
-gunzip -c m4/ac_check_curl.m4.gz > m4/ac_check_curl.m4
-
-if test -x "`which glibtoolize 2> /dev/null || true`"; then
-    glibtoolize -f -c --automake
-else
-    libtoolize -f -c --automake
-fi
-
-aclocal -I m4
-autoheader -f
-automake -f -a 2>&1 | sed -e "/install/d"
-autoconf -f
-
-ln -f -s "`dirname \`readlink build-aux/missing\``/INSTALL"
-
-cat << EOF
-You have bootstrapped Apache CouchDB, time to relax.
-
-Run \`./configure' to configure the source before you install.
-EOF
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index c609a084..00000000
--- a/configure.ac
+++ /dev/null
@@ -1,434 +0,0 @@
-dnl Licensed under the Apache License, Version 2.0 (the "License"); you may not
-dnl use this file except in compliance with the License.  dnl You may obtain a
-dnl copy of the License at
-dnl
-dnl   http://www.apache.org/licenses/LICENSE-2.0
-dnl
-dnl Unless required by applicable law or agreed to in writing, software
-dnl distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-dnl WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-dnl License for the specific language governing permissions and limitations
-dnl under the License.
-
-AC_INIT([LOCAL_PACKAGE_NAME], [LOCAL_VERSION], [], [LOCAL_PACKAGE_TARNAME])
-
-AC_PREREQ([2.59])
-
-AC_CONFIG_SRCDIR([CHANGES])
-AC_CONFIG_AUX_DIR([build-aux])
-AC_CONFIG_MACRO_DIR([m4])
-
-AM_CONFIG_HEADER([config.h])
-
-AM_INIT_AUTOMAKE([1.6.3 foreign])
-
-AC_GNU_SOURCE
-AC_ENABLE_SHARED
-AC_DISABLE_STATIC
-
-AC_PROG_CC
-AC_PROG_LIBTOOL
-AC_PROG_LN_S
-
-AC_MSG_CHECKING([for pthread_create in -lpthread])
-
-original_LIBS="$LIBS"
-LIBS="-lpthread $original_LIBS"
-
-AC_TRY_LINK([#include<pthread.h>],
-    [pthread_create((void *)0, (void *)0, (void *)0, (void *)0)],
-    [pthread=yes], [pthread=no])
-
-if test x${pthread} = xyes; then
-    AC_MSG_RESULT([yes])
-else
-    LIBS="$original_LIBS"
-    AC_MSG_RESULT([no])
-fi
-
-AC_ARG_WITH([erlang], [AC_HELP_STRING([--with-erlang=PATH],
-    [set PATH to the Erlang include directory])], [
-    ERLANG_FLAGS="-I$withval"
-], [
-    ERLANG_FLAGS="-I${libdir}/erlang/usr/include"
-    ERLANG_FLAGS="$ERLANG_FLAGS -I/usr/lib/erlang/usr/include"
-    ERLANG_FLAGS="$ERLANG_FLAGS -I/usr/local/lib/erlang/usr/include"
-    ERLANG_FLAGS="$ERLANG_FLAGS -I/opt/local/lib/erlang/usr/include"
-])
-
-AC_ARG_WITH([js-include], [AC_HELP_STRING([--with-js-include=PATH],
-    [set PATH to the SpiderMonkey include directory])], [
-    JS_INCLUDE="$withval"
-    JS_FLAGS="-I$JS_INCLUDE"
-], [
-    JS_FLAGS="-I/usr/include"
-    JS_FLAGS="$JS_FLAGS -I/usr/include/js"
-    JS_FLAGS="$JS_FLAGS -I/usr/include/mozjs"
-    JS_FLAGS="$JS_FLAGS -I/usr/local/include"
-    JS_FLAGS="$JS_FLAGS -I/opt/local/include"
-    JS_FLAGS="$JS_FLAGS -I/usr/local/include/js"
-    JS_FLAGS="$JS_FLAGS -I/opt/local/include/js"
-])
-
-AC_ARG_WITH([js-lib], [AC_HELP_STRING([--with-js-lib=PATH],
-    [set PATH to the SpiderMonkey library directory])],
-    [
-    JS_LIB_DIR=$withval
-    JS_LIB_FLAGS="-L$withval"
-], [
-    JS_LIB_DIR=
-])
-AC_SUBST(JS_LIB_DIR)
-
-AC_ARG_VAR([ERLC_FLAGS], [general flags to prepend to ERLC_FLAGS])
-AC_ARG_VAR([FLAGS], [general flags to prepend to LDFLAGS and CPPFLAGS])
-
-LIB_FLAGS="$JS_LIB_FLAGS -L/usr/local/lib -L/opt/local/lib"
-LIBS="$LIB_FLAGS $LIBS"
-
-case "$(uname -s)" in
-  CYGWIN*)
-    FLAGS="$LIB_FLAGS $ERLANG_FLAGS $JS_FLAGS -DXP_WIN $FLAGS"
-    CPPFLAGS="$FLAGS $CPPFLAGS"
-    LDFLAGS="$FLAGS $LDFLAGS"
-    IS_WINDOWS="TRUE"
-    # The erlang cc.sh/ld.sh scripts will convert a -O option
-    # into the same optimization flags erlang itself uses.
-    CFLAGS="-O2"
-    LTCFLAGS="$CFLAGS"
-    ;;
-  *)
-    # XP_UNIX required for jsapi.h and has been tested to work on Linux and Darwin.
-    FLAGS="$LIB_FLAGS $ERLANG_FLAGS $JS_FLAGS -DXP_UNIX $FLAGS"
-    CPPFLAGS="$FLAGS $CPPFLAGS"
-    # manually linking libm is requred for FreeBSD 7.0
-    LDFLAGS="$FLAGS -lm $LDFLAGS"
-    ;;
-esac
-
-AM_CONDITIONAL([WINDOWS], [test x$IS_WINDOWS = xTRUE])
-
-AC_CHECK_LIB([mozjs], [JS_NewContext], [JS_LIB_BASE=mozjs], [
-    AC_CHECK_LIB([js], [JS_NewContext], [JS_LIB_BASE=js], [
-        AC_CHECK_LIB([js3250], [JS_NewContext], [JS_LIB_BASE=js3250], [
-            AC_CHECK_LIB([js32], [JS_NewContext], [JS_LIB_BASE=js32], [
-                AC_MSG_ERROR([Could not find the js library.
-
-Is the Mozilla SpiderMonkey library installed?])])])])])
-
-AC_SUBST(JS_LIB_BASE)
-
-if test x${IS_WINDOWS} = xTRUE; then
-    if test -f "$JS_LIB_DIR/$JS_LIB_BASE.dll"; then
-        # seamonkey 1.7- build layout on Windows
-        JS_LIB_BINARY="$JS_LIB_DIR/$JS_LIB_BASE.dll"
-    else
-        # seamonkey 1.8+ build layout on Windows
-        if test -f "$JS_LIB_DIR/../bin/$JS_LIB_BASE.dll"; then
-            JS_LIB_BINARY="$JS_LIB_DIR/../bin/$JS_LIB_BASE.dll"
-        else
-        AC_MSG_ERROR([Could not find $JS_LIB_BASE.dll.])
-        fi
-    fi
-    AC_SUBST(JS_LIB_BINARY)
-
-    # On windows we need to know the path to the openssl binaries.
-    AC_ARG_WITH([openssl-bin-dir], [AC_HELP_STRING([--with-openssl-bin-dir=PATH],
-        [path to the open ssl binaries for distribution on Windows])], [
-        openssl_bin_dir=`cygpath -m "$withval"`
-        AC_SUBST(openssl_bin_dir)
-    ], [])
-
-    # Windows uses Inno setup - look for its compiler.
-    AC_PATH_PROG([INNO_COMPILER_EXECUTABLE], [iscc])
-    if test x${INNO_COMPILER_EXECUTABLE} = x; then
-        AC_MSG_WARN([You will be unable to build the Windows installer.])
-    fi
-
-    # We need the msvc redistributables for this platform too
-    # (in theory we could just install the assembly locally - but
-    # there are at least 4 directories with binaries, meaning 4 copies;
-    # so using the redist .exe means it ends up installed globally...)
-    AC_ARG_WITH([msvc-redist-dir], [AC_HELP_STRING([--with-msvc-redist-dir=PATH],
-        [path to the msvc redistributables for the Windows platform])], [
-        msvc_redist_dir=`cygpath -m "$withval"`
-        msvc_redist_name="vcredist_x86.exe"
-        AC_SUBST(msvc_redist_dir)
-        AC_SUBST(msvc_redist_name)
-    ], [])
-    if test ! -f ${msvc_redist_dir}/${msvc_redist_name}; then
-        AC_MSG_WARN([The MSVC redistributable seems to be missing; expect the installer to fail.])
-    fi
-fi
-
-JSLIB=-l$JS_LIB_BASE
-
-AC_CHECK_HEADER([jsapi.h], [], [
-    AC_CHECK_HEADER([js/jsapi.h],
-        [
-        CPPFLAGS="$CPPFLAGS -I$JS_INCLUDE/js"
-        ],
-        [
-            AC_MSG_ERROR([Could not find the jsapi header.
-
-Are the Mozilla SpiderMonkey headers installed?])
-        ])])
-
-AC_SUBST(JSLIB)
-
-AC_LANG_PUSH(C)
-OLD_CFLAGS="$CFLAGS"
-CFLAGS="-Werror-implicit-function-declaration"
-AC_COMPILE_IFELSE(
-    [AC_LANG_PROGRAM(
-        [[#include <jsapi.h>]],
-        [[JS_SetOperationCallback(0, 0);]]
-    )],
-    AC_DEFINE([USE_JS_SETOPCB], [], [Use new JS_SetOperationCallback])
-)
-CFLAGS="$OLD_CFLAGS"
-AC_LANG_POP(C)
-
-AC_ARG_WITH([win32-icu-binaries], [AC_HELP_STRING([--with-win32-icu-binaries=PATH],
-    [set PATH to the Win32 native ICU binaries directory])], [
-    ICU_CONFIG="" # supposed to be a command to query options...
-    ICU_LOCAL_CFLAGS="-I$withval/include"
-    ICU_LOCAL_LDFLAGS="-L$withval/lib"
-    ICU_LOCAL_BIN=$withval/bin
-], [
-    AC_CHECK_ICU([3.4.1])
-    ICU_LOCAL_CFLAGS=`$ICU_CONFIG --cppflags-searchpath`
-    ICU_LOCAL_LDFLAGS=`$ICU_CONFIG --ldflags-searchpath`
-    ICU_LOCAL_BIN=
-])
-
-AC_SUBST(ICU_CONFIG)
-AC_SUBST(ICU_LOCAL_CFLAGS)
-AC_SUBST(ICU_LOCAL_LDFLAGS)
-AC_SUBST(ICU_LOCAL_BIN)
-
-AC_ARG_WITH([win32-curl], [AC_HELP_STRING([--with-win32-curl=PATH],
-    [set PATH to the Win32 native curl directory])], [
-    # default build on windows is a static lib, and that's what we want too
-    CURL_CFLAGS="-I$withval/include -DCURL_STATICLIB"
-    CURL_LIBS="$withval/lib/libcurl"
-    CURL_LDFLAGS="-l$CURL_LIBS -lWs2_32 -lkernel32 -luser32 -ladvapi32 -lWldap32"
-], [
-    AC_CHECK_CURL([7.18.0])
-    CURL_LDFLAGS=-lcurl
-])
-
-AC_SUBST(CURL_CFLAGS)
-AC_SUBST(CURL_LIBS)
-AC_SUBST(CURL_LDFLAGS)
-
-case "$(uname -s)" in
-  Linux)
-    LIBS="$LIBS -lcrypt"
-    CPPFLAGS="-D_XOPEN_SOURCE $CPPFLAGS"
-    ;;
-  FreeBSD)
-    LIBS="$LIBS -lcrypt"
-    ;;
-  OpenBSD)
-    LIBS="$LIBS -lcrypto"
-  ;;
-esac
-
-AC_PATH_PROG([ERL], [erl])
-
-if test x${ERL} = x; then
-    AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?])
-fi
-
-erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)."
-
-version="`${ERL} -version 2>&1 | ${SED} "s/[[^0-9]]/ /g"`"
-
-if test `echo $version | ${AWK} "{print \\$1}"` -lt 5; then
-    AC_MSG_ERROR([$erlang_version_error])
-fi
-
-if test `echo $version | ${AWK} "{print \\$2}"` -lt 6; then
-    AC_MSG_ERROR([$erlang_version_error])
-fi
-
-if test `echo $version | ${AWK} "{print \\$2}"` -eq 6; then
-    if test `echo $version | ${AWK} "{print \\$3}"` -lt 5; then
-        AC_MSG_ERROR([$erlang_version_error])
-    fi
-fi
-
-AC_PATH_PROG([ERLC], [erlc])
-
-if test x${ERLC} = x; then
-    AC_MSG_ERROR([Could not find the `erlc' executable. Is Erlang installed?])
-fi
-
-AC_CHECK_HEADER([erl_driver.h], [], [
-    AC_MSG_ERROR([Could not find the `erl_driver.h' header.
-
-Are the Erlang headers installed? Use the `--with-erlang' option to specify the
-path to the Erlang include directory.])])
-
-AC_PATH_PROG([HELP2MAN_EXECUTABLE], [help2man])
-if test x${HELP2MAN_EXECUTABLE} = x; then
-    AC_MSG_WARN([You will be unable to regenerate any man pages.])
-fi
-
-use_init=yes
-use_launchd=yes
-
-AC_ARG_ENABLE([init], [AC_HELP_STRING([--disable-init],
-    [don't install init script where applicable])], [
-    use_init=$enableval
-], [])
-
-AC_ARG_ENABLE([launchd], [AC_HELP_STRING([--disable-launchd],
-    [don't install launchd configuration where applicable])], [
-    use_launchd=$enableval
-], [])
-
-init_enabled=false
-launchd_enabled=false
-
-if test "$use_init" = "yes"; then
-   AC_MSG_CHECKING(location of init directory)
-   if test -d /etc/rc.d; then
-       init_enabled=true
-       AC_SUBST([initdir], ['${sysconfdir}/rc.d'])
-       AC_MSG_RESULT(${initdir})
-   else
-       if test -d /etc/init.d; then
-           init_enabled=true
-           AC_SUBST([initdir], ['${sysconfdir}/init.d'])
-           AC_MSG_RESULT(${initdir})
-       else
-           AC_MSG_RESULT(not found)
-       fi
-    fi
-fi
-
-if test "$use_launchd" = "yes"; then
-    AC_MSG_CHECKING(location of launchd directory)
-    if test -d /Library/LaunchDaemons; then
-        init_enabled=false
-        launchd_enabled=true
-        AC_SUBST([launchddir], ['${prefix}/Library/LaunchDaemons'])
-        AC_MSG_RESULT(${launchddir})
-    else
-        AC_MSG_RESULT(not found)
-    fi
-fi
-
-AC_ARG_VAR([ERL], [path to the `erl' executable])
-AC_ARG_VAR([ERLC], [path to the `erlc' executable])
-AC_ARG_VAR([HELP2MAN_EXECUTABLE], [path to the `help2man' program])
-
-if test -n "$HELP2MAN_EXECUTABLE"; then
-    help2man_enabled=true
-else
-    if test -f "$srcdir/bin/couchdb.1" -a -f "$srcdir/bin/couchjs.1"; then
-        help2man_enabled=true
-    else
-        help2man_enabled=false
-    fi
-fi
-
-AM_CONDITIONAL([INIT], [test x${init_enabled} = xtrue])
-AM_CONDITIONAL([LAUNCHD], [test x${launchd_enabled} = xtrue])
-AM_CONDITIONAL([HELP2MAN], [test x${help2man_enabled} = xtrue])
-
-AC_SUBST([package_author_name], ["LOCAL_PACKAGE_AUTHOR_NAME"])
-AC_SUBST([package_author_address], ["LOCAL_PACKAGE_AUTHOR_ADDRESS"])
-AC_SUBST([package_identifier], ["LOCAL_PACKAGE_IDENTIFIER"])
-AC_SUBST([package_tarname], ["LOCAL_PACKAGE_TARNAME"])
-AC_SUBST([package_name], ["LOCAL_PACKAGE_NAME"])
-
-AC_SUBST([version], ["LOCAL_VERSION"])
-AC_SUBST([version_major], ["LOCAL_VERSION_MAJOR"])
-AC_SUBST([version_minor], ["LOCAL_VERSION_MINOR"])
-AC_SUBST([version_revision], ["LOCAL_VERSION_REVISION"])
-AC_SUBST([version_stage], ["LOCAL_VERSION_STAGE"])
-AC_SUBST([version_release], ["LOCAL_VERSION_RELEASE"])
-
-AC_SUBST([bug_uri], ["LOCAL_BUG_URI"])
-
-AC_SUBST([localconfdir], [${sysconfdir}/${package_identifier}])
-AC_SUBST([localdatadir], [${datadir}/${package_identifier}])
-AC_SUBST([localdocdir], [${datadir}/doc/${package_identifier}])
-AC_SUBST([locallibdir], [${libdir}/${package_identifier}])
-AC_SUBST([localstatelibdir], [${localstatedir}/lib/${package_identifier}])
-AC_SUBST([localstatelogdir], [${localstatedir}/log/${package_identifier}])
-AC_SUBST([localstaterundir], [${localstatedir}/run/${package_identifier}])
-
-# On Windows we install directly into our erlang distribution.
-if test x${IS_WINDOWS} = xTRUE; then
-    AC_SUBST([locallibbindir], [${prefix}/bin])
-    AC_SUBST([localerlanglibdir], [${libdir}])
-else
-    AC_SUBST([locallibbindir], [${locallibdir}/bin])
-    AC_SUBST([localerlanglibdir], [${locallibdir}/erlang/lib])
-fi
-
-# fix for older autotools that don't define "abs_top_YYY" by default
-AC_SUBST(abs_top_srcdir)
-AC_SUBST(abs_top_builddir)
-
-AC_REVISION([LOCAL_VERSION])
-
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([bin/couchjs.tpl])
-AC_CONFIG_FILES([bin/couchdb.tpl])
-AC_CONFIG_FILES([bin/couchdb.bat.tpl])
-AC_CONFIG_FILES([bin/Makefile])
-AC_CONFIG_FILES([etc/couchdb/Makefile])
-AC_CONFIG_FILES([etc/couchdb/default.ini.tpl])
-AC_CONFIG_FILES([etc/default/Makefile])
-AC_CONFIG_FILES([etc/init/couchdb.tpl])
-AC_CONFIG_FILES([etc/init/Makefile])
-AC_CONFIG_FILES([etc/launchd/org.apache.couchdb.plist.tpl])
-AC_CONFIG_FILES([etc/launchd/Makefile])
-AC_CONFIG_FILES([etc/logrotate.d/couchdb.tpl])
-AC_CONFIG_FILES([etc/logrotate.d/Makefile])
-AC_CONFIG_FILES([etc/windows/Makefile])
-AC_CONFIG_FILES([etc/Makefile])
-AC_CONFIG_FILES([share/Makefile])
-AC_CONFIG_FILES([src/Makefile])
-AC_CONFIG_FILES([src/couchdb/couch.app.tpl])
-AC_CONFIG_FILES([src/couchdb/Makefile])
-AC_CONFIG_FILES([src/couchdb/priv/Makefile])
-AC_CONFIG_FILES([src/erlang-oauth/Makefile])
-AC_CONFIG_FILES([src/etap/Makefile])
-AC_CONFIG_FILES([src/ibrowse/Makefile])
-AC_CONFIG_FILES([src/mochiweb/Makefile])
-AC_CONFIG_FILES([test/Makefile])
-AC_CONFIG_FILES([test/bench/Makefile])
-AC_CONFIG_FILES([test/etap/Makefile])
-AC_CONFIG_FILES([test/etap/test_util.erl])
-AC_CONFIG_FILES([test/javascript/Makefile])
-AC_CONFIG_FILES([test/view_server/Makefile])
-AC_CONFIG_FILES([utils/Makefile])
-AC_CONFIG_FILES([var/Makefile])
-
-AC_OUTPUT
-
-# *sob* - on Windows libtool fails as 'libname_spec' isn't correct (it
-# expects GNU style lib names).  I can't work out how to configure this
-# option sanely, so we pass the script through sed to modify it.
-# Also, the erlang cc.sh script doesn't cope well with the '-link' command
-# line option libtool provides.
-# PLEASE, someone help put this out of its misery!!
-# This hackery is being tracked via COUCHDB-440.
-if test x${IS_WINDOWS} = xTRUE; then
-    sed -e 's,libname_spec="lib\\$name",libname_spec="\\\$name",' \
-        -e 's,-link,,' \
-        < libtool > libtool.tmp
-    mv libtool.tmp libtool
-    # probably would chmod +x if we weren't on windows...
-fi
-
-echo
-echo "You have configured Apache CouchDB, time to relax."
-echo
-echo "Run \`make && sudo make install' to install."
diff --git a/etc/Makefile.am b/etc/Makefile.am
deleted file mode 100644
index 148f7015..00000000
--- a/etc/Makefile.am
+++ /dev/null
@@ -1,117 +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.
-
-SUBDIRS = couchdb default init launchd logrotate.d windows
-
-default_sysconf_data = logrotate.d/couchdb
-
-if INIT
-init_sysconf_data = default/couchdb
-init_DATA = init/couchdb
-endif
-
-if LAUNCHD
-launchd_DATA = launchd/org.apache.couchdb.plist
-endif
-
-nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
-
-EXTRA_DIST = \
-    default/couchdb \
-    windows/couchdb.iss.tpl \
-    windows/README.txt.tpl
-
-if WINDOWS
-EXTRA_DIST += \
-    windows/setup-couchdb-@version@.exe.md5 \
-    windows/setup-couchdb-@version@.exe.sha
-endif
-
-CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA)
-
-transform = @program_transform_name@
-couchdb_command_name = `echo couchdb | sed '$(transform)'`
-
-init/couchdb: init/couchdb.tpl
-	if test "$(mkdir_p)"; then \
-	    $(mkdir_p) init; \
-	else \
-	    if test ! -d init; then \
-	        mkdir init; \
-	    fi \
-	fi
-	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	    -e "s|%bindir%|$(bindir)|" \
-	    -e "s|%sysconfdir%|$(sysconfdir)|" \
-	    -e "s|%localstaterundir%|$(localstaterundir)|" \
-	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
-	< $< > $@
-
-logrotate.d/couchdb: logrotate.d/couchdb.tpl
-	sed -e "s|%localstatelogdir%|@localstatelogdir@|g" < $< > $@
-
-launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl
-	if test "$(mkdir_p)"; then \
-	    $(mkdir_p) launchd; \
-	else \
-	    if test ! -d launchd; then \
-	        mkdir launchd; \
-	    fi \
-	fi
-	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	    -e "s|%bindir%|$(bindir)|" \
-	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
-	< $< > $@
-
-if WINDOWS
-
-# README.txt has \n line endings in the repo and must have \r\n
-# when installed as notepad is used to view it.
-# Also: the targets below don't seem to update after an svn-up (which
-# changes the version string in the generated files) so we trick make
-# into always building it with the FORCE pattern...
-windows/README.txt: windows/README.txt.tpl FORCE
-	sed -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	< $< | unix2dos > $@
-
-windows/couchdb.iss: windows/couchdb.iss.tpl FORCE
-	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	    -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%locallibbindir%|`cygpath -m @locallibbindir@`|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|%erts_version%|`$(ERL) -version 2>&1 | $(SED) 's/[^0-9\.]//g'`|g" \
-	    -e "s|%openssl_bin_dir%|@openssl_bin_dir@|g" \
-	    -e "s|%msvc_redist_dir%|@msvc_redist_dir@|g" \
-	    -e "s|%msvc_redist_name%|@msvc_redist_name@|g" \
-	< $< > $@
-
-# The installer depends on all files, not just the source .iss file,
-# so we trick make into always building it with the FORCE pattern...
-windows/setup-couchdb-@version@.exe: windows/couchdb.iss windows/README.txt FORCE
-	"$(INNO_COMPILER_EXECUTABLE)" /q $<
-	@echo Windows Installer is at: `cygpath -a -w windows/setup-couchdb-@version@.exe`
-
-windows/setup-couchdb-@version@.exe.md5: windows/setup-couchdb-@version@.exe
-	cd windows && md5sum ./$(<F) > $(@F)
-
-windows/setup-couchdb-@version@.exe.sha: windows/setup-couchdb-@version@.exe
-	cd windows && sha1sum ./$(<F) > $(@F)
-
-FORCE:
-
-endif
-
-install-data-hook:
-	if test -n "$(init_DATA)"; then \
-	    chmod +x "$(DESTDIR)$(initdir)/couchdb"; \
-	fi
diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
deleted file mode 100644
index ded52084..00000000
--- a/etc/couchdb/Makefile.am
+++ /dev/null
@@ -1,83 +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.
-
-couchprivlibdir = $(localerlanglibdir)/couch-$(version)/priv/lib
-devcouchprivlibdir = $(abs_top_builddir)/src/couchdb/priv/.libs
-
-localconf_DATA = default.ini
-noinst_DATA = default_dev.ini local_dev.ini
-
-EXTRA_DIST = local.ini
-
-CLEANFILES = $(localconf_DATA) $(noinst_DATA)
-
-transform = @program_transform_name@
-couchjs_command_name = `echo couchjs | sed '$(transform)'`
-couchjs_dev_command_name = `echo couchjs_dev | sed '$(transform)'`
-
-if WINDOWS
-default.ini: default.ini.tpl
-	sed -e "s|%bindir%|.|g" \
-	    -e "s|%localconfdir%|$(localconfdir)|g" \
-	    -e "s|%localdatadir%|../share/couchdb|g" \
-		-e "s|%localbuilddatadir%|../share/couchdb|g" \
-	    -e "s|%localstatelibdir%|../var/lib/couchdb|g" \
-	    -e "s|%localstatelogdir%|../var/log/couchdb|g" \
-	    -e "s|%couchprivlibdir%|../lib/couch-$(version)/priv/lib|g" \
-	    -e "s|%couchjs_command_name%|couchjs.exe|g" \
-	< $< > $@
-else
-default.ini: default.ini.tpl
-	sed -e "s|%bindir%|$(bindir)|g" \
-	    -e "s|%localconfdir%|$(localconfdir)|g" \
-	    -e "s|%localdatadir%|$(localdatadir)|g" \
-		-e "s|%localbuilddatadir%|$(localdatadir)|g" \
-	    -e "s|%localstatelibdir%|$(localstatelibdir)|g" \
-	    -e "s|%localstatelogdir%|$(localstatelogdir)|g" \
-	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
-	< $< > $@
-endif
-
-default_dev.ini: default.ini.tpl
-	sed -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
-	    -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
-	    -e "s|%localdatadir%|$(abs_top_srcdir)/share|g" \
-		-e "s|%localbuilddatadir%|$(abs_top_builddir)/share|g" \
-	    -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
-	    -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
-	    -e "s|%couchprivlibdir%|$(devcouchprivlibdir)|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_dev_command_name)|g" \
-	< $< > $@
-
-# Noah said to not specify local.ini but it borks
-# VPATH builds that make distcheck uses.
-local_dev.ini: local.ini
-	if test ! -f "$@"; then \
-	    cp $< $@; \
-	fi
-
-install-data-hook:
-	if test ! -f "$(DESTDIR)$(localconfdir)/local.ini"; then \
-	    cp $(srcdir)/local.ini "$(DESTDIR)$(localconfdir)/local.ini"; \
-	fi
-	if test ! "$(mkdir_p)" = ""; then \
-	    $(mkdir_p) "$(DESTDIR)$(localconfdir)/default.d"; \
-	    $(mkdir_p) "$(DESTDIR)$(localconfdir)/local.d"; \
-	else \
-	    echo "WARNING: You may have to create these directories by hand."; \
-	    mkdir -p "$(DESTDIR)$(localconfdir)/default.d"; \
-	    mkdir -p "$(DESTDIR)$(localconfdir)/local.d"; \
-	fi
-
-uninstall-local:
-	rm -f "$(DESTDIR)/$(localconfdir)/local.ini"
diff --git a/etc/default/Makefile.am b/etc/default/Makefile.am
deleted file mode 100644
index 5b4faae0..00000000
--- a/etc/default/Makefile.am
+++ /dev/null
@@ -1,13 +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.
-
-## This file intentionally left blank.
diff --git a/etc/init/Makefile.am b/etc/init/Makefile.am
deleted file mode 100644
index 5b4faae0..00000000
--- a/etc/init/Makefile.am
+++ /dev/null
@@ -1,13 +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.
-
-## This file intentionally left blank.
diff --git a/etc/launchd/Makefile.am b/etc/launchd/Makefile.am
deleted file mode 100644
index 5b4faae0..00000000
--- a/etc/launchd/Makefile.am
+++ /dev/null
@@ -1,13 +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.
-
-## This file intentionally left blank.
diff --git a/etc/logrotate.d/Makefile.am b/etc/logrotate.d/Makefile.am
deleted file mode 100644
index 5b4faae0..00000000
--- a/etc/logrotate.d/Makefile.am
+++ /dev/null
@@ -1,13 +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.
-
-## This file intentionally left blank.
diff --git a/etc/windows/Makefile.am b/etc/windows/Makefile.am
deleted file mode 100644
index 5b4faae0..00000000
--- a/etc/windows/Makefile.am
+++ /dev/null
@@ -1,13 +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.
-
-## This file intentionally left blank.
diff --git a/m4/ac_check_curl.m4.gz b/m4/ac_check_curl.m4.gz
deleted file mode 100644
index 020e646f..00000000
--- a/m4/ac_check_curl.m4.gz
+++ /dev/null
diff --git a/m4/ac_check_icu.m4.gz b/m4/ac_check_icu.m4.gz
deleted file mode 100644
index 8af50ff9..00000000
--- a/m4/ac_check_icu.m4.gz
+++ /dev/null
diff --git a/rebar b/rebar
new file mode 100755
index 00000000..1b106d4d
--- /dev/null
+++ b/rebar
diff --git a/rebar.config b/rebar.config
new file mode 100644
index 00000000..f72523b2
--- /dev/null
+++ b/rebar.config
@@ -0,0 +1,9 @@
+{sub_dirs, [
+    "apps/couch",
+    "apps/etap",
+    "apps/ibrowse",
+    "apps/mochiweb",
+    "apps/oauth",
+    "rel"
+]}.
+{erl_opts, [debug_info]}.
+\ No newline at end of file
diff --git a/rel/reltool.config b/rel/reltool.config
new file mode 100644
index 00000000..0ee91698
--- /dev/null
+++ b/rel/reltool.config
@@ -0,0 +1,31 @@
+{sys, [
+    {lib_dirs, ["../apps"]},
+    {rel, "dbcore", "1.2.4", [
+        kernel,
+        stdlib,
+        sasl,
+        crypto,
+        ssl,
+        inets,
+        xmerl,
+        runtime_tools,
+        mochiweb,
+        ibrowse,
+        oauth,
+        couch
+    ]},
+    {rel, "start_clean", "", [kernel, stdlib]},
+    {boot_rel, "dbcore"},
+    {profile, embedded},
+    {excl_sys_filters, ["^bin/.*", "^erts.*/bin/(dialyzer|typer)"]},
+    {excl_archive_filters, [".*"]},
+    {app, sasl, [{incl_cond, include}]},
+    {app, mochiweb, [{incl_cond, include}]},
+    {app, ibrowse, [{incl_cond, include}]},
+    {app, oauth, [{incl_cond, include}]},
+    {app, couch, [{incl_cond, include}]}
+]}.
+
+{overlay, [
+    {copy, "overlay/var"}
+]}.
diff --git a/share/Makefile.am b/share/Makefile.am
deleted file mode 100644
index 752fa9f9..00000000
--- a/share/Makefile.am
+++ /dev/null
@@ -1,194 +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.
-
-JS_FILE = server/main.js
-
-JS_FILE_COMPONENTS = \
-    server/json2.js \
-    server/filter.js \
-    server/mimeparse.js \
-    server/render.js \
-    server/state.js \
-    server/util.js \
-    server/validate.js \
-    server/views.js
-
-JS_FILE_COMPONENTS_LAST = server/loop.js
-
-$(JS_FILE): $(JS_FILE_COMPONENTS) $(JS_FILE_COMPONENTS_LAST)
-	mkdir -p `dirname $(JS_FILE)`
-	echo "// DO NOT EDIT THIS FILE BY HAND" > $@
-	echo >> $@
-	cat $^ >> $@
-
-CLEANFILES = $(JS_FILE)
-
-EXTRA_DIST = $(JS_FILE_COMPONENTS) $(JS_FILE_COMPONENTS_LAST)
-
-nobase_localdata_SCRIPTS = \
-    $(JS_FILE)
-
-nobase_dist_localdata_DATA = \
-    www/config.html \
-    www/couch_tests.html \
-    www/custom_test.html \
-    www/database.html \
-    www/session.html \
-    www/dialog/_admin_party.html \
-    www/dialog/_compact_cleanup.html \
-    www/dialog/_create_admin.html \
-    www/dialog/_login.html \
-    www/dialog/_signup.html \
-    www/dialog/_create_database.html \
-    www/dialog/_create_config.html \
-    www/dialog/_delete_database.html \
-    www/dialog/_delete_document.html \
-    www/dialog/_database_security.html \
-    www/dialog/_share_test_reports.html \
-    www/dialog/_save_view_as.html \
-    www/dialog/_upload_attachment.html \
-    www/document.html \
-    www/favicon.ico \
-    www/image/add.png \
-    www/image/apply.gif \
-    www/image/bg.png \
-    www/image/cancel.gif \
-    www/image/compact.png \
-    www/image/delete-mini.png \
-    www/image/delete.png \
-    www/image/grippie.gif \
-    www/image/hgrad.gif \
-    www/image/key.png \
-    www/image/load.png \
-    www/image/logo.png \
-    www/image/order-asc.gif \
-    www/image/order-desc.gif \
-    www/image/path.gif \
-    www/image/progress.gif \
-    www/image/rarrow.png \
-    www/image/run-mini.png \
-    www/image/run.png \
-    www/image/running.png \
-    www/image/save.png \
-    www/image/sidebar-toggle.png \
-    www/image/spinner.gif \
-    www/image/test_failure.gif \
-    www/image/test_success.gif \
-    www/image/thead-key.gif \
-    www/image/thead.gif \
-    www/image/toggle-collapse.gif \
-    www/image/toggle-expand.gif \
-    www/image/twisty.gif \
-    www/index.html \
-    www/replicator.html \
-    www/script/couch.js \
-    www/script/couch_tests.js \
-    www/script/couch_test_runner.js \
-    www/script/futon.browse.js \
-    www/script/futon.format.js \
-    www/script/futon.js \
-    www/script/jquery.couch.js \
-    www/script/jquery.dialog.js \
-    www/script/jquery.editinline.js \
-    www/script/jquery.form.js \
-    www/script/jquery.js \
-    www/script/jquery.resizer.js \
-    www/script/jquery.suggest.js \
-    www/script/json2.js \
-    www/script/jspec/jspec.css \
-    www/script/jspec/jspec.jquery.js \
-    www/script/jspec/jspec.js \
-    www/script/jspec/jspec.xhr.js \
-    www/script/oauth.js \
-    www/script/sha1.js \
-    www/script/base64.js \
-    www/script/test/all_docs.js \
-    www/script/test/attachments.js \
-    www/script/test/attachments_multipart.js \
-    www/script/test/attachment_names.js \
-    www/script/test/attachment_paths.js \
-    www/script/test/attachment_views.js \
-    www/script/test/auth_cache.js \
-    www/script/test/basics.js \
-    www/script/test/batch_save.js \
-    www/script/test/bulk_docs.js \
-    www/script/test/changes.js \
-    www/script/test/compact.js \
-    www/script/test/config.js \
-    www/script/test/conflicts.js \
-    www/script/test/content_negotiation.js \
-    www/script/test/cookie_auth.js \
-    www/script/test/copy_doc.js \
-    www/script/test/delayed_commits.js \
-    www/script/test/design_docs.js \
-    www/script/test/design_options.js \
-    www/script/test/design_paths.js \
-    www/script/test/erlang_views.js \
-    www/script/test/etags_head.js \
-    www/script/test/etags_views.js \
-    www/script/test/form_submit.js \
-    www/script/test/http.js \
-    www/script/test/invalid_docids.js \
-    www/script/test/jsonp.js \
-    www/script/test/large_docs.js \
-    www/script/test/list_views.js \
-    www/script/test/lorem.txt \
-    www/script/test/lorem_b64.txt \
-    www/script/test/lots_of_docs.js \
-    www/script/test/method_override.js \
-    www/script/test/multiple_rows.js \
-    www/script/test/oauth.js \
-    www/script/test/proxyauth.js \
-    www/script/test/purge.js \
-    www/script/test/reader_acl.js \
-    www/script/test/recreate_doc.js \
-    www/script/test/reduce.js \
-    www/script/test/reduce_builtin.js \
-    www/script/test/reduce_false.js \
-    www/script/test/reduce_false_temp.js \
-    www/script/test/replication.js \
-    www/script/test/rev_stemming.js \
-    www/script/test/rewrite.js \
-    www/script/test/security_validation.js \
-    www/script/test/show_documents.js \
-    www/script/test/stats.js \
-    www/script/test/update_documents.js \
-    www/script/test/users_db.js \
-    www/script/test/utf8.js \
-    www/script/test/uuids.js \
-    www/script/test/view_collation.js \
-    www/script/test/view_collation_raw.js \
-    www/script/test/view_conflicts.js \
-    www/script/test/view_compaction.js \
-    www/script/test/view_errors.js \
-    www/script/test/view_include_docs.js \
-    www/script/test/view_multi_key_all_docs.js \
-    www/script/test/view_multi_key_design.js \
-    www/script/test/view_multi_key_temp.js \
-    www/script/test/view_offsets.js \
-    www/script/test/view_update_seq.js \
-    www/script/test/view_pagination.js \
-    www/script/test/view_sandboxing.js \
-    www/script/test/view_xml.js \
-    www/spec/couch_js_class_methods_spec.js \
-    www/spec/couch_js_instance_methods_1_spec.js \
-    www/spec/couch_js_instance_methods_2_spec.js \
-    www/spec/couch_js_instance_methods_3_spec.js \
-    www/spec/custom_helpers.js \
-    www/spec/jquery_couch_js_class_methods_spec.js \
-    www/spec/jquery_couch_js_instance_methods_1_spec.js \
-    www/spec/jquery_couch_js_instance_methods_2_spec.js \
-    www/spec/jquery_couch_js_instance_methods_3_spec.js \
-    www/spec/run.html \
-    www/status.html \
-    www/style/layout.css \
-    www/_sidebar.html
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index b9529f94..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,13 +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.
-
-SUBDIRS = couchdb erlang-oauth etap ibrowse mochiweb
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
deleted file mode 100644
index b36d828d..00000000
--- a/src/couchdb/priv/Makefile.am
+++ /dev/null
@@ -1,93 +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.
-
-couchlibdir = $(localerlanglibdir)/couch-$(version)
-couchprivdir = $(couchlibdir)/priv
-couchprivlibdir = $(couchlibdir)/priv/lib
-
-EXTRA_DIST = \
-	spawnkillable/couchspawnkillable.sh \
-	stat_descriptions.cfg.in
-
-CLEANFILES = stat_descriptions.cfg
-
-ICU_LOCAL_FLAGS = $(ICU_LOCAL_CFLAGS) $(ICU_LOCAL_LDFLAGS)
-if WINDOWS
-ICU_LOCAL_LIBS=-licuuc -licudt -licuin
-else
-ICU_LOCAL_LIBS=-licuuc -licudata -licui18n
-endif
-
-couchprivlib_LTLIBRARIES = couch_icu_driver.la
-couch_icu_driver_la_SOURCES = icu_driver/couch_icu_driver.c
-couch_icu_driver_la_LDFLAGS = -module -avoid-version $(ICU_LOCAL_FLAGS)
-couch_icu_driver_la_CFLAGS = $(ICU_LOCAL_FLAGS)
-couch_icu_driver_la_LIBADD = $(ICU_LOCAL_LIBS)
-
-if WINDOWS
-couch_icu_driver_la_LDFLAGS += -no-undefined
-endif
-
-COUCHJS_SRCS = \
-	couch_js/http.c \
-	couch_js/http.h \
-	couch_js/main.c \
-	couch_js/utf8.c \
-	couch_js/utf8.h
-
-locallibbin_PROGRAMS = couchjs
-couchjs_SOURCES = $(COUCHJS_SRCS)
-couchjs_LDFLAGS = $(CURL_LDFLAGS)
-couchjs_CFLAGS = -D_BSD_SOURCE $(CURL_CFLAGS)
-couchjs_LDADD = $(CURL_LDFLAGS) @JSLIB@
-
-couchpriv_DATA = stat_descriptions.cfg
-couchpriv_PROGRAMS = couchspawnkillable
-
-%.cfg: %.cfg.in
-	cp $< $@
-
-if WINDOWS
-couchspawnkillable_SOURCES = spawnkillable/couchspawnkillable_win.c
-endif
-
-if !WINDOWS
-couchspawnkillable: spawnkillable/couchspawnkillable.sh
-	cp $< $@
-	chmod +x $@
-endif
-
-# libtool and automake have defeated markh.  For each of our executables
-# we end up with 2 copies - one directly in the 'target' folder (eg, 'priv')
-# and another - the correct one - in .libs.  The former doesn't work but is 
-# what gets installed for 'couchspawnkillable' - but the correct one for
-# couchjs.exe *does* get copied.  *shrug*  So just clobber it with the 
-# correct one as the last step. See bug COUCHDB-439
-install-data-hook:
-	if test -f "$(DESTDIR)$(couchprivlibdir)/couch_icu_driver"; then \
-	    rm -f "$(DESTDIR)$(couchprivlibdir)/couch_icu_driver.so"; \
-	    cd "$(DESTDIR)$(couchprivlibdir)" && \
-	        $(LN_S) couch_icu_driver couch_icu_driver.so; \
-	fi
-if WINDOWS
-	$(INSTALL) $(ICU_LOCAL_BIN)/icuuc42.dll $(bindir)
-	$(INSTALL) $(ICU_LOCAL_BIN)/icudt42.dll $(bindir)
-	$(INSTALL) $(ICU_LOCAL_BIN)/icuin42.dll $(bindir)
-	$(INSTALL) $(JS_LIB_BINARY) $(bindir)
-	$(INSTALL) .libs/couchspawnkillable.exe \
-		"$(DESTDIR)$(couchprivdir)/couchspawnkillable.exe"
-endif
-
-uninstall-local:
-	if test -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver"; then \
-	    rm -f "$(DESTDIR)$(couchprivlibdir)/couch_erl_driver.so"; \
-	fi
diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am
deleted file mode 100644
index 48b76482..00000000
--- a/src/erlang-oauth/Makefile.am
+++ /dev/null
@@ -1,50 +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.
-
-oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
-
-oauth_file_collection = \
-	oauth.app.in \
-    oauth.erl \
-    oauth_hmac_sha1.erl \
-    oauth_http.erl \
-    oauth_plaintext.erl \
-    oauth_rsa_sha1.erl \
-    oauth_unix.erl \
-    oauth_uri.erl
-
-# Removed oauth_rsa_sha1.beam until we require R12B5 or
-# we add a ./configure option to enable it.
-
-oauthebin_make_generated_file_list = \
-	oauth.app \
-    oauth.beam \
-    oauth_hmac_sha1.beam \
-    oauth_http.beam \
-    oauth_plaintext.beam \
-    oauth_unix.beam \
-    oauth_uri.beam
-
-oauthebin_DATA = \
-	$(oauthebin_make_generated_file_list)
-
-EXTRA_DIST = \
-	$(oauth_file_collection)
-
-CLEANFILES = \
-    $(oauthebin_make_generated_file_list)
-
-%.app: %.app.in
-	cp $< $@
-
-%.beam: %.erl
-	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/etap/Makefile.am b/src/etap/Makefile.am
deleted file mode 100644
index 732347bf..00000000
--- a/src/etap/Makefile.am
+++ /dev/null
@@ -1,44 +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.
-
-etapebindir = $(localerlanglibdir)/etap/ebin
-
-etap_file_collection = \
-    etap.erl \
-   	etap_application.erl \
-    etap_can.erl \
-    etap_exception.erl \
-    etap_process.erl \
-	etap_report.erl \
-	etap_request.erl \
-	etap_string.erl \
-   	etap_web.erl
-
-etapebin_make_generated_file_list = \
-    etap.beam \
-   	etap_application.beam \
-    etap_can.beam \
-    etap_exception.beam \
-    etap_process.beam \
-	etap_report.beam \
-	etap_request.beam \
-	etap_string.beam \
-   	etap_web.beam
-
-etapebin_DATA = $(etapebin_make_generated_file_list)
-
-EXTRA_DIST =  $(etap_file_collection)
-
-CLEANFILES = $(etapebin_make_generated_file_list)
-
-%.beam: %.erl
-	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/ibrowse/Makefile.am b/src/ibrowse/Makefile.am
deleted file mode 100644
index 510f36a9..00000000
--- a/src/ibrowse/Makefile.am
+++ /dev/null
@@ -1,49 +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.
-
-ibrowseebindir = $(localerlanglibdir)/ibrowse-1.5.2/ebin
-
-ibrowse_file_collection = \
-	ibrowse.app.in \
-    ibrowse.erl \
-    ibrowse_app.erl \
-    ibrowse_http_client.erl \
-    ibrowse_lb.erl \
-    ibrowse_lib.erl \
-    ibrowse_sup.erl \
-    ibrowse_test.erl
-
-ibrowseebin_make_generated_file_list = \
-	ibrowse.app \
-    ibrowse.beam \
-    ibrowse_app.beam \
-    ibrowse_http_client.beam \
-    ibrowse_lb.beam \
-    ibrowse_lib.beam \
-    ibrowse_sup.beam \
-    ibrowse_test.beam
-
-ibrowseebin_DATA = \
-    $(ibrowseebin_make_generated_file_list)
-
-EXTRA_DIST =  \
-    $(ibrowse_file_collection) \
-    ibrowse.hrl
-
-CLEANFILES = \
-    $(ibrowseebin_make_generated_file_list)
-
-%.app: %.app.in
-	cp $< $@
-
-%.beam: %.erl
-	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am
deleted file mode 100644
index c191abfa..00000000
--- a/src/mochiweb/Makefile.am
+++ /dev/null
@@ -1,80 +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.
-
-mochiwebebindir = $(localerlanglibdir)/mochiweb-r113/ebin
-
-mochiweb_file_collection = \
-    mochifmt.erl \
-    mochifmt_records.erl \
-    mochifmt_std.erl \
-    mochihex.erl \
-    mochijson.erl \
-    mochijson2.erl \
-    mochinum.erl \
-	mochiweb.app.in \
-    mochiweb.erl \
-    mochiweb_app.erl \
-    mochiweb_charref.erl \
-    mochiweb_cookies.erl \
-    mochiweb_echo.erl \
-    mochiweb_headers.erl \
-    mochiweb_html.erl \
-    mochiweb_http.erl \
-    mochiweb_multipart.erl \
-    mochiweb_request.erl \
-    mochiweb_response.erl \
-    mochiweb_skel.erl \
-    mochiweb_socket_server.erl \
-    mochiweb_sup.erl \
-    mochiweb_util.erl \
-    reloader.erl
-
-mochiwebebin_make_generated_file_list = \
-    mochifmt.beam \
-    mochifmt_records.beam \
-    mochifmt_std.beam \
-    mochihex.beam \
-    mochijson.beam \
-    mochijson2.beam \
-    mochinum.beam \
-	mochiweb.app \
-    mochiweb.beam \
-    mochiweb_app.beam \
-    mochiweb_charref.beam \
-    mochiweb_cookies.beam \
-    mochiweb_echo.beam \
-    mochiweb_headers.beam \
-    mochiweb_html.beam \
-    mochiweb_http.beam \
-    mochiweb_multipart.beam \
-    mochiweb_request.beam \
-    mochiweb_response.beam \
-    mochiweb_skel.beam \
-    mochiweb_socket_server.beam \
-    mochiweb_sup.beam \
-    mochiweb_util.beam \
-    reloader.beam
-
-mochiwebebin_DATA = \
-    $(mochiwebebin_make_generated_file_list)
-
-EXTRA_DIST =  \
-    $(mochiweb_file_collection)
-
-CLEANFILES = \
-    $(mochiwebebin_make_generated_file_list)
-
-%.app: %.app.in
-	cp $< $@
-
-%.beam: %.erl
-	$(ERLC) $(ERLC_FLAGS) $<
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 45130a64..00000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,14 +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.
-
-SUBDIRS = bench etap javascript view_server
-
diff --git a/test/bench/Makefile.am b/test/bench/Makefile.am
deleted file mode 100644
index ce39c4b0..00000000
--- a/test/bench/Makefile.am
+++ /dev/null
@@ -1,22 +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 = benchbulk.sh bench_marks.js run.tpl
-
-noinst_SCRIPTS = run
-CLEANFILES = run
-
-run: run.tpl
-	sed -e "s|%abs_top_srcdir%|$(abs_top_srcdir)|" \
-		-e "s|%abs_top_builddir%|$(abs_top_builddir)|" \
-	< $< > $@
-	chmod +x $@
diff --git a/test/etap/Makefile.am b/test/etap/Makefile.am
deleted file mode 100644
index bdab95aa..00000000
--- a/test/etap/Makefile.am
+++ /dev/null
@@ -1,69 +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.
-
-noinst_SCRIPTS = run
-noinst_DATA = test_util.beam
-
-%.beam: %.erl
-	$(ERLC) $<
-
-run: run.tpl
-	sed -e "s|%abs_top_srcdir%|@abs_top_srcdir@|g" \
-	    -e "s|%abs_top_builddir%|@abs_top_builddir@|g" > \
-	$@ < $<
-	chmod +x $@
-
-CLEANFILES = run *.beam
-DISTCLEANFILES = temp.*
-
-EXTRA_DIST = \
-	run.tpl \
-    001-load.t \
-    002-icu-driver.t \
-    010-file-basics.t \
-    011-file-headers.t \
-    020-btree-basics.t \
-    021-btree-reductions.t \
-    030-doc-from-json.t \
-    031-doc-to-json.t \
-    040-util.t \
-    041-uuid-gen-seq.ini \
-    041-uuid-gen-utc.ini \
-    041-uuid-gen.t \
-    050-stream.t \
-    060-kt-merging.t \
-    061-kt-missing-leaves.t \
-    062-kt-remove-leaves.t \
-    063-kt-get-leaves.t \
-    064-kt-counting.t \
-    065-kt-stemming.t \
-    070-couch-db.t \
-    080-config-get-set.t \
-    081-config-override.1.ini \
-    081-config-override.2.ini \
-    081-config-override.t \
-    082-config-register.t \
-    083-config-no-files.t \
-    090-task-status.t \
-    100-ref-counter.t \
-    110-replication-httpc.t \
-    111-replication-changes-feed.t \
-    112-replication-missing-revs.t \
-    113-replication-attachment-comp.t \
-    120-stats-collect.t \
-    121-stats-aggregates.cfg \
-    121-stats-aggregates.ini \
-    121-stats-aggregates.t \
-    130-attachments-md5.t \
-    140-attachment-comp.t \
-    150-invalid-view-seq.t \
-    160-vhosts.t
diff --git a/test/javascript/Makefile.am b/test/javascript/Makefile.am
deleted file mode 100644
index 71f9ae62..00000000
--- a/test/javascript/Makefile.am
+++ /dev/null
@@ -1,25 +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 = \
-	cli_runner.js \
-	couch_http.js \
-	run.tpl
-
-noinst_SCRIPTS = run
-CLEANFILES = run
-
-run: run.tpl
-	sed -e "s|%abs_top_srcdir%|$(abs_top_srcdir)|" \
-		-e "s|%abs_top_builddir%|$(abs_top_builddir)|" \
-	< $< > $@
-	chmod +x $@
diff --git a/test/view_server/Makefile.am b/test/view_server/Makefile.am
deleted file mode 100644
index 11e7feb4..00000000
--- a/test/view_server/Makefile.am
+++ /dev/null
@@ -1,15 +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 = \
-	query_server_spec.rb \
-	run_native_process.es
diff --git a/utils/Makefile.am b/utils/Makefile.am
deleted file mode 100644
index 379c1eb0..00000000
--- a/utils/Makefile.am
+++ /dev/null
@@ -1,42 +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.
-
-noinst_SCRIPTS = run
-
-CLEANFILES = $(noinst_SCRIPTS)
-
-transform = @program_transform_name@
-couchdb_command_name = `echo couchdb | sed '$(transform)'`
-
-run: ../bin/couchdb.tpl
-	sed -e "s|%ERL%|$(ERL)|g" \
-	    -e "s|%ICU_CONFIG%|$(ICU_CONFIG)|g" \
-	    -e "s|%bindir%|$(abs_top_builddir)/bin|g" \
-	    -e "s|%defaultini%|default_dev.ini|g" \
-	    -e "s|%localini%|local_dev.ini|g" \
-	    -e "s|%localerlanglibdir%|foo \
-			-pa $(abs_top_builddir)\/src\/couchdb \
-			-pa $(abs_top_builddir)\/src\/erlang-oauth \
-			-pa $(abs_top_builddir)\/src\/ibrowse \
-			-pa $(abs_top_builddir)\/src\/mochiweb|g" \
-	    -e "s|%localconfdir%|$(abs_top_builddir)/etc/couchdb|g" \
-	    -e "s|%localstatelogdir%|$(abs_top_builddir)/tmp/log|g" \
-	    -e "s|%localstatelibdir%|$(abs_top_builddir)/tmp/lib|g" \
-	    -e "s|%localstatedir%|$(abs_top_builddir)/tmp|g" \
-	    -e "s|%bug_uri%|@bug_uri@|g" \
-	    -e "s|%package_author_address%|@package_author_address@|g" \
-	    -e "s|%package_author_name%|@package_author_name@|g" \
-	    -e "s|%package_name%|@package_name@|g" \
-	    -e "s|%version%|@version@|g" \
-	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|g" > \
-	$@ < $<
-	chmod +x $@
diff --git a/var/Makefile.am b/var/Makefile.am
deleted file mode 100644
index 901ab2b7..00000000
--- a/var/Makefile.am
+++ /dev/null
@@ -1,23 +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.
-
-install-data-hook:
-	if test ! "$(mkdir_p)" = ""; then \
-	    $(mkdir_p) "$(DESTDIR)$(localstatelibdir)"; \
-	    $(mkdir_p) "$(DESTDIR)$(localstatelogdir)"; \
-	    $(mkdir_p) "$(DESTDIR)$(localstaterundir)"; \
-	else \
-	    echo "WARNING: You may have to create these directories by hand."; \
-	    mkdir -p "$(DESTDIR)$(localstatelibdir)"; \
-	    mkdir -p "$(DESTDIR)$(localstatelogdir)"; \
-	    mkdir -p "$(DESTDIR)$(localstaterundir)"; \
-	fi
author	Adam Kocoloski <adam@cloudant.com>	2010-08-11 16:56:51 -0400
committer	Adam Kocoloski <adam@cloudant.com>	2010-08-11 17:39:38 -0400
commit	35da277fe75b2786952dbfb867cf60bdaab5f65d (patch)
tree	928e44620e2a3248550509c4571d791a393f5f36
parent	ad7099a4e3f3d2035e3e26419a633b4bb1ce7b7c (diff)