diff --git a/autogen.sh b/autogen.sh
deleted file mode 100755
index d8f826650..000000000
--- a/autogen.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash
-#
-# Authors: Brian W. Barrett <bwbarre@sandia.gov>,
-#          Kyle B. Wheeler <kbwheel@sandia.gov>
-#
-
-echo "Generating configure files..."
-
-if [ "$ACLOCAL" ] ; then
-	# do nothing
-	echo I saw ACLOCAL defined to be $ACLOCAL
-elif type aclocal &>/dev/null ; then
-	export ACLOCAL=`type -P aclocal`
-else
-	echo "ERROR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	echo "I need aclocal in order to generate the configure script and makefiles. I couldn't find it in your PATH, though. Perhaps you need to set the ACLOCAL environment variable to point toward a custom installation?"
-	exit -1
-fi
-
-if [ "$LIBTOOLIZE" ] ; then
-	# accept anything that's been pre-configured
-	echo LIBTOOLIZE=$LIBTOOLIZE
-elif type glibtoolize &>/dev/null ; then
-	# prefer glibtoolize over libtoolize
-	export LIBTOOLIZE=`type -p glibtoolize`
-	echo LIBTOOLIZE=$LIBTOOLIZE
-elif type libtoolize &>/dev/null ; then
-	export LIBTOOLIZE=`type -p libtoolize`
-	echo LIBTOOLIZE=$LIBTOOLIZE
-else
-	echo "ERROR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	echo "I need libtoolize in order to generate the configure script and makefiles. I couldn't find either libtoolize or glibtoolize in your PATH. Perhaps you need to set the LIBTOOLIZE environment variable to point toward a custom installation?"
-	exit -1
-fi
-
-libtool_version=( $($LIBTOOLIZE --version) )
-libtool_version=( ${libtool_version[3]//./ } )
-libtool_version=( ${libtool_version[*]/[a-z]/} )
-if [ ${libtool_version[0]} -lt 2 ] ; then
-	if [ ${libtool_version[0]} -eq 1 ] ; then
-		if [ ${libtool_version[1]} -lt 5 ] ; then
-			echo "Your version of libtoolize ($LIBTOOLIZE) is too old!"
-			echo "We have tested with libtool 1.5.22."
-			echo -n "You have: "
-			$LIBTOOLIZE --version | head -n 1
-			exit -1
-		elif [ ${libtool_version[1]} -lt 9 ] ; then
-			echo "You have an awfully old version of libtool. (${libtool_version[0]}.${libtool_version[1]}.${libtool_version[2]})"
-			echo "We prefer to use LT_INIT, which came out with libtool 1.9b,"
-			echo "way back in 2004. Maybe you should consider upgrading."
-		fi
-	else
-		echo "Your version of libtoolize ($LIBTOOLIZE) is too old!"
-		echo "We have tested with libtool 1.5.22."
-		echo -n "You have: "
-		$LIBTOOLIZE --version | head -n 1
-		exit -1
-	fi
-fi
-
-if [ "${LIBTOOLIZE}" = "${LIBTOOLIZE#/}" ] ; then
-    libtool_fullpath=$(type -p "${LIBTOOLIZE}" )
-else
-    libtool_fullpath="$LIBTOOLIZE"
-fi
-if [ "${ACLOCAL}" = "${ACLOCAL#/}" ] ; then
-    aclocal_fullpath=$(type -p "${ACLOCAL}" )
-else
-    aclocal_fullpath="$ACLOCAL"
-fi
-if [ "${libtool_fullpath%bin/*}" != "${aclocal_fullpath%bin/*}" ] ; then
-    echo "Libtoolize and aclocal are not in the same directory, so I'm guessing ACLOCAL needs to be modified to include libtoolize's directory in its search path."
-    if [ -d "${libtool_fullpath%/bin/*}/share/aclocal" ] ; then
-        ACLOCAL_INCLUDE="${libtool_fullpath%/bin/*}/share/aclocal"
-        echo 'That aclocal directory looks like "'$ACLOCAL_INCLUDE'"'
-    else
-        echo "I would do it for you, but I can't find a likely candidate".
-    fi
-else
-    echo "Since LIBTOOLIZE and ACLOCAL are in the same directory, I'm going to assume they know about each other."
-fi
-
-if [ "$AUTOMAKE" ] ; then
-	# accept anything that's been pre-configured
-	echo Using AUTOMAKE=$AUTOMAKE
-elif type automake &>/dev/null ; then
-	export AUTOMAKE=`type -p automake`
-else
-	echo "ERROR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	echo "I need automake in order to generate the configure script and makefiles. I couldn't find it in your PATH, though. Perhaps you need to set the AUTOMAKE environment variable to point toward a custom installation?"
-	exit -1
-fi
-
-if [ "$AUTOCONF" ] ; then
-	# accept anything that's been pre-configured
-	echo Using AUTOCONF=$AUTOCONF
-elif type autoconf &>/dev/null ; then
-	export AUTOCONF=`type -p autoconf`
-else
-	echo "ERROR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	echo "I need autoconf in order to generate the configure script and makefiles. I couldn't find it in your PATH, though. Perhaps you need to set the AUTOCONF environment variable to point toward a custom installation?"
-	exit -1
-fi
-
-if [ "$AUTORECONF" ] ; then
-	# accept anything that's been pre-configured
-	echo Using AUTORECONF=$AUTORECONF
-elif type autoreconf &>/dev/null ; then
-	export AUTORECONF=`type -p autoreconf`
-else
-	echo "ERROR!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
-	echo "I need autoreconf in order to generate the configure script and makefiles. I couldn't find it in your PATH, though. Perhaps you need to set the AUTORECONF environment variable to point toward a custom installation?"
-	exit -1
-fi
-
-if [ "$ACLOCAL_INCLUDE" ] ; then
-	echo 'ACLOCAL="'$ACLOCAL -I$ACLOCAL_INCLUDE'"'
-	export ACLOCAL="$ACLOCAL -I$ACLOCAL_INCLUDE"
-fi
-
-# If this directory isn't removed, the configure script may not have the right
-# dynamically-generated version number
-if [ -d autom4te.cache ] ; then
-	rm -rf autom4te.cache
-fi
-
-version=$(awk '{if(NR==1)print$2;else exit}' ./NEWS)
-if [[ ${version%b} != ${version} ]] && type git &>/dev/null && [[ $SKIPVGEN != 1 ]] ; then
-	echo "Counting entries in git's log to come up with a revision number..."
-	#git log -1 --pretty=format:%h | tee .autogen_git_output
-    git log --pretty=oneline | wc -l | tee .autogen_git_output
-	#svn stat -u README | tee .autogen_svn_output
-	rev=$version-$(awk '{print $1}' .autogen_git_output)
-	if [ "$rev" ] ; then
-		echo -n $rev > .autogen-version
-	else
-		echo $version | tr -d '\012' > .autogen-version
-	fi
-else
-	echo $version | tr -d '\012' > .autogen-version
-fi
-
-$AUTORECONF --install --symlink --warnings=gnu,obsolete,override,portability,no-obsolete "$@" && \
-  echo "Preparing was successful if there were no error messages above." && \
-  exit 0
-
-echo "It appears that configure file generation failed.  Sorry :(."
-exit -1
diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644
index 746f459ba..000000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,14 +0,0 @@
-compile
-depcomp
-missing
-config.guess
-config.sub
-ltmain.sh
-install-sh
-mkinstalldirs
-libtool.m4
-lt~obsolete.m4
-ltsugar.m4
-ltversion.m4
-ltoptions.m4
-test-driver
diff --git a/config/ax_openmp.m4 b/config/ax_openmp.m4
deleted file mode 100644
index 2915a2ef6..000000000
--- a/config/ax_openmp.m4
+++ /dev/null
@@ -1,98 +0,0 @@
-# ===========================================================================
-#         http://www.gnu.org/software/autoconf-archive/ax_openmp.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_OPENMP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro tries to find out how to compile programs that use OpenMP a
-#   standard API and set of compiler directives for parallel programming
-#   (see http://www-unix.mcs/)
-#
-#   On success, it sets the OPENMP_CFLAGS/OPENMP_CXXFLAGS/OPENMP_F77FLAGS
-#   output variable to the flag (e.g. -omp) used both to compile *and* link
-#   OpenMP programs in the current language.
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well.
-#
-#   If you want to compile everything with OpenMP, you should set:
-#
-#     CFLAGS="$CFLAGS $OPENMP_CFLAGS"
-#     #OR#  CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-#     #OR#  FFLAGS="$FFLAGS $OPENMP_FFLAGS"
-#
-#   (depending on the selected language).
-#
-#   The user can override the default choice by setting the corresponding
-#   environment variable (e.g. OPENMP_CFLAGS).
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if an OpenMP flag is
-#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
-#   not found. If ACTION-IF-FOUND is not specified, the default action will
-#   define HAVE_OPENMP.
-#
-# LICENSE
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Archive. When you make and distribute a
-#   modified version of the Autoconf Macro, you may extend this special
-#   exception to the GPL to apply to your modified version as well.
-
-#serial 8
-
-AC_DEFUN([AX_OPENMP], [
-AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
-
-AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown
-# Flags to try:  -fopenmp (gcc), -openmp (icc), none
-ax_openmp_flags="-fopenmp -openmp none"
-if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then
-  ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags"
-fi
-for ax_openmp_flag in $ax_openmp_flags; do
-  case $ax_openmp_flag in
-    none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;;
-    *) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;;
-  esac
-  AC_TRY_LINK_FUNC(omp_set_num_threads,
-	[ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break])
-done
-[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
-])
-if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then
-  m4_default([$2],:)
-else
-  if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
-    OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
-  fi
-  m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
-fi
-])dnl AX_OPENMP
diff --git a/config/qthread_check_hwloc.m4 b/config/qthread_check_hwloc.m4
deleted file mode 100644
index 20e70b2b2..000000000
--- a/config/qthread_check_hwloc.m4
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- Autoconf -*-
-#
-# Copyright (c)      2009  Sandia Corporation
-#
-
-# QTHREAD_CHECK_HWLOC([action-if-found], [action-if-not-found])
-# ------------------------------------------------------------------------------
-AC_DEFUN([QTHREAD_CHECK_HWLOC], [
-  qt_allgoodsofar=yes
-  AC_ARG_WITH([hwloc],
-              [AS_HELP_STRING([--with-hwloc=[[PATH]]],
-			                  [specify the path to the hwloc library; used for both the library and the include files])])
-  AC_ARG_WITH([hwloc-symbol-prefix],
-              [AS_HELP_STRING([--with-hwloc-symbol-prefix=[[prefix]]],
-                        [specify prefix for hwloc symbols @<:@default=hwloc_@:>@.])], [],
-                        [with_hwloc_symbol_prefix="hwloc_"])
-  AC_ARG_ENABLE([hwloc-configure-checks],
-              [AS_HELP_STRING([--disable-hwloc-configure-checks],
-                        [Disable hwloc link checks during configuration])])
-  AC_ARG_ENABLE([hwloc-has-distance],
-              [AS_HELP_STRING([--disable-hwloc-has-distance],
-                          [Disable hwloc distance support])])
-
-  hwloc_saved_CPPFLAGS="$CPPFLAGS"
-  hwloc_saved_LDFLAGS="$LDFLAGS"
-  AS_IF([test "x$with_hwloc" != x],
-        [CPPFLAGS="-I$with_hwloc/include $CPPFLAGS"
-		 LDFLAGS="-L$with_hwloc/lib $LDFLAGS"])
-  AC_CHECK_HEADERS([hwloc.h],[],
-  				   [qt_allgoodsofar=no])
-
-  # enable or disable distance support if specified
-  AS_IF([test "x$qt_allgoodsofar" = xyes && test "x$enable_hwloc_has_distance" = xyes],
-        [AC_MSG_NOTICE([enabling hwloc distance support])
-        AC_DEFINE([QTHREAD_HAVE_HWLOC_DISTS],[1],[hwloc has distances])])
-  AS_IF([test "x$qt_allgoodsofar" = xyes && test "x$enable_hwloc_has_distance" = xno],
-        [AC_MSG_NOTICE([disabling hwloc distance support])])
-
-
-  AS_IF([test "x$enable_hwloc_configure_checks" != xno],
-    # do configuration checks
-    [AS_IF([test "x$qt_allgoodsofar" = xyes],
-            # check if we can link against hwloc
-        [AC_SEARCH_LIBS([${with_hwloc_symbol_prefix}topology_init], [hwloc "hwloc -lnuma"], [],
-                      [qt_allgoodsofar=no])])
-    # check if hwloc has distance support if it wasn't specified
-    AS_IF([test "x$qt_allgoodsofar" = xyes && test "x$enable_hwloc_has_distance" = x],
-          [AC_MSG_CHECKING([for distance support in hwloc])
-       AC_LINK_IFELSE([AC_LANG_SOURCE([[
-  #include <hwloc.h>
-int main()
-{
-  hwloc_topology_t topology;
-  hwloc_topology_init(&topology);
-  hwloc_topology_load(topology);
-  return (NULL == hwloc_get_whole_distance_matrix_by_type(topology, 0));
-}]])],
-          [AC_MSG_RESULT(yes)
-       AC_DEFINE([QTHREAD_HAVE_HWLOC_DISTS],[1],[hwloc has distances])],
-      [AC_MSG_RESULT(no)])
-      ])
-    AS_IF([test "x$qt_allgoodsofar" = xyes],
-        # we can use hwloc and do action-if-found
-        [AC_DEFINE([USE_HWLOC],[1],[if I can use the hwloc topology interface])
-       $1],
-      # restore CPPFLAGS and LDFLAGS if hwloc is unavailable
-      [CPPFLAGS="$hwloc_saved_CPPFLAGS"
-       LDFLAGS="$hwloc_saved_LDFLAGS"
-       # do action-if-not-found
-       $2])],
-    # don't do configuration checks, assume hwloc works
-    [AC_MSG_NOTICE([skipping hwloc link checks])
-    AC_DEFINE([USE_HWLOC],[1],[if I can use the hwloc topology interface])
-    # default to having distance if not specified
-    AS_IF([test "x$qt_allgoodsofar" = xyes && test "x$enable_hwloc_has_distance" = x],
-        [AC_MSG_NOTICE([enabling hwloc distance support])
-        AC_DEFINE([QTHREAD_HAVE_HWLOC_DISTS],[1],[hwloc has distances])])
-    # do action-if-found
-    $1])])
diff --git a/config/qthread_check_makecontext.m4 b/config/qthread_check_makecontext.m4
deleted file mode 100644
index 11225142c..000000000
--- a/config/qthread_check_makecontext.m4
+++ /dev/null
@@ -1,86 +0,0 @@
-# -*- Autoconf -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-# QTHREAD_CHECK_MAKECONTEXT_SPLIT_ARGS([action-if-found], [action-if-not-found])
-# ------------------------------------------------------------------------------
-AC_DEFUN([QTHREAD_CHECK_MAKECONTEXT_SPLIT_ARGS], [
-AC_CACHE_CHECK([whether makecontext needs split arguments],
-  [qthread_cv_func_makecontext_split],
-  [AS_IF([test "$ac_cv_sizeof_int" -eq "$ac_cv_sizeof_voidp"],
-     [qthread_cv_func_makecontext_split="no"],
-     [AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <assert.h>
-#include <stdlib.h>
-#include <ucontext.h>
-
-void func(void * msg)
-{
-	long expected = 0;
-	expected = (1L << 16);
-	expected = expected << 16;
-	expected += 1L;
-
-	((long)msg == expected) ? exit(0) : exit(1);
-}
-
-int main()
-{
-	if (sizeof(int) == sizeof(void*)) {
-		return 0;
-	} else {
-		ucontext_t c, d;
-		/* big enough to ignore stack direction */
-		char * stack = malloc(1024*1024*16);
-		long msg = 0;
-
-		if (sizeof(long) != sizeof(void*)) return 3;
-		getcontext(&c);
-		getcontext(&d);
-		c.uc_stack.ss_sp = stack + 1024*1024*8;
-		c.uc_stack.ss_size = 1024*1024*8 - 64;
-		c.uc_link = &d;
-		/* keep compiler quiet */
-		msg = (1L << 16);
-		msg = msg << 16;
-		msg += 1L;
-
-		makecontext(&c, (void (*)(void))func, 1, msg);
-		swapcontext(&d, &c);
-
-		return 2;
-	}
-}]])],
-        [qthread_cv_func_makecontext_split="no"],
-        [qthread_cv_func_makecontext_split="yes"],
-        [qthread_cv_func_makecontext_split="yes"])])])
-  AS_IF([test "$qthread_cv_func_makecontext_split" = "yes"], [$1], [$2])
-])
-
-
-# QTHREAD_CHECK_COMPAT_MAKECONTEXT([action-if-found], [action-if-not-found])
-# ------------------------------------------------------------------------------
-AC_DEFUN([QTHREAD_CHECK_COMPAT_MAKECONTEXT], [
-AC_CACHE_CHECK([for hand-implemented makecontext],
-  [qthread_cv_makecontext],
-  [qthread_cv_makecontext="no"
-   case "$host" in
-     *-darwin*)
-	  qthread_cv_makecontext="yes"
-     ;;
-	 *tile*)
-	  qthread_cv_makecontext="yes"
-	 ;;
-	 *-linux-gnu*|*-linux|*-linux-musl)
-	 qthread_cv_makecontext="yes"
-	 ;;
-	 *-cygwin)
-	 qthread_cv_makecontext="yes"
-	 ;;
-   esac])
-
-AS_IF([test "$qthread_cv_makecontext" = "yes"],
-  [$1],
-  [$2])
-])
diff --git a/config/qthread_check_swapcontext.m4 b/config/qthread_check_swapcontext.m4
deleted file mode 100644
index fa541c1e3..000000000
--- a/config/qthread_check_swapcontext.m4
+++ /dev/null
@@ -1,92 +0,0 @@
-# -*- Autoconf -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-# QTHREAD_PICK_CONTEXT_TYPE([variable-to-set])
-# ------------------------------------------------------------------------------
-AC_DEFUN([QTHREAD_PICK_CONTEXT_TYPE], [
-AC_ARG_ENABLE([fastcontext],
-              [AS_HELP_STRING([--disable-fastcontext],
-                              [use a lighter-weight non-system-based context
-                               swapping mechanism that does not make system
-                               calls. If you run into bugs, you can disable it
-                               on some systems to use the slower libc-provided
-                               version.])])
-AC_MSG_CHECKING([whether we have a fast context swap for this system])
-case "$host" in
-  powerpc-*|powerpc64-*|x86-*|x86_64-*|tile-*)
-    # Yes, we have these platforms
-    qt_host_based_enable_fastcontext=yes
-    ;;
-  armv7l-*)
-    qt_host_based_enable_fastcontext=yes
-	;;
-  *aarch64*)
-    qt_host_based_enable_fastcontext=yes
-	;;
-  *)
-    qt_host_based_enable_fastcontext=no
-	;;
-esac
-AC_MSG_RESULT([$qt_host_based_enable_fastcontext])
-AS_IF([test "x$qt_host_based_enable_fastcontext" = "xno"],
-      [AS_IF([test "x$enable_fastcontext" = xyes],
-	         [AC_MSG_ERROR([Do not have an implementation of fastcontext for $host])],
-			 [enable_fastcontext=no])])
-qt_cv_pick_ctxt="none"
-AS_IF([test "x$enable_fastcontext" = "xno"],
-	  [QTHREAD_CHECK_SWAPCONTEXT([qt_cv_pick_ctxt="native"],
-		                         [qt_cv_pick_ctxt="own"])],
-	  [QTHREAD_CHECK_COMPAT_MAKECONTEXT([qt_cv_pick_ctxt="own"])])
-AS_IF([test "x$qt_cv_pick_ctxt" = "xnone"], 
-	  [AC_MSG_ERROR([Can not find working makecontext.])])
-$1=$qt_cv_pick_ctxt
-])
-
-# QTHREAD_CHECK_SWAPCONTEXT([action-if-found], [action-if-not-found])
-# ------------------------------------------------------------------------------
-AC_DEFUN([QTHREAD_CHECK_SWAPCONTEXT], [
-AS_IF([test "x$ac_cv_func_getcontext" = "xyes"], [
-	QTHREAD_CHECK_UCSTACK_SSFLAGS(
-		[AC_DEFINE([QTHREAD_UCSTACK_HAS_SSFLAGS],[1],
-				   [the uc_stack structure in ucontext_t has an ss_flags structure that needs to be initialized])])
-AC_CACHE_CHECK([whether swapcontext works properly],
-  [qthread_cv_swapcontext_works],
-  [AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <ucontext.h>
-#include <stdlib.h>
-ucontext_t child, parent;
-int comparison = 0;
-void inout(void *junk) { comparison = (junk == (void*)5); }
-int main()
-{
-	char *stack = malloc(1024*1024*16);
-	getcontext(&child);
-	getcontext(&parent);
-	child.uc_stack.ss_sp = stack + 1024*1024*8;
-	child.uc_stack.ss_size = 1024*1024*8 - 64;
-#ifdef QTHREAD_UCSTACK_HAS_SSFLAGS
-	child.uc_stack.ss_flags = 0;
-#endif
-	child.uc_link = &parent;
-	makecontext(&child, (void(*)(void))inout, 1, 5);
-	if (swapcontext(&parent, &child) != 0) return 1;
-	if (!comparison) return 1;
-	return 0;
-}]])],
-	[qthread_cv_swapcontext_works=yes],
-	[qthread_cv_swapcontext_works=no],
-	[AS_IF([test "x$enable_fastcontext" != "x"],
-	       [AS_IF([test "x$enable_fastcontext" = xyes],
-		          [qthread_cv_swapcontext_works=no],
-				  [qthread_cv_swapcontext_works=yes])],
-	       [qthread_cv_swapcontext_works=yes])])])
-AS_IF([test "$qthread_cv_swapcontext_works" = yes],
-	[AC_DEFINE([USE_SYSTEM_SWAPCONTEXT], [1], [Use the system provided functional native make/swap/get-context functions])
-	 QTHREAD_CHECK_MAKECONTEXT_SPLIT_ARGS(
-	 	[AC_DEFINE([QTHREAD_MAKECONTEXT_SPLIT],[1],[makecontext()passes args as int-size, not long-size])])
-	 $1],
-	[QTHREAD_CHECK_COMPAT_MAKECONTEXT([$2])])
-], [QTHREAD_CHECK_COMPAT_MAKECONTEXT([$2])])
-])
diff --git a/config/qthread_check_ucstack_ssflags.m4 b/config/qthread_check_ucstack_ssflags.m4
deleted file mode 100644
index 36eb9b9ac..000000000
--- a/config/qthread_check_ucstack_ssflags.m4
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Autoconf -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-# QTHREAD_CHECK_UCSTACK_SSFLAGS([action-if-found], [action-if-not-found])
-# ------------------------------------------------------------------------------
-AC_DEFUN([QTHREAD_CHECK_UCSTACK_SSFLAGS], [
-AC_CACHE_CHECK([whether ucstack has an ss_flags element],
-    [qthread_cv_ucstack_ssflags],
-    [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <assert.h>
-#include <stdlib.h>
-#include <ucontext.h>]],
-[[ucontext_t uc;
-uc.uc_stack.ss_flags = 0;]])],
-	[qthread_cv_ucstack_ssflags="yes"],
-	[qthread_cv_ucstack_ssflags="no"],
-	[qthread_cv_ucstack_ssflags="no"])])
-AS_IF([test "$qthread_cv_ucstack_ssflags" = "yes"], [$1], [$2])
-])
diff --git a/config/qthread_cond_define.m4 b/config/qthread_cond_define.m4
deleted file mode 100644
index 39a9d0d30..000000000
--- a/config/qthread_cond_define.m4
+++ /dev/null
@@ -1,3 +0,0 @@
-AC_DEFUN([QT_COND_DEFINE],
-         [AS_IF([test "x$1" = "xyes"],
-                [AC_DEFINE([$2], [1], [$3])])])
diff --git a/config/qthread_detect_compiler_type.m4 b/config/qthread_detect_compiler_type.m4
deleted file mode 100644
index 242cbd91d..000000000
--- a/config/qthread_detect_compiler_type.m4
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- Autoconf -*-
-#
-# Copyright (c) 2010 Sandia Corporation
-#
-
-AC_DEFUN([_QTHREAD_CHECK_IFDEF],
- [AC_PREPROC_IFELSE(
-    [AC_LANG_PROGRAM([[]],[[#ifndef $1
-#error $1 not defined
-#endif]])],
-    [$2],[$3])])
-
-AC_DEFUN([_QTHREAD_CHECK_IFDEF_EQ],
- [AC_PREPROC_IFELSE(
-    [AC_LANG_PROGRAM([[]],[[#ifndef $1
-#error $1 not defined
-#elif (($1) != ($2))
-#error $1 does not equal $2
-#endif]])],
-    [$3],[$4])])
-
-# QTHREAD_DETECT_COMPILER_TYPE
-# These #defs are based on the list at http://predef.sourceforge.net/precomp.html
-# Moved at some point to http://sourceforge.net/p/predef/wiki/Compilers
-# ------------------------------------------------------------------
-AC_DEFUN([QTHREAD_DETECT_COMPILER_TYPE], [
-AC_CACHE_CHECK([what kind of C compiler $CC is],
-  [qthread_cv_c_compiler_type],
-  [AC_LANG_PUSH([C])
-
-   dnl These compilers have been caught pretending to be GNU GCC
-   AS_IF([test "x$qthread_cv_c_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__INTEL_COMPILER],[qthread_cv_c_compiler_type=Intel])])
-   AS_IF([test "x$qthread_cv_c_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__clang__],[qthread_cv_c_compiler_type=Clang])])
-   AS_IF([test "x$qthread_cv_c_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__llvm__],[
-	    qthread_cv_c_compiler_type=LLVM
-		_QTHREAD_CHECK_IFDEF_EQ([__APPLE_CC__],[5658],[qthread_cv_c_compiler_type=Apple-LLVM-5658])
-		AS_IF([test "x$qthread_cv_c_compiler_type" = "xLLVM"],
-		      [_QTHREAD_CHECK_IFDEF([__APPLE_CC__],[qthread_cv_c_compiler_type=Apple-LLVM])])
-		])])
-
-   dnl GCC is one of the most common
-   AS_IF([test "x$qthread_cv_c_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__GNUC__],[
-	    qthread_cv_c_compiler_type=GNU
-		_QTHREAD_CHECK_IFDEF_EQ([__GNUC__],[2],[qthread_cv_c_compiler_type=GNU2])
-		AS_IF([test "x$qthread_cv_c_compiler_type" = "xGNU"],
-			  [_QTHREAD_CHECK_IFDEF_EQ([__GNUC__],[3],[qthread_cv_c_compiler_type=GNU3])])
-		AS_IF([test "x$qthread_cv_c_compiler_type" = "xGNU"],
-			  [_QTHREAD_CHECK_IFDEF_EQ([__GNUC__],[4],[qthread_cv_c_compiler_type=GNU4])])
-		AS_IF([test "x$qthread_cv_c_compiler_type" != "xGNU"],
-		      [_QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[0],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.0"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[1],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.1"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[2],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.2"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[3],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.3"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[4],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.4"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[5],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.5"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[6],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.6"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[7],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.7"])
-		       _QTHREAD_CHECK_IFDEF_EQ([__GNUC_MINOR__],[8],[qthread_cv_c_compiler_type="${qthread_cv_c_compiler_type}.8"])
-			   _QTHREAD_CHECK_IFDEF([__APPLE_CC__],[qthread_cv_c_compiler_type="Apple-${qthread_cv_c_compiler_type}"])
-			  ])
-	 ])])
-
-   AS_IF([test "x$qthread_cv_c_compiler_type" == x],
-     [qthread_cv_c_compiler_type=unknown])
-   AC_LANG_POP([C])
-  ])
-AC_CACHE_CHECK([what kind of C++ compiler $CXX is],
-  [qthread_cv_cxx_compiler_type],
-  [AC_LANG_PUSH([C++])
-
-   dnl These compilers have been caught pretending to be GNU G++
-   AS_IF([test "x$qthread_cv_cxx_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__INTEL_COMPILER],[qthread_cv_cxx_compiler_type=Intel])])
-   AS_IF([test "x$qthread_cv_cxx_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__clang__],[qthread_cv_cxx_compiler_type=Clang])])
-   AS_IF([test "x$qthread_cv_cxx_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__llvm__],[qthread_cv_cxx_compiler_type=LLVM])])
-
-   dnl GCC is one of the most common
-   AS_IF([test "x$qthread_cv_cxx_compiler_type" == x],
-     [_QTHREAD_CHECK_IFDEF([__GNUC__],[
-	    qthread_cv_cxx_compiler_type=GNU
-		AS_IF([test "x$qthread_cv_cxx_compiler_type" = "xGNU"],
-			  [_QTHREAD_CHECK_IFDEF_EQ([__GNUC__],[2],[qthread_cv_cxx_compiler_type=GNU2])])
-		AS_IF([test "x$qthread_cv_cxx_compiler_type" = "xGNU"],
-			  [_QTHREAD_CHECK_IFDEF_EQ([__GNUC__],[3],[qthread_cv_cxx_compiler_type=GNU3])])
-		AS_IF([test "x$qthread_cv_cxx_compiler_type" = "xGNU"],
-			  [_QTHREAD_CHECK_IFDEF_EQ([__GNUC__],[4],[qthread_cv_cxx_compiler_type=GNU4])])
-		])])
-
-   AS_IF([test "x$qthread_cv_cxx_compiler_type" == x],
-     [qthread_cv_cxx_compiler_type=unknown])
-   AC_LANG_POP([C++])
-  ])
-])
diff --git a/config/qthread_ia_cacheline.m4 b/config/qthread_ia_cacheline.m4
deleted file mode 100644
index 25d3bcfea..000000000
--- a/config/qthread_ia_cacheline.m4
+++ /dev/null
@@ -1,62 +0,0 @@
-AC_DEFUN([QTHREAD_IA_CACHELINE],
-[AC_REQUIRE([AC_PROG_CC])
-AC_LANG_PUSH([C])
-AC_CACHE_CHECK([for x86 cache line size],
-	[qt_cv_cacheline],
-	[AC_RUN_IFELSE([AC_LANG_PROGRAM([
-#include <stdio.h>
-/* Architecture defines */
-#define QTHREAD_UNSUPPORTED 0
-#define QTHREAD_IA32        1
-#define QTHREAD_AMD64       2
-#define QTHREAD_POWERPC32   6
-#define QTHREAD_POWERPC64   7
-#define QTHREAD_ARM         12
-#define QTHREAD_ARMV8_A64   13
-],[
-int op = 1, eax, ebx, ecx, edx, cachelinesize;
-FILE *f;
-#if QTHREAD_ASSEMBLY_ARCH == QTHREAD_IA32
-# ifdef __PIC__
-__asm__("push %%ebx\n\t"
-"cpuid\n\t"
-"mov %%ebx, %1\n\t"
-"pop %%ebx"
-:"=a"(eax), "=m"(ebx), "=c"(ecx), "=d"(edx)
-:"a"(op));
-# else
-__asm__("cpuid"
-:"=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
-:"a"(op));
-# endif
-#elif QTHREAD_ASSEMBLY_ARCH == QTHREAD_AMD64
-__asm__("cpuid"
-:"=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
-:"a"(op));
-#endif
-cachelinesize = 8*((ebx>>8)&0xff);
-if (cachelinesize == 0) {
-	op = 2;
-#if QTHREAD_ASSEMBLY_ARCH == QTHREAD_IA32
-__asm__("push %%ebx\n\t"
-"cpuid\n\t"
-"mov %%ebx, %1\n\t"
-"pop %%ebx"
-:"=a"(eax), "=m"(ebx), "=c"(ecx), "=d"(edx)
-:"a"(op));
-#elif QTHREAD_ASSEMBLY_ARCH == QTHREAD_AMD64
-__asm__("cpuid"
-:"=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
-:"a"(op));
-#endif
-}
-f = fopen("conftest_cacheline", "w"); if (!f) return 1;
-fprintf(f, "%i\n", cachelinesize);
-fclose(f);
-return 0;
-])],
-	[qt_cv_cacheline=`cat conftest_cacheline`; rm -f conftest_cacheline],
-	[qt_cv_cacheline=0; rm -f conftest_cacheline],
-	[qt_cv_cacheline=0])])
-AC_LANG_POP([C])
-])
diff --git a/config/version-gen b/config/version-gen
deleted file mode 100755
index 814f2cbc7..000000000
--- a/config/version-gen
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-cat .autogen-version
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index 5982e70a3..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,486 +0,0 @@
-# -*- Autoconf -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-## --------------------- ##
-## Autoconf Requirements ##
-## --------------------- ##
-AC_PREREQ(2.71)
-
-## ---------------------------------- ##
-## Autoconf / Automake Initialization ##
-## ---------------------------------- ##
-AC_INIT([qthread],
-        [m4_esyscmd([config/version-gen])],
-        [wg-qthread@sandia.gov])
-AC_CONFIG_AUX_DIR([config])
-AC_CONFIG_MACRO_DIR([config])
-AC_CONFIG_SRCDIR([src/qthread.c])
-
-AM_INIT_AUTOMAKE([foreign subdir-objects dist-bzip2 no-define 1.16 ])
-##AM_SILENT_RULES([yes])
-
-# clean some extra things...
-CLEANFILES="*~ .\#* .gdb_history"
-AC_SUBST(CLEANFILES)
-
-AC_CANONICAL_HOST
-
-## ----------------- ##
-## Check the options ##
-## ----------------- ##
-AC_ARG_ENABLE([picky],
-              [AS_HELP_STRING([--enable-picky],
-                              [turns on extra compiler warnings (for developers of qthreads)])])
-
-AC_ARG_ENABLE([debugging],
-              [AS_HELP_STRING([--enable-debugging],
-                              [turns off optimization and turns on debug flags])])
-
-AC_ARG_ENABLE([guard-pages],
-              [AS_HELP_STRING([--enable-guard-pages],
-                              [use extra memory around the thread stacks to
-                               help detect stack overruns (will triple memory
-                               requirements per thread)])])
-
-AC_ARG_WITH([default-stack-size],
-            [AS_HELP_STRING([--with-default-stack-size=[[bytes]]],
-                            [Specify the number of bytes to use for stacks, by
-                             default (i.e. when the environment variable
-                             QT_STACK_SIZE is unset). Default: 16384 (16k).
-                             Depending on your OS, standard Pthread threads may
-                             get anywhere from 2MB to 10MB default stacks.])])
-
-AC_ARG_ENABLE([asserts],
-              [AS_HELP_STRING([--enable-asserts],
-                              [adds sanity checks to most qthread functions])])
-
-AC_ARG_WITH([topology],
-            [AS_HELP_STRING([--with-topology=[[topologylib]]],
-                            [specify which topology interface to use. Supported
-                             interfaces include no, hwloc, hwloc_v2, binders, libnuma,
-                             libnumaV2, mach, plpa, and sys.])],
-            [AS_IF([test "x$with_topology" = xyes],
-                   [with_topology=none_specified])
-             case "$with_topology" in
-                 hwloc|binders|hwloc_v2|libnuma|libnumaV2|mach|no|plpa|sys) ;;
-                 none_specified) ;;
-                 *)
-                 AC_MSG_ERROR([Unsupported topology library ($with_topology)])
-                 ;;
-             esac
-             qthread_topo="$with_topology"],
-            [qthread_topo=none_specified])
-
-AC_ARG_WITH([gcd],
-            [AS_HELP_STRING([--with-gcd=[[gcd_style]]],
-                            [specify which algorithm for computing greatest
-                             common denominator. Current options are: "mod"
-                             (default) and "shift". The mod option uses modulo
-                             operations, and is usually the fastest option. On
-                             some systems, modulo operations are particularly
-                             slow, and so the "shift" algorithm is faster. The
-                             difference is usually minor, and probably will not
-                             impact overall performance significantly, but this
-                             option is for true speed-demons who want to get
-                             the last word in speed.])],
-                        [],
-                        [with_gcd=mod])
-
-AC_ARG_ENABLE([condwait-queue],
-              [AS_HELP_STRING([--enable-condwait-queue],
-                              [force the use of a pthread condwait queue,
-                               instead of a spin-based queue for inter-thread
-                               communication (important if spinning shepherds
-                               interfere with each other). Default disabled.])])
-
-AC_ARG_ENABLE([third-party-benchmarks],
-              [AS_HELP_STRING([--enable-third-party-benchmarks],
-                              [Turns on configure options to look for OpenMP,
-                               Cilk, and TBB; used only in building some
-                               external benchmarks])])
-
-AC_ARG_WITH([scheduler],
-            [AS_HELP_STRING([--with-scheduler=[[type]]],
-                            [Specify the scheduler. Options when using
-                             single-threaded shepherds are: nemesis (default).
-                             Options when using multi-threaded shepherds are:
-                             sherwood (default), and distrib. Details on 
-                             these options are in the SCHEDULING file.])])
-
-AC_ARG_WITH([sinc],
-            [AS_HELP_STRING([--with-sinc=[[type]]],
-                            [Specify the sinc implementation. Options are
-                             'donecount' (default), 'donecount_cas', 'snzi', and 'original'.])])
-
-AC_ARG_WITH([alloc],
-          [AS_HELP_STRING([--with-alloc=[[type]]],
-                             [Specify the memory allocator. The only
-                             option is 'base' for now.])])
-
-AC_ARG_WITH([dict],
-            [AS_HELP_STRING([--with-dict=[[type]]],
-                            [Specify the dictionary implementation. Options are
-                             'simple' (default), 'trie', and 'shavit'.])])
-AC_ARG_WITH([barrier],
-            [AS_HELP_STRING([--with-barrier=[[type]]],
-                            [Specify the barrier implementation. Options are 'feb' (default), 'sinc', 'array', and 'log'.])])
-
-AC_ARG_ENABLE([hpctoolkit],
-              [AS_HELP_STRING([--enable-hpctoolkit-support],
-                              [Enable modifications so that HPCToolkit can unwind Qthreads threads.])])
-
-AC_ARG_ENABLE([valgrind],
-              [AS_HELP_STRING([--enable-valgrind],
-                              [compile with valgrind macros to assist with debugging])])
-
-AC_ARG_ENABLE([lf-febs],
-              [AS_HELP_STRING([--enable-lf-febs],
-                              [Use a lock-free hash table to store the FEB data. EXPERIMENTAL!])])
-
-AC_ARG_WITH([cacheline-width],
-            [AS_HELP_STRING([--with-cacheline-width=bytes],
-                            [Specify the cacheline width for the target
-                             machine. Defaults to 64. Used only for optimizing
-                             internal data structure layout;
-                             qthread_cacheline() still detects this at
-                             runtime.])],
-            [],
-            [with_cacheline_width=64])
-
-AC_ARG_VAR([MPICC], [Path to the MPI C compiler-wrapper.])
-AC_ARG_VAR([MPICXX], [Path to the MPI C++ compiler-wrapper.])
-
-AC_CACHE_SAVE
-
-## ------------------- ##
-## Checks for programs ##
-## ------------------- ##
-AC_PROG_CC
-AC_PROG_CC_C99
-AS_IF([test "x$ac_cv_prog_cc_c99" == "xno"],
-      [AC_MSG_ERROR([Qthreads requires a C compiler that supports the C99 standard.])])
-AC_PROG_CPP
-AC_PROG_CXX
-AS_IF([test "x$CXX" = "xg++"],
-      [AS_IF([test "x$GXX" = x],
-             [AC_MSG_ERROR([Qthreads requires a C++ compiler!])])])
-QTHREAD_DETECT_COMPILER_TYPE
-AS_IF([test "x$enable_picky" = x],
-      [AS_IF([test -d "${srcdir}/.svn"],
-             [echo "--> developer override: enable picky compiler by default"
-              enable_picky=yes])])
-AM_PROG_AS
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_MAKE_SET
-
-dnl This is to provide some backward libtool compatibility.
-dnl The weird formatting is to avoid spurious warnings from libtoolize
-m4_ifdef([LT_INIT],[
-LT_INIT],[
-AC_PROG_LIBTOOL])
-AC_SUBST([LIBTOOL_DEPS])
-
-AM_PROG_CC_C_O
-
-AS_IF([test "x$enable_picky" = xyes],
-      [case "$qthread_cv_c_compiler_type" in dnl ((((((((
-         Clang)
-           CFLAGS="-Wall -Wno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes $CFLAGS"
-           ;;
-         Apple-GNU*|GNU*|*LLVM*)
-           CFLAGS="-Wall -Wno-strict-aliasing -Wmissing-prototypes -Wstrict-prototypes $CFLAGS"
-           ;;
-         Intel)
-           CFLAGS="-Wall -wd981 -wd1572 -wd869 $CFLAGS"
-           ;;
-         *)
-           CFLAGS="-Wall $CFLAGS"
-           ;;
-       esac
-       case "$qthread_cv_cxx_compiler_type" in dnl (((((((
-         Clang|GNU*|LLVM)
-           CXXFLAGS="-Wall $CXXFLAGS"
-           ;;
-         Intel)
-           CXXFLAGS="-Wall -wd981 $CXXFLAGS"
-           ;;
-         *)
-           CXXFLAGS="-Wall $CXXFLAGS"
-           ;;
-         esac])
-
-AC_CACHE_SAVE
-
-## -------------------- ##
-## Checks for libraries ##
-## -------------------- ##
-AC_SEARCH_LIBS([pthread_create], [pthread], [],
-               [AC_MSG_ERROR([Qthreads requires a working pthreads implementation.])])
-
-AC_SEARCH_LIBS([nanosleep],[rt],[],
-               [AC_MSG_ERROR([Cannot find nanosleep])])
-AC_SEARCH_LIBS([ceil],[m],[],[AC_MSG_ERROR([Cannot find ceil.])])
-AC_SEARCH_LIBS([accept], [xnet "socket -lnsl"])
-
-AC_CACHE_SAVE
-
-## -------------------- ##
-## Check for structures ##
-## -------------------- ##
-AC_MSG_CHECKING([cacheline width])
-AC_MSG_RESULT([$with_cacheline_width])
-AC_DEFINE_UNQUOTED([CACHELINE_WIDTH],[$with_cacheline_width],[The cacheline width])
-
-AC_CACHE_SAVE
-
-## ---------------------------------- ##
-## Check for compiler characteristics ##
-## ---------------------------------- ##
-# Find out if we need the -restrict flag
-AS_IF([test "x$qthread_cv_cxx_compiler_type" = "xIntel"],
-      [CXXFLAGS="-restrict $CXXFLAGS"])
-
-AS_IF([test "x$enable_third_party_benchmarks" = xyes],
-      [AX_OPENMP([have_openmp=yes], [have_openmp=no])
-       AC_CHECK_FUNC([__cilkrts_get_nworkers], [have_cilk=yes], [have_cilk=no])
-       AC_LANG_PUSH([C++])
-       AC_CHECK_HEADER([tbb/task.h],
-                       [have_tbb=yes],
-                       [have_tbb=no])
-       AS_IF([test "x$have_tbb" = xyes],
-             [LIBS_saved="$LIBS"
-              AC_SEARCH_LIBS([TBB_runtime_interface_version],[tbb],
-                             [TBB_LIBS="-ltbb"
-                              LIBS="$LIBS_saved"],
-                             [have_tbb=no])])
-       AC_LANG_POP([C++])
-       ])
-
-AS_IF([test "x$enable_guard_pages" = "xyes"],
-      [AC_DEFINE([QTHREAD_GUARD_PAGES], [1], [Use guard pages to detect stack overruns])],
-      [enable_guard_pages="no"])
-
-AS_IF([test "x$enable_precache_guard_pages" = "xyes"],
-      [AC_DEFINE([QTHREAD_PRECACHE_GUARD_PAGES], [1], [Precache guard pages in pooled stacks])],
-      [enable_precache_guard_pages="no"])
-
-
-AC_CACHE_SAVE
-
-## ------------------------- ##
-## Check for system services ##
-## ------------------------- ##
-
-# Figure out if we need makecontext
-QTHREAD_PICK_CONTEXT_TYPE(qthread_makecontext_type)
-
-AS_IF([test "x$with_gcd" = "xshift"],
-      [AC_DEFINE([QTHREAD_SHIFT_GCD],[1],[use a shift-based gcd algorithm])])
-
-AS_IF([test "x$enable_condwait_queue" = "x"],
-      [enable_condwait_queue="no"])
-AS_IF([test "x$enable_condwait_queue" = "xyes"],
-      [AC_DEFINE([QTHREAD_CONDWAIT_BLOCKING_QUEUE], [1], [use pthread-based condwait for lf queue])])
-
-AS_IF([test "x$enable_valgrind" = "xyes"],
-      [AC_CHECK_HEADERS([valgrind/memcheck.h],
-                        [AC_DEFINE([QTHREAD_USE_VALGRIND], [1], [Use Valgrind Macros])])])
-
-AS_IF([test "x$enable_hpctoolkit_support" = xyes],
-      [AC_DEFINE([QTHREAD_ALLOW_HPCTOOLKIT_STACK_UNWINDING], [1], [Support HPCToolkit stack unwinding])])
-
-# check scheduler requirements
-AS_IF([test "x$with_scheduler" != "x"],
-      [case "$with_scheduler" in
-         default)
-           [with_scheduler="sherwood"]
-           ;;
-         sherwood|nemesis|distrib)
-           # all valid options that require no additional configuration
-           ;;
-         *)
-           AC_MSG_ERROR([Unknown scheduler option])
-           ;;
-       esac
-       EXTRA_DISTCHECK_OPTIONS="$EXTRA_DISTCHECK_OPTIONS --with-scheduler=$with_scheduler"],
-      [with_scheduler="sherwood"])
-EXTRA_DISTCHECK_OPTIONS="$EXTRA_DISTCHECK_OPTIONS --with-scheduler=sherwood"
-
-AS_IF([test "x$with_sinc" = "x"],
-      [with_sinc="donecount"],
-      [])
-case "$with_sinc" in
- donecount|donecount_cas|snzi|original) ;;
- *) AC_MSG_ERROR([Unknown sinc option]) ;;
-esac
-
-AS_IF([test "x$with_alloc" = "x"],
-      [with_alloc="base"],
-      [])
-case "$with_alloc" in
- base|chapel) ;;
- *) AC_MSG_ERROR([Unknown alloc option]) ;;
-esac
-
-AS_IF([test "x$with_barrier" = "x"],
-      [with_barrier="feb"])
-case "$with_barrier" in
-    feb|log|sinc|array) ;;
-    *) AC_MSG_ERROR([Unknown barrier implementation: "$with_barrier". Use 'feb', 'sinc', 'array', or 'log'.]) ;;
-esac
-
-AS_IF([test "x$with_dict" = "x"],
-      [with_dict="shavit"],
-      [])
-case "$with_dict" in
-  simple|shavit|trie) ;;
-  *) AC_MSG_ERROR([Unknown dictionary option "$with_dict". Use 'shavit', 'trie' or 'simple'.]) ;;
-esac
-
-AS_IF([test "x$enable_omp_affinity" = xyes],
-      [AC_DEFINE([QTHREAD_OMP_AFFINITY], [1], [Enable experimental OpenMP affinity extensions. Under development])],
-      [enable_omp_affinity="no"])
-
-AS_IF([test "x$enable_asserts" != "xyes"],
-      [AC_DEFINE([NDEBUG], [1], [removes sanity checks from most qthread functions])
-       enable_asserts=no],
-      [enable_asserts=yes])
-
-AS_IF([test "x$with_stack_alignment" = "x"],
-      [with_stack_alignment=16])
-
-dnl Which timer do we want to use
-qthread_timer_type=gettimeofday
-AS_IF([test "x$qthread_timer_type" = "xgettimeofday"],
-      [AC_CHECK_FUNC([mach_absolute_time], [qthread_timer_type=mach])])
-AS_IF([test "x$qthread_timer_type" = "xgettimeofday"],
-      [AC_CHECK_FUNC([gethrtime], [qthread_timer_type=gethrtime])])
-AS_IF([test "x$qthread_timer_type" = "xgettimeofday"],
-      [AC_SEARCH_LIBS([clock_gettime],[rt],
-                      [qthread_timer_type=clock_gettime
-                       break])])
-AC_MSG_CHECKING([for high resolution timer type])
-AC_MSG_RESULT([$qthread_timer_type])
-
-AS_IF([test "x$with_default_stack_size" != "x"],
-      [qthread_cv_stack_size=$with_default_stack_size],
-      [qthread_cv_stack_size=32768])
-
-AC_DEFINE_UNQUOTED([QTHREAD_DEFAULT_STACK_SIZE],[$qthread_cv_stack_size], [What size stacks to use by default])
-
-AS_IF([test "x$enable_thread_count" = "xyes"],
-      [AC_DEFINE([QTHREAD_COUNT_THREADS], [1], [keeps track of the number of threads])],
-      [enable_thread_count="no"])
-
-AC_CACHE_SAVE
-
-## External libraries that help on some architectures
-AS_IF([test "x$qthread_topo" != xno],
-      [AS_IF([test "x$qthread_topo" = "xnone_specified"],
-             [qthread_topo=no])
-       # First, check for hwloc, since it gives me the most portable/flexible/reliable/detailed information.
-       AS_IF([test "x$qthread_topo" = xno -o "x$qthread_topo" = xbinders -o "x$qthread_topo" = xhwloc],
-             [QTHREAD_CHECK_HWLOC([AS_IF([test "x$qthread_topo" != xhwloc -a "x$qthread_topo" != xbinders],
-                                         [qthread_topo=hwloc])],
-                                  [AS_IF([test "x$qthread_topo" != xno],
-                                         [AC_MSG_ERROR([Specified topology library ($qthread_topo) does not work.])])])])
-       ])
-
-AS_IF([test "x$enable_lf_febs" == "xyes"],
-      [AC_DEFINE([LOCK_FREE_FEBS], [1], [Define to use a lock-free hash table for FEB metadata.])],
-      [enable_lf_febs=no])
-
-## --------------- ##
-## Output and done ##
-## --------------- ##
-AC_SUBST(EXTRA_DISTCHECK_OPTIONS)
-AC_SUBST(qthread_topo)
-AC_SUBST(with_scheduler)
-AC_SUBST(with_sinc)
-AC_SUBST(with_alloc)
-AC_SUBST(with_dict)
-AC_SUBST(with_barrier)
-AC_SUBST(OPENMP_CFLAGS)
-AC_SUBST(TBB_LIBS)
-AC_SUBST(CHPL_OPTS)
-
-AM_CONDITIONAL([QTHREAD_NEED_OWN_MAKECONTEXT], [test "x$qthread_makecontext_type" = "xown"])
-AM_CONDITIONAL([QTHREAD_TIMER_TYPE_GETTIME], [test "x$qthread_timer_type" = "xclock_gettime"])
-AM_CONDITIONAL([QTHREAD_TIMER_TYPE_MACH], [test "x$qthread_timer_type" = "xmach"])
-AM_CONDITIONAL([QTHREAD_TIMER_TYPE_GETHRTIME], [test "x$qthread_timer_type" = "xgethrtime"])
-AM_CONDITIONAL([QTHREAD_TIMER_TYPE_GETTIMEOFDAY], [test "x$qthread_timer_type" = "xgettimeofday"])
-AM_CONDITIONAL([HAVE_GUARD_PAGES], [test "x$enable_guard_pages" = "xyes"])
-AM_CONDITIONAL([WANT_SINGLE_WORKER_SCHEDULER], [test "x$with_scheduler" = "xnemesis" -o "x$with_scheduler" = "xlifo" -o "x$with_scheduler" = "xmutexfifo" -o "x$with_scheduler" = "xmtsfifo" -o "x$with_scheduler" = "xmdlifo"])
-AM_CONDITIONAL([COMPILE_OMP_BENCHMARKS], [test "x$have_openmp" = "xyes"])
-AM_CONDITIONAL([COMPILE_TBB_BENCHMARKS], [test "x$have_tbb" = "xyes"])
-AM_CONDITIONAL([COMPILE_CILK_BENCHMARKS], [test "x$have_cilk" = "xyes"])
-AM_CONDITIONAL([COMPILE_LF_HASH], [test "x$enable_lf_febs" = "xyes"])
-
-AC_CONFIG_FILES([Makefile
-                 src/Makefile
-                 man/Makefile
-                 qthread.pc
-                
- man/man3/Makefile
-                 include/Makefile
-                 include/qthread/Makefile
-                 test/Makefile
-                 test/utils/Makefile
-                 test/utils/rng/Makefile
-                 test/basics/Makefile
-                 test/features/Makefile
-                 test/stress/Makefile
-                 test/benchmarks/Makefile
-                 test/benchmarks/mantevo/Makefile
-                 test/benchmarks/mantevo/hpccg/Makefile
-                 test/benchmarks/finepoints/Makefile
-                 test/benchmarks/finepoints/partSendPrototype/Makefile])
-AC_OUTPUT
-
-case "$qthread_cv_stack_size" in
-        8388608) stack_string="8MB" ;;
-        7340032) stack_string="7MB" ;;
-        6291456) stack_string="6MB" ;;
-        5242880) stack_string="5MB" ;;
-        4194304) stack_string="4MB" ;;
-        3145728) stack_string="3MB" ;;
-        2097152) stack_string="2MB" ;;
-        1048576) stack_string="1MB" ;;
-        524288)  stack_string="512kB" ;;
-        262144)  stack_string="256kB" ;;
-        131072)  stack_string="128kB" ;;
-        65536)   stack_string="64kB" ;;
-        32768)   stack_string="32kB" ;;
-        16384)   stack_string="16kB" ;;
-        8192)    stack_string="8kB" ;;
-        4096)    stack_string="4kB" ;;
-        2096)    stack_string="2kB" ;;
-        *)       stack_string="${qthread_cv_stack_size} bytes" ;;
-esac
-echo ""
-echo    "System Characteristics:"
-echo    "       Target Style: $qthread_implementation"
-echo    "       Topology API: ${qthread_topo:-none}"
-echo    "        Qtimer type: ${qthread_timer_type:-none}"
-echo    " Default Stack size: $stack_string"
-echo    ""
-echo    "Safety/Debugging:"
-echo    "   Sanity assert()s: $enable_asserts"
-echo    "        Guard Pages: $enable_guard_pages"
-echo    ""
-AS_IF([test "x$enable_lf_febs" = xno],
-      [feb_string="lock-based hash"],
-      [feb_string="lock-free"])
-echo    "Speed:"
-echo    "       Scheduler: $with_scheduler"
-echo    "      Sinc Style: $with_sinc"
-echo    "     Alloc Style: $with_alloc"
-echo    "   Barrier Style: $with_barrier"
-echo    "Dictionary Style: $with_dict"
-echo    "    Pools/caches: $pool_string"
-echo    "            FEBs: $incr_string, $feb_string"
-echo ""
-
diff --git a/include/Makefile.am b/include/Makefile.am
deleted file mode 100644
index cc5ecf272..000000000
--- a/include/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-SUBDIRS = qthread
-
-noinst_HEADERS = \
-    56reader-rwlock.h \
-	fastcontext/taskimpl.h \
-	fastcontext/power-ucontext.h \
-	fastcontext/386-ucontext.h \
-	qthread_innards.h \
-	qloop_innards.h \
-	qt_asserts.h \
-	qt_expect.h \
-	qt_prefetch.h \
-	qt_addrstat.h \
-	qt_affinity.h \
-	qt_alloc.h \
-	qt_arrive_first.h \
-	qt_atomics.h \
-	qt_barrier.h \
-	qt_blocking_structs.h \
-	qt_context.h \
-	qt_envariables.h \
-	qt_filters.h \
-	qt_gcd.h \
-	qt_hash.h \
-	qt_hazardptrs.h \
-	qt_initialized.h \
-	qt_int_ceil.h \
-	qt_int_log.h \
-	qt_io.h \
-	qt_feb.h \
-        qt_locks.h \
-	qt_syncvar.h \
-	qt_macros.h \
-	qt_mpool.h \
-	qt_output_macros.h \
-	qt_profiling.h \
-	qt_qthread_mgmt.h \
-	qt_qthread_struct.h \
-	qt_qthread_t.h \
-	qt_queue.h \
-	qt_shepherd_innards.h \
-	qt_spawn_macros.h \
-	qt_subsystems.h \
-	qt_teams.h \
-	qt_threadqueues.h \
-	qt_threadqueue_scheduler.h \
-	qt_threadstate.h \
-	qt_touch.h \
-	qt_visibility.h \
-	spr_innards.h
-
diff --git a/include/qthread/Makefile.am b/include/qthread/Makefile.am
deleted file mode 100644
index 3f8bb30cc..000000000
--- a/include/qthread/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-include_HEADERS = top/qthread.h
-pkginclude_HEADERS = \
-	allpairs.h \
-	barrier.h \
-	cacheline.h \
-        common.h \
-	dictionary.h \
-	hash.h \
-	io.h \
-	macros.h \
-	qalloc.h \
-	qarray.h \
-	qdqueue.h \
-	qlfqueue.h \
-	qswsrqueue.h \
-	qloop.h \
-	qloop.hpp \
-	qpool.h \
-	sinc.h \
-	qt_syscalls.h \
-	qthread.h \
-	qthread.hpp \
-	qtimer.h \
-	qutil.h \
-	syncvar.hpp \
-	wavefront.h \
-	logging.h \
-	tls.h
-
-# Installed here to keep it separate from the "real" omp_defines.h
-noinst_HEADERS = \
-	omp_defines.h
-
-# ensure that this happens after the rest of the uninstall is done
-uninstall-hook:
-	test -d "$(pkgincludedir)" && rmdir $(pkgincludedir) || true
diff --git a/man/Makefile.am b/man/Makefile.am
deleted file mode 100644
index 3bcdf4584..000000000
--- a/man/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-SUBDIRS = man3
diff --git a/man/man3/Makefile.am b/man/man3/Makefile.am
deleted file mode 100644
index 078beef56..000000000
--- a/man/man3/Makefile.am
+++ /dev/null
@@ -1,196 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-man_MANS = \
-		   qalloc_checkpoint.3 \
-		   qalloc_cleanup.3 \
-		   qalloc_dynfree.3 \
-		   qalloc_dynmalloc.3 \
-		   qalloc_free.3 \
-		   qalloc_loadmap.3 \
-		   qalloc_makedynmap.3 \
-		   qalloc_makestatmap.3 \
-		   qalloc_malloc.3 \
-		   qalloc_statfree.3 \
-		   qalloc_statmalloc.3 \
-		   qarray_create.3 \
-		   qarray_create_configured.3 \
-		   qarray_create_tight.3 \
-		   qarray_destroy.3 \
-		   qarray_dist_like.3 \
-		   qarray_elem.3 \
-		   qarray_elem_migrate.3 \
-		   qarray_elem_nomigrate.3 \
-		   qarray_iter.3 \
-		   qarray_iter_constloop.3 \
-		   qarray_iter_loop.3 \
-		   qarray_iter_loop_nb.3 \
-		   qarray_iter_loopaccum.3 \
-		   qarray_set_shepof.3 \
-		   qarray_shepof.3 \
-		   qdqueue_create.3 \
-		   qdqueue_dequeue.3 \
-		   qdqueue_destroy.3 \
-		   qdqueue_empty.3 \
-		   qdqueue_enqueue.3 \
-		   qdqueue_enqueue_there.3 \
-		   qlfqueue_create.3 \
-		   qlfqueue_dequeue.3 \
-		   qlfqueue_destroy.3 \
-		   qlfqueue_empty.3 \
-		   qlfqueue_enqueue.3 \
-		   qpool_alloc.3 \
-		   qpool_create.3 \
-		   qpool_create_aligned.3 \
-		   qpool_destroy.3 \
-		   qpool_free.3 \
-		   qt_accept.3 \
-		   qt_allpairs.3 \
-		   qt_begin_blocking_action.3 \
-		   qt_connect.3 \
-		   qt_dictionary_create.3 \
-		   qt_dictionary_delete.3 \
-		   qt_dictionary_destroy.3 \
-		   qt_dictionary_end.3 \
-		   qt_dictionary_get.3 \
-		   qt_dictionary_iterator_copy.3 \
-		   qt_dictionary_iterator_create.3 \
-		   qt_dictionary_iterator_destroy.3 \
-		   qt_dictionary_iterator_equals.3 \
-		   qt_dictionary_iterator_get.3 \
-		   qt_dictionary_iterator_next.3 \
-		   qt_dictionary_put.3 \
-		   qt_dictionary_put_if_absent.3 \
-		   qt_double_max.3 \
-		   qt_double_min.3 \
-		   qt_double_prod.3 \
-		   qt_double_sum.3 \
-		   qt_end_blocking_action.3 \
-		   qt_int_max.3 \
-		   qt_int_min.3 \
-		   qt_int_prod.3 \
-		   qt_int_sum.3 \
-		   qt_loop.3 \
-		   qt_loop_balance.3 \
-		   qt_loop_balance_simple.3 \
-		   qt_loop_queue_addworker.3 \
-		   qt_loop_queue_create.3 \
-		   qt_loop_queue_run.3 \
-		   qt_loop_queue_run_there.3 \
-		   qt_loop_queue_setchunk.3 \
-		   qt_loop_step.3 \
-		   qt_loopaccum_balance.3 \
-		   qt_poll.3 \
-		   qt_pread.3 \
-		   qt_pwrite.3 \
-		   qt_read.3 \
-		   qt_select.3 \
-		   qt_sinc_create.3 \
-		   qt_sinc_destroy.3 \
-		   qt_sinc_expect.3 \
-		   qt_sinc_fini.3 \
-		   qt_sinc_init.3 \
-		   qt_sinc_reset.3 \
-		   qt_sinc_submit.3 \
-		   qt_sinc_wait.3 \
-		   qt_system.3 \
-		   qt_team_critical_section.3 \
-		   qt_team_eureka.3 \
-		   qt_team_id.3 \
-		   qt_team_parent_id.3 \
-		   qt_uint_max.3 \
-		   qt_uint_min.3 \
-		   qt_uint_prod.3 \
-		   qt_uint_sum.3 \
-		   qt_wait4.3 \
-		   qt_write.3 \
-		   qthread_cacheline.3 \
-		   qthread_cas.3 \
-		   qthread_cas_ptr.3 \
-		   qthread_dincr.3 \
-		   qthread_disable_shepherd.3 \
-		   qthread_disable_worker.3 \
-		   qthread_distance.3 \
-		   qthread_empty.3 \
-		   qthread_enable_shepherd.3 \
-		   qthread_enable_worker.3 \
-		   qthread_feb_barrier_create.3 \
-		   qthread_feb_barrier_destroy.3 \
-		   qthread_feb_barrier_enter.3 \
-		   qthread_feb_barrier_resize.3 \
-		   qthread_feb_status.3 \
-		   qthread_fill.3 \
-		   qthread_finalize.3 \
-		   qthread_fincr.3 \
-		   qthread_fork.3 \
-		   qthread_fork_precond.3 \
-		   qthread_fork_syncvar.3 \
-		   qthread_fork_to.3 \
-		   qthread_fork_precond_to.3 \
-		   qthread_fork_syncvar_to.3 \
-		   qthread_get_tasklocal.3 \
-		   qthread_id.3 \
-		   qthread_incr.3 \
-		   qthread_init.3 \
-		   qthread_initialize.3 \
-		   qthread_lock.3 \
-		   qthread_migrate_to.3 \
-		   qthread_num_shepherds.3 \
-		   qthread_num_workers.3 \
-		   qthread_queue_create.3 \
-		   qthread_queue_destroy.3 \
-		   qthread_queue_join.3 \
-		   qthread_queue_length.3 \
-		   qthread_queue_release_all.3 \
-		   qthread_queue_release_one.3 \
-		   qthread_readFE.3 \
-		   qthread_readFF.3 \
-		   qthread_readstate.3 \
-		   qthread_retloc.3 \
-		   qthread_shep.3 \
-		   qthread_shep_ok.3 \
-		   qthread_size_tasklocal.3 \
-		   qthread_sorted_sheps.3 \
-		   qthread_sorted_sheps_remote.3 \
-		   qthread_spawn.3 \
-		   qthread_stackleft.3 \
-		   qthread_syncvar_empty.3 \
-		   qthread_syncvar_fill.3 \
-		   qthread_syncvar_readFE.3 \
-		   qthread_syncvar_readFF.3 \
-		   qthread_syncvar_status.3 \
-		   qthread_syncvar_writeEF.3 \
-		   qthread_syncvar_writeEF_const.3 \
-		   qthread_syncvar_writeF.3 \
-		   qthread_syncvar_writeF_const.3 \
-		   qthread_unlock.3 \
-		   qthread_worker.3 \
-		   qthread_worker_unique.3 \
-		   qthread_writeEF.3 \
-		   qthread_writeEF_const.3 \
-		   qthread_writeF.3 \
-		   qthread_writeF_const.3 \
-		   qthread_yield.3 \
-		   qtimer_create.3 \
-		   qtimer_destroy.3 \
-		   qtimer_fastrand.3 \
-		   qtimer_start.3 \
-		   qtimer_stop.3 \
-		   qtimer_secs.3 \
-		   qutil_double_max.3 \
-		   qutil_double_min.3 \
-		   qutil_double_mult.3 \
-		   qutil_double_sum.3 \
-		   qutil_int_max.3 \
-		   qutil_int_min.3 \
-		   qutil_int_mult.3 \
-		   qutil_int_sum.3 \
-		   qutil_mergesort.3 \
-		   qutil_qsort.3 \
-		   qutil_uint_max.3 \
-		   qutil_uint_min.3 \
-		   qutil_uint_mult.3 \
-		   qutil_uint_sum.3
-EXTRA_DIST = $(man_MANS)
diff --git a/scripts/ChangeLogGen.sh b/scripts/ChangeLogGen.sh
deleted file mode 100755
index b106803d0..000000000
--- a/scripts/ChangeLogGen.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-svn2cl --authors=AUTHORS
diff --git a/scripts/package.sh b/scripts/package.sh
deleted file mode 100755
index 138af7bd5..000000000
--- a/scripts/package.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-# Gen script for distributable package
-# Usage: cd SRC_DIR/scripts && bash package.sh TAG
-
-# Runs ./autogen 
-# Copies all files into subdir
-# Replaces soft links with linked files
-# Removes hidden files (except .autogen-version)
-# Updates .autogen-version
-# Creates tar.gz
-# Leaves subdir
-
-shopt -s extglob
-
-tag=$1
-
-while [ ! -f ./autogen.sh ]; do 
-    cd ..
-    qthread_root=`pwd`
-done
-
-if [ ! -f ./autogen.sh ]; then
-    echo "Error: I can't figure out where I am. Please run this script from the root of the qthreads source directory"
-    exit 1
-fi
-
-#=================================================================
-base_dir_name=${PWD##*/}
-base_dir_name=${base_dir_name:-/}
-#=================================================================
-
-linked_files="./compile \
-              ./config.guess \
-              ./config.sub \
-              ./depcomp \
-              ./install-sh \
-              ./libtool.m4 \
-              ./ltmain.sh \
-              ./lt~obsolete.m4 \
-              ./ltoptions.m4 \
-              ./ltsugar.m4 \
-              ./ltversion.m4 \
-              ./missing \
-              ./test-driver"
-
-
-#=================================================================
-echo "./autogen"
-bash ./autogen.sh
-#=================================================================
-echo "mkdir $base_dir_name-$tag"
-mkdir $base_dir_name-$tag
-#=================================================================
-cp -r !($base_dir_name-$tag) $base_dir_name-$tag/
-#=================================================================
-cd $base_dir_name-$tag
-    echo "rm -r ./autom4te.cache"
-    rm -rf ./autom4te.cache 
-    echo "Replacing links to autotool scripts with actual scripts"
-    cd config
-        mkdir tmp
-        for  i in $linked_files
-        do
-            echo $i
-            cp -Lr $i tmp/$i
-            mv tmp/$i $i
-        done
-    rm -r tmp
-    cd .. #config dir
-    echo "Removing hidden files"
-    rm -rf .[a-z]*
-    rm -rf configure~
-    echo "Update .autogen-version"
-    rm -rf .autogen-version
-    echo "$tag" > .autogen-version
-    echo "Gen time-stamp"
-    echo "timestamp for include/qthread/common.h" > ./include/qthread/stamp-h2
-    # Now update time stamp of the configure script to avoid rebuilding it
-    touch ./configure
-#=================================================================
-cd .. #$base_dir_name-$tag
-#=================================================================
-echo "tar czf $base_dir_name-$tag.tar.gz -C .. $base_dir_name-$tag"
-tar czf $base_dir_name-$tag.tar.gz -C . $base_dir_name-$tag 
-#=================================================================
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index b1f481411..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,99 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CCASFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -DHAVE_CONFIG_H
-
-lib_LTLIBRARIES = libqthread.la
-SUBDIRS =
-noinst_HEADERS = affinity/shufflesheps.h
-
-libqthread_la_SOURCES = \
-	cacheline.c \
-	envariables.c \
-	feb.c \
-	hazardptrs.c \
-	io.c \
-	locks.c \
-	qalloc.c \
-	qloop.c \
-	queue.c \
-	barrier/@with_barrier@.c \
-	qutil.c \
-	syncvar.c \
-	qthread.c \
-	mpool.c \
-	shepherds.c \
-	workers.c \
-	threadqueues/@with_scheduler@_threadqueues.c \
-	sincs/@with_sinc@.c \
-	alloc/@with_alloc@.c \
-	affinity/common.c \
-	affinity/@qthread_topo@.c \
-	touch.c \
-	tls.c \
-	teams.c
-
-EXTRA_DIST = 
-
-if COMPILE_LF_HASH
-libqthread_la_SOURCES += lf_hashmap.c
-else
-libqthread_la_SOURCES += hashmap.c
-endif
-
-include qtimer/Makefile.inc
-include ds/Makefile.inc
-include patterns/Makefile.inc
-include syscalls/Makefile.inc
-
-# version-info fields are:
-# 1. the current interface revision number (i.e. whenever arguments of existing
-#    functions change, increment this number)
-# 2. the revision number (the library with the highest revision number will be
-#    preferred)
-# 3. the age (how many previous interfaces are supported)
-#
-# So...
-# - If you add functions, increase the interface number AND the age, and reset
-#   the revision number to 0.
-# - If you modify (or remove) existing functions, increase the interface number
-#   and reset the revision and age numbers to 0
-# - If you support all the same functions (just bugfixes or whatnot), increment
-#   the revision number
-libqthread_la_LDFLAGS = -version-info 19:0:0 -no-undefined
-
-libqthread_la_LIBADD =
-libqthread_la_DEPENDENCIES =
-
-if QTHREAD_NEED_OWN_MAKECONTEXT
-include fastcontext/Makefile.inc
-endif
-
-EXTRA_DIST += \
-			 threadqueues/distrib_threadqueues.c \
-			 threadqueues/nemesis_threadqueues.c \
-			 threadqueues/sherwood_threadqueues.c \
-			 sincs/donecount.c \
-			 sincs/donecount_cas.c \
-			 sincs/original.c \
-			 barrier/feb.c \
-			 barrier/array.c \
-			 barrier/log.c \
-			 barrier/sinc.c \
-			 alloc/base.c \
-			 alloc/chapel.c \
-			 affinity/common.c \
-			 affinity/hwloc.c \
-			 affinity/binders.c \
-			 affinity/hwloc_v2.c \
-			 affinity/no.c \
-			 affinity/sys.c \
-			 affinity/libnuma.c \
-			 affinity/libnumaV2.c \
-			 affinity/mach.c \
-			 affinity/plpa.c \
-			 affinity/lgrp.c \
-			 affinity/shepcomp.h
diff --git a/src/ds/Makefile.inc b/src/ds/Makefile.inc
deleted file mode 100644
index 53ae41f68..000000000
--- a/src/ds/Makefile.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Makefile -*-
-# vim:ft=automake
-#
-# Copyright (c) 2010 Sandia Corporation
-#
-
-libqthread_la_SOURCES += \
-			 ds/qarray.c \
-			 ds/qdqueue.c \
-			 ds/qlfqueue.c \
-			 ds/qswsrqueue.c \
-			 ds/qpool.c \
-			 ds/dictionary/hash.c \
-			 ds/dictionary/dictionary_@with_dict@.c
-
-EXTRA_DIST += \
-			 ds/dictionary/dictionary_shavit.c \
-			 ds/dictionary/dictionary_trie.c \
-			 ds/dictionary/dictionary_simple.c
diff --git a/src/fastcontext/Makefile.inc b/src/fastcontext/Makefile.inc
deleted file mode 100644
index 76ffdf59a..000000000
--- a/src/fastcontext/Makefile.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*- Makefile -*-
-# vim:ft=automake
-#
-# Copyright (c) 2010 Sandia Corporation
-#
-
-if QTHREAD_NEED_OWN_MAKECONTEXT
-
-libqthread_la_SOURCES += \
-			 fastcontext/asm.S \
-			 fastcontext/context.c
-
-endif
diff --git a/src/patterns/Makefile.inc b/src/patterns/Makefile.inc
deleted file mode 100644
index 8fd26e14d..000000000
--- a/src/patterns/Makefile.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Makefile -*-
-# vim:ft=automake
-#
-# Copyright (c) 2010 Sandia Corporation
-#
-
-libqthread_la_SOURCES += \
-						 patterns/allpairs.c \
-						 patterns/wavefront.c
diff --git a/src/qtimer/Makefile.inc b/src/qtimer/Makefile.inc
deleted file mode 100644
index 767ec8b3b..000000000
--- a/src/qtimer/Makefile.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- Makefile -*-
-# vim:ft=automake
-#
-# Copyright (c) 2010 Sandia Corporation
-#
-
-if QTHREAD_TIMER_TYPE_MACH
-libqthread_la_SOURCES += qtimer/mach.c
-endif
-
-if QTHREAD_TIMER_TYPE_GETHRTIME
-libqthread_la_SOURCES += qtimer/gethrtime.c
-endif
-
-if QTHREAD_TIMER_TYPE_GETTIMEOFDAY
-libqthread_la_SOURCES += qtimer/gettimeofday.c
-endif
-
-if QTHREAD_TIMER_TYPE_GETTIME
-libqthread_la_SOURCES += qtimer/gettime.c
-endif
diff --git a/src/syscalls/Makefile.inc b/src/syscalls/Makefile.inc
deleted file mode 100644
index 161d62b60..000000000
--- a/src/syscalls/Makefile.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Makefile -*-
-# vim:ft=automake
-#
-# Copyright (c) 2011 Sandia Corporation
-#
-
-libqthread_la_SOURCES += \
-			 syscalls/accept.c \
-			 syscalls/connect.c \
-			 syscalls/poll.c \
-			 syscalls/pread.c \
-			 syscalls/pwrite.c \
-			 syscalls/read.c \
-			 syscalls/select.c \
-			 syscalls/system.c \
-			 syscalls/user_defined.c \
-			 syscalls/wait4.c \
-			 syscalls/write.c
diff --git a/test/Makefile.am b/test/Makefile.am
deleted file mode 100644
index 6ad3c7890..000000000
--- a/test/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2008  Sandia Corporation
-#
-
-SUBDIRS = basics features stress utils
-
-DIST_SUBDIRS = $(SUBDIRS) benchmarks
-
-basictests:
-	$(MAKE) -C basics buildtests
-
-featuretests:
-	$(MAKE) -C features buildtests
-
-stresstests:
-	$(MAKE) -C stress buildtests
-
-tests: basictests featuretests stresstests
-
-buildtests: tests
-
-buildextra: benchmarks
-
-benchmarks:
-	$(MAKE) -C benchmarks buildextra
-
-buildall: buildtests buildextra
-
-.PHONY: buildall tests buildtests benchmarks buildextra basictests featuretests stresstests
-
-noinst_HEADERS = argparsing.h
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-outputdir = $(top_builddir)/src
-qthreadlib = $(outputdir)/libqthread.la
-
-LDADD = $(qthreadlib)
diff --git a/test/basics/Makefile.am b/test/basics/Makefile.am
deleted file mode 100644
index 190b885b6..000000000
--- a/test/basics/Makefile.am
+++ /dev/null
@@ -1,140 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2012  Sandia Corporation
-#
-
-.PHONY: buildall buildtests buildextra
-
-TESTS = \
-		hello_world \
-		aligned_prodcons \
-		aligned_readXX_basic \
-		aligned_purge_basic \
-		aligned_purge_wakes \
-		aligned_writeFF_basic \
-		aligned_writeFF_waits \
-		hello_world_multi \
-		syncvar_prodcons \
-		reinitialization \
-		qthread_cas \
-		qthread_cacheline \
-		qthread_readstate \
-		qthread_id \
-		qthread_incr qthread_fincr qthread_dincr \
-		qthread_stackleft \
-		qtimer \
-		qalloc \
-		queue \
-		arbitrary_blocking_operation \
-		sinc_null \
-		sinc_workers \
-		sinc \
-		tasklocal_data \
-		tasklocal_data_no_default \
-		tasklocal_data_no_argcopy \
-		external_fork \
-		external_syncvar \
-		read \
-		test_teams \
-		test_subteams \
- 		qthread_fork_precond \
-		qthread_migrate_to  \
-		qthread_disable_shepherd \
-                qthread_timer_wait \
-                qthread_fp \
-                qthread_fp_double
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT =
-
-if WANT_SINGLE_WORKER_SCHEDULER
-TESTS_ENVIRONMENT += env QT_NUM_SHEPHERDS=2 QT_NUM_WORKERS_PER_SHEPHERD=1
-endif
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/test/
-qthreadlib = $(top_builddir)/src/libqthread.la
-
-buildall: $(TESTS)
-
-buildtests: $(TESTS)
-
-buildextra: $(TESTS)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
-
-LDADD = $(qthreadlib)
-
-hello_world_SOURCES = hello_world.c
-
-aligned_prodcons_SOURCES = aligned_prodcons.c
-
-aligned_readXX_basic_SOURCES = aligned_readXX_basic.c
-
-aligned_purge_basic_SOURCES = aligned_purge_basic.c
-
-aligned_purge_wakes_SOURCES = aligned_purge_wakes.c
-
-aligned_writeFF_basic_SOURCES = aligned_writeFF_basic.c
-
-aligned_writeFF_waits_SOURCES = aligned_writeFF_waits.c
-
-hello_world_multi_SOURCES = hello_world_multi.c
-
-syncvar_prodcons_SOURCES = syncvar_prodcons.c
-
-reinitialization_SOURCES = reinitialization.c
-
-qthread_cas_SOURCES = qthread_cas.c
-
-qthread_cacheline_SOURCES = qthread_cacheline.c
-
-qthread_id_SOURCES = qthread_id.c
-
-qthread_incr_SOURCES = qthread_incr.c
-
-qthread_fincr_SOURCES = qthread_fincr.c
-
-qthread_dincr_SOURCES = qthread_dincr.c
-
-qthread_stackleft_SOURCES = qthread_stackleft.c
-
-qthread_migrate_to_SOURCES = qthread_migrate_to.c
-
-qthread_disable_shepherd_SOURCES = qthread_disable_shepherd.c
-
-qthread_timer_wait_SOURCES = qthread_timer_wait.c
-
-qtimer_SOURCES = qtimer.c
-
-queue_SOURCES = queue.c
-
-qthread_fork_precond_SOURCES = qthread_fork_precond.c
-
-qalloc_SOURCES = qalloc.c
-
-arbitrary_blocking_operation_SOURCES = arbitrary_blocking_operation.c
-
-sinc_null_SOURCES = sinc_null.c
-
-sinc_workers_SOURCES = sinc_workers.c
-
-sinc_SOURCES = sinc.c
-
-tasklocal_data_SOURCES = tasklocal_data.c
-
-tasklocal_data_no_default_SOURCES = tasklocal_data_no_default.c
-
-tasklocal_data_no_argcopy_SOURCES = tasklocal_data_no_argcopy.c
-
-external_fork_SOURCES = external_fork.c
-
-external_syncvar_SOURCES = external_syncvar.c
-
-read_SOURCES = read.c
-
-test_teams_SOURCES = test_teams.c
-
-test_subteams_SOURCES = test_subteams.c
-
diff --git a/test/benchmarks/Makefile.am b/test/benchmarks/Makefile.am
deleted file mode 100644
index 9f2c166fd..000000000
--- a/test/benchmarks/Makefile.am
+++ /dev/null
@@ -1,365 +0,0 @@
-SUBDIRS = mantevo finepoints
-
-.PHONY: buildall buildtests buildextra benchmarks
-
-DIST_SUBDIRS = mantevo finepoints
-
-generic_benchmarks = \
-                     time_gcd \
-                     time_increments \
-                     time_febs \
-                     time_febs_graph_test \
-                     time_febs_stream_test \
-                     time_producerconsumer \
-                     time_syncvar_producerconsumer \
-                     time_threading \
-                     time_stencil_bsp \
-                     time_stencil_feb \
-                     time_stencil_pre \
-                     time_halo_swap_all \
-                     time_prodcons_comm \
-                     time_qt_loops \
-                     time_qt_loopaccums \
-                     time_thread_ring \
-                     time_chpl_spawn
-
-thesis_benchmarks = \
-                    time_allpairs \
-                    time_wavefront \
-                    time_qutil_qsort
-
-pmea09_benchmarks = \
-                    time_qarray \
-                    time_qarray_sizes \
-                    time_qpool \
-                    time_qlfqueue \
-                    time_qdqueue \
-                    time_qdqueue_sizes
-mtaap08_benchmarks = \
-                     time_incr_bench \
-                     time_incr_bench_pthread \
-                     time_lul_bench \
-                     time_lul_bench_pthread \
-                     time_mutex_bench \
-                     time_mutex_bench_pthread \
-                     time_spin_bench \
-                     time_spin_bench_pthread \
-                     time_chain_bench \
-                     time_chain_bench_pthread \
-                     time_thrcrt_bench \
-                     time_thrcrt_bench_pthread \
-                     time_cncthr_bench \
-                     time_cncthr_bench_pthread
-uts_benchmarks = \
-                 time_uts_syncvar \
-                 time_uts_aligned \
-                 time_uts_sinc \
-                 time_uts_donecount \
-                 time_uts_donecount2 \
-                 time_uts_donecount3
-mt_benchmarks = \
-                time_task_spawn \
-                time_eager_future \
-                time_fib \
-                time_fib2
-sc12_benchmarks = \
-                  spawn_sequential_qthreads \
-                  spawn_parallel_qthreads \
-                  fib_qthreads \
-                  uts_qthreads
-
-if COMPILE_OMP_BENCHMARKS
-generic_benchmarks += time_threading.omp
-uts_benchmarks += time_uts_omp
-mt_benchmarks += \
-                 time_omp_task_spawn \
-                 time_omp_eager_future \
-                 time_omp_fib
-sc12_benchmarks += \
-                   spawn_sequential_omp \
-                   spawn_parallel_omp \
-                   fib_omp \
-                   uts_omp
-endif
-
-if COMPILE_TBB_BENCHMARKS
-uts_benchmarks += time_uts_tbb
-pmea09_benchmarks += \
-                     time_tbbq \
-                     time_tbbq_sizes
-mt_benchmarks += \
-                 time_tbb_eager_future \
-                 time_tbb_fib \
-                 time_tbb_task_spawn
-sc12_benchmarks += \
-                   spawn_sequential_tbb \
-                   spawn_parallel_tbb \
-                   fib_tbb \
-                   uts_tbb
-endif
-
-if COMPILE_CILK_BENCHMARKS
-uts_benchmarks += time_uts_cilk
-mt_benchmarks += \
-                 time_cilk_eager_future \
-                 time_cilk_fib \
-                 time_cilk_task_spawn
-sc12_benchmarks += \
-                   spawn_sequential_cilk \
-                   spawn_parallel_cilk \
-                   fib_cilk \
-                   uts_cilk
-endif
-
-benchmarks = \
-             $(generic_benchmarks) \
-             $(uts_benchmarks) \
-             $(thesis_benchmarks) \
-             $(pmea09_benchmarks) \
-             $(mtaap08_benchmarks) \
-             $(mt_benchmarks) \
-             $(sc12_benchmarks)
-
-EXTRA_PROGRAMS = $(benchmarks)
-CLEANFILES = $(benchmarks)
-
-EXTRA_DIST = \
-             pmea09/time_tbbq.cpp \
-             pmea09/time_tbbq_sizes.cpp
-
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/test/
-outputdir = $(top_builddir)/src
-qthreadlib = $(outputdir)/libqthread.la
-utils_rnglib = $(top_builddir)/test/utils/rng/librng.la
-
-LDADD = $(qthreadlib)
-
-benchmarks: buildextra
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
-
-$(utils_rnglib):
-	$(MAKE) -C $(top_builddir)/test/utils/rng librng.la
-
-time_allpairs_SOURCES = thesis/time_allpairs.c
-
-time_wavefront_SOURCES = thesis/time_wavefront.c
-
-time_qutil_qsort_SOURCES = thesis/time_qutil_qsort.c
-time_qutil_qsort_LDADD = -lm $(qthreadlib)
-
-time_qarray_SOURCES = pmea09/time_qarray.c
-
-time_qarray_sizes_SOURCES = pmea09/time_qarray_sizes.c
-
-time_qpool_SOURCES = pmea09/time_qpool.c
-
-time_qlfqueue_SOURCES = pmea09/time_qlfqueue.c
-
-time_qdqueue_SOURCES = pmea09/time_qdqueue.c
-
-time_qdqueue_sizes_SOURCES = pmea09/time_qdqueue_sizes.c
-
-if COMPILE_TBB_BENCHMARKS
-time_tbbq_SOURCES = pmea09/time_tbbq.cpp
-time_tbbq_LDFLAGS = @TBB_LIBS@
-
-time_tbbq_sizes_SOURCES = pmea09/time_tbbq_sizes.cpp
-time_tbbq_sizes_LDFLAGS = @TBB_LIBS@
-endif
-
-time_incr_bench_SOURCES = mtaap08/time_incr_bench.c
-
-time_incr_bench_pthread_SOURCES = mtaap08/time_incr_bench_pthread.c
-
-time_lul_bench_SOURCES = mtaap08/time_lul_bench.c
-
-time_lul_bench_pthread_SOURCES = mtaap08/time_lul_bench_pthread.c
-
-time_mutex_bench_SOURCES = mtaap08/time_mutex_bench.c
-
-time_mutex_bench_pthread_SOURCES = mtaap08/time_mutex_bench_pthread.c
-
-time_spin_bench_SOURCES = mtaap08/time_spin_bench.c
-
-time_spin_bench_pthread_SOURCES = mtaap08/time_spin_bench_pthread.c
-
-time_chain_bench_SOURCES = mtaap08/time_chain_bench.c
-
-time_chain_bench_pthread_SOURCES = mtaap08/time_chain_bench_pthread.c
-
-time_thrcrt_bench_SOURCES = mtaap08/time_thrcrt_bench.c
-
-time_thrcrt_bench_pthread_SOURCES = mtaap08/time_thrcrt_bench_pthread.c
-
-time_cncthr_bench_SOURCES = mtaap08/time_cncthr_bench.c
-
-time_cncthr_bench_pthread_SOURCES = mtaap08/time_cncthr_bench_pthread.c
-
-time_gcd_SOURCES = generic/time_gcd.c
-
-time_increments_SOURCES = generic/time_increments.c
-
-time_febs_SOURCES = generic/time_febs.c
-
-time_febs_graph_test_SOURCES = generic/time_febs_graph_test.c
-
-time_febs_stream_test_SOURCES = generic/time_febs_stream_test.c
-
-time_fib_SOURCES = mt/time_fib.c
-
-time_fib2_SOURCES = mt/time_fib2.c
-
-time_producerconsumer_SOURCES = generic/time_producerconsumer.c
-
-time_syncvar_producerconsumer_SOURCES = generic/time_syncvar_producerconsumer.c
-
-time_threading_SOURCES = generic/time_threading.c
-
-time_thread_ring_SOURCES = generic/time_thread_ring.c
-
-time_chpl_spawn_SOURCES = generic/time_chpl_spawn.c
-
-if COMPILE_OMP_BENCHMARKS
-time_threading_omp_SOURCES = generic/time_threading.omp.c
-time_threading_omp_CFLAGS = @OPENMP_CFLAGS@
-endif
-
-time_stencil_bsp_SOURCES = generic/time_stencil_bsp.c
-
-time_stencil_feb_SOURCES = generic/time_stencil_feb.c
-
-time_stencil_pre_SOURCES = generic/time_stencil_pre.c
-
-time_halo_swap_all_SOURCES = generic/time_halo_swap_all.c
-
-time_prodcons_comm_SOURCES = generic/time_prodcons_comm.c
-
-time_qt_loops_SOURCES = generic/time_qt_loops.c
-
-time_qt_loopaccums_SOURCES = generic/time_qt_loopaccums.c
-
-if COMPILE_OMP_BENCHMARKS
-time_uts_omp_SOURCES = uts/time_uts_omp.c
-time_uts_omp_LDADD = $(LDADD) -lm $(utils_rnglib)
-time_uts_omp_CFLAGS = @OPENMP_CFLAGS@
-endif
-
-if COMPILE_TBB_BENCHMARKS
-time_uts_tbb_SOURCES = uts/time_uts_tbb.cc
-time_uts_tbb_LDADD = $(LDADD) -lm $(utils_rnglib)
-time_uts_tbb_LDFLAGS = @TBB_LIBS@
-endif
-
-if COMPILE_CILK_BENCHMARKS
-time_uts_cilk_SOURCES = uts/time_uts_cilk.c
-time_uts_cilk_LDADD = $(LDADD) -lm $(utils_rnglib)
-endif
-
-time_uts_syncvar_SOURCES = uts/time_uts_syncvar.c
-time_uts_syncvar_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-time_uts_aligned_SOURCES = uts/time_uts_aligned.c
-time_uts_aligned_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-time_uts_sinc_SOURCES = uts/time_uts_sinc.c
-time_uts_sinc_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-time_uts_donecount_SOURCES = uts/time_uts_donecount.c
-time_uts_donecount_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-time_uts_donecount2_SOURCES = uts/time_uts_donecount2.c
-time_uts_donecount2_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-time_uts_donecount3_SOURCES = uts/time_uts_donecount3.c
-time_uts_donecount3_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-time_task_spawn_SOURCES = mt/time_task_spawn.c
-
-time_eager_future_SOURCES = mt/time_eager_future.c
-
-if COMPILE_OMP_BENCHMARKS
-time_omp_task_spawn_SOURCES = mt/time_omp_task_spawn.c
-time_omp_task_spawn_CFLAGS = @OPENMP_CFLAGS@
-
-time_omp_fib_SOURCES = mt/time_omp_fib.c
-time_omp_fib_CFLAGS = @OPENMP_CFLAGS@
-endif
-
-if COMPILE_TBB_BENCHMARKS
-time_tbb_fib_SOURCES = mt/time_tbb_fib.cc
-time_tbb_fib_LDFLAGS = @TBB_LIBS@
-
-time_tbb_task_spawn_SOURCES = mt/time_tbb_task_spawn.cc
-time_tbb_task_spawn_LDFLAGS = @TBB_LIBS@
-
-time_tbb_eager_future_SOURCES = mt/time_tbb_eager_future.cc
-time_tbb_eager_future_LDFLAGS = @TBB_LIBS@
-endif
-
-if COMPILE_CILK_BENCHMARKS
-time_cilk_fib_SOURCES = mt/time_cilk_fib.c
-
-time_cilk_task_spawn_SOURCES = mt/time_cilk_task_spawn.c
-
-time_cilk_eager_future_SOURCES = mt/time_cilk_eager_future.c
-endif
-
-# SC12 Benchmarks
-
-spawn_sequential_qthreads_SOURCES = sc12/spawn_sequential_qthreads.c
-
-spawn_parallel_qthreads_SOURCES = sc12/spawn_parallel_qthreads.c
-
-fib_qthreads_SOURCES = sc12/fib_qthreads.c
-
-uts_qthreads_SOURCES = sc12/uts_qthreads.c
-uts_qthreads_LDADD = $(LDADD) -lm $(utils_rnglib)
-
-if COMPILE_OMP_BENCHMARKS
-time_omp_eager_future_SOURCES = mt/time_omp_eager_future.c
-time_omp_eager_future_CFLAGS = @OPENMP_CFLAGS@
-
-spawn_sequential_omp_SOURCES = sc12/spawn_sequential_omp.c
-spawn_sequential_omp_CFLAGS = @OPENMP_CFLAGS@
-
-spawn_parallel_omp_SOURCES = sc12/spawn_parallel_omp.c
-spawn_parallel_omp_CFLAGS = @OPENMP_CFLAGS@
-
-fib_omp_SOURCES = sc12/fib_omp.c
-fib_omp_CFLAGS = @OPENMP_CFLAGS@
-
-uts_omp_SOURCES = sc12/uts_omp.c
-uts_omp_LDADD = $(LDADD) -lm $(utils_rnglib)
-uts_omp_CFLAGS = @OPENMP_CFLAGS@
-endif
-
-if COMPILE_TBB_BENCHMARKS
-spawn_sequential_tbb_SOURCES = sc12/spawn_sequential_tbb.cc
-spawn_sequential_tbb_LDFLAGS = @TBB_LIBS@
-
-spawn_parallel_tbb_SOURCES = sc12/spawn_parallel_tbb.cc
-spawn_parallel_tbb_LDFLAGS = @TBB_LIBS@
-
-fib_tbb_SOURCES = sc12/fib_tbb.cc
-fib_tbb_LDFLAGS = @TBB_LIBS@
-
-uts_tbb_SOURCES = sc12/uts_tbb.cc
-uts_tbb_LDADD = $(LDADD) -lm $(utils_rnglib)
-uts_tbb_LDFLAGS = @TBB_LIBS@
-endif
-
-if COMPILE_CILK_BENCHMARKS
-spawn_sequential_cilk_SOURCES = sc12/spawn_sequential_cilk.c
-
-spawn_parallel_cilk_SOURCES = sc12/spawn_parallel_cilk.c
-
-fib_cilk_SOURCES = sc12/fib_cilk.c
-
-uts_cilk_SOURCES = sc12/uts_cilk.c
-uts_cilk_LDADD = $(LDADD) -lm $(utils_rnglib)
-endif
-
-# vim: set expandtab
diff --git a/test/benchmarks/finepoints/Makefile.am b/test/benchmarks/finepoints/Makefile.am
deleted file mode 100644
index 5c15ced3a..000000000
--- a/test/benchmarks/finepoints/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = partSendPrototype
-
-DIST_SUBDIRS = $(SUBDIRS)
-
-.PHONY: buildall buildextra benchmarks
-
-finepoints_benchmarks = partSendPrototype/partTest
-
-benchmarks: buildextra
-buildall: buildextra
-
-buildextra:
-	for DIR in $(SUBDIRS) ; do \
-		$(MAKE) -C $$DIR buildall ; \
-	done
-
-partSendPrototype/partTest:
-	$(MAKE) -C partSendPrototype buildall
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-qthreadlib = $(top_builddir)/src/libqthread.la
-
-LDADD = $(qthreadlib)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
diff --git a/test/benchmarks/finepoints/partSendPrototype/Makefile.am b/test/benchmarks/finepoints/partSendPrototype/Makefile.am
deleted file mode 100644
index d584dabf7..000000000
--- a/test/benchmarks/finepoints/partSendPrototype/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-.PHONY: buildall buildextra benchmarks
-
-benchmarks: partTest
-buildall: partTest
-buildextra: partTest
-
-EXTRA_PROGRAMS = partTest
-CLEANFILES = partTest
-
-CC=mpicc #$(MPICC)
-CXX=mpic++ #$(MPICXX)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-qthreadlib = $(top_builddir)/src/libqthread.la
-
-LDADD = $(qthreadlib)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
-
-partTest_SOURCES = mpiBase.cc \
-	mpiPart.cc \
-	mpiBaseTest1.cc \
-	mpiBaseTest11.cc \
-	mpiBaseTest2.cc \
-	mpiBaseTest21.cc \
-	mpiBaseTest3.cc \
-	mpiBaseTest31.cc \
-	mpiBaseTest31t.cc \
-	mpiBaseTest32.cc \
-	mpiBaseTest5.cc
-
-partTest_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) -DUSING_QTHREADS -DWALL
-
diff --git a/test/benchmarks/mantevo/Makefile.am b/test/benchmarks/mantevo/Makefile.am
deleted file mode 100644
index c4e588088..000000000
--- a/test/benchmarks/mantevo/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-SUBDIRS = hpccg
-
-DIST_SUBDIRS = $(SUBDIRS)
-
-.PHONY: buildall buildextra benchmarks
-
-mantevo_benchmarks = hpccg/hpccg
-
-benchmarks: buildextra
-buildall: buildextra
-
-buildextra:
-	for DIR in $(SUBDIRS) ; do \
-		$(MAKE) -C $$DIR buildall ; \
-	done
-
-hpccg/hpccg:
-	$(MAKE) -C hpccg buildall
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-qthreadlib = $(top_builddir)/src/libqthread.la
-
-LDADD = $(qthreadlib)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
diff --git a/test/benchmarks/mantevo/hpccg/Makefile.am b/test/benchmarks/mantevo/hpccg/Makefile.am
deleted file mode 100644
index 96697cdcc..000000000
--- a/test/benchmarks/mantevo/hpccg/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-.PHONY: buildall buildextra benchmarks
-
-benchmarks: hpccg
-buildall: hpccg
-buildextra: hpccg
-
-EXTRA_PROGRAMS = hpccg
-CLEANFILES = hpccg
-
-AM_CPPFLAGS = -I$(top_srcdir)/include
-qthreadlib = $(top_builddir)/src/libqthread.la
-
-LDADD = $(qthreadlib)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
-
-hpccg_SOURCES = HPCCG.cpp \
-				HPC_sparsemv.cpp \
-				compute_residual.cpp \
-				ddot.cpp \
-				exchange_externals.cpp \
-				generate_matrix.cpp \
-				main.cpp \
-				make_local_matrix.cpp \
-				mytimer.cpp \
-				read_HPC_row.cpp \
-				waxpby.cpp
-hpccg_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS) -DUSING_QTHREADS -DWALL
-
diff --git a/test/features/Makefile.am b/test/features/Makefile.am
deleted file mode 100644
index 59668153e..000000000
--- a/test/features/Makefile.am
+++ /dev/null
@@ -1,100 +0,0 @@
-# -*- Makefile -*-VE
-#
-# Copyright (c)      2012  Sandia Corporation
-#
-
-.PHONY: buildall buildtests buildextra
-
-TESTS = \
-		qt_loop \
-		qt_loop_simple \
-		qt_loop_sinc \
-		qt_loop_balance \
-		qt_loop_balance_simple \
-		qt_loop_balance_sinc \
-		qt_loop_queue \
-		qutil \
-		qutil_qsort \
-		barrier \
-		qloop_utils \
-		qarray \
-		qarray_accum \
-		qpool \
-		qlfqueue \
-		qswsrqueue \
-		qdqueue \
-		allpairs \
-		subteams \
-		qt_dictionary \
-		cxx_qt_loop \
-		cxx_qt_loop_balance
-
-if HAVE_GUARD_PAGES
-TESTS += guard_pages
-endif
-
-EXTRA_PROGRAMS = wavefront
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT =
-
-if WANT_SINGLE_WORKER_SCHEDULER
-TESTS_ENVIRONMENT += env QT_NUM_SHEPHERDS=2 QT_NUM_WORKERS_PER_SHEPHERD=1
-endif
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/test/
-qthreadlib = $(top_builddir)/src/libqthread.la
-
-buildall: $(TESTS)
-
-buildtests: $(TESTS)
-
-buildextra: $(TESTS)
-
-LDADD = $(qthreadlib)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
-
-qt_loop_SOURCES = qt_loop.c
-
-qt_loop_simple_SOURCES = qt_loop_simple.c
-
-qt_loop_sinc_SOURCES = qt_loop_sinc.c
-
-qt_loop_balance_SOURCES = qt_loop_balance.c
-
-qt_loop_balance_sinc_SOURCES = qt_loop_balance_sinc.c
-
-qutil_SOURCES = qutil.c
-
-qutil_qsort_SOURCES = qutil_qsort.c
-
-barrier_SOURCES = barrier.c
-
-qloop_utils_SOURCES = qloop_utils.c
-
-qt_loop_queue_SOURCES = qt_loop_queue.c
-
-qpool_SOURCES = qpool.c
-
-qarray_SOURCES = qarray.c
-
-qarray_accum_SOURCES = qarray_accum.c
-
-qlfqueue_SOURCES = qlfqueue.c
-
-qswsrqueue_SOURCES = qswsrqueue.c
-
-qdqueue_SOURCES = qdqueue.c
-
-allpairs_SOURCES = allpairs.c
-
-subteams_SOURCES = subteams.c
-
-cxx_qt_loop_SOURCES = cxx_qt_loop.cpp
-
-cxx_qt_loop_balance_SOURCES = cxx_qt_loop_balance.cpp
-
-wavefront_SOURCES = wavefront.c
diff --git a/test/stress/Makefile.am b/test/stress/Makefile.am
deleted file mode 100644
index bb779af2f..000000000
--- a/test/stress/Makefile.am
+++ /dev/null
@@ -1,66 +0,0 @@
-# -*- Makefile -*-
-#
-# Copyright (c)      2012  Sandia Corporation
-#
-
-.PHONY: buildall buildtests buildextra
-
-TESTS = \
-		feb_prodcons_contended \
-		syncvar_prodcons_contended \
-		feb_stream \
-		syncvar_stream \
-		precond_fib \
-		task_spawn \
-		test_spawn_simple \
-		precond_spawn_simple \
-		lock_acq_rel \
-		feb_as_fence \
-                subteams_uts
-
-check_PROGRAMS = $(TESTS)
-
-TESTS_ENVIRONMENT =
-
-if WANT_SINGLE_WORKER_SCHEDULER
-TESTS_ENVIRONMENT += env QT_NUM_SHEPHERDS=2 QT_NUM_WORKERS_PER_SHEPHERD=1
-endif
-
-AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/test/
-qthreadlib = $(top_builddir)/src/libqthread.la
-utils_rnglib = $(top_builddir)/test/utils/rng/librng.la
-
-buildall: $(TESTS)
-
-buildtests: $(TESTS)
-
-buildextra: $(TESTS)
-
-LDADD = $(qthreadlib)
-
-$(qthreadlib):
-	$(MAKE) -C $(top_builddir)/src libqthread.la
-
-$(utils_rnglib):
-	$(MAKE) -C $(top_builddir)/test/utils/rng librng.la
-
-feb_prodcons_contended_SOURCES = feb_prodcons_contended.c
-
-syncvar_prodcons_contended_SOURCES = syncvar_prodcons_contended.c
-
-precond_fib_SOURCES = precond_fib.c
-
-precond_spawn_simple_SOURCES = precond_spawn_simple.c
-
-task_spawn_SOURCES = task_spawn.c
-
-test_spawn_simple_SOURCES = test_spawn_simple.c
-
-syncvar_stream_SOURCES = syncvar_stream.c
-
-feb_stream_SOURCES = feb_stream.c
-
-lock_acq_rel_SOURCES = lock_acq_rel.c
-
-subteams_uts_SOURCES = subteams_uts.c
-subteams_uts_LDADD = $(LDADD) -lm $(utils_rnglib)