diff --git a/LIB_VERSION b/LIB_VERSION
index 95a490c2..b4b65eb7 100755
--- a/LIB_VERSION
+++ b/LIB_VERSION
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 #Return library version in the libtool current:revision:age format.
 
diff --git a/Makefile.in b/Makefile.in
index e453848c..746d3989 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -206,9 +206,9 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/bootstrap.sh b/bootstrap.sh
index db54bd4c..b2836bb2 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -4,6 +4,7 @@ echo Bootstrap in spindle
 autoheader
 autoconf
 aclocal
+automake --add-missing
 automake
 
 echo Bootstrap in client
@@ -11,6 +12,7 @@ cd src/client
 autoheader
 autoconf
 aclocal
+automake --add-missing
 automake
 cd ../..
 
@@ -19,6 +21,7 @@ cd src/server
 autoheader
 autoconf
 aclocal
+automake --add-missing
 automake
 cd ../..
 
@@ -27,5 +30,10 @@ cd src/fe
 autoheader
 autoconf
 aclocal
+automake --add-missing
 automake
 cd ../..
+
+automake
+touch configure
+
diff --git a/configure b/configure
index 08d8d532..58337ac2 100755
--- a/configure
+++ b/configure
@@ -653,7 +653,6 @@ MPI_CFLAGS
 MPICC
 BLD_TESTSUITE_FALSE
 BLD_TESTSUITE_TRUE
-AM_CFLAGS
 LMON_DYNAMIC_FALSE
 LMON_DYNAMIC_TRUE
 LMON_FALSE
@@ -686,6 +685,7 @@ SOCKETS_TRUE
 PIPES_FALSE
 PIPES_TRUE
 TESTRM
+AR_FLAGS
 CXXCPP
 CPP
 OTOOL64
@@ -16200,6 +16200,87 @@ DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wall" >&5
+$as_echo_n "checking for -Wall... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wall"
+CXXFLAGS="$CXXLAGS -Wall"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-unused-result" >&5
+$as_echo_n "checking for -Wno-unused-result... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wunused-result"
+CXXFLAGS="$CXXFLAGS -Wunused-result"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-unused-result"; CXXFLAGS="$OCXXFLAGS -Wno-unused-result"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-portability" >&5
+$as_echo_n "checking for -Wno-portability... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wportability"
+CXXFLAGS="$CXXFLAGS -Wportability"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-portability"; CXXFLAGS="$OCXXFLAGS -Wno-portability"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+AR_FLAGS=cr
+
+
 
 # Check whether --with-default-port was given.
 if test "${with_default_port+set}" = set; then :
@@ -16914,9 +16995,11 @@ else
 fi
 
 
-#Default flags
-AM_CFLAGS=-Wall
-
+#AC_ARG_WITH(testrm,
+#            [AS_HELP_STRING([--with-testrm=ARG],[Resource manager to use for tests (valid options are 'slurm' and 'flux')])],
+#            [TESTRM=${withval}],
+#            [TESTRM=unknown; AC_MSG_WARN([--with-testrm not specified. Spindle tests will not work])])
+#AC_SUBST(TESTRM)
 
 #MPI detection
 # Check whether --enable-testsuite was given.
@@ -17649,6 +17732,19 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking automake compatibility" >&5
+$as_echo_n "checking automake compatibility... " >&6; }
+AUTOMAKE_LINE=`head -n 1 ${srcdir}/Makefile.in`
+if test "${AUTOMAKE_LINE:0:40}" == "# Makefile.in generated by automake 1.15"; then
+if test "x$enable_dependency_tracking" != "xno"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+as_fn_error $? "Incompatible automake version.  This automake does not generate correct dependency information with Spindle.  Please run with a different automake (by adding another automake to your PATH and running bootstrap.sh), or by configuring with the --disable-dependency-tracking option." "$LINENO" 5
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
diff --git a/configure.ac b/configure.ac
index 09f3019f..aec4260b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([spindle], m4_esyscmd([tr -d '\n' < VERSION]), m4_esyscmd([tr -d '\n' <
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([scripts])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([-Wall -Werror foreign -Wno-portability])
+AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 AM_PROG_AR
 AC_PROG_CC
@@ -20,8 +20,11 @@ m4_include([m4/ax_tls.m4])
 m4_include([m4/lmon.m4])
 AX_TLS
 
-#Default flags
-AC_SUBST([AM_CFLAGS], [-Wall])
+#AC_ARG_WITH(testrm,
+#            [AS_HELP_STRING([--with-testrm=ARG],[Resource manager to use for tests (valid options are 'slurm' and 'flux')])],
+#            [TESTRM=${withval}],
+#            [TESTRM=unknown; AC_MSG_WARN([--with-testrm not specified. Spindle tests will not work])])
+#AC_SUBST(TESTRM)
 
 #MPI detection
 AC_ARG_ENABLE(testsuite,
@@ -48,6 +51,16 @@ AC_ARG_VAR([BE_CPP], [CPP for back end])
 AC_ARG_VAR([BE_CXXCPP], [CXXCPP for back end])
 AC_ARG_VAR([BE_host], [host to use for back end])
 
+AC_MSG_CHECKING([automake compatibility])
+AUTOMAKE_LINE=`head -n 1 ${srcdir}/Makefile.in`
+if test "${AUTOMAKE_LINE:0:40}" == "# Makefile.in generated by automake 1.15"; then
+if test "x$enable_dependency_tracking" != "xno"; then
+AC_MSG_RESULT([no])
+AC_MSG_ERROR([Incompatible automake version.  This automake does not generate correct dependency information with Spindle.  Please run with a different automake (by adding another automake to your PATH and running bootstrap.sh), or by configuring with the --disable-dependency-tracking option.])
+fi
+fi
+AC_MSG_RESULT([yes])
+
 AC_OUTPUT
 
 #Set BE_CC, BE_CXX and related flags
diff --git a/configure.common.ac b/configure.common.ac
index 5985a1ca..526696a5 100644
--- a/configure.common.ac
+++ b/configure.common.ac
@@ -4,6 +4,33 @@ DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
+AC_MSG_CHECKING([for -Wall])
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wall"
+CXXFLAGS="$CXXLAGS -Wall"
+AC_TRY_COMPILE([], [], AC_MSG_RESULT(yes), [AC_MSG_RESULT(no); CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS])
+
+AC_MSG_CHECKING([for -Wno-unused-result])
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wunused-result"
+CXXFLAGS="$CXXFLAGS -Wunused-result"
+AC_TRY_COMPILE([], [],
+               [AC_MSG_RESULT(yes); CFLAGS="$OCFLAGS -Wno-unused-result"; CXXFLAGS="$OCXXFLAGS -Wno-unused-result"],
+               [AC_MSG_RESULT(no); CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS])
+
+AC_MSG_CHECKING([for -Wno-portability])
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wportability"
+CXXFLAGS="$CXXFLAGS -Wportability"
+AC_TRY_COMPILE([], [],
+               [AC_MSG_RESULT(yes); CFLAGS="$OCFLAGS -Wno-portability"; CXXFLAGS="$OCXXFLAGS -Wno-portability"],
+               [AC_MSG_RESULT(no); CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS])
+
+AC_SUBST([AR_FLAGS], [cr])
+
 AC_ARG_WITH(default-port,
             [AS_HELP_STRING([--with-default-port=NUM],[TCP/IP Port for Spindle server communication])],
             [SPINDLE_PORT=${withval}],
diff --git a/doc/Makefile.in b/doc/Makefile.in
index fcf8bb25..a33851cb 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -147,9 +147,9 @@ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/Makefile.in b/src/client/Makefile.in
index 5a499d2e..b9a4e8df 100644
--- a/src/client/Makefile.in
+++ b/src/client/Makefile.in
@@ -212,6 +212,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/auditclient/Makefile.in b/src/client/auditclient/Makefile.in
index 4d282802..abb143e8 100644
--- a/src/client/auditclient/Makefile.in
+++ b/src/client/auditclient/Makefile.in
@@ -250,6 +250,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/beboot/Makefile.am b/src/client/beboot/Makefile.am
index be7df151..b694c9ba 100644
--- a/src/client/beboot/Makefile.am
+++ b/src/client/beboot/Makefile.am
@@ -2,7 +2,7 @@ pkglibexec_PROGRAMS = spindle_bootstrap
 
 spindle_bootstrap_LDFLAGS = -all-static $(AM_LDFLAGS)
 spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/client
-spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindlelogc.la 
+spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la 
 spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/client/exec_util.c
 
 if PIPES
diff --git a/src/client/beboot/Makefile.in b/src/client/beboot/Makefile.in
index 7971bba5..023dac98 100644
--- a/src/client/beboot/Makefile.in
+++ b/src/client/beboot/Makefile.in
@@ -109,7 +109,7 @@ am_spindle_bootstrap_OBJECTS =  \
 	spindle_bootstrap-exec_util.$(OBJEXT)
 spindle_bootstrap_OBJECTS = $(am_spindle_bootstrap_OBJECTS)
 spindle_bootstrap_DEPENDENCIES =  \
-	$(top_builddir)/logging/libspindlelogc.la $(am__append_1) \
+	$(top_builddir)/logging/libspindleclogc.la $(am__append_1) \
 	$(am__append_2)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -184,6 +184,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -302,7 +303,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 spindle_bootstrap_LDFLAGS = -all-static $(AM_LDFLAGS)
 spindle_bootstrap_CPPFLAGS = $(AM_CPPFLAGS) -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\" -I$(top_srcdir)/../include -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/client
-spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindlelogc.la \
+spindle_bootstrap_LDADD = $(top_builddir)/logging/libspindleclogc.la \
 	$(am__append_1) $(am__append_2)
 spindle_bootstrap_SOURCES = spindle_bootstrap.c $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/spindle_mkdir.c $(top_srcdir)/client/exec_util.c
 all: all-am
diff --git a/src/client/biter/Makefile.am b/src/client/biter/Makefile.am
index 6414b479..f00350a9 100644
--- a/src/client/biter/Makefile.am
+++ b/src/client/biter/Makefile.am
@@ -1,19 +1,18 @@
 noinst_LTLIBRARIES = libbiterc.la libsheep.la
 
-BS=$(top_srcdir)/../biter
-
-libbiterc_la_SOURCES = $(BS)/biterc.c $(BS)/client_queue.c $(BS)/demultiplex.c
+libbiterc_la_SOURCES = $(top_srcdir)/../biter/biterc.c $(top_srcdir)/../biter/client_queue.c $(top_srcdir)/../biter/demultiplex.c
+libbiterc_la_CFLAGS = -DCLIENT
 libbiterc_la_LIBADD = libsheep.la
 
-libsheep_la_SOURCES = $(BS)/sheep.c $(BS)/shmutil.c $(BS)/shm_wrappers.c
+libsheep_la_SOURCES = $(top_srcdir)/../biter/sheep.c $(top_srcdir)/../biter/shmutil.c $(top_srcdir)/../biter/shm_wrappers.c
 
-AM_CPPFLAGS = -I$(BS) -I$(top_srcdir)/../logging
+AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging
 AM_CFLAGS = -fvisibility=hidden
 
 if BGQ_BLD
 AM_CPPFLAGS += -I/bgsys/drivers/ppcfloor/comm/lib/gnu -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/comm/sys/include -I/bgsys/drivers/ppcfloor/spi/include -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
-libbiterc_la_SOURCES += $(BS)/bgq_ids.c
+libbiterc_la_SOURCES += $(top_srcdir)/../biter/bgq_ids.c
 endif
 if LINUX_BLD
-libbiterc_la_SOURCES += $(BS)/linux_ids.c
+libbiterc_la_SOURCES += $(top_srcdir)/../biter/linux_ids.c
 endif
diff --git a/src/client/biter/Makefile.in b/src/client/biter/Makefile.in
index db8dee24..6e44643a 100644
--- a/src/client/biter/Makefile.in
+++ b/src/client/biter/Makefile.in
@@ -80,8 +80,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @BGQ_BLD_TRUE@am__append_1 = -I/bgsys/drivers/ppcfloor/comm/lib/gnu -I/bgsys/drivers/ppcfloor -I/bgsys/drivers/ppcfloor/comm/sys/include -I/bgsys/drivers/ppcfloor/spi/include -I/bgsys/drivers/ppcfloor/spi/include/kernel/cnk
-@BGQ_BLD_TRUE@am__append_2 = $(BS)/bgq_ids.c
-@LINUX_BLD_TRUE@am__append_3 = $(BS)/linux_ids.c
+@BGQ_BLD_TRUE@am__append_2 = $(top_srcdir)/../biter/bgq_ids.c
+@LINUX_BLD_TRUE@am__append_3 = $(top_srcdir)/../biter/linux_ids.c
 subdir = biter
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../scripts/depcomp
@@ -102,17 +102,24 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libbiterc_la_DEPENDENCIES = libsheep.la
-am__libbiterc_la_SOURCES_DIST = $(BS)/biterc.c $(BS)/client_queue.c \
-	$(BS)/demultiplex.c $(BS)/bgq_ids.c $(BS)/linux_ids.c
-@BGQ_BLD_TRUE@am__objects_1 = bgq_ids.lo
-@LINUX_BLD_TRUE@am__objects_2 = linux_ids.lo
-am_libbiterc_la_OBJECTS = biterc.lo client_queue.lo demultiplex.lo \
+am__libbiterc_la_SOURCES_DIST = $(top_srcdir)/../biter/biterc.c \
+	$(top_srcdir)/../biter/client_queue.c \
+	$(top_srcdir)/../biter/demultiplex.c \
+	$(top_srcdir)/../biter/bgq_ids.c \
+	$(top_srcdir)/../biter/linux_ids.c
+@BGQ_BLD_TRUE@am__objects_1 = libbiterc_la-bgq_ids.lo
+@LINUX_BLD_TRUE@am__objects_2 = libbiterc_la-linux_ids.lo
+am_libbiterc_la_OBJECTS = libbiterc_la-biterc.lo \
+	libbiterc_la-client_queue.lo libbiterc_la-demultiplex.lo \
 	$(am__objects_1) $(am__objects_2)
 libbiterc_la_OBJECTS = $(am_libbiterc_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+libbiterc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libbiterc_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 libsheep_la_LIBADD =
 am_libsheep_la_OBJECTS = sheep.lo shmutil.lo shm_wrappers.lo
 libsheep_la_OBJECTS = $(am_libsheep_la_OBJECTS)
@@ -181,6 +188,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -298,12 +306,15 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libbiterc.la libsheep.la
-BS = $(top_srcdir)/../biter
-libbiterc_la_SOURCES = $(BS)/biterc.c $(BS)/client_queue.c \
-	$(BS)/demultiplex.c $(am__append_2) $(am__append_3)
+libbiterc_la_SOURCES = $(top_srcdir)/../biter/biterc.c \
+	$(top_srcdir)/../biter/client_queue.c \
+	$(top_srcdir)/../biter/demultiplex.c $(am__append_2) \
+	$(am__append_3)
+libbiterc_la_CFLAGS = -DCLIENT
 libbiterc_la_LIBADD = libsheep.la
-libsheep_la_SOURCES = $(BS)/sheep.c $(BS)/shmutil.c $(BS)/shm_wrappers.c
-AM_CPPFLAGS = -I$(BS) -I$(top_srcdir)/../logging $(am__append_1)
+libsheep_la_SOURCES = $(top_srcdir)/../biter/sheep.c $(top_srcdir)/../biter/shmutil.c $(top_srcdir)/../biter/shm_wrappers.c
+AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging \
+	$(am__append_1)
 AM_CFLAGS = -fvisibility=hidden
 all: all-am
 
@@ -352,7 +363,7 @@ clean-noinstLTLIBRARIES:
 	}
 
 libbiterc.la: $(libbiterc_la_OBJECTS) $(libbiterc_la_DEPENDENCIES) $(EXTRA_libbiterc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libbiterc_la_OBJECTS) $(libbiterc_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libbiterc_la_LINK)  $(libbiterc_la_OBJECTS) $(libbiterc_la_LIBADD) $(LIBS)
 
 libsheep.la: $(libsheep_la_OBJECTS) $(libsheep_la_DEPENDENCIES) $(EXTRA_libsheep_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libsheep_la_OBJECTS) $(libsheep_la_LIBADD) $(LIBS)
@@ -363,11 +374,11 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgq_ids.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/biterc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/client_queue.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demultiplex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux_ids.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterc_la-bgq_ids.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterc_la-biterc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterc_la-client_queue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterc_la-demultiplex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterc_la-linux_ids.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sheep.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shm_wrappers.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shmutil.Plo@am__quote@
@@ -393,61 +404,61 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-biterc.lo: $(BS)/biterc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT biterc.lo -MD -MP -MF $(DEPDIR)/biterc.Tpo -c -o biterc.lo `test -f '$(BS)/biterc.c' || echo '$(srcdir)/'`$(BS)/biterc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/biterc.Tpo $(DEPDIR)/biterc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/biterc.c' object='biterc.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterc_la-biterc.lo: $(top_srcdir)/../biter/biterc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT libbiterc_la-biterc.lo -MD -MP -MF $(DEPDIR)/libbiterc_la-biterc.Tpo -c -o libbiterc_la-biterc.lo `test -f '$(top_srcdir)/../biter/biterc.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/biterc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterc_la-biterc.Tpo $(DEPDIR)/libbiterc_la-biterc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/biterc.c' object='libbiterc_la-biterc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o biterc.lo `test -f '$(BS)/biterc.c' || echo '$(srcdir)/'`$(BS)/biterc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o libbiterc_la-biterc.lo `test -f '$(top_srcdir)/../biter/biterc.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/biterc.c
 
-client_queue.lo: $(BS)/client_queue.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT client_queue.lo -MD -MP -MF $(DEPDIR)/client_queue.Tpo -c -o client_queue.lo `test -f '$(BS)/client_queue.c' || echo '$(srcdir)/'`$(BS)/client_queue.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/client_queue.Tpo $(DEPDIR)/client_queue.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/client_queue.c' object='client_queue.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterc_la-client_queue.lo: $(top_srcdir)/../biter/client_queue.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT libbiterc_la-client_queue.lo -MD -MP -MF $(DEPDIR)/libbiterc_la-client_queue.Tpo -c -o libbiterc_la-client_queue.lo `test -f '$(top_srcdir)/../biter/client_queue.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/client_queue.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterc_la-client_queue.Tpo $(DEPDIR)/libbiterc_la-client_queue.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/client_queue.c' object='libbiterc_la-client_queue.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o client_queue.lo `test -f '$(BS)/client_queue.c' || echo '$(srcdir)/'`$(BS)/client_queue.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o libbiterc_la-client_queue.lo `test -f '$(top_srcdir)/../biter/client_queue.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/client_queue.c
 
-demultiplex.lo: $(BS)/demultiplex.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT demultiplex.lo -MD -MP -MF $(DEPDIR)/demultiplex.Tpo -c -o demultiplex.lo `test -f '$(BS)/demultiplex.c' || echo '$(srcdir)/'`$(BS)/demultiplex.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/demultiplex.Tpo $(DEPDIR)/demultiplex.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/demultiplex.c' object='demultiplex.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterc_la-demultiplex.lo: $(top_srcdir)/../biter/demultiplex.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT libbiterc_la-demultiplex.lo -MD -MP -MF $(DEPDIR)/libbiterc_la-demultiplex.Tpo -c -o libbiterc_la-demultiplex.lo `test -f '$(top_srcdir)/../biter/demultiplex.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/demultiplex.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterc_la-demultiplex.Tpo $(DEPDIR)/libbiterc_la-demultiplex.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/demultiplex.c' object='libbiterc_la-demultiplex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o demultiplex.lo `test -f '$(BS)/demultiplex.c' || echo '$(srcdir)/'`$(BS)/demultiplex.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o libbiterc_la-demultiplex.lo `test -f '$(top_srcdir)/../biter/demultiplex.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/demultiplex.c
 
-bgq_ids.lo: $(BS)/bgq_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bgq_ids.lo -MD -MP -MF $(DEPDIR)/bgq_ids.Tpo -c -o bgq_ids.lo `test -f '$(BS)/bgq_ids.c' || echo '$(srcdir)/'`$(BS)/bgq_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bgq_ids.Tpo $(DEPDIR)/bgq_ids.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/bgq_ids.c' object='bgq_ids.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterc_la-bgq_ids.lo: $(top_srcdir)/../biter/bgq_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT libbiterc_la-bgq_ids.lo -MD -MP -MF $(DEPDIR)/libbiterc_la-bgq_ids.Tpo -c -o libbiterc_la-bgq_ids.lo `test -f '$(top_srcdir)/../biter/bgq_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/bgq_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterc_la-bgq_ids.Tpo $(DEPDIR)/libbiterc_la-bgq_ids.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/bgq_ids.c' object='libbiterc_la-bgq_ids.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bgq_ids.lo `test -f '$(BS)/bgq_ids.c' || echo '$(srcdir)/'`$(BS)/bgq_ids.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o libbiterc_la-bgq_ids.lo `test -f '$(top_srcdir)/../biter/bgq_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/bgq_ids.c
 
-linux_ids.lo: $(BS)/linux_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux_ids.lo -MD -MP -MF $(DEPDIR)/linux_ids.Tpo -c -o linux_ids.lo `test -f '$(BS)/linux_ids.c' || echo '$(srcdir)/'`$(BS)/linux_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/linux_ids.Tpo $(DEPDIR)/linux_ids.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/linux_ids.c' object='linux_ids.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterc_la-linux_ids.lo: $(top_srcdir)/../biter/linux_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -MT libbiterc_la-linux_ids.lo -MD -MP -MF $(DEPDIR)/libbiterc_la-linux_ids.Tpo -c -o libbiterc_la-linux_ids.lo `test -f '$(top_srcdir)/../biter/linux_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/linux_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterc_la-linux_ids.Tpo $(DEPDIR)/libbiterc_la-linux_ids.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/linux_ids.c' object='libbiterc_la-linux_ids.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o linux_ids.lo `test -f '$(BS)/linux_ids.c' || echo '$(srcdir)/'`$(BS)/linux_ids.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterc_la_CFLAGS) $(CFLAGS) -c -o libbiterc_la-linux_ids.lo `test -f '$(top_srcdir)/../biter/linux_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/linux_ids.c
 
-sheep.lo: $(BS)/sheep.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sheep.lo -MD -MP -MF $(DEPDIR)/sheep.Tpo -c -o sheep.lo `test -f '$(BS)/sheep.c' || echo '$(srcdir)/'`$(BS)/sheep.c
+sheep.lo: $(top_srcdir)/../biter/sheep.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sheep.lo -MD -MP -MF $(DEPDIR)/sheep.Tpo -c -o sheep.lo `test -f '$(top_srcdir)/../biter/sheep.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/sheep.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sheep.Tpo $(DEPDIR)/sheep.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/sheep.c' object='sheep.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/sheep.c' object='sheep.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sheep.lo `test -f '$(BS)/sheep.c' || echo '$(srcdir)/'`$(BS)/sheep.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sheep.lo `test -f '$(top_srcdir)/../biter/sheep.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/sheep.c
 
-shmutil.lo: $(BS)/shmutil.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shmutil.lo -MD -MP -MF $(DEPDIR)/shmutil.Tpo -c -o shmutil.lo `test -f '$(BS)/shmutil.c' || echo '$(srcdir)/'`$(BS)/shmutil.c
+shmutil.lo: $(top_srcdir)/../biter/shmutil.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shmutil.lo -MD -MP -MF $(DEPDIR)/shmutil.Tpo -c -o shmutil.lo `test -f '$(top_srcdir)/../biter/shmutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/shmutil.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shmutil.Tpo $(DEPDIR)/shmutil.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/shmutil.c' object='shmutil.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/shmutil.c' object='shmutil.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shmutil.lo `test -f '$(BS)/shmutil.c' || echo '$(srcdir)/'`$(BS)/shmutil.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shmutil.lo `test -f '$(top_srcdir)/../biter/shmutil.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/shmutil.c
 
-shm_wrappers.lo: $(BS)/shm_wrappers.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shm_wrappers.lo -MD -MP -MF $(DEPDIR)/shm_wrappers.Tpo -c -o shm_wrappers.lo `test -f '$(BS)/shm_wrappers.c' || echo '$(srcdir)/'`$(BS)/shm_wrappers.c
+shm_wrappers.lo: $(top_srcdir)/../biter/shm_wrappers.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shm_wrappers.lo -MD -MP -MF $(DEPDIR)/shm_wrappers.Tpo -c -o shm_wrappers.lo `test -f '$(top_srcdir)/../biter/shm_wrappers.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/shm_wrappers.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/shm_wrappers.Tpo $(DEPDIR)/shm_wrappers.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/shm_wrappers.c' object='shm_wrappers.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/shm_wrappers.c' object='shm_wrappers.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shm_wrappers.lo `test -f '$(BS)/shm_wrappers.c' || echo '$(srcdir)/'`$(BS)/shm_wrappers.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shm_wrappers.lo `test -f '$(top_srcdir)/../biter/shm_wrappers.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/shm_wrappers.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/src/client/client/Makefile.am b/src/client/client/Makefile.am
index 58896f4d..1b4fee14 100644
--- a/src/client/client/Makefile.am
+++ b/src/client/client/Makefile.am
@@ -1,4 +1,5 @@
-noinst_LTLIBRARIES = libspindle_audit.la libspindle_instr.la
+noinst_LTLIBRARIES = libspindle_audit.la
+#noinst_LTLIBRARIES += libspindle_instr.la
 
 if SOCKETS
 noinst_LTLIBRARIES += libspindlec_socket.la
@@ -19,16 +20,16 @@ INTERCEPT_SRCS = intercept_open.c intercept_exec.c intercept_stat.c intercept_re
 BASE_SRCS = client.c should_intercept.c exec_util.c remap_exec.c rogot.c $(top_srcdir)/../utils/parseloc.c
 
 libspindlec_socket_la_SOURCES = $(BASE_SRCS)
-libspindlec_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindlec_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la
 
 libspindlec_pipe_la_SOURCES = $(BASE_SRCS)
-libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la
 
 libspindlec_biter_la_SOURCES = $(BASE_SRCS)
-libspindlec_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindlec_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la
 
 libspindle_audit_la_SOURCES = $(INTERCEPT_SRCS)
 libspindle_audit_la_CPPFLAGS = -DAUDIT_LIB -I$(top_srcdir)/auditclient $(AM_CPPFLAGS)
 
-libspindle_instr_la_SOURCES = $(INTERCEPT_SRCS)
-libspindle_instr_la_CPPFLAGS = -DINSTR_LIB -I$(top_srcdir)/instrclient $(AM_CPPFLAGS)
+#libspindle_instr_la_SOURCES = $(INTERCEPT_SRCS)
+#libspindle_instr_la_CPPFLAGS = -DINSTR_LIB -I$(top_srcdir)/instrclient $(AM_CPPFLAGS)
diff --git a/src/client/client/Makefile.in b/src/client/client/Makefile.in
index e5fc52f8..631d34c5 100644
--- a/src/client/client/Makefile.in
+++ b/src/client/client/Makefile.in
@@ -79,6 +79,7 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
+#noinst_LTLIBRARIES += libspindle_instr.la
 @SOCKETS_TRUE@am__append_1 = libspindlec_socket.la
 @PIPES_TRUE@am__append_2 = libspindlec_pipe.la
 @BITER_TRUE@am__append_3 = libspindlec_biter.la
@@ -114,36 +115,27 @@ AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libspindle_instr_la_LIBADD =
-am__objects_2 = libspindle_instr_la-intercept_open.lo \
-	libspindle_instr_la-intercept_exec.lo \
-	libspindle_instr_la-intercept_stat.lo \
-	libspindle_instr_la-intercept_readlink.lo \
-	libspindle_instr_la-intercept_spindleapi.lo \
-	libspindle_instr_la-intercept.lo
-am_libspindle_instr_la_OBJECTS = $(am__objects_2)
-libspindle_instr_la_OBJECTS = $(am_libspindle_instr_la_OBJECTS)
 libspindlec_biter_la_DEPENDENCIES =  \
 	$(top_builddir)/client_comlib/libclient_biter.la \
-	$(top_builddir)/logging/libspindlelogc.la \
+	$(top_builddir)/logging/libspindleclogc.la \
 	$(top_builddir)/shm_cache/libshmcache.la
-am__objects_3 = client.lo should_intercept.lo exec_util.lo \
+am__objects_2 = client.lo should_intercept.lo exec_util.lo \
 	remap_exec.lo rogot.lo parseloc.lo
-am_libspindlec_biter_la_OBJECTS = $(am__objects_3)
+am_libspindlec_biter_la_OBJECTS = $(am__objects_2)
 libspindlec_biter_la_OBJECTS = $(am_libspindlec_biter_la_OBJECTS)
 @BITER_TRUE@am_libspindlec_biter_la_rpath =
 libspindlec_pipe_la_DEPENDENCIES =  \
 	$(top_builddir)/client_comlib/libclient_pipe.la \
-	$(top_builddir)/logging/libspindlelogc.la \
+	$(top_builddir)/logging/libspindleclogc.la \
 	$(top_builddir)/shm_cache/libshmcache.la
-am_libspindlec_pipe_la_OBJECTS = $(am__objects_3)
+am_libspindlec_pipe_la_OBJECTS = $(am__objects_2)
 libspindlec_pipe_la_OBJECTS = $(am_libspindlec_pipe_la_OBJECTS)
 @PIPES_TRUE@am_libspindlec_pipe_la_rpath =
 libspindlec_socket_la_DEPENDENCIES =  \
 	$(top_builddir)/client_comlib/libclient_socket.la \
-	$(top_builddir)/logging/libspindlelogc.la \
+	$(top_builddir)/logging/libspindleclogc.la \
 	$(top_builddir)/shm_cache/libshmcache.la
-am_libspindlec_socket_la_OBJECTS = $(am__objects_3)
+am_libspindlec_socket_la_OBJECTS = $(am__objects_2)
 libspindlec_socket_la_OBJECTS = $(am_libspindlec_socket_la_OBJECTS)
 @SOCKETS_TRUE@am_libspindlec_socket_la_rpath =
 AM_V_P = $(am__v_P_@AM_V@)
@@ -181,12 +173,10 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(libspindle_audit_la_SOURCES) \
-	$(libspindle_instr_la_SOURCES) $(libspindlec_biter_la_SOURCES) \
-	$(libspindlec_pipe_la_SOURCES) \
+	$(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) \
 	$(libspindlec_socket_la_SOURCES)
 DIST_SOURCES = $(libspindle_audit_la_SOURCES) \
-	$(libspindle_instr_la_SOURCES) $(libspindlec_biter_la_SOURCES) \
-	$(libspindlec_pipe_la_SOURCES) \
+	$(libspindlec_biter_la_SOURCES) $(libspindlec_pipe_la_SOURCES) \
 	$(libspindlec_socket_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
@@ -217,6 +207,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -333,22 +324,20 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libspindle_audit.la libspindle_instr.la \
-	$(am__append_1) $(am__append_2) $(am__append_3)
+noinst_LTLIBRARIES = libspindle_audit.la $(am__append_1) \
+	$(am__append_2) $(am__append_3)
 AM_CFLAGS = -fvisibility=hidden
 AM_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/client_comlib -I$(top_srcdir)/../include -I$(top_srcdir)/shm_cache
 INTERCEPT_SRCS = intercept_open.c intercept_exec.c intercept_stat.c intercept_readlink.c intercept_spindleapi.c intercept.c
 BASE_SRCS = client.c should_intercept.c exec_util.c remap_exec.c rogot.c $(top_srcdir)/../utils/parseloc.c
 libspindlec_socket_la_SOURCES = $(BASE_SRCS)
-libspindlec_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindlec_socket_la_LIBADD = $(top_builddir)/client_comlib/libclient_socket.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la
 libspindlec_pipe_la_SOURCES = $(BASE_SRCS)
-libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindlec_pipe_la_LIBADD = $(top_builddir)/client_comlib/libclient_pipe.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la
 libspindlec_biter_la_SOURCES = $(BASE_SRCS)
-libspindlec_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindlelogc.la $(top_builddir)/shm_cache/libshmcache.la
+libspindlec_biter_la_LIBADD = $(top_builddir)/client_comlib/libclient_biter.la $(top_builddir)/logging/libspindleclogc.la $(top_builddir)/shm_cache/libshmcache.la
 libspindle_audit_la_SOURCES = $(INTERCEPT_SRCS)
 libspindle_audit_la_CPPFLAGS = -DAUDIT_LIB -I$(top_srcdir)/auditclient $(AM_CPPFLAGS)
-libspindle_instr_la_SOURCES = $(INTERCEPT_SRCS)
-libspindle_instr_la_CPPFLAGS = -DINSTR_LIB -I$(top_srcdir)/instrclient $(AM_CPPFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -398,9 +387,6 @@ clean-noinstLTLIBRARIES:
 libspindle_audit.la: $(libspindle_audit_la_OBJECTS) $(libspindle_audit_la_DEPENDENCIES) $(EXTRA_libspindle_audit_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK)  $(libspindle_audit_la_OBJECTS) $(libspindle_audit_la_LIBADD) $(LIBS)
 
-libspindle_instr.la: $(libspindle_instr_la_OBJECTS) $(libspindle_instr_la_DEPENDENCIES) $(EXTRA_libspindle_instr_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libspindle_instr_la_OBJECTS) $(libspindle_instr_la_LIBADD) $(LIBS)
-
 libspindlec_biter.la: $(libspindlec_biter_la_OBJECTS) $(libspindlec_biter_la_DEPENDENCIES) $(EXTRA_libspindlec_biter_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(LINK) $(am_libspindlec_biter_la_rpath) $(libspindlec_biter_la_OBJECTS) $(libspindlec_biter_la_LIBADD) $(LIBS)
 
@@ -424,12 +410,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_audit_la-intercept_readlink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_audit_la-intercept_spindleapi.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_audit_la-intercept_stat.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_instr_la-intercept.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_instr_la-intercept_exec.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_instr_la-intercept_open.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_instr_la-intercept_readlink.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_instr_la-intercept_spindleapi.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindle_instr_la-intercept_stat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parseloc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remap_exec.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rogot.Plo@am__quote@
@@ -498,48 +478,6 @@ libspindle_audit_la-intercept.lo: intercept.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_audit_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_audit_la-intercept.lo `test -f 'intercept.c' || echo '$(srcdir)/'`intercept.c
 
-libspindle_instr_la-intercept_open.lo: intercept_open.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspindle_instr_la-intercept_open.lo -MD -MP -MF $(DEPDIR)/libspindle_instr_la-intercept_open.Tpo -c -o libspindle_instr_la-intercept_open.lo `test -f 'intercept_open.c' || echo '$(srcdir)/'`intercept_open.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindle_instr_la-intercept_open.Tpo $(DEPDIR)/libspindle_instr_la-intercept_open.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='intercept_open.c' object='libspindle_instr_la-intercept_open.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_instr_la-intercept_open.lo `test -f 'intercept_open.c' || echo '$(srcdir)/'`intercept_open.c
-
-libspindle_instr_la-intercept_exec.lo: intercept_exec.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspindle_instr_la-intercept_exec.lo -MD -MP -MF $(DEPDIR)/libspindle_instr_la-intercept_exec.Tpo -c -o libspindle_instr_la-intercept_exec.lo `test -f 'intercept_exec.c' || echo '$(srcdir)/'`intercept_exec.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindle_instr_la-intercept_exec.Tpo $(DEPDIR)/libspindle_instr_la-intercept_exec.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='intercept_exec.c' object='libspindle_instr_la-intercept_exec.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_instr_la-intercept_exec.lo `test -f 'intercept_exec.c' || echo '$(srcdir)/'`intercept_exec.c
-
-libspindle_instr_la-intercept_stat.lo: intercept_stat.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspindle_instr_la-intercept_stat.lo -MD -MP -MF $(DEPDIR)/libspindle_instr_la-intercept_stat.Tpo -c -o libspindle_instr_la-intercept_stat.lo `test -f 'intercept_stat.c' || echo '$(srcdir)/'`intercept_stat.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindle_instr_la-intercept_stat.Tpo $(DEPDIR)/libspindle_instr_la-intercept_stat.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='intercept_stat.c' object='libspindle_instr_la-intercept_stat.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_instr_la-intercept_stat.lo `test -f 'intercept_stat.c' || echo '$(srcdir)/'`intercept_stat.c
-
-libspindle_instr_la-intercept_readlink.lo: intercept_readlink.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspindle_instr_la-intercept_readlink.lo -MD -MP -MF $(DEPDIR)/libspindle_instr_la-intercept_readlink.Tpo -c -o libspindle_instr_la-intercept_readlink.lo `test -f 'intercept_readlink.c' || echo '$(srcdir)/'`intercept_readlink.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindle_instr_la-intercept_readlink.Tpo $(DEPDIR)/libspindle_instr_la-intercept_readlink.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='intercept_readlink.c' object='libspindle_instr_la-intercept_readlink.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_instr_la-intercept_readlink.lo `test -f 'intercept_readlink.c' || echo '$(srcdir)/'`intercept_readlink.c
-
-libspindle_instr_la-intercept_spindleapi.lo: intercept_spindleapi.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspindle_instr_la-intercept_spindleapi.lo -MD -MP -MF $(DEPDIR)/libspindle_instr_la-intercept_spindleapi.Tpo -c -o libspindle_instr_la-intercept_spindleapi.lo `test -f 'intercept_spindleapi.c' || echo '$(srcdir)/'`intercept_spindleapi.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindle_instr_la-intercept_spindleapi.Tpo $(DEPDIR)/libspindle_instr_la-intercept_spindleapi.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='intercept_spindleapi.c' object='libspindle_instr_la-intercept_spindleapi.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_instr_la-intercept_spindleapi.lo `test -f 'intercept_spindleapi.c' || echo '$(srcdir)/'`intercept_spindleapi.c
-
-libspindle_instr_la-intercept.lo: intercept.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libspindle_instr_la-intercept.lo -MD -MP -MF $(DEPDIR)/libspindle_instr_la-intercept.Tpo -c -o libspindle_instr_la-intercept.lo `test -f 'intercept.c' || echo '$(srcdir)/'`intercept.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindle_instr_la-intercept.Tpo $(DEPDIR)/libspindle_instr_la-intercept.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='intercept.c' object='libspindle_instr_la-intercept.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindle_instr_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libspindle_instr_la-intercept.lo `test -f 'intercept.c' || echo '$(srcdir)/'`intercept.c
-
 parseloc.lo: $(top_srcdir)/../utils/parseloc.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parseloc.lo -MD -MP -MF $(DEPDIR)/parseloc.Tpo -c -o parseloc.lo `test -f '$(top_srcdir)/../utils/parseloc.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/parseloc.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/parseloc.Tpo $(DEPDIR)/parseloc.Plo
@@ -757,6 +695,9 @@ uninstall-am:
 	tags tags-am uninstall uninstall-am
 
 
+#libspindle_instr_la_SOURCES = $(INTERCEPT_SRCS)
+#libspindle_instr_la_CPPFLAGS = -DINSTR_LIB -I$(top_srcdir)/instrclient $(AM_CPPFLAGS)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/src/client/client_comlib/Makefile.in b/src/client/client_comlib/Makefile.in
index 4de16273..776be740 100644
--- a/src/client/client_comlib/Makefile.in
+++ b/src/client/client_comlib/Makefile.in
@@ -190,6 +190,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/configure b/src/client/configure
index 1539e625..520e95a6 100755
--- a/src/client/configure
+++ b/src/client/configure
@@ -659,6 +659,7 @@ SOCKETS_TRUE
 PIPES_FALSE
 PIPES_TRUE
 TESTRM
+AR_FLAGS
 CPP
 OTOOL64
 OTOOL
@@ -12413,6 +12414,87 @@ DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wall" >&5
+$as_echo_n "checking for -Wall... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wall"
+CXXFLAGS="$CXXLAGS -Wall"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-unused-result" >&5
+$as_echo_n "checking for -Wno-unused-result... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wunused-result"
+CXXFLAGS="$CXXFLAGS -Wunused-result"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-unused-result"; CXXFLAGS="$OCXXFLAGS -Wno-unused-result"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-portability" >&5
+$as_echo_n "checking for -Wno-portability... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wportability"
+CXXFLAGS="$CXXFLAGS -Wportability"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-portability"; CXXFLAGS="$OCXXFLAGS -Wno-portability"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+AR_FLAGS=cr
+
+
 
 # Check whether --with-default-port was given.
 if test "${with_default_port+set}" = set; then :
diff --git a/src/client/configure.ac b/src/client/configure.ac
index d83256d2..271be0e3 100644
--- a/src/client/configure.ac
+++ b/src/client/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([spindle], m4_esyscmd([tr -d '\n' < ../../VERSION]), m4_esyscmd([tr -d '
 AC_CONFIG_MACRO_DIR([../../m4])
 AC_CONFIG_AUX_DIR([../../scripts])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 AC_CONFIG_HEADERS([config.h])
 AM_PROG_AR
diff --git a/src/client/ldsolookup/Makefile.in b/src/client/ldsolookup/Makefile.in
index 12f837ec..574062b4 100644
--- a/src/client/ldsolookup/Makefile.in
+++ b/src/client/ldsolookup/Makefile.in
@@ -216,6 +216,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/logging/Makefile.am b/src/client/logging/Makefile.am
index 96bdaca8..73ebc1cf 100644
--- a/src/client/logging/Makefile.am
+++ b/src/client/logging/Makefile.am
@@ -1,7 +1,7 @@
-noinst_LTLIBRARIES = libspindlelogc.la
+noinst_LTLIBRARIES = libspindleclogc.la
 
 AM_CFLAGS = -fvisibility=hidden
 
-libspindlelogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
-libspindlelogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -DSPINDLECLIENT
-libspindlelogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\" $(AM_CFLAGS)
+libspindleclogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
+libspindleclogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -DSPINDLECLIENT
+libspindleclogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\" $(AM_CFLAGS)
diff --git a/src/client/logging/Makefile.in b/src/client/logging/Makefile.in
index 5e48ed90..eeaf7e5f 100644
--- a/src/client/logging/Makefile.in
+++ b/src/client/logging/Makefile.in
@@ -98,18 +98,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libspindlelogc_la_LIBADD =
-am_libspindlelogc_la_OBJECTS = libspindlelogc_la-spindle_logc.lo \
-	libspindlelogc_la-spindle_mkdir.lo
-libspindlelogc_la_OBJECTS = $(am_libspindlelogc_la_OBJECTS)
+libspindleclogc_la_LIBADD =
+am_libspindleclogc_la_OBJECTS = libspindleclogc_la-spindle_logc.lo \
+	libspindleclogc_la-spindle_mkdir.lo
+libspindleclogc_la_OBJECTS = $(am_libspindleclogc_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libspindlelogc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libspindleclogc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libspindlelogc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(libspindleclogc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -144,8 +144,8 @@ AM_V_CCLD = $(am__v_CCLD_@AM_V@)
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libspindlelogc_la_SOURCES)
-DIST_SOURCES = $(libspindlelogc_la_SOURCES)
+SOURCES = $(libspindleclogc_la_SOURCES)
+DIST_SOURCES = $(libspindleclogc_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -175,6 +175,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -291,11 +292,11 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libspindlelogc.la
+noinst_LTLIBRARIES = libspindleclogc.la
 AM_CFLAGS = -fvisibility=hidden
-libspindlelogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
-libspindlelogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -DSPINDLECLIENT
-libspindlelogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\" $(AM_CFLAGS)
+libspindleclogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
+libspindleclogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../include -DSPINDLECLIENT
+libspindleclogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\" $(AM_CFLAGS)
 all: all-am
 
 .SUFFIXES:
@@ -342,8 +343,8 @@ clean-noinstLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-libspindlelogc.la: $(libspindlelogc_la_OBJECTS) $(libspindlelogc_la_DEPENDENCIES) $(EXTRA_libspindlelogc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libspindlelogc_la_LINK)  $(libspindlelogc_la_OBJECTS) $(libspindlelogc_la_LIBADD) $(LIBS)
+libspindleclogc.la: $(libspindleclogc_la_OBJECTS) $(libspindleclogc_la_DEPENDENCIES) $(EXTRA_libspindleclogc_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libspindleclogc_la_LINK)  $(libspindleclogc_la_OBJECTS) $(libspindleclogc_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -351,8 +352,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindlelogc_la-spindle_logc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindlelogc_la-spindle_mkdir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindleclogc_la-spindle_logc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindleclogc_la-spindle_mkdir.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -375,19 +376,19 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libspindlelogc_la-spindle_logc.lo: $(top_srcdir)/../logging/spindle_logc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -MT libspindlelogc_la-spindle_logc.lo -MD -MP -MF $(DEPDIR)/libspindlelogc_la-spindle_logc.Tpo -c -o libspindlelogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindlelogc_la-spindle_logc.Tpo $(DEPDIR)/libspindlelogc_la-spindle_logc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../logging/spindle_logc.c' object='libspindlelogc_la-spindle_logc.lo' libtool=yes @AMDEPBACKSLASH@
+libspindleclogc_la-spindle_logc.lo: $(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleclogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleclogc_la_CFLAGS) $(CFLAGS) -MT libspindleclogc_la-spindle_logc.lo -MD -MP -MF $(DEPDIR)/libspindleclogc_la-spindle_logc.Tpo -c -o libspindleclogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindleclogc_la-spindle_logc.Tpo $(DEPDIR)/libspindleclogc_la-spindle_logc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../logging/spindle_logc.c' object='libspindleclogc_la-spindle_logc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -c -o libspindlelogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleclogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleclogc_la_CFLAGS) $(CFLAGS) -c -o libspindleclogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
 
-libspindlelogc_la-spindle_mkdir.lo: $(top_srcdir)/../utils/spindle_mkdir.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -MT libspindlelogc_la-spindle_mkdir.lo -MD -MP -MF $(DEPDIR)/libspindlelogc_la-spindle_mkdir.Tpo -c -o libspindlelogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindlelogc_la-spindle_mkdir.Tpo $(DEPDIR)/libspindlelogc_la-spindle_mkdir.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../utils/spindle_mkdir.c' object='libspindlelogc_la-spindle_mkdir.lo' libtool=yes @AMDEPBACKSLASH@
+libspindleclogc_la-spindle_mkdir.lo: $(top_srcdir)/../utils/spindle_mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleclogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleclogc_la_CFLAGS) $(CFLAGS) -MT libspindleclogc_la-spindle_mkdir.lo -MD -MP -MF $(DEPDIR)/libspindleclogc_la-spindle_mkdir.Tpo -c -o libspindleclogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindleclogc_la-spindle_mkdir.Tpo $(DEPDIR)/libspindleclogc_la-spindle_mkdir.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../utils/spindle_mkdir.c' object='libspindleclogc_la-spindle_mkdir.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -c -o libspindlelogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleclogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleclogc_la_CFLAGS) $(CFLAGS) -c -o libspindleclogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/src/client/shm_cache/Makefile.in b/src/client/shm_cache/Makefile.in
index 1334759c..6906bcf5 100644
--- a/src/client/shm_cache/Makefile.in
+++ b/src/client/shm_cache/Makefile.in
@@ -171,6 +171,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/spindle_api/Makefile.in b/src/client/spindle_api/Makefile.in
index b471fbe0..924e2034 100644
--- a/src/client/spindle_api/Makefile.in
+++ b/src/client/spindle_api/Makefile.in
@@ -203,6 +203,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/client/subaudit/Makefile.in b/src/client/subaudit/Makefile.in
index afef5983..fdae2166 100644
--- a/src/client/subaudit/Makefile.in
+++ b/src/client/subaudit/Makefile.in
@@ -245,6 +245,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/Makefile.in b/src/fe/Makefile.in
index e05fe416..eae277e0 100644
--- a/src/fe/Makefile.in
+++ b/src/fe/Makefile.in
@@ -214,6 +214,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/cobo/Makefile.in b/src/fe/cobo/Makefile.in
index acd4376c..eee45c77 100644
--- a/src/fe/cobo/Makefile.in
+++ b/src/fe/cobo/Makefile.in
@@ -172,6 +172,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/comlib/Makefile.in b/src/fe/comlib/Makefile.in
index c0ad6e25..a42e2900 100644
--- a/src/fe/comlib/Makefile.in
+++ b/src/fe/comlib/Makefile.in
@@ -171,6 +171,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/configure b/src/fe/configure
index 7761ef83..08b8d50b 100755
--- a/src/fe/configure
+++ b/src/fe/configure
@@ -673,6 +673,7 @@ SOCKETS_TRUE
 PIPES_FALSE
 PIPES_TRUE
 TESTRM
+AR_FLAGS
 CXXCPP
 CPP
 OTOOL64
@@ -16259,6 +16260,87 @@ DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wall" >&5
+$as_echo_n "checking for -Wall... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wall"
+CXXFLAGS="$CXXLAGS -Wall"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-unused-result" >&5
+$as_echo_n "checking for -Wno-unused-result... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wunused-result"
+CXXFLAGS="$CXXFLAGS -Wunused-result"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-unused-result"; CXXFLAGS="$OCXXFLAGS -Wno-unused-result"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-portability" >&5
+$as_echo_n "checking for -Wno-portability... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wportability"
+CXXFLAGS="$CXXFLAGS -Wportability"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-portability"; CXXFLAGS="$OCXXFLAGS -Wno-portability"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+AR_FLAGS=cr
+
+
 
 # Check whether --with-default-port was given.
 if test "${with_default_port+set}" = set; then :
diff --git a/src/fe/configure.ac b/src/fe/configure.ac
index f9b26a0b..367eb988 100644
--- a/src/fe/configure.ac
+++ b/src/fe/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([spindle], m4_esyscmd([tr -d '\n' < ../../VERSION]), m4_esyscmd([tr -d '
 AC_CONFIG_MACRO_DIR([../../m4])
 AC_CONFIG_AUX_DIR([../../scripts])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 AM_PROG_AR
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/fe/hostbin/Makefile.in b/src/fe/hostbin/Makefile.in
index 5206c004..957f3a1f 100644
--- a/src/fe/hostbin/Makefile.in
+++ b/src/fe/hostbin/Makefile.in
@@ -171,6 +171,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/launchmon/Makefile.in b/src/fe/launchmon/Makefile.in
index e66f2cd9..e0f4bb99 100644
--- a/src/fe/launchmon/Makefile.in
+++ b/src/fe/launchmon/Makefile.in
@@ -173,6 +173,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/logging/Makefile.am b/src/fe/logging/Makefile.am
index f8f2751e..70c32a7e 100644
--- a/src/fe/logging/Makefile.am
+++ b/src/fe/logging/Makefile.am
@@ -1,10 +1,10 @@
 pkglibexec_PROGRAMS = spindlef_logd
-noinst_LTLIBRARIES = libspindlelogc.la
+noinst_LTLIBRARIES = libspindleflogc.la
 
 spindlef_logd_SOURCES = $(top_srcdir)/../logging/spindle_logd.cc
 spindlef_logd_CPPFLAGS = -I$(top_srcdir)/../logging
 spindlef_logd_LDADD = -lpthread
 
-libspindlelogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
-libspindlelogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../utils -I$(top_srcdir)/../include
-libspindlelogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindlef_logd\"
+libspindleflogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
+libspindleflogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../utils -I$(top_srcdir)/../include
+libspindleflogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindlef_logd\"
diff --git a/src/fe/logging/Makefile.in b/src/fe/logging/Makefile.in
index 4af1c3b0..620de105 100644
--- a/src/fe/logging/Makefile.in
+++ b/src/fe/logging/Makefile.in
@@ -101,18 +101,18 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libspindlelogc_la_LIBADD =
-am_libspindlelogc_la_OBJECTS = libspindlelogc_la-spindle_logc.lo \
-	libspindlelogc_la-spindle_mkdir.lo
-libspindlelogc_la_OBJECTS = $(am_libspindlelogc_la_OBJECTS)
+libspindleflogc_la_LIBADD =
+am_libspindleflogc_la_OBJECTS = libspindleflogc_la-spindle_logc.lo \
+	libspindleflogc_la-spindle_mkdir.lo
+libspindleflogc_la_OBJECTS = $(am_libspindleflogc_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libspindlelogc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libspindleflogc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libspindlelogc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(libspindleflogc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am__installdirs = "$(DESTDIR)$(pkglibexecdir)"
 PROGRAMS = $(pkglibexec_PROGRAMS)
 am_spindlef_logd_OBJECTS = spindlef_logd-spindle_logd.$(OBJEXT)
@@ -170,8 +170,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(libspindlelogc_la_SOURCES) $(spindlef_logd_SOURCES)
-DIST_SOURCES = $(libspindlelogc_la_SOURCES) $(spindlef_logd_SOURCES)
+SOURCES = $(libspindleflogc_la_SOURCES) $(spindlef_logd_SOURCES)
+DIST_SOURCES = $(libspindleflogc_la_SOURCES) $(spindlef_logd_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -201,6 +201,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -332,13 +333,13 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libspindlelogc.la
+noinst_LTLIBRARIES = libspindleflogc.la
 spindlef_logd_SOURCES = $(top_srcdir)/../logging/spindle_logd.cc
 spindlef_logd_CPPFLAGS = -I$(top_srcdir)/../logging
 spindlef_logd_LDADD = -lpthread
-libspindlelogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
-libspindlelogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../utils -I$(top_srcdir)/../include
-libspindlelogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindlef_logd\"
+libspindleflogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c $(top_srcdir)/../utils/spindle_mkdir.c
+libspindleflogc_la_CPPFLAGS = -I$(top_srcdir)/../logging -I$(top_srcdir)/../utils -I$(top_srcdir)/../include
+libspindleflogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindlef_logd\"
 all: all-am
 
 .SUFFIXES:
@@ -385,8 +386,8 @@ clean-noinstLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-libspindlelogc.la: $(libspindlelogc_la_OBJECTS) $(libspindlelogc_la_DEPENDENCIES) $(EXTRA_libspindlelogc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libspindlelogc_la_LINK)  $(libspindlelogc_la_OBJECTS) $(libspindlelogc_la_LIBADD) $(LIBS)
+libspindleflogc.la: $(libspindleflogc_la_OBJECTS) $(libspindleflogc_la_DEPENDENCIES) $(EXTRA_libspindleflogc_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libspindleflogc_la_LINK)  $(libspindleflogc_la_OBJECTS) $(libspindleflogc_la_LIBADD) $(LIBS)
 install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
@@ -447,8 +448,8 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindlelogc_la-spindle_logc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindlelogc_la-spindle_mkdir.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindleflogc_la-spindle_logc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindleflogc_la-spindle_mkdir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spindlef_logd-spindle_logd.Po@am__quote@
 
 .c.o:
@@ -472,19 +473,19 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libspindlelogc_la-spindle_logc.lo: $(top_srcdir)/../logging/spindle_logc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -MT libspindlelogc_la-spindle_logc.lo -MD -MP -MF $(DEPDIR)/libspindlelogc_la-spindle_logc.Tpo -c -o libspindlelogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindlelogc_la-spindle_logc.Tpo $(DEPDIR)/libspindlelogc_la-spindle_logc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../logging/spindle_logc.c' object='libspindlelogc_la-spindle_logc.lo' libtool=yes @AMDEPBACKSLASH@
+libspindleflogc_la-spindle_logc.lo: $(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleflogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleflogc_la_CFLAGS) $(CFLAGS) -MT libspindleflogc_la-spindle_logc.lo -MD -MP -MF $(DEPDIR)/libspindleflogc_la-spindle_logc.Tpo -c -o libspindleflogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindleflogc_la-spindle_logc.Tpo $(DEPDIR)/libspindleflogc_la-spindle_logc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../logging/spindle_logc.c' object='libspindleflogc_la-spindle_logc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -c -o libspindlelogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleflogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleflogc_la_CFLAGS) $(CFLAGS) -c -o libspindleflogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
 
-libspindlelogc_la-spindle_mkdir.lo: $(top_srcdir)/../utils/spindle_mkdir.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -MT libspindlelogc_la-spindle_mkdir.lo -MD -MP -MF $(DEPDIR)/libspindlelogc_la-spindle_mkdir.Tpo -c -o libspindlelogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindlelogc_la-spindle_mkdir.Tpo $(DEPDIR)/libspindlelogc_la-spindle_mkdir.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../utils/spindle_mkdir.c' object='libspindlelogc_la-spindle_mkdir.lo' libtool=yes @AMDEPBACKSLASH@
+libspindleflogc_la-spindle_mkdir.lo: $(top_srcdir)/../utils/spindle_mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleflogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleflogc_la_CFLAGS) $(CFLAGS) -MT libspindleflogc_la-spindle_mkdir.lo -MD -MP -MF $(DEPDIR)/libspindleflogc_la-spindle_mkdir.Tpo -c -o libspindleflogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindleflogc_la-spindle_mkdir.Tpo $(DEPDIR)/libspindleflogc_la-spindle_mkdir.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../utils/spindle_mkdir.c' object='libspindleflogc_la-spindle_mkdir.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindlelogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -c -o libspindlelogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libspindleflogc_la_CPPFLAGS) $(CPPFLAGS) $(libspindleflogc_la_CFLAGS) $(CFLAGS) -c -o libspindleflogc_la-spindle_mkdir.lo `test -f '$(top_srcdir)/../utils/spindle_mkdir.c' || echo '$(srcdir)/'`$(top_srcdir)/../utils/spindle_mkdir.c
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/src/fe/openmpi_intercept/Makefile.in b/src/fe/openmpi_intercept/Makefile.in
index 39e068ab..9e5de191 100644
--- a/src/fe/openmpi_intercept/Makefile.in
+++ b/src/fe/openmpi_intercept/Makefile.in
@@ -225,6 +225,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/fe/startup/Makefile.am b/src/fe/startup/Makefile.am
index f44c7d22..eea54e1f 100644
--- a/src/fe/startup/Makefile.am
+++ b/src/fe/startup/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/../logging
 
 CORE_SOURCES = spindle_fe.cc parseargs.cc parse_preload.cc $(top_srcdir)/../utils/pathfn.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/parseloc.c
 CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../include -I$(top_srcdir)/comlib -I$(top_srcdir)/../server/cache -I$(top_srcdir)/../server/comlib -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DBINDIR=\"$(pkglibexecdir)\" -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\"
-CORE_LDADD = $(top_builddir)/logging/libspindlelogc.la -lpthread
+CORE_LDADD = $(top_builddir)/logging/libspindleflogc.la -lpthread
 if COBO
 CORE_LDADD += $(top_builddir)/comlib/libfe_cobo.la $(top_builddir)/cobo/libldcs_cobo.la
 endif
diff --git a/src/fe/startup/Makefile.in b/src/fe/startup/Makefile.in
index e02da474..1e1c6a0d 100644
--- a/src/fe/startup/Makefile.in
+++ b/src/fe/startup/Makefile.in
@@ -135,7 +135,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(includedir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindlelogc.la \
+am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindleflogc.la \
 	$(am__append_1) $(am__append_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 libspindlefe_la_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -252,6 +252,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -388,7 +389,7 @@ include_HEADERS = $(top_srcdir)/../include/spindle_launch.h
 AM_CPPFLAGS = -I$(top_srcdir)/../logging
 CORE_SOURCES = spindle_fe.cc parseargs.cc parse_preload.cc $(top_srcdir)/../utils/pathfn.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/parseloc.c
 CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/../include -I$(top_srcdir)/comlib -I$(top_srcdir)/../server/cache -I$(top_srcdir)/../server/comlib -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo -DBINDIR=\"$(pkglibexecdir)\" -DLIBEXECDIR=\"$(pkglibexecdir)\" -DPROGLIBDIR=\"$(pkglibdir)\"
-CORE_LDADD = $(top_builddir)/logging/libspindlelogc.la -lpthread \
+CORE_LDADD = $(top_builddir)/logging/libspindleflogc.la -lpthread \
 	$(am__append_1) $(am__append_2) $(MUNGE_DYN_LIB) \
 	$(GCRYPT_LIBS)
 libspindlefe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEFELIB
diff --git a/src/server/Makefile.in b/src/server/Makefile.in
index 23d082e6..e9732c71 100644
--- a/src/server/Makefile.in
+++ b/src/server/Makefile.in
@@ -213,6 +213,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/server/auditserver/Makefile.in b/src/server/auditserver/Makefile.in
index a2e0aa8f..18973798 100644
--- a/src/server/auditserver/Makefile.in
+++ b/src/server/auditserver/Makefile.in
@@ -180,6 +180,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/server/biter/Makefile.am b/src/server/biter/Makefile.am
index 2c64b0de..694191dd 100644
--- a/src/server/biter/Makefile.am
+++ b/src/server/biter/Makefile.am
@@ -1,14 +1,15 @@
 noinst_LTLIBRARIES = libbiterd.la
 
-BS=$(top_srcdir)/../biter
+AM_CFLAGS = -fvisibility=hidden
 
-libbiterd_la_SOURCES = $(BS)/biterd.c $(BS)/server_queue.c $(BS)/demultiplex.c
-AM_CPPFLAGS = -I$(BS) -I$(top_srcdir)/../logging -I$(top_srcdir)/../include
+libbiterd_la_SOURCES = $(top_srcdir)/../biter/biterd.c $(top_srcdir)/../biter/server_queue.c $(top_srcdir)/../biter/demultiplex.c
+libbiterd_la_CFLAGS = -DSERVER
+AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging -I$(top_srcdir)/../include
 
 if BGQ_BLD
-libbiterd_la_SOURCES += $(BS)/bgq_daemon_ids.c
+libbiterd_la_SOURCES += $(top_srcdir)/../biter/bgq_daemon_ids.c
 endif
 if LINUX_BLD
-libbiterd_la_SOURCES += $(BS)/linux_daemon_ids.c
+libbiterd_la_SOURCES += $(top_srcdir)/../biter/linux_daemon_ids.c
 endif
 
diff --git a/src/server/biter/Makefile.in b/src/server/biter/Makefile.in
index 4fbb1127..4a96c798 100644
--- a/src/server/biter/Makefile.in
+++ b/src/server/biter/Makefile.in
@@ -79,8 +79,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
-@BGQ_BLD_TRUE@am__append_1 = $(BS)/bgq_daemon_ids.c
-@LINUX_BLD_TRUE@am__append_2 = $(BS)/linux_daemon_ids.c
+@BGQ_BLD_TRUE@am__append_1 = $(top_srcdir)/../biter/bgq_daemon_ids.c
+@LINUX_BLD_TRUE@am__append_2 = $(top_srcdir)/../biter/linux_daemon_ids.c
 subdir = biter
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/../../scripts/depcomp
@@ -101,18 +101,24 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
 libbiterd_la_LIBADD =
-am__libbiterd_la_SOURCES_DIST = $(BS)/biterd.c $(BS)/server_queue.c \
-	$(BS)/demultiplex.c $(BS)/bgq_daemon_ids.c \
-	$(BS)/linux_daemon_ids.c
-@BGQ_BLD_TRUE@am__objects_1 = bgq_daemon_ids.lo
-@LINUX_BLD_TRUE@am__objects_2 = linux_daemon_ids.lo
-am_libbiterd_la_OBJECTS = biterd.lo server_queue.lo demultiplex.lo \
+am__libbiterd_la_SOURCES_DIST = $(top_srcdir)/../biter/biterd.c \
+	$(top_srcdir)/../biter/server_queue.c \
+	$(top_srcdir)/../biter/demultiplex.c \
+	$(top_srcdir)/../biter/bgq_daemon_ids.c \
+	$(top_srcdir)/../biter/linux_daemon_ids.c
+@BGQ_BLD_TRUE@am__objects_1 = libbiterd_la-bgq_daemon_ids.lo
+@LINUX_BLD_TRUE@am__objects_2 = libbiterd_la-linux_daemon_ids.lo
+am_libbiterd_la_OBJECTS = libbiterd_la-biterd.lo \
+	libbiterd_la-server_queue.lo libbiterd_la-demultiplex.lo \
 	$(am__objects_1) $(am__objects_2)
 libbiterd_la_OBJECTS = $(am_libbiterd_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
+libbiterd_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libbiterd_la_CFLAGS) \
+	$(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -178,6 +184,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -313,10 +320,13 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libbiterd.la
-BS = $(top_srcdir)/../biter
-libbiterd_la_SOURCES = $(BS)/biterd.c $(BS)/server_queue.c \
-	$(BS)/demultiplex.c $(am__append_1) $(am__append_2)
-AM_CPPFLAGS = -I$(BS) -I$(top_srcdir)/../logging -I$(top_srcdir)/../include
+AM_CFLAGS = -fvisibility=hidden
+libbiterd_la_SOURCES = $(top_srcdir)/../biter/biterd.c \
+	$(top_srcdir)/../biter/server_queue.c \
+	$(top_srcdir)/../biter/demultiplex.c $(am__append_1) \
+	$(am__append_2)
+libbiterd_la_CFLAGS = -DSERVER
+AM_CPPFLAGS = -I$(top_srcdir)/../biter -I$(top_srcdir)/../logging -I$(top_srcdir)/../include
 all: all-am
 
 .SUFFIXES:
@@ -364,7 +374,7 @@ clean-noinstLTLIBRARIES:
 	}
 
 libbiterd.la: $(libbiterd_la_OBJECTS) $(libbiterd_la_DEPENDENCIES) $(EXTRA_libbiterd_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(LINK)  $(libbiterd_la_OBJECTS) $(libbiterd_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libbiterd_la_LINK)  $(libbiterd_la_OBJECTS) $(libbiterd_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -372,11 +382,11 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bgq_daemon_ids.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/biterd.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demultiplex.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux_daemon_ids.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server_queue.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterd_la-biterd.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterd_la-demultiplex.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libbiterd_la-server_queue.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -399,40 +409,40 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-biterd.lo: $(BS)/biterd.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT biterd.lo -MD -MP -MF $(DEPDIR)/biterd.Tpo -c -o biterd.lo `test -f '$(BS)/biterd.c' || echo '$(srcdir)/'`$(BS)/biterd.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/biterd.Tpo $(DEPDIR)/biterd.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/biterd.c' object='biterd.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterd_la-biterd.lo: $(top_srcdir)/../biter/biterd.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT libbiterd_la-biterd.lo -MD -MP -MF $(DEPDIR)/libbiterd_la-biterd.Tpo -c -o libbiterd_la-biterd.lo `test -f '$(top_srcdir)/../biter/biterd.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/biterd.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterd_la-biterd.Tpo $(DEPDIR)/libbiterd_la-biterd.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/biterd.c' object='libbiterd_la-biterd.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o biterd.lo `test -f '$(BS)/biterd.c' || echo '$(srcdir)/'`$(BS)/biterd.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o libbiterd_la-biterd.lo `test -f '$(top_srcdir)/../biter/biterd.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/biterd.c
 
-server_queue.lo: $(BS)/server_queue.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT server_queue.lo -MD -MP -MF $(DEPDIR)/server_queue.Tpo -c -o server_queue.lo `test -f '$(BS)/server_queue.c' || echo '$(srcdir)/'`$(BS)/server_queue.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/server_queue.Tpo $(DEPDIR)/server_queue.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/server_queue.c' object='server_queue.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterd_la-server_queue.lo: $(top_srcdir)/../biter/server_queue.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT libbiterd_la-server_queue.lo -MD -MP -MF $(DEPDIR)/libbiterd_la-server_queue.Tpo -c -o libbiterd_la-server_queue.lo `test -f '$(top_srcdir)/../biter/server_queue.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/server_queue.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterd_la-server_queue.Tpo $(DEPDIR)/libbiterd_la-server_queue.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/server_queue.c' object='libbiterd_la-server_queue.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o server_queue.lo `test -f '$(BS)/server_queue.c' || echo '$(srcdir)/'`$(BS)/server_queue.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o libbiterd_la-server_queue.lo `test -f '$(top_srcdir)/../biter/server_queue.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/server_queue.c
 
-demultiplex.lo: $(BS)/demultiplex.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT demultiplex.lo -MD -MP -MF $(DEPDIR)/demultiplex.Tpo -c -o demultiplex.lo `test -f '$(BS)/demultiplex.c' || echo '$(srcdir)/'`$(BS)/demultiplex.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/demultiplex.Tpo $(DEPDIR)/demultiplex.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/demultiplex.c' object='demultiplex.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterd_la-demultiplex.lo: $(top_srcdir)/../biter/demultiplex.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT libbiterd_la-demultiplex.lo -MD -MP -MF $(DEPDIR)/libbiterd_la-demultiplex.Tpo -c -o libbiterd_la-demultiplex.lo `test -f '$(top_srcdir)/../biter/demultiplex.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/demultiplex.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterd_la-demultiplex.Tpo $(DEPDIR)/libbiterd_la-demultiplex.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/demultiplex.c' object='libbiterd_la-demultiplex.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o demultiplex.lo `test -f '$(BS)/demultiplex.c' || echo '$(srcdir)/'`$(BS)/demultiplex.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o libbiterd_la-demultiplex.lo `test -f '$(top_srcdir)/../biter/demultiplex.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/demultiplex.c
 
-bgq_daemon_ids.lo: $(BS)/bgq_daemon_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bgq_daemon_ids.lo -MD -MP -MF $(DEPDIR)/bgq_daemon_ids.Tpo -c -o bgq_daemon_ids.lo `test -f '$(BS)/bgq_daemon_ids.c' || echo '$(srcdir)/'`$(BS)/bgq_daemon_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bgq_daemon_ids.Tpo $(DEPDIR)/bgq_daemon_ids.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/bgq_daemon_ids.c' object='bgq_daemon_ids.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterd_la-bgq_daemon_ids.lo: $(top_srcdir)/../biter/bgq_daemon_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT libbiterd_la-bgq_daemon_ids.lo -MD -MP -MF $(DEPDIR)/libbiterd_la-bgq_daemon_ids.Tpo -c -o libbiterd_la-bgq_daemon_ids.lo `test -f '$(top_srcdir)/../biter/bgq_daemon_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/bgq_daemon_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterd_la-bgq_daemon_ids.Tpo $(DEPDIR)/libbiterd_la-bgq_daemon_ids.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/bgq_daemon_ids.c' object='libbiterd_la-bgq_daemon_ids.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bgq_daemon_ids.lo `test -f '$(BS)/bgq_daemon_ids.c' || echo '$(srcdir)/'`$(BS)/bgq_daemon_ids.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o libbiterd_la-bgq_daemon_ids.lo `test -f '$(top_srcdir)/../biter/bgq_daemon_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/bgq_daemon_ids.c
 
-linux_daemon_ids.lo: $(BS)/linux_daemon_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT linux_daemon_ids.lo -MD -MP -MF $(DEPDIR)/linux_daemon_ids.Tpo -c -o linux_daemon_ids.lo `test -f '$(BS)/linux_daemon_ids.c' || echo '$(srcdir)/'`$(BS)/linux_daemon_ids.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/linux_daemon_ids.Tpo $(DEPDIR)/linux_daemon_ids.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(BS)/linux_daemon_ids.c' object='linux_daemon_ids.lo' libtool=yes @AMDEPBACKSLASH@
+libbiterd_la-linux_daemon_ids.lo: $(top_srcdir)/../biter/linux_daemon_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -MT libbiterd_la-linux_daemon_ids.lo -MD -MP -MF $(DEPDIR)/libbiterd_la-linux_daemon_ids.Tpo -c -o libbiterd_la-linux_daemon_ids.lo `test -f '$(top_srcdir)/../biter/linux_daemon_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/linux_daemon_ids.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libbiterd_la-linux_daemon_ids.Tpo $(DEPDIR)/libbiterd_la-linux_daemon_ids.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../biter/linux_daemon_ids.c' object='libbiterd_la-linux_daemon_ids.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o linux_daemon_ids.lo `test -f '$(BS)/linux_daemon_ids.c' || echo '$(srcdir)/'`$(BS)/linux_daemon_ids.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libbiterd_la_CFLAGS) $(CFLAGS) -c -o libbiterd_la-linux_daemon_ids.lo `test -f '$(top_srcdir)/../biter/linux_daemon_ids.c' || echo '$(srcdir)/'`$(top_srcdir)/../biter/linux_daemon_ids.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/src/server/cache/Makefile.in b/src/server/cache/Makefile.in
index bc8e5671..63a4b956 100644
--- a/src/server/cache/Makefile.in
+++ b/src/server/cache/Makefile.in
@@ -171,6 +171,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/server/cobo/Makefile.in b/src/server/cobo/Makefile.in
index 05707075..c79b2d08 100644
--- a/src/server/cobo/Makefile.in
+++ b/src/server/cobo/Makefile.in
@@ -171,6 +171,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/server/comlib/Makefile.in b/src/server/comlib/Makefile.in
index a81fd693..292c7e5e 100644
--- a/src/server/comlib/Makefile.in
+++ b/src/server/comlib/Makefile.in
@@ -204,6 +204,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/server/configure b/src/server/configure
index cd6863e1..5ecb9029 100755
--- a/src/server/configure
+++ b/src/server/configure
@@ -678,6 +678,7 @@ SOCKETS_TRUE
 PIPES_FALSE
 PIPES_TRUE
 TESTRM
+AR_FLAGS
 CXXCPP
 CPP
 OTOOL64
@@ -16258,6 +16259,87 @@ DEFAULT_PORT=21940
 DEFAULT_LOC='$TMPDIR'
 DEFAULT_NUM_COBO_PORTS=25
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wall" >&5
+$as_echo_n "checking for -Wall... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wall"
+CXXFLAGS="$CXXLAGS -Wall"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-unused-result" >&5
+$as_echo_n "checking for -Wno-unused-result... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wunused-result"
+CXXFLAGS="$CXXFLAGS -Wunused-result"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-unused-result"; CXXFLAGS="$OCXXFLAGS -Wno-unused-result"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Wno-portability" >&5
+$as_echo_n "checking for -Wno-portability... " >&6; }
+OCFLAGS=$CFLAGS
+OCXXFLAGS=$CXXFLAGS
+CFLAGS="$CFLAGS -Wportability"
+CXXFLAGS="$CXXFLAGS -Wportability"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; CFLAGS="$OCFLAGS -Wno-portability"; CXXFLAGS="$OCXXFLAGS -Wno-portability"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }; CFLAGS=$OCFLAGS; CXXFLAGS=$OCXXFLAGS
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+AR_FLAGS=cr
+
+
 
 # Check whether --with-default-port was given.
 if test "${with_default_port+set}" = set; then :
diff --git a/src/server/configure.ac b/src/server/configure.ac
index 13ab6573..cc00bd1d 100644
--- a/src/server/configure.ac
+++ b/src/server/configure.ac
@@ -2,7 +2,7 @@ AC_INIT([spindle], m4_esyscmd([tr -d '\n' < ../../VERSION]), m4_esyscmd([tr -d '
 AC_CONFIG_MACRO_DIR([../../m4])
 AC_CONFIG_AUX_DIR([../../scripts])
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([foreign])
 AM_SILENT_RULES([yes])
 AM_PROG_AR
 AC_CONFIG_HEADERS([config.h])
diff --git a/src/server/launchmon/Makefile.in b/src/server/launchmon/Makefile.in
index 1804af5e..d2bf7c2c 100644
--- a/src/server/launchmon/Makefile.in
+++ b/src/server/launchmon/Makefile.in
@@ -170,6 +170,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
diff --git a/src/server/logging/Makefile.am b/src/server/logging/Makefile.am
index ee5dea68..8199f641 100644
--- a/src/server/logging/Makefile.am
+++ b/src/server/logging/Makefile.am
@@ -1,10 +1,11 @@
 pkglibexec_PROGRAMS = spindled_logd
-noinst_LTLIBRARIES = libspindlelogc.la
+noinst_LTLIBRARIES = libspindledlogc.la
 
-spindled_logd_SOURCES = ../../logging/spindle_logd.cc
+spindled_logd_SOURCES = $(top_srcdir)/../logging/spindle_logd.cc
 spindled_logd_CPP = -I../../logging
 spindled_logd_LDADD = -lpthread
 
-libspindlelogc_la_SOURCES = ../../logging/spindle_logc.c
-libspindlelogc_la_CPP = -I../../logging
-libspindlelogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\"
+libspindledlogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c
+libspindledlogc_la_CPP = -I../../logging
+libspindledlogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\"
+
diff --git a/src/server/logging/Makefile.in b/src/server/logging/Makefile.in
index 7e0d8ec2..5e529399 100644
--- a/src/server/logging/Makefile.in
+++ b/src/server/logging/Makefile.in
@@ -100,17 +100,17 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libspindlelogc_la_LIBADD =
-am_libspindlelogc_la_OBJECTS = libspindlelogc_la-spindle_logc.lo
-libspindlelogc_la_OBJECTS = $(am_libspindlelogc_la_OBJECTS)
+libspindledlogc_la_LIBADD =
+am_libspindledlogc_la_OBJECTS = libspindledlogc_la-spindle_logc.lo
+libspindledlogc_la_OBJECTS = $(am_libspindledlogc_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
-libspindlelogc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+libspindledlogc_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(libspindlelogc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+	$(libspindledlogc_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+	$(LDFLAGS) -o $@
 am__installdirs = "$(DESTDIR)$(pkglibexecdir)"
 PROGRAMS = $(pkglibexec_PROGRAMS)
 am_spindled_logd_OBJECTS = spindle_logd.$(OBJEXT)
@@ -168,8 +168,8 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(libspindlelogc_la_SOURCES) $(spindled_logd_SOURCES)
-DIST_SOURCES = $(libspindlelogc_la_SOURCES) $(spindled_logd_SOURCES)
+SOURCES = $(libspindledlogc_la_SOURCES) $(spindled_logd_SOURCES)
+DIST_SOURCES = $(libspindledlogc_la_SOURCES) $(spindled_logd_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -199,6 +199,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -333,13 +334,13 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-noinst_LTLIBRARIES = libspindlelogc.la
-spindled_logd_SOURCES = ../../logging/spindle_logd.cc
+noinst_LTLIBRARIES = libspindledlogc.la
+spindled_logd_SOURCES = $(top_srcdir)/../logging/spindle_logd.cc
 spindled_logd_CPP = -I../../logging
 spindled_logd_LDADD = -lpthread
-libspindlelogc_la_SOURCES = ../../logging/spindle_logc.c
-libspindlelogc_la_CPP = -I../../logging
-libspindlelogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\"
+libspindledlogc_la_SOURCES = $(top_srcdir)/../logging/spindle_logc.c
+libspindledlogc_la_CPP = -I../../logging
+libspindledlogc_la_CFLAGS = -DLIBEXEC=\"${pkglibexecdir}\" -DDAEMON_NAME=\"spindled_logd\"
 all: all-am
 
 .SUFFIXES:
@@ -386,8 +387,8 @@ clean-noinstLTLIBRARIES:
 	  rm -f $${locs}; \
 	}
 
-libspindlelogc.la: $(libspindlelogc_la_OBJECTS) $(libspindlelogc_la_DEPENDENCIES) $(EXTRA_libspindlelogc_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libspindlelogc_la_LINK)  $(libspindlelogc_la_OBJECTS) $(libspindlelogc_la_LIBADD) $(LIBS)
+libspindledlogc.la: $(libspindledlogc_la_OBJECTS) $(libspindledlogc_la_DEPENDENCIES) $(EXTRA_libspindledlogc_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libspindledlogc_la_LINK)  $(libspindledlogc_la_OBJECTS) $(libspindledlogc_la_LIBADD) $(LIBS)
 install-pkglibexecPROGRAMS: $(pkglibexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(pkglibexec_PROGRAMS)'; test -n "$(pkglibexecdir)" || list=; \
@@ -448,7 +449,7 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindlelogc_la-spindle_logc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libspindledlogc_la-spindle_logc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spindle_logd.Po@am__quote@
 
 .c.o:
@@ -472,12 +473,12 @@ distclean-compile:
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
-libspindlelogc_la-spindle_logc.lo: ../../logging/spindle_logc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -MT libspindlelogc_la-spindle_logc.lo -MD -MP -MF $(DEPDIR)/libspindlelogc_la-spindle_logc.Tpo -c -o libspindlelogc_la-spindle_logc.lo `test -f '../../logging/spindle_logc.c' || echo '$(srcdir)/'`../../logging/spindle_logc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindlelogc_la-spindle_logc.Tpo $(DEPDIR)/libspindlelogc_la-spindle_logc.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='../../logging/spindle_logc.c' object='libspindlelogc_la-spindle_logc.lo' libtool=yes @AMDEPBACKSLASH@
+libspindledlogc_la-spindle_logc.lo: $(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libspindledlogc_la_CFLAGS) $(CFLAGS) -MT libspindledlogc_la-spindle_logc.lo -MD -MP -MF $(DEPDIR)/libspindledlogc_la-spindle_logc.Tpo -c -o libspindledlogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libspindledlogc_la-spindle_logc.Tpo $(DEPDIR)/libspindledlogc_la-spindle_logc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$(top_srcdir)/../logging/spindle_logc.c' object='libspindledlogc_la-spindle_logc.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libspindlelogc_la_CFLAGS) $(CFLAGS) -c -o libspindlelogc_la-spindle_logc.lo `test -f '../../logging/spindle_logc.c' || echo '$(srcdir)/'`../../logging/spindle_logc.c
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libspindledlogc_la_CFLAGS) $(CFLAGS) -c -o libspindledlogc_la-spindle_logc.lo `test -f '$(top_srcdir)/../logging/spindle_logc.c' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logc.c
 
 .cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -500,19 +501,19 @@ libspindlelogc_la-spindle_logc.lo: ../../logging/spindle_logc.c
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
-spindle_logd.o: ../../logging/spindle_logd.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spindle_logd.o -MD -MP -MF $(DEPDIR)/spindle_logd.Tpo -c -o spindle_logd.o `test -f '../../logging/spindle_logd.cc' || echo '$(srcdir)/'`../../logging/spindle_logd.cc
+spindle_logd.o: $(top_srcdir)/../logging/spindle_logd.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spindle_logd.o -MD -MP -MF $(DEPDIR)/spindle_logd.Tpo -c -o spindle_logd.o `test -f '$(top_srcdir)/../logging/spindle_logd.cc' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logd.cc
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/spindle_logd.Tpo $(DEPDIR)/spindle_logd.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../../logging/spindle_logd.cc' object='spindle_logd.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(top_srcdir)/../logging/spindle_logd.cc' object='spindle_logd.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spindle_logd.o `test -f '../../logging/spindle_logd.cc' || echo '$(srcdir)/'`../../logging/spindle_logd.cc
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spindle_logd.o `test -f '$(top_srcdir)/../logging/spindle_logd.cc' || echo '$(srcdir)/'`$(top_srcdir)/../logging/spindle_logd.cc
 
-spindle_logd.obj: ../../logging/spindle_logd.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spindle_logd.obj -MD -MP -MF $(DEPDIR)/spindle_logd.Tpo -c -o spindle_logd.obj `if test -f '../../logging/spindle_logd.cc'; then $(CYGPATH_W) '../../logging/spindle_logd.cc'; else $(CYGPATH_W) '$(srcdir)/../../logging/spindle_logd.cc'; fi`
+spindle_logd.obj: $(top_srcdir)/../logging/spindle_logd.cc
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spindle_logd.obj -MD -MP -MF $(DEPDIR)/spindle_logd.Tpo -c -o spindle_logd.obj `if test -f '$(top_srcdir)/../logging/spindle_logd.cc'; then $(CYGPATH_W) '$(top_srcdir)/../logging/spindle_logd.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../logging/spindle_logd.cc'; fi`
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/spindle_logd.Tpo $(DEPDIR)/spindle_logd.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../../logging/spindle_logd.cc' object='spindle_logd.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$(top_srcdir)/../logging/spindle_logd.cc' object='spindle_logd.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spindle_logd.obj `if test -f '../../logging/spindle_logd.cc'; then $(CYGPATH_W) '../../logging/spindle_logd.cc'; else $(CYGPATH_W) '$(srcdir)/../../logging/spindle_logd.cc'; fi`
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spindle_logd.obj `if test -f '$(top_srcdir)/../logging/spindle_logd.cc'; then $(CYGPATH_W) '$(top_srcdir)/../logging/spindle_logd.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/../logging/spindle_logd.cc'; fi`
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff --git a/src/server/startup/Makefile.am b/src/server/startup/Makefile.am
index 51359fec..dd1e326f 100644
--- a/src/server/startup/Makefile.am
+++ b/src/server/startup/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/../logging
 
 CORE_SOURCES = spindle_be.cc $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/spindle_mkdir.c
 CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo
-CORE_LDADD = $(top_builddir)/logging/libspindlelogc.la
+CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la
 if COBO
 CORE_LDADD += $(top_builddir)/auditserver/libaudit_server_cobo.la
 endif
diff --git a/src/server/startup/Makefile.in b/src/server/startup/Makefile.in
index cc782f66..61958c0a 100644
--- a/src/server/startup/Makefile.in
+++ b/src/server/startup/Makefile.in
@@ -137,7 +137,7 @@ am__uninstall_files_from_dir = { \
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkglibexecdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
-am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindlelogc.la \
+am__DEPENDENCIES_2 = $(top_builddir)/logging/libspindledlogc.la \
 	$(am__append_1) $(am__append_2) $(am__append_3) \
 	$(am__append_4) $(am__append_5) $(am__DEPENDENCIES_1)
 libspindlebe_la_DEPENDENCIES = $(am__DEPENDENCIES_2) \
@@ -258,6 +258,7 @@ ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -396,9 +397,9 @@ lib_LTLIBRARIES = libspindlebe.la
 AM_CPPFLAGS = -I$(top_srcdir)/../logging
 CORE_SOURCES = spindle_be.cc $(top_srcdir)/../utils/parseloc.c $(top_srcdir)/../utils/keyfile.c $(top_srcdir)/../utils/spindle_mkdir.c
 CORE_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/comlib -I$(top_srcdir)/auditserver -I$(top_srcdir)/../client/beboot -I$(top_srcdir)/../include -I$(top_srcdir)/../utils -I$(top_srcdir)/../cobo
-CORE_LDADD = $(top_builddir)/logging/libspindlelogc.la $(am__append_1) \
-	$(am__append_2) $(am__append_3) $(am__append_4) \
-	$(am__append_5) $(GCRYPT_LIBS)
+CORE_LDADD = $(top_builddir)/logging/libspindledlogc.la \
+	$(am__append_1) $(am__append_2) $(am__append_3) \
+	$(am__append_4) $(am__append_5) $(GCRYPT_LIBS)
 libspindlebe_la_CPPFLAGS = $(CORE_CPPFLAGS) -DSPINDLEBELIB
 libspindlebe_la_SOURCES = $(CORE_SOURCES)
 libspindlebe_la_LIBADD = $(CORE_LDADD) $(MUNGE_DYN_LIB)
diff --git a/src/utils/pathfn.c b/src/utils/pathfn.c
index 6483ce95..1bf04ea1 100644
--- a/src/utils/pathfn.c
+++ b/src/utils/pathfn.c
@@ -20,7 +20,6 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <string.h>
 
 #include "ldcs_api.h"
-#include "ldcs_cache.h"
 
 int addCWDToDir(const char *cwd, char *dir, int result_size)
 {
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 30c8776f..4b34fb1f 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -167,9 +167,9 @@ CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
-AM_CFLAGS = @AM_CFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AR = @AR@
+AR_FLAGS = @AR_FLAGS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@