diff --git a/Makefile.in b/Makefile.in
index ffd0d820..187cc92f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -82,7 +82,7 @@ subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) mkinstalldirs \
 	$(srcdir)/TESTS_ENVIRONMENT.in AUTHORS INSTALL NEWS README \
-	config.guess config.sub depcomp install-sh missing
+	compile config.guess config.sub depcomp install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/ax_sqlite3.m4 \
 	$(top_srcdir)/ax_with_curses.m4 $(top_srcdir)/lnav.m4 \
@@ -552,10 +552,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
diff --git a/aclocal.m4 b/aclocal.m4
index 952e89b0..18cadc48 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.13.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.14 -*- Autoconf -*-
 
 # Copyright (C) 1996-2013 Free Software Foundation, Inc.
 
@@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.])
 # generated from the m4 files accompanying Automake X.Y.
 # (This private macro should not be called outside this file.)
 AC_DEFUN([AM_AUTOMAKE_VERSION],
-[am__api_version='1.13'
+[am__api_version='1.14'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.13.2], [],
+m4_if([$1], [1.14], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.13.2])dnl
+[AM_AUTOMAKE_VERSION([1.14])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # This macro actually does too much.  Some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
 
+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
+m4_define([AC_PROG_CC],
+m4_defn([AC_PROG_CC])
+[_AM_PROG_CC_C_O
+])
+
 # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
 # AM_INIT_AUTOMAKE([OPTIONS])
 # -----------------------------------------------
@@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
 AC_CONFIG_COMMANDS_PRE(dnl
 [m4_provide_if([_AM_COMPILER_EXEEXT],
   [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-])
+
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
+  fi
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
@@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement.
 m4_define([_AC_COMPILER_EXEEXT],
 m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
 
-
 # When config.status generates a header, we must update the stamp-h file.
 # This file resides in the same directory as the config header
 # that is generated.  The stamp files are numbered to have different names.
@@ -722,6 +768,53 @@ AC_DEFUN([_AM_IF_OPTION],
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# _AM_PROG_CC_C_O
+# ---------------
+# Like AC_PROG_CC_C_O, but changed for automake.  We rewrite AC_PROG_CC
+# to automatically call this.
+AC_DEFUN([_AM_PROG_CC_C_O],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([compile])dnl
+AC_LANG_PUSH([C])dnl
+AC_CACHE_CHECK(
+  [whether $CC understands -c and -o together],
+  [am_cv_prog_cc_c_o],
+  [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i])
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+AC_LANG_POP([C])])
+
+# For backward compatibility.
+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
+
+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
 
 # AM_PATH_PYTHON([MINIMUM-VERSION], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # ---------------------------------------------------------------------------
diff --git a/configure b/configure
index 0ccaf9d4..a733f308 100755
--- a/configure
+++ b/configure
@@ -2366,7 +2366,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-am__api_version='1.13'
+am__api_version='1.14'
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2932,6 +2932,47 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# POSIX will say in a future version that running "rm -f" with no argument
+# is OK; and we want to be able to make that assumption in our Makefile
+# recipes.  So use an aggressive probe to check that the usage we want is
+# actually supported "in the wild" to an acceptable degree.
+# See automake bug#10828.
+# To make any issue more visible, cause the running configure to be aborted
+# by default if the 'rm' program in use doesn't match our expectations; the
+# user can still override this though.
+if rm -f && rm -fr && rm -rf; then : OK; else
+  cat >&2 <<'END'
+Oops!
+
+Your 'rm' program seems unable to run without file operands specified
+on the command line, even when the '-f' option is present.  This is contrary
+to the behaviour of most rm programs out there, and not conforming with
+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
+
+Please tell bug-automake@gnu.org about your system, including the value
+of your $PATH and any error possibly output before this message.  This
+can help us improve future automake versions.
+
+END
+  if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
+    echo 'Configuration will proceed anyway, since you have set the' >&2
+    echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
+    echo >&2
+  else
+    cat >&2 <<'END'
+Aborting the configuration process, to ensure you take notice of the issue.
+
+You can download and install GNU coreutils to get an 'rm' implementation
+that behaves properly: <http://www.gnu.org/software/coreutils/>.
+
+If you want to complete the configuration process using your problematic
+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
+to "yes", and re-run configure.
+
+END
+    as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
+  fi
+fi
 # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
   enableval=$enable_silent_rules;
@@ -3768,8 +3809,8 @@ fi
 
 
 
-# CFLAGS=`echo $CFLAGS | sed 's/-O2//g'`
-# CXXFLAGS=`echo $CXXFLAGS | sed 's/-O2//g'`
+CFLAGS=`echo $CFLAGS | sed 's/-O2//g'`
+CXXFLAGS=`echo $CXXFLAGS | sed 's/-O2//g'`
 
 # Check whether --enable-static was given.
 if test "${enable_static+set}" = set; then :
@@ -4804,6 +4845,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
+$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
+if ${am_cv_prog_cc_c_o+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+  # Make sure it works both with $CC and with simple cc.
+  # Following AC_PROG_CC_C_O, we do the test twice because some
+  # compilers refuse to overwrite an existing .o file with -o,
+  # though they will create one.
+  am_cv_prog_cc_c_o=yes
+  for am_i in 1 2; do
+    if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
+   ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } \
+         && test -f conftest2.$ac_objext; then
+      : OK
+    else
+      am_cv_prog_cc_c_o=no
+      break
+    fi
+  done
+  rm -f core conftest*
+  unset am_i
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
+$as_echo "$am_cv_prog_cc_c_o" >&6; }
+if test "$am_cv_prog_cc_c_o" != yes; then
+   # Losing compiler, so override with the script.
+   # FIXME: It is wrong to rewrite CC.
+   # But if we don't then we get into trouble of one sort or another.
+   # A longer-term fix would be to have automake use am__CC in this case,
+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
+   CC="$am_aux_dir/compile $CC"
+fi
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
 depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
diff --git a/configure.ac b/configure.ac
index 88ab7502..f4099512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 AC_INIT(lnav, 0.5.1, lnav@googlegroups.com)
 AC_CONFIG_SRCDIR([src/lnav.cc])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 AM_SILENT_RULES([yes])
 
 AC_PREFIX_DEFAULT(/usr/)
@@ -35,8 +35,8 @@ AC_SUBST(abssrcdir)
 
 AC_PROG_CXX
 
-# CFLAGS=`echo $CFLAGS | sed 's/-O2//g'`
-# CXXFLAGS=`echo $CXXFLAGS | sed 's/-O2//g'`
+CFLAGS=`echo $CFLAGS | sed 's/-O2//g'`
+CXXFLAGS=`echo $CXXFLAGS | sed 's/-O2//g'`
 
 AC_ARG_ENABLE([static],
               AS_HELP_STRING([--disable-static],
diff --git a/src/Makefile.in b/src/Makefile.in
index e34911ab..081f076f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -108,6 +108,7 @@ am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 = 
 libdiag_a_AR = $(AR) $(ARFLAGS)
 libdiag_a_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
 am_libdiag_a_OBJECTS = ansi_scrubber.$(OBJEXT) bookmarks.$(OBJEXT) \
 	collation-functions.$(OBJEXT) extension-functions.$(OBJEXT) \
 	fs-extension-functions.$(OBJEXT) grep_proc.$(OBJEXT) \
@@ -125,10 +126,11 @@ am_libdiag_a_OBJECTS = ansi_scrubber.$(OBJEXT) bookmarks.$(OBJEXT) \
 	state-extension-functions.$(OBJEXT) strnatcmp.$(OBJEXT) \
 	textview_curses.$(OBJEXT) view_curses.$(OBJEXT) \
 	vt52_curses.$(OBJEXT) log_vtab_impl.$(OBJEXT) \
-	xterm_mouse.$(OBJEXT) yajlpp.$(OBJEXT) yajl.$(OBJEXT) \
-	yajl_alloc.$(OBJEXT) yajl_buf.$(OBJEXT) yajl_encode.$(OBJEXT) \
-	yajl_gen.$(OBJEXT) yajl_lex.$(OBJEXT) yajl_parser.$(OBJEXT) \
-	yajl_tree.$(OBJEXT) yajl_version.$(OBJEXT)
+	xterm_mouse.$(OBJEXT) yajlpp.$(OBJEXT) yajl/yajl.$(OBJEXT) \
+	yajl/yajl_alloc.$(OBJEXT) yajl/yajl_buf.$(OBJEXT) \
+	yajl/yajl_encode.$(OBJEXT) yajl/yajl_gen.$(OBJEXT) \
+	yajl/yajl_lex.$(OBJEXT) yajl/yajl_parser.$(OBJEXT) \
+	yajl/yajl_tree.$(OBJEXT) yajl/yajl_version.$(OBJEXT)
 libdiag_a_OBJECTS = $(am_libdiag_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
@@ -165,10 +167,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-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 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 AM_V_CC = $(am__v_CC_@AM_V@)
@@ -538,8 +536,8 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -554,6 +552,30 @@ distclean-hdr:
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+yajl/$(am__dirstamp):
+	@$(MKDIR_P) yajl
+	@: > yajl/$(am__dirstamp)
+yajl/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) yajl/$(DEPDIR)
+	@: > yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_alloc.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_buf.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_encode.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_gen.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_lex.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_parser.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_tree.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
+yajl/yajl_version.$(OBJEXT): yajl/$(am__dirstamp) \
+	yajl/$(DEPDIR)/$(am__dirstamp)
 
 libdiag.a: $(libdiag_a_OBJECTS) $(libdiag_a_DEPENDENCIES) $(EXTRA_libdiag_a_DEPENDENCIES) 
 	$(AM_V_at)-rm -f libdiag.a
@@ -619,6 +641,7 @@ lnav-test$(EXEEXT): $(lnav_test_OBJECTS) $(lnav_test_DEPENDENCIES) $(EXTRA_lnav_
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f yajl/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -661,167 +684,45 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view_curses.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vt52_curses.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xterm_mouse.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_alloc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_buf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_encode.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_gen.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_lex.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_parser.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_tree.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajl_version.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/yajlpp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_alloc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_buf.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_encode.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_gen.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_lex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_parser.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_tree.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@yajl/$(DEPDIR)/yajl_version.Po@am__quote@
 
 .c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
 
 .c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-yajl.o: yajl/yajl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl.o -MD -MP -MF $(DEPDIR)/yajl.Tpo -c -o yajl.o `test -f 'yajl/yajl.c' || echo '$(srcdir)/'`yajl/yajl.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl.Tpo $(DEPDIR)/yajl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl.c' object='yajl.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl.o `test -f 'yajl/yajl.c' || echo '$(srcdir)/'`yajl/yajl.c
-
-yajl.obj: yajl/yajl.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl.obj -MD -MP -MF $(DEPDIR)/yajl.Tpo -c -o yajl.obj `if test -f 'yajl/yajl.c'; then $(CYGPATH_W) 'yajl/yajl.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl.Tpo $(DEPDIR)/yajl.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl.c' object='yajl.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl.obj `if test -f 'yajl/yajl.c'; then $(CYGPATH_W) 'yajl/yajl.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl.c'; fi`
-
-yajl_alloc.o: yajl/yajl_alloc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_alloc.o -MD -MP -MF $(DEPDIR)/yajl_alloc.Tpo -c -o yajl_alloc.o `test -f 'yajl/yajl_alloc.c' || echo '$(srcdir)/'`yajl/yajl_alloc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_alloc.Tpo $(DEPDIR)/yajl_alloc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_alloc.c' object='yajl_alloc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_alloc.o `test -f 'yajl/yajl_alloc.c' || echo '$(srcdir)/'`yajl/yajl_alloc.c
-
-yajl_alloc.obj: yajl/yajl_alloc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_alloc.obj -MD -MP -MF $(DEPDIR)/yajl_alloc.Tpo -c -o yajl_alloc.obj `if test -f 'yajl/yajl_alloc.c'; then $(CYGPATH_W) 'yajl/yajl_alloc.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_alloc.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_alloc.Tpo $(DEPDIR)/yajl_alloc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_alloc.c' object='yajl_alloc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_alloc.obj `if test -f 'yajl/yajl_alloc.c'; then $(CYGPATH_W) 'yajl/yajl_alloc.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_alloc.c'; fi`
-
-yajl_buf.o: yajl/yajl_buf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_buf.o -MD -MP -MF $(DEPDIR)/yajl_buf.Tpo -c -o yajl_buf.o `test -f 'yajl/yajl_buf.c' || echo '$(srcdir)/'`yajl/yajl_buf.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_buf.Tpo $(DEPDIR)/yajl_buf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_buf.c' object='yajl_buf.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_buf.o `test -f 'yajl/yajl_buf.c' || echo '$(srcdir)/'`yajl/yajl_buf.c
-
-yajl_buf.obj: yajl/yajl_buf.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_buf.obj -MD -MP -MF $(DEPDIR)/yajl_buf.Tpo -c -o yajl_buf.obj `if test -f 'yajl/yajl_buf.c'; then $(CYGPATH_W) 'yajl/yajl_buf.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_buf.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_buf.Tpo $(DEPDIR)/yajl_buf.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_buf.c' object='yajl_buf.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_buf.obj `if test -f 'yajl/yajl_buf.c'; then $(CYGPATH_W) 'yajl/yajl_buf.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_buf.c'; fi`
-
-yajl_encode.o: yajl/yajl_encode.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_encode.o -MD -MP -MF $(DEPDIR)/yajl_encode.Tpo -c -o yajl_encode.o `test -f 'yajl/yajl_encode.c' || echo '$(srcdir)/'`yajl/yajl_encode.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_encode.Tpo $(DEPDIR)/yajl_encode.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_encode.c' object='yajl_encode.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_encode.o `test -f 'yajl/yajl_encode.c' || echo '$(srcdir)/'`yajl/yajl_encode.c
-
-yajl_encode.obj: yajl/yajl_encode.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_encode.obj -MD -MP -MF $(DEPDIR)/yajl_encode.Tpo -c -o yajl_encode.obj `if test -f 'yajl/yajl_encode.c'; then $(CYGPATH_W) 'yajl/yajl_encode.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_encode.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_encode.Tpo $(DEPDIR)/yajl_encode.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_encode.c' object='yajl_encode.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_encode.obj `if test -f 'yajl/yajl_encode.c'; then $(CYGPATH_W) 'yajl/yajl_encode.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_encode.c'; fi`
-
-yajl_gen.o: yajl/yajl_gen.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_gen.o -MD -MP -MF $(DEPDIR)/yajl_gen.Tpo -c -o yajl_gen.o `test -f 'yajl/yajl_gen.c' || echo '$(srcdir)/'`yajl/yajl_gen.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_gen.Tpo $(DEPDIR)/yajl_gen.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_gen.c' object='yajl_gen.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_gen.o `test -f 'yajl/yajl_gen.c' || echo '$(srcdir)/'`yajl/yajl_gen.c
-
-yajl_gen.obj: yajl/yajl_gen.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_gen.obj -MD -MP -MF $(DEPDIR)/yajl_gen.Tpo -c -o yajl_gen.obj `if test -f 'yajl/yajl_gen.c'; then $(CYGPATH_W) 'yajl/yajl_gen.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_gen.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_gen.Tpo $(DEPDIR)/yajl_gen.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_gen.c' object='yajl_gen.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_gen.obj `if test -f 'yajl/yajl_gen.c'; then $(CYGPATH_W) 'yajl/yajl_gen.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_gen.c'; fi`
-
-yajl_lex.o: yajl/yajl_lex.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_lex.o -MD -MP -MF $(DEPDIR)/yajl_lex.Tpo -c -o yajl_lex.o `test -f 'yajl/yajl_lex.c' || echo '$(srcdir)/'`yajl/yajl_lex.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_lex.Tpo $(DEPDIR)/yajl_lex.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_lex.c' object='yajl_lex.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_lex.o `test -f 'yajl/yajl_lex.c' || echo '$(srcdir)/'`yajl/yajl_lex.c
-
-yajl_lex.obj: yajl/yajl_lex.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_lex.obj -MD -MP -MF $(DEPDIR)/yajl_lex.Tpo -c -o yajl_lex.obj `if test -f 'yajl/yajl_lex.c'; then $(CYGPATH_W) 'yajl/yajl_lex.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_lex.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_lex.Tpo $(DEPDIR)/yajl_lex.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_lex.c' object='yajl_lex.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_lex.obj `if test -f 'yajl/yajl_lex.c'; then $(CYGPATH_W) 'yajl/yajl_lex.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_lex.c'; fi`
-
-yajl_parser.o: yajl/yajl_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_parser.o -MD -MP -MF $(DEPDIR)/yajl_parser.Tpo -c -o yajl_parser.o `test -f 'yajl/yajl_parser.c' || echo '$(srcdir)/'`yajl/yajl_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_parser.Tpo $(DEPDIR)/yajl_parser.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_parser.c' object='yajl_parser.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_parser.o `test -f 'yajl/yajl_parser.c' || echo '$(srcdir)/'`yajl/yajl_parser.c
-
-yajl_parser.obj: yajl/yajl_parser.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_parser.obj -MD -MP -MF $(DEPDIR)/yajl_parser.Tpo -c -o yajl_parser.obj `if test -f 'yajl/yajl_parser.c'; then $(CYGPATH_W) 'yajl/yajl_parser.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_parser.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_parser.Tpo $(DEPDIR)/yajl_parser.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_parser.c' object='yajl_parser.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_parser.obj `if test -f 'yajl/yajl_parser.c'; then $(CYGPATH_W) 'yajl/yajl_parser.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_parser.c'; fi`
-
-yajl_tree.o: yajl/yajl_tree.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_tree.o -MD -MP -MF $(DEPDIR)/yajl_tree.Tpo -c -o yajl_tree.o `test -f 'yajl/yajl_tree.c' || echo '$(srcdir)/'`yajl/yajl_tree.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_tree.Tpo $(DEPDIR)/yajl_tree.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_tree.c' object='yajl_tree.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_tree.o `test -f 'yajl/yajl_tree.c' || echo '$(srcdir)/'`yajl/yajl_tree.c
-
-yajl_tree.obj: yajl/yajl_tree.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_tree.obj -MD -MP -MF $(DEPDIR)/yajl_tree.Tpo -c -o yajl_tree.obj `if test -f 'yajl/yajl_tree.c'; then $(CYGPATH_W) 'yajl/yajl_tree.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_tree.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_tree.Tpo $(DEPDIR)/yajl_tree.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_tree.c' object='yajl_tree.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_tree.obj `if test -f 'yajl/yajl_tree.c'; then $(CYGPATH_W) 'yajl/yajl_tree.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_tree.c'; fi`
-
-yajl_version.o: yajl/yajl_version.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_version.o -MD -MP -MF $(DEPDIR)/yajl_version.Tpo -c -o yajl_version.o `test -f 'yajl/yajl_version.c' || echo '$(srcdir)/'`yajl/yajl_version.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_version.Tpo $(DEPDIR)/yajl_version.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_version.c' object='yajl_version.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_version.o `test -f 'yajl/yajl_version.c' || echo '$(srcdir)/'`yajl/yajl_version.c
-
-yajl_version.obj: yajl/yajl_version.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT yajl_version.obj -MD -MP -MF $(DEPDIR)/yajl_version.Tpo -c -o yajl_version.obj `if test -f 'yajl/yajl_version.c'; then $(CYGPATH_W) 'yajl/yajl_version.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_version.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/yajl_version.Tpo $(DEPDIR)/yajl_version.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='yajl/yajl_version.c' object='yajl_version.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o yajl_version.obj `if test -f 'yajl/yajl_version.c'; then $(CYGPATH_W) 'yajl/yajl_version.c'; else $(CYGPATH_W) '$(srcdir)/yajl/yajl_version.c'; fi`
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .cc.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
@@ -942,6 +843,8 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f yajl/$(DEPDIR)/$(am__dirstamp)
+	-rm -f yajl/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -953,7 +856,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) yajl/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -999,7 +902,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) yajl/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/data_scanner.cc b/src/data_scanner.cc
index cebdf817..33544211 100644
--- a/src/data_scanner.cc
+++ b/src/data_scanner.cc
@@ -44,7 +44,7 @@ static struct {
 } MATCHERS[DT_TERMINAL_MAX] = {
     { "quot",    pcrepp("\\A(?:(?:u|r)?\"((?:\\\\.|[^\"])+)\"|"
                         "(?:u|r)?'((?:\\\\.|[^'])+)')"), },
-    { "url",     pcrepp("\\A([\\w]+://[^\\s'\"\\[\\](){}]+[a-zA-Z0-9\\-=&])"),
+    { "url",     pcrepp("\\A([\\w]+://[^\\s'\"\\[\\](){}]+[/a-zA-Z0-9\\-=&])"),
     },
     { "path",    pcrepp("\\A((?:/|\\./|\\.\\./)[\\w\\.\\-_\\~/]*)"),
     },
diff --git a/src/default-log-formats.json b/src/default-log-formats.json
index aada5947..9a7f8455 100644
--- a/src/default-log-formats.json
+++ b/src/default-log-formats.json
@@ -309,7 +309,7 @@
     },
     "uwsgi_log" : {
         "regex" : [
-            "^\\[pid: (?<s_pid>\\d+)\\|app: (?<s_app>[\\-\\d]+)\\|req: (?<s_req>[\\-\\d]+)/(?<s_worker_reqs>\\d+)\\] (?<c_ip>[^ ]+) \\((?<cs_username>[^\\)]*)\\) \\{(?<cs_vars>\\d+) vars in (?<cs_bytes>\\d+) bytes\\} \\[(?<timestamp>[^\\]]+)\\] (?<cs_method>[A-Z]+) (?<cs_uri_stem>[^ \\?]+)(?:\\?(?<cs_uri_query>[^ ]*))? => generated (?<sc_bytes>\\d+) bytes in (?<s_runtime>\\d+ \\w+) \\((?<cs_version>[^ ]+) (?<sc_status>\\d+)\\) (?<sc_headers>\\d+) headers in (?<sc_header_bytes>\\d+) bytes \\((?<s_switches>\\d+) switches on core (?<s_core>\\d+)\\)"
+            "^\\[pid: (?<s_pid>\\d+)\\|app: (?<s_app>[\\-\\d]+)\\|req: (?<s_req>[\\-\\d]+)/(?<s_worker_reqs>\\d+)\\] (?<c_ip>[^ ]+) \\((?<cs_username>[^\\)]*)\\) \\{(?<cs_vars>\\d+) vars in (?<cs_bytes>\\d+) bytes\\} \\[(?<timestamp>[^\\]]+)\\] (?<cs_method>[A-Z]+) (?<cs_uri_stem>[^ \\?]+)(?:\\?(?<cs_uri_query>[^ ]*))? => generated (?<sc_bytes>\\d+) bytes in (?<s_runtime>\\d+) (?<rt_unit>\\w+) \\((?<cs_version>[^ ]+) (?<sc_status>\\d+)\\) (?<sc_headers>\\d+) headers in (?<sc_header_bytes>\\d+) bytes \\((?<s_switches>\\d+) switches on core (?<s_core>\\d+)\\)"
         ],
         "level-field": "sc_status",
         "level" : {
@@ -360,7 +360,14 @@
                 "kind" : "integer"
             },
             "s_runtime" : {
-                "kind" : "string"
+                "kind" : "float",
+                "unit" : {
+                    "field" : "rt_unit",
+                    "scaling-factor" : {
+                        "/msecs" : 1000.0,
+                        "/micros" : 1000000.0
+                    }
+                }
             },
             "cs_version" : {
                 "kind" : "string",
diff --git a/src/lnav.cc b/src/lnav.cc
index 3307c762..fbe1aec7 100644
--- a/src/lnav.cc
+++ b/src/lnav.cc
@@ -1984,7 +1984,7 @@ void execute_search(lnav_view_t view, const std::string &regex)
                                   grep_line_t(tc.get_top()));
             }
             gp->start();
-            gp->set_sink(lnav_data.ld_view_stack.top());
+            gp->set_sink(&tc);
 
             tc.set_follow_search(true);
 
@@ -3237,7 +3237,7 @@ static void setup_highlights(textview_curses::highlight_map_t &hm)
         "@(?:author|deprecated|exception|file|param|return|see|since|throws|version)"));
     hm["$var"] = textview_curses::highlighter(xpcre_compile(
         "(?:"
-          "(?:var\\s+)?(\\w+)\\s*=|"
+          "(?:var\\s+)?([\\-\\w]+)\\s*=|"
           "(?<!\\$)\\$(\\w+)|"
           "(?<!\\$)\\$\\((\\w+)\\)|"
           "(?<!\\$)\\$\\{(\\w+)\\}"
@@ -3282,7 +3282,8 @@ int main(int argc, char *argv[])
         for (std::vector<std::string>::iterator iter = loader_errors.begin();
              iter != loader_errors.end();
              ++iter) {
-            fprintf(stderr, "%s\n", iter->c_str());
+            fprintf(stderr, "%s%s", iter->c_str(),
+                (*iter)[iter->size() - 1] == '\n' ? "" : "\n");
         }
         return EXIT_FAILURE;
     }
diff --git a/src/lnav_config.cc b/src/lnav_config.cc
index 2a35ecd1..83f08956 100644
--- a/src/lnav_config.cc
+++ b/src/lnav_config.cc
@@ -80,4 +80,9 @@ void ensure_dotlnav(void)
     if (!path.empty()) {
         mkdir(path.c_str(), 0755);
     }
+
+    path = dotlnav_path("formats");
+    if (!path.empty()) {
+        mkdir(path.c_str(), 0755);
+    }
 }
diff --git a/src/log_format.cc b/src/log_format.cc
index aaa3324b..41545182 100644
--- a/src/log_format.cc
+++ b/src/log_format.cc
@@ -300,11 +300,29 @@ void external_log_format::annotate(const std::string &line,
 
     for (size_t lpc = 0; lpc < this->elf_patterns[this->lf_fmt_lock].p_value_by_index.size(); lpc++) {
         const value_def &vd = this->elf_patterns[this->lf_fmt_lock].p_value_by_index[lpc];
+        const struct scaling_factor *scaling = NULL;
+
+        if (vd.vd_unit_field_index >= 0) {
+            pcre_context::iterator unit_cap = pc[vd.vd_unit_field_index];
+
+            if (unit_cap != NULL && unit_cap->c_begin != -1) {
+                std::string unit_val = pi.get_substr(unit_cap);
+                std::map<string, scaling_factor>::const_iterator unit_iter;
+
+                unit_iter = vd.vd_unit_scaling.find(unit_val);
+                if (unit_iter != vd.vd_unit_scaling.end()) {
+                    const struct scaling_factor &sf = unit_iter->second;
+
+                    scaling = &sf;
+                }
+            }
+        }
 
         values.push_back(logline_value(vd.vd_name,
                          vd.vd_kind,
                          pi.get_substr(pc[vd.vd_index]),
-                         vd.vd_identifier));
+                         vd.vd_identifier,
+                         scaling));
 
         if (pc[vd.vd_index]->c_begin != -1 && vd.vd_identifier) {
             lr.lr_start = pc[vd.vd_index]->c_begin;
@@ -337,6 +355,7 @@ void external_log_format::build(std::vector<std::string> &errors)
             value_iter = this->elf_value_defs.find(std::string(name_iter->pnc_name));
             if (value_iter != this->elf_value_defs.end()) {
                 value_iter->second.vd_index = name_iter->index();
+                value_iter->second.vd_unit_field_index = iter->p_pcre->name_index(value_iter->second.vd_unit_field.c_str());
                 iter->p_value_by_index.push_back(value_iter->second);
             }
         }
@@ -399,9 +418,10 @@ public:
 
     void get_columns(vector<vtab_column> &cols) {
         std::vector<external_log_format::value_def>::const_iterator iter;
+        const external_log_format &elf = this->elt_format;
 
-        for (iter = this->elt_format.elf_patterns[0].p_value_by_index.begin();
-             iter != this->elt_format.elf_patterns[0].p_value_by_index.end();
+        for (iter = elf.elf_patterns[0].p_value_by_index.begin();
+             iter != elf.elf_patterns[0].p_value_by_index.end();
              ++iter) {
             int type;
 
diff --git a/src/log_format.hh b/src/log_format.hh
index 1e90a6e1..fc5045a0 100644
--- a/src/log_format.hh
+++ b/src/log_format.hh
@@ -207,10 +207,10 @@ public:
      */
     bool has_schema(void) const
     {
-        return this->ll_schema[0] != 0 ||
-               this->ll_schema[1] != 0 ||
-               this->ll_schema[2] != 0 ||
-               this->ll_schema[3] != 0;
+        return (this->ll_schema[0] != 0 ||
+                this->ll_schema[1] != 0 ||
+                this->ll_schema[2] != 0 ||
+                this->ll_schema[3] != 0);
     };
 
     /**
@@ -265,6 +265,33 @@ private:
     char     ll_schema[4];
 };
 
+enum scale_op_t {
+    SO_IDENTITY,
+    SO_MULTIPLY,
+    SO_DIVIDE
+};
+
+struct scaling_factor {
+    scaling_factor() : sf_op(SO_IDENTITY), sf_value(1) { };
+
+    template<typename T>
+    void scale(T &val) const {
+        switch (this->sf_op) {
+        case SO_IDENTITY:
+            break;
+        case SO_DIVIDE:
+            val = val / (T)this->sf_value;
+            break;
+        case SO_MULTIPLY:
+            val = val * (T)this->sf_value;
+            break;
+        }
+    }
+
+    scale_op_t sf_op;
+    double sf_value;
+};
+
 class logline_value {
 public:
     enum kind_t {
@@ -282,7 +309,8 @@ public:
         : lv_name(name), lv_kind(VALUE_FLOAT), lv_number(i) { };
     logline_value(std::string name, std::string s)
         : lv_name(name), lv_kind(VALUE_TEXT), lv_string(s) { };
-    logline_value(std::string name, kind_t kind, std::string s, bool ident=false)
+    logline_value(std::string name, kind_t kind, std::string s,
+                  bool ident=false, const scaling_factor *scaling=NULL)
         : lv_name(name), lv_kind(kind), lv_identifier(ident)
     {
         switch (kind) {
@@ -292,10 +320,16 @@ public:
 
         case VALUE_INTEGER:
             sscanf(s.c_str(), "%" PRId64 "", &this->lv_number.i);
+            if (scaling != NULL) {
+                scaling->scale(this->lv_number.i);
+            }
             break;
 
         case VALUE_FLOAT:
             sscanf(s.c_str(), "%lf", &this->lv_number.d);
+            if (scaling != NULL) {
+                scaling->scale(this->lv_number.d);
+            }
             break;
 
         case VALUE_UNKNOWN:
@@ -447,7 +481,9 @@ public:
         value_def() :
             vd_index(-1),
             vd_kind(logline_value::VALUE_UNKNOWN),
-            vd_identifier(false) {
+            vd_identifier(false),
+            vd_foreign_key(false),
+            vd_unit_field_index(-1) {
 
         };
 
@@ -457,6 +493,9 @@ public:
         std::string vd_collate;
         bool vd_identifier;
         bool vd_foreign_key;
+        std::string vd_unit_field;
+        int vd_unit_field_index;
+        std::map<std::string, scaling_factor> vd_unit_scaling;
 
         bool operator<(const value_def &rhs) const {
             return this->vd_index < rhs.vd_index;
diff --git a/src/log_format_loader.cc b/src/log_format_loader.cc
index e8846a3a..1309cfff 100644
--- a/src/log_format_loader.cc
+++ b/src/log_format_loader.cc
@@ -31,10 +31,15 @@
 
 #include "config.h"
 
+#include <errno.h>
+#include <fcntl.h>
+#include <glob.h>
+
 #include <map>
 #include <string>
 
 #include "yajlpp.hh"
+#include "lnav_config.hh"
 #include "log_format.hh"
 #include "default-log-formats-json.hh"
 
@@ -54,9 +59,8 @@ static external_log_format *ensure_format(const std::string &name)
     return retval;
 }
 
-static int read_format_regex(void *ctx, const unsigned char *str, size_t len)
+static int read_format_regex(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
     string value = string((const char *)str, len);
 
@@ -65,9 +69,8 @@ static int read_format_regex(void *ctx, const unsigned char *str, size_t len)
     return 1;
 }
 
-static int read_format_field(void *ctx, const unsigned char *str, size_t len)
+static int read_format_field(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
     string value = string((const char *)str, len);
     string field_name = ypc->get_path_fragment(1);
@@ -78,9 +81,8 @@ static int read_format_field(void *ctx, const unsigned char *str, size_t len)
     return 1;
 }
 
-static int read_levels(void *ctx, const unsigned char *str, size_t len)
+static int read_levels(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
     string regex = string((const char *)str, len);
     logline::level_t level = logline::string2level(ypc->get_path_fragment(2).c_str());
@@ -90,9 +92,8 @@ static int read_levels(void *ctx, const unsigned char *str, size_t len)
     return 1;
 }
 
-static int read_value_def(void *ctx, const unsigned char *str, size_t len)
+static int read_value_def(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
     string value_name = ypc->get_path_fragment(2);
     string field_name = ypc->get_path_fragment(3);
@@ -109,13 +110,18 @@ static int read_value_def(void *ctx, const unsigned char *str, size_t len)
         }
         elf->elf_value_defs[value_name].vd_kind = kind;
     }
+    else if (field_name == "unit" && ypc->get_path_fragment(4) == "field") {
+        elf->elf_value_defs[value_name].vd_unit_field = val;
+    }
+    else if (field_name == "collate") {
+        elf->elf_value_defs[value_name].vd_collate = val;
+    }
 
     return 1;
 }
 
-static int read_value_bool(void *ctx, int val)
+static int read_value_bool(yajlpp_parse_context *ypc, int val)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
     string value_name = ypc->get_path_fragment(2);
     string key_name = ypc->get_path_fragment(3);
@@ -136,9 +142,43 @@ static external_log_format::sample &ensure_sample(external_log_format *elf,
     return elf->elf_samples[index];
 }
 
-static int read_sample_line(void *ctx, const unsigned char *str, size_t len)
+static int read_scaling(yajlpp_parse_context *ypc, double val)
+{
+    external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
+    string value_name = ypc->get_path_fragment(2);
+    string scale_name = ypc->get_path_fragment(5);
+
+    if (scale_name.empty()) {
+        fprintf(stderr,
+                "error:%s:%s: scaling factor field cannot be empty\n",
+                ypc->get_path_fragment(0).c_str(),
+                value_name.c_str());
+        return 0;
+    }
+
+    struct scaling_factor &sf = elf->elf_value_defs[value_name].vd_unit_scaling[scale_name.substr(1)];
+
+    if (scale_name[0] == '/') {
+        sf.sf_op = SO_DIVIDE;
+    }
+    else if (scale_name[0] == '*') {
+        sf.sf_op = SO_MULTIPLY;
+    }
+    else {
+        fprintf(stderr,
+                "error:%s:%s: scaling factor field must start with '/' or '*'\n",
+                ypc->get_path_fragment(0).c_str(),
+                value_name.c_str());
+        return 0;
+    }
+
+    sf.sf_value = val;
+
+    return 1;
+}
+
+static int read_sample_line(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     external_log_format *elf = ensure_format(ypc->get_path_fragment(0));
     string val = string((const char *)str, len);
     int index = ypc->ypc_array_index.back();
@@ -151,12 +191,14 @@ static int read_sample_line(void *ctx, const unsigned char *str, size_t len)
 
 static struct json_path_handler format_handlers[] = {
     json_path_handler("/\\w+/regex#", read_format_regex),
-    json_path_handler("/\\w+/(level-field)", read_format_field),
+    json_path_handler("/\\w+/(level-field|url)", read_format_field),
     json_path_handler("/\\w+/level/"
                       "(trace|debug|info|warning|error|critical|fatal)",
                       read_levels),
-    json_path_handler("/\\w+/value/\\w+/(kind)", read_value_def),
+    json_path_handler("/\\w+/value/\\w+/(kind|collate|unit/field)", read_value_def),
     json_path_handler("/\\w+/value/\\w+/(identifier|foreign-key)", read_value_bool),
+    json_path_handler("/\\w+/value/\\w+/unit/scaling-factor/.*",
+        read_scaling),
     json_path_handler("/\\w+/sample#/line", read_sample_line),
 
     json_path_handler()
@@ -164,17 +206,61 @@ static struct json_path_handler format_handlers[] = {
 
 void load_formats(std::vector<std::string> &errors)
 {
-    yajlpp_parse_context ypc(format_handlers);
+    yajlpp_parse_context ypc_builtin("builtin", format_handlers);
     std::vector<std::string> retval;
     yajl_handle handle;
 
-    handle = yajl_alloc(&ypc.ypc_callbacks, NULL, &ypc);
+    handle = yajl_alloc(&ypc_builtin.ypc_callbacks, NULL, &ypc_builtin);
     yajl_parse(handle,
                (const unsigned char *)default_log_formats_json,
                strlen(default_log_formats_json));
     yajl_complete_parse(handle);
     yajl_free(handle);
 
+    string format_path = dotlnav_path("formats/*.json");
+    static_root_mem<glob_t, globfree> gl;
+
+    if (glob(format_path.c_str(), GLOB_NOCHECK, NULL, gl.inout()) == 0) {
+        for (int lpc = 0; lpc < (int)gl->gl_pathc; lpc++) {
+            string filename(gl->gl_pathv[lpc]);
+            int fd;
+
+            yajlpp_parse_context ypc(filename, format_handlers);
+            if ((fd = open(gl->gl_pathv[lpc], O_RDONLY)) != -1) {
+                char buffer[2048];
+                int rc = -1;
+
+                handle = yajl_alloc(&ypc.ypc_callbacks, NULL, &ypc);
+                while (true) {
+                    rc = read(fd, buffer, sizeof(buffer));
+                    if (rc == 0) {
+                        break;
+                    }
+                    else if (rc == -1) {
+                        errors.push_back(filename +
+                                         ":unable to read file -- " +
+                                         string(strerror(errno)));
+                        break;
+                    }
+                    if (yajl_parse(handle, (const unsigned char *)buffer, rc) != yajl_status_ok) {
+                        errors.push_back(filename +
+                            ": invalid json -- " +
+                            string((char *)yajl_get_error(handle, 1, (unsigned char *)buffer, rc)));
+                        break;
+                    }
+                }
+                if (rc == 0) {
+                    if (yajl_complete_parse(handle) != yajl_status_ok) {
+                        errors.push_back(filename +
+                            ": invalid json -- " +
+                            string((char *)yajl_get_error(handle, 0, NULL, 0)));
+                    }
+                }
+                yajl_free(handle);
+            }
+        }
+    }
+
     for (map<string, external_log_format *>::iterator iter = LOG_FORMATS.begin();
          iter != LOG_FORMATS.end();
          ++iter) {
diff --git a/src/session_data.cc b/src/session_data.cc
index 3bf27b24..0e163914 100644
--- a/src/session_data.cc
+++ b/src/session_data.cc
@@ -660,21 +660,20 @@ static void load_time_bookmarks(void)
     }
 }
 
-static int read_save_time(void *ctx, long long value)
+static int read_save_time(yajlpp_parse_context *ypc, long long value)
 {
     lnav_data.ld_session_save_time = value;
 
     return 1;
 }
 
-static int read_files(void *ctx, const unsigned char *str, size_t len)
+static int read_files(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
     return 1;
 }
 
-static int read_last_search(void *ctx, const unsigned char *str, size_t len)
+static int read_last_search(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     string       regex        = std::string((const char *)str, len);
     const char **view_name;
     int          view_index;
@@ -692,9 +691,8 @@ static int read_last_search(void *ctx, const unsigned char *str, size_t len)
     return 1;
 }
 
-static int read_top_line(void *ctx, long long value)
+static int read_top_line(yajlpp_parse_context *ypc, long long value)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
     const char **         view_name;
     int view_index;
 
@@ -713,7 +711,7 @@ static int read_top_line(void *ctx, long long value)
     return 1;
 }
 
-static int read_commands(void *ctx, const unsigned char *str, size_t len)
+static int read_commands(yajlpp_parse_context *ypc, const unsigned char *str, size_t len)
 {
     std::string cmdline = std::string((const char *)str, len);
 
@@ -735,7 +733,6 @@ static struct json_path_handler view_info_handlers[] = {
 void load_session(void)
 {
     std::list<session_pair_t>::iterator sess_iter;
-    yajlpp_parse_context ypc(view_info_handlers);
     yajl_handle          handle;
     auto_fd fd;
 
@@ -744,13 +741,15 @@ void load_session(void)
         return;
     }
 
-    handle    = yajl_alloc(&ypc.ypc_callbacks, NULL, &ypc);
     sess_iter = lnav_data.ld_session_file_names.begin();
     advance(sess_iter, lnav_data.ld_session_file_index);
     lnav_data.ld_session_load_time = sess_iter->first.second;
     lnav_data.ld_session_save_time = sess_iter->first.second;
     string &view_info_name = sess_iter->second;
 
+    yajlpp_parse_context ypc(view_info_name, view_info_handlers);
+    handle    = yajl_alloc(&ypc.ypc_callbacks, NULL, &ypc);
+
     load_time_bookmarks();
 
     if ((fd = open(view_info_name.c_str(), O_RDONLY)) < 0) {
diff --git a/src/textview_curses.cc b/src/textview_curses.cc
index d24a30ff..8ce2f911 100644
--- a/src/textview_curses.cc
+++ b/src/textview_curses.cc
@@ -117,14 +117,17 @@ void textview_curses::listview_value_for_row(const listview_curses &lv,
         // XXX testing for '$search' here sucks
         bool internal_hl = iter->first[0] == '$' && iter->first != "$search";
         int off, hcount = 0;
+        size_t re_end;
+
+        re_end = internal_hl ? body.lr_end : str.size();
+        re_end = max(re_end, (size_t)2048);
 
         for (off = internal_hl ? body.lr_start : 0; off < (int)str.size(); ) {
             int rc, matches[60];
-
             rc = pcre_exec(iter->second.h_code,
                            iter->second.h_code_extra,
                            str.c_str(),
-                           internal_hl ? body.lr_end : str.size(),
+                           re_end,
                            off,
                            0,
                            matches,
diff --git a/src/yajlpp.cc b/src/yajlpp.cc
index 41cec7e7..8ed93d35 100644
--- a/src/yajlpp.cc
+++ b/src/yajlpp.cc
@@ -69,12 +69,16 @@ void yajlpp_parse_context::update_callbacks(void)
         const json_path_handler &jph = this->ypc_handlers[lpc];
 
         if (jph.jph_regex.match(this->ypc_pcre_context, pi)) {
-            this->ypc_callbacks.yajl_null    = jph.jph_callbacks.yajl_null;
-            this->ypc_callbacks.yajl_boolean = jph.jph_callbacks.yajl_boolean;
-            this->ypc_callbacks.yajl_integer = jph.jph_callbacks.yajl_integer;
-            this->ypc_callbacks.yajl_double  = jph.jph_callbacks.yajl_double;
-            this->ypc_callbacks.yajl_string  = jph.jph_callbacks.yajl_string;
-            break;
+            if (jph.jph_callbacks.yajl_null != NULL)
+                this->ypc_callbacks.yajl_null = jph.jph_callbacks.yajl_null;
+            if (jph.jph_callbacks.yajl_boolean != NULL)
+                this->ypc_callbacks.yajl_boolean = jph.jph_callbacks.yajl_boolean;
+            if (jph.jph_callbacks.yajl_integer != NULL)
+                this->ypc_callbacks.yajl_integer = jph.jph_callbacks.yajl_integer;
+            if (jph.jph_callbacks.yajl_double != NULL)
+                this->ypc_callbacks.yajl_double = jph.jph_callbacks.yajl_double;
+            if (jph.jph_callbacks.yajl_string != NULL)
+                this->ypc_callbacks.yajl_string = jph.jph_callbacks.yajl_string;
         }
     }
 }
@@ -116,13 +120,50 @@ int yajlpp_parse_context::array_end(void *ctx)
     return 1;
 }
 
+int yajlpp_parse_context::handle_unused(void *ctx)
+{
+    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
+
+    fprintf(stderr, "warning:%s:%s:unexpected data, expecting one of the following data types --\n",
+        ypc->ypc_source.c_str(),
+        ypc->ypc_path.c_str());
+    if (ypc->ypc_callbacks.yajl_boolean != (int (*)(void *, int))yajlpp_parse_context::handle_unused) {
+        fprintf(stderr, "warning:%s:%s:  boolean\n",
+                ypc->ypc_source.c_str(), ypc->ypc_path.c_str());
+    }
+    if (ypc->ypc_callbacks.yajl_integer != (int (*)(void *, long long))yajlpp_parse_context::handle_unused) {
+        fprintf(stderr, "warning:%s:%s:  integer\n",
+                ypc->ypc_source.c_str(), ypc->ypc_path.c_str());
+    }
+    if (ypc->ypc_callbacks.yajl_double != (int (*)(void *, double))yajlpp_parse_context::handle_unused) {
+        fprintf(stderr, "warning:%s:%s:  float\n",
+                ypc->ypc_source.c_str(), ypc->ypc_path.c_str());
+    }
+    if (ypc->ypc_callbacks.yajl_string != (int (*)(void *, const unsigned char *, size_t))yajlpp_parse_context::handle_unused) {
+        fprintf(stderr, "warning:%s:%s:  string\n",
+                ypc->ypc_source.c_str(), ypc->ypc_path.c_str());
+    }
+
+    fprintf(stderr, "warning:%s:%s:accepted paths --\n",
+            ypc->ypc_source.c_str(), ypc->ypc_path.c_str());
+    for (int lpc = 0; ypc->ypc_handlers[lpc].jph_path[0]; lpc++) {
+        fprintf(stderr, "warning:%s:%s:  %s\n",
+            ypc->ypc_source.c_str(),
+            ypc->ypc_path.c_str(),
+            ypc->ypc_handlers[lpc].jph_path);
+    }
+
+    return 1;
+}
+
 const yajl_callbacks yajlpp_parse_context::DEFAULT_CALLBACKS = {
+    yajlpp_parse_context::handle_unused,
+    (int (*)(void *, int))yajlpp_parse_context::handle_unused,
+    (int (*)(void *, long long))yajlpp_parse_context::handle_unused,
+    (int (*)(void *, double))yajlpp_parse_context::handle_unused,
     NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
+    (int (*)(void *, const unsigned char *, size_t))
+    yajlpp_parse_context::handle_unused,
     yajlpp_parse_context::map_start,
     yajlpp_parse_context::map_key,
     yajlpp_parse_context::map_end,
diff --git a/src/yajlpp.hh b/src/yajlpp.hh
index 9c5937b1..79ea4c80 100644
--- a/src/yajlpp.hh
+++ b/src/yajlpp.hh
@@ -71,36 +71,38 @@ struct json_path_handler_base {
     yajl_callbacks jph_callbacks;
 };
 
+class yajlpp_parse_context;
+
 struct json_path_handler : public json_path_handler_base {
-    json_path_handler(const char *path, int(*null_func)(void *))
+    json_path_handler(const char *path, int(*null_func)(yajlpp_parse_context *))
         : json_path_handler_base(path)
     {
-        this->jph_callbacks.yajl_null = null_func;
+        this->jph_callbacks.yajl_null = (int (*)(void *))null_func;
     };
 
-    json_path_handler(const char *path, int(*bool_func)(void *, int))
+    json_path_handler(const char *path, int(*bool_func)(yajlpp_parse_context *, int))
         : json_path_handler_base(path)
     {
-        this->jph_callbacks.yajl_boolean = bool_func;
+        this->jph_callbacks.yajl_boolean = (int (*)(void *, int))bool_func;
     }
 
-    json_path_handler(const char *path, int(*int_func)(void *, long long))
+    json_path_handler(const char *path, int(*int_func)(yajlpp_parse_context *, long long))
         : json_path_handler_base(path)
     {
-        this->jph_callbacks.yajl_integer = int_func;
+        this->jph_callbacks.yajl_integer = (int (*)(void *, long long))int_func;
     }
 
-    json_path_handler(const char *path, int(*double_func)(void *, double))
+    json_path_handler(const char *path, int(*double_func)(yajlpp_parse_context *, double))
         : json_path_handler_base(path)
     {
-        this->jph_callbacks.yajl_double = double_func;
+        this->jph_callbacks.yajl_double = (int (*)(void *, double))double_func;
     }
 
     json_path_handler(const char *path,
-                      int(*str_func)(void *, const unsigned char *, size_t))
+                      int(*str_func)(yajlpp_parse_context *, const unsigned char *, size_t))
         : json_path_handler_base(path)
     {
-        this->jph_callbacks.yajl_string = str_func;
+        this->jph_callbacks.yajl_string = (int (*)(void *, const unsigned char *, size_t))str_func;
     }
 
     json_path_handler() : json_path_handler_base("") {};
@@ -125,8 +127,9 @@ public:
         int         jpe_index;
     };
 
-    yajlpp_parse_context(struct json_path_handler *handlers) : ypc_handlers(
-                                                                   handlers)
+    yajlpp_parse_context(std::string source,
+                         struct json_path_handler *handlers)
+        : ypc_source(source), ypc_handlers(handlers)
     {
         this->ypc_callbacks = DEFAULT_CALLBACKS;
     };
@@ -148,6 +151,7 @@ public:
         return this->ypc_path.substr(start, end - start);
     };
 
+    const std::string ypc_source;
     struct json_path_handler *ypc_handlers;
     void *                  ypc_userdata;
     yajl_callbacks          ypc_callbacks;
@@ -166,6 +170,7 @@ private:
     static int map_end(void *ctx);
     static int array_start(void *ctx);
     static int array_end(void *ctx);
+    static int handle_unused(void *ctx);
 };
 
 class yajlpp_generator {
diff --git a/test/Makefile.in b/test/Makefile.in
index 21b08529..c44970ac 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.14 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -121,33 +121,37 @@ am__DEPENDENCIES_1 =
 drive_data_scanner_DEPENDENCIES = ../src/libdiag.a \
 	../src/default-log-formats-json.o $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_drive_grep_proc_OBJECTS = pcrepp.$(OBJEXT) line_buffer.$(OBJEXT) \
-	grep_proc.$(OBJEXT) drive_grep_proc.$(OBJEXT)
+am__dirstamp = $(am__leading_dot)dirstamp
+am_drive_grep_proc_OBJECTS = ../src/pcrepp.$(OBJEXT) \
+	../src/line_buffer.$(OBJEXT) ../src/grep_proc.$(OBJEXT) \
+	drive_grep_proc.$(OBJEXT)
 drive_grep_proc_OBJECTS = $(am_drive_grep_proc_OBJECTS)
 drive_grep_proc_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_drive_line_buffer_OBJECTS = line_buffer.$(OBJEXT) \
+am_drive_line_buffer_OBJECTS = ../src/line_buffer.$(OBJEXT) \
 	drive_line_buffer.$(OBJEXT)
 drive_line_buffer_OBJECTS = $(am_drive_line_buffer_OBJECTS)
 drive_line_buffer_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_drive_listview_OBJECTS = listview_curses.$(OBJEXT) \
-	view_curses.$(OBJEXT) drive_listview.$(OBJEXT)
+am_drive_listview_OBJECTS = ../src/listview_curses.$(OBJEXT) \
+	../src/view_curses.$(OBJEXT) drive_listview.$(OBJEXT)
 drive_listview_OBJECTS = $(am_drive_listview_OBJECTS)
 drive_listview_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_drive_logfile_OBJECTS = logfile.$(OBJEXT) log_format.$(OBJEXT) \
-	line_buffer.$(OBJEXT) pcrepp.$(OBJEXT) drive_logfile.$(OBJEXT)
+am_drive_logfile_OBJECTS = ../src/logfile.$(OBJEXT) \
+	../src/log_format.$(OBJEXT) ../src/line_buffer.$(OBJEXT) \
+	../src/pcrepp.$(OBJEXT) drive_logfile.$(OBJEXT)
 drive_logfile_OBJECTS = $(am_drive_logfile_OBJECTS)
 drive_logfile_DEPENDENCIES = ../src/libdiag.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_drive_readline_curses_OBJECTS = ansi_scrubber.$(OBJEXT) \
-	pcrepp.$(OBJEXT) vt52_curses.$(OBJEXT) \
-	readline_curses.$(OBJEXT) view_curses.$(OBJEXT) \
+am_drive_readline_curses_OBJECTS = ../src/ansi_scrubber.$(OBJEXT) \
+	../src/pcrepp.$(OBJEXT) ../src/vt52_curses.$(OBJEXT) \
+	../src/readline_curses.$(OBJEXT) ../src/view_curses.$(OBJEXT) \
 	drive_readline_curses.$(OBJEXT)
 drive_readline_curses_OBJECTS = $(am_drive_readline_curses_OBJECTS)
 drive_readline_curses_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_drive_sequencer_OBJECTS = grep_proc.$(OBJEXT) logfile.$(OBJEXT) \
-	log_format.$(OBJEXT) line_buffer.$(OBJEXT) pcrepp.$(OBJEXT) \
-	sequence_matcher.$(OBJEXT) drive_sequencer.$(OBJEXT)
+am_drive_sequencer_OBJECTS = ../src/grep_proc.$(OBJEXT) \
+	../src/logfile.$(OBJEXT) ../src/log_format.$(OBJEXT) \
+	../src/line_buffer.$(OBJEXT) ../src/pcrepp.$(OBJEXT) \
+	../src/sequence_matcher.$(OBJEXT) drive_sequencer.$(OBJEXT)
 drive_sequencer_OBJECTS = $(am_drive_sequencer_OBJECTS)
 drive_sequencer_DEPENDENCIES = ../src/libdiag.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
@@ -156,19 +160,19 @@ drive_sql_OBJECTS = $(am_drive_sql_OBJECTS)
 drive_sql_DEPENDENCIES = ../src/libdiag.a $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
-am_drive_view_colors_OBJECTS = view_curses.$(OBJEXT) \
+am_drive_view_colors_OBJECTS = ../src/view_curses.$(OBJEXT) \
 	drive_view_colors.$(OBJEXT)
 drive_view_colors_OBJECTS = $(am_drive_view_colors_OBJECTS)
 drive_view_colors_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_drive_vt52_curses_OBJECTS = vt52_curses.$(OBJEXT) \
-	view_curses.$(OBJEXT) drive_vt52_curses.$(OBJEXT)
+am_drive_vt52_curses_OBJECTS = ../src/vt52_curses.$(OBJEXT) \
+	../src/view_curses.$(OBJEXT) drive_vt52_curses.$(OBJEXT)
 drive_vt52_curses_OBJECTS = $(am_drive_vt52_curses_OBJECTS)
 drive_vt52_curses_DEPENDENCIES = $(am__DEPENDENCIES_1)
 am_scripty_OBJECTS = scripty.$(OBJEXT)
 scripty_OBJECTS = $(am_scripty_OBJECTS)
 scripty_LDADD = $(LDADD)
 scripty_DEPENDENCIES =
-am_slicer_OBJECTS = line_buffer.$(OBJEXT) slicer.$(OBJEXT)
+am_slicer_OBJECTS = ../src/line_buffer.$(OBJEXT) slicer.$(OBJEXT)
 slicer_OBJECTS = $(am_slicer_OBJECTS)
 slicer_LDADD = $(LDADD)
 slicer_DEPENDENCIES =
@@ -185,24 +189,25 @@ test_auto_mem_OBJECTS = $(am_test_auto_mem_OBJECTS)
 test_auto_mem_LDADD = $(LDADD)
 test_auto_mem_DEPENDENCIES =
 am_test_bookmarks_OBJECTS = test_bookmarks.$(OBJEXT) \
-	bookmarks.$(OBJEXT)
+	../src/bookmarks.$(OBJEXT)
 test_bookmarks_OBJECTS = $(am_test_bookmarks_OBJECTS)
 test_bookmarks_LDADD = $(LDADD)
 test_bookmarks_DEPENDENCIES =
-am_test_grep_proc2_OBJECTS = line_buffer.$(OBJEXT) grep_proc.$(OBJEXT) \
-	pcrepp.$(OBJEXT) test_grep_proc2.$(OBJEXT)
+am_test_grep_proc2_OBJECTS = ../src/line_buffer.$(OBJEXT) \
+	../src/grep_proc.$(OBJEXT) ../src/pcrepp.$(OBJEXT) \
+	test_grep_proc2.$(OBJEXT)
 test_grep_proc2_OBJECTS = $(am_test_grep_proc2_OBJECTS)
 test_grep_proc2_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_test_hist_source_OBJECTS = hist_source.$(OBJEXT) \
-	view_curses.$(OBJEXT) test_hist_source.$(OBJEXT)
+am_test_hist_source_OBJECTS = ../src/hist_source.$(OBJEXT) \
+	../src/view_curses.$(OBJEXT) test_hist_source.$(OBJEXT)
 test_hist_source_OBJECTS = $(am_test_hist_source_OBJECTS)
 test_hist_source_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_test_line_buffer2_OBJECTS = line_buffer.$(OBJEXT) \
+am_test_line_buffer2_OBJECTS = ../src/line_buffer.$(OBJEXT) \
 	test_line_buffer2.$(OBJEXT)
 test_line_buffer2_OBJECTS = $(am_test_line_buffer2_OBJECTS)
 test_line_buffer2_LDADD = $(LDADD)
 test_line_buffer2_DEPENDENCIES =
-am_test_pcrepp_OBJECTS = pcrepp.$(OBJEXT) test_pcrepp.$(OBJEXT)
+am_test_pcrepp_OBJECTS = ../src/pcrepp.$(OBJEXT) test_pcrepp.$(OBJEXT)
 test_pcrepp_OBJECTS = $(am_test_pcrepp_OBJECTS)
 test_pcrepp_LDADD = $(LDADD)
 test_pcrepp_DEPENDENCIES =
@@ -229,10 +234,6 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-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 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_@AM_V@)
@@ -847,6 +848,18 @@ clean-checkPROGRAMS:
 drive_data_scanner$(EXEEXT): $(drive_data_scanner_OBJECTS) $(drive_data_scanner_DEPENDENCIES) $(EXTRA_drive_data_scanner_DEPENDENCIES) 
 	@rm -f drive_data_scanner$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(drive_data_scanner_OBJECTS) $(drive_data_scanner_LDADD) $(LIBS)
+../src/$(am__dirstamp):
+	@$(MKDIR_P) ../src
+	@: > ../src/$(am__dirstamp)
+../src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) ../src/$(DEPDIR)
+	@: > ../src/$(DEPDIR)/$(am__dirstamp)
+../src/pcrepp.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
+../src/line_buffer.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
+../src/grep_proc.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 drive_grep_proc$(EXEEXT): $(drive_grep_proc_OBJECTS) $(drive_grep_proc_DEPENDENCIES) $(EXTRA_drive_grep_proc_DEPENDENCIES) 
 	@rm -f drive_grep_proc$(EXEEXT)
@@ -855,18 +868,34 @@ drive_grep_proc$(EXEEXT): $(drive_grep_proc_OBJECTS) $(drive_grep_proc_DEPENDENC
 drive_line_buffer$(EXEEXT): $(drive_line_buffer_OBJECTS) $(drive_line_buffer_DEPENDENCIES) $(EXTRA_drive_line_buffer_DEPENDENCIES) 
 	@rm -f drive_line_buffer$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(drive_line_buffer_OBJECTS) $(drive_line_buffer_LDADD) $(LIBS)
+../src/listview_curses.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
+../src/view_curses.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 drive_listview$(EXEEXT): $(drive_listview_OBJECTS) $(drive_listview_DEPENDENCIES) $(EXTRA_drive_listview_DEPENDENCIES) 
 	@rm -f drive_listview$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(drive_listview_OBJECTS) $(drive_listview_LDADD) $(LIBS)
+../src/logfile.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
+../src/log_format.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 drive_logfile$(EXEEXT): $(drive_logfile_OBJECTS) $(drive_logfile_DEPENDENCIES) $(EXTRA_drive_logfile_DEPENDENCIES) 
 	@rm -f drive_logfile$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(drive_logfile_OBJECTS) $(drive_logfile_LDADD) $(LIBS)
+../src/ansi_scrubber.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
+../src/vt52_curses.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
+../src/readline_curses.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 drive_readline_curses$(EXEEXT): $(drive_readline_curses_OBJECTS) $(drive_readline_curses_DEPENDENCIES) $(EXTRA_drive_readline_curses_DEPENDENCIES) 
 	@rm -f drive_readline_curses$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(drive_readline_curses_OBJECTS) $(drive_readline_curses_LDADD) $(LIBS)
+../src/sequence_matcher.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 drive_sequencer$(EXEEXT): $(drive_sequencer_OBJECTS) $(drive_sequencer_DEPENDENCIES) $(EXTRA_drive_sequencer_DEPENDENCIES) 
 	@rm -f drive_sequencer$(EXEEXT)
@@ -903,6 +932,8 @@ test_auto_fd$(EXEEXT): $(test_auto_fd_OBJECTS) $(test_auto_fd_DEPENDENCIES) $(EX
 test_auto_mem$(EXEEXT): $(test_auto_mem_OBJECTS) $(test_auto_mem_DEPENDENCIES) $(EXTRA_test_auto_mem_DEPENDENCIES) 
 	@rm -f test_auto_mem$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_auto_mem_OBJECTS) $(test_auto_mem_LDADD) $(LIBS)
+../src/bookmarks.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 test_bookmarks$(EXEEXT): $(test_bookmarks_OBJECTS) $(test_bookmarks_DEPENDENCIES) $(EXTRA_test_bookmarks_DEPENDENCIES) 
 	@rm -f test_bookmarks$(EXEEXT)
@@ -911,6 +942,8 @@ test_bookmarks$(EXEEXT): $(test_bookmarks_OBJECTS) $(test_bookmarks_DEPENDENCIES
 test_grep_proc2$(EXEEXT): $(test_grep_proc2_OBJECTS) $(test_grep_proc2_DEPENDENCIES) $(EXTRA_test_grep_proc2_DEPENDENCIES) 
 	@rm -f test_grep_proc2$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(test_grep_proc2_OBJECTS) $(test_grep_proc2_LDADD) $(LIBS)
+../src/hist_source.$(OBJEXT): ../src/$(am__dirstamp) \
+	../src/$(DEPDIR)/$(am__dirstamp)
 
 test_hist_source$(EXEEXT): $(test_hist_source_OBJECTS) $(test_hist_source_DEPENDENCIES) $(EXTRA_test_hist_source_DEPENDENCIES) 
 	@rm -f test_hist_source$(EXEEXT)
@@ -934,12 +967,24 @@ test_yajlpp$(EXEEXT): $(test_yajlpp_OBJECTS) $(test_yajlpp_DEPENDENCIES) $(EXTRA
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f ../src/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ansi_scrubber.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmarks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/ansi_scrubber.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/bookmarks.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/grep_proc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/hist_source.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/line_buffer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/listview_curses.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/log_format.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/logfile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/pcrepp.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/readline_curses.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/sequence_matcher.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/view_curses.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@../src/$(DEPDIR)/vt52_curses.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drive_data_scanner.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drive_grep_proc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drive_line_buffer.Po@am__quote@
@@ -950,16 +995,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drive_sql.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drive_view_colors.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drive_vt52_curses.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grep_proc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hist_source.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/line_buffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/listview_curses.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log_format.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/logfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pcrepp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readline_curses.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scripty.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence_matcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slicer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_ansi_scrubber.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_auto_fd.Po@am__quote@
@@ -971,205 +1007,23 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_pcrepp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_top_status.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_yajlpp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view_curses.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vt52_curses.Po@am__quote@
 
 .cc.o:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .cc.obj:
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
-pcrepp.o: ../src/pcrepp.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pcrepp.o -MD -MP -MF $(DEPDIR)/pcrepp.Tpo -c -o pcrepp.o `test -f '../src/pcrepp.cc' || echo '$(srcdir)/'`../src/pcrepp.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcrepp.Tpo $(DEPDIR)/pcrepp.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/pcrepp.cc' object='pcrepp.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 pcrepp.o `test -f '../src/pcrepp.cc' || echo '$(srcdir)/'`../src/pcrepp.cc
-
-pcrepp.obj: ../src/pcrepp.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT pcrepp.obj -MD -MP -MF $(DEPDIR)/pcrepp.Tpo -c -o pcrepp.obj `if test -f '../src/pcrepp.cc'; then $(CYGPATH_W) '../src/pcrepp.cc'; else $(CYGPATH_W) '$(srcdir)/../src/pcrepp.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/pcrepp.Tpo $(DEPDIR)/pcrepp.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/pcrepp.cc' object='pcrepp.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 pcrepp.obj `if test -f '../src/pcrepp.cc'; then $(CYGPATH_W) '../src/pcrepp.cc'; else $(CYGPATH_W) '$(srcdir)/../src/pcrepp.cc'; fi`
-
-line_buffer.o: ../src/line_buffer.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT line_buffer.o -MD -MP -MF $(DEPDIR)/line_buffer.Tpo -c -o line_buffer.o `test -f '../src/line_buffer.cc' || echo '$(srcdir)/'`../src/line_buffer.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/line_buffer.Tpo $(DEPDIR)/line_buffer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/line_buffer.cc' object='line_buffer.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 line_buffer.o `test -f '../src/line_buffer.cc' || echo '$(srcdir)/'`../src/line_buffer.cc
-
-line_buffer.obj: ../src/line_buffer.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT line_buffer.obj -MD -MP -MF $(DEPDIR)/line_buffer.Tpo -c -o line_buffer.obj `if test -f '../src/line_buffer.cc'; then $(CYGPATH_W) '../src/line_buffer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/line_buffer.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/line_buffer.Tpo $(DEPDIR)/line_buffer.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/line_buffer.cc' object='line_buffer.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 line_buffer.obj `if test -f '../src/line_buffer.cc'; then $(CYGPATH_W) '../src/line_buffer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/line_buffer.cc'; fi`
-
-grep_proc.o: ../src/grep_proc.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grep_proc.o -MD -MP -MF $(DEPDIR)/grep_proc.Tpo -c -o grep_proc.o `test -f '../src/grep_proc.cc' || echo '$(srcdir)/'`../src/grep_proc.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/grep_proc.Tpo $(DEPDIR)/grep_proc.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/grep_proc.cc' object='grep_proc.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 grep_proc.o `test -f '../src/grep_proc.cc' || echo '$(srcdir)/'`../src/grep_proc.cc
-
-grep_proc.obj: ../src/grep_proc.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT grep_proc.obj -MD -MP -MF $(DEPDIR)/grep_proc.Tpo -c -o grep_proc.obj `if test -f '../src/grep_proc.cc'; then $(CYGPATH_W) '../src/grep_proc.cc'; else $(CYGPATH_W) '$(srcdir)/../src/grep_proc.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/grep_proc.Tpo $(DEPDIR)/grep_proc.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/grep_proc.cc' object='grep_proc.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 grep_proc.obj `if test -f '../src/grep_proc.cc'; then $(CYGPATH_W) '../src/grep_proc.cc'; else $(CYGPATH_W) '$(srcdir)/../src/grep_proc.cc'; fi`
-
-listview_curses.o: ../src/listview_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT listview_curses.o -MD -MP -MF $(DEPDIR)/listview_curses.Tpo -c -o listview_curses.o `test -f '../src/listview_curses.cc' || echo '$(srcdir)/'`../src/listview_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/listview_curses.Tpo $(DEPDIR)/listview_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/listview_curses.cc' object='listview_curses.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 listview_curses.o `test -f '../src/listview_curses.cc' || echo '$(srcdir)/'`../src/listview_curses.cc
-
-listview_curses.obj: ../src/listview_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT listview_curses.obj -MD -MP -MF $(DEPDIR)/listview_curses.Tpo -c -o listview_curses.obj `if test -f '../src/listview_curses.cc'; then $(CYGPATH_W) '../src/listview_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/listview_curses.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/listview_curses.Tpo $(DEPDIR)/listview_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/listview_curses.cc' object='listview_curses.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 listview_curses.obj `if test -f '../src/listview_curses.cc'; then $(CYGPATH_W) '../src/listview_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/listview_curses.cc'; fi`
-
-view_curses.o: ../src/view_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT view_curses.o -MD -MP -MF $(DEPDIR)/view_curses.Tpo -c -o view_curses.o `test -f '../src/view_curses.cc' || echo '$(srcdir)/'`../src/view_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/view_curses.Tpo $(DEPDIR)/view_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/view_curses.cc' object='view_curses.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 view_curses.o `test -f '../src/view_curses.cc' || echo '$(srcdir)/'`../src/view_curses.cc
-
-view_curses.obj: ../src/view_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT view_curses.obj -MD -MP -MF $(DEPDIR)/view_curses.Tpo -c -o view_curses.obj `if test -f '../src/view_curses.cc'; then $(CYGPATH_W) '../src/view_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/view_curses.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/view_curses.Tpo $(DEPDIR)/view_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/view_curses.cc' object='view_curses.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 view_curses.obj `if test -f '../src/view_curses.cc'; then $(CYGPATH_W) '../src/view_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/view_curses.cc'; fi`
-
-logfile.o: ../src/logfile.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT logfile.o -MD -MP -MF $(DEPDIR)/logfile.Tpo -c -o logfile.o `test -f '../src/logfile.cc' || echo '$(srcdir)/'`../src/logfile.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/logfile.Tpo $(DEPDIR)/logfile.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/logfile.cc' object='logfile.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 logfile.o `test -f '../src/logfile.cc' || echo '$(srcdir)/'`../src/logfile.cc
-
-logfile.obj: ../src/logfile.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT logfile.obj -MD -MP -MF $(DEPDIR)/logfile.Tpo -c -o logfile.obj `if test -f '../src/logfile.cc'; then $(CYGPATH_W) '../src/logfile.cc'; else $(CYGPATH_W) '$(srcdir)/../src/logfile.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/logfile.Tpo $(DEPDIR)/logfile.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/logfile.cc' object='logfile.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 logfile.obj `if test -f '../src/logfile.cc'; then $(CYGPATH_W) '../src/logfile.cc'; else $(CYGPATH_W) '$(srcdir)/../src/logfile.cc'; fi`
-
-log_format.o: ../src/log_format.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log_format.o -MD -MP -MF $(DEPDIR)/log_format.Tpo -c -o log_format.o `test -f '../src/log_format.cc' || echo '$(srcdir)/'`../src/log_format.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/log_format.Tpo $(DEPDIR)/log_format.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/log_format.cc' object='log_format.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 log_format.o `test -f '../src/log_format.cc' || echo '$(srcdir)/'`../src/log_format.cc
-
-log_format.obj: ../src/log_format.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT log_format.obj -MD -MP -MF $(DEPDIR)/log_format.Tpo -c -o log_format.obj `if test -f '../src/log_format.cc'; then $(CYGPATH_W) '../src/log_format.cc'; else $(CYGPATH_W) '$(srcdir)/../src/log_format.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/log_format.Tpo $(DEPDIR)/log_format.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/log_format.cc' object='log_format.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 log_format.obj `if test -f '../src/log_format.cc'; then $(CYGPATH_W) '../src/log_format.cc'; else $(CYGPATH_W) '$(srcdir)/../src/log_format.cc'; fi`
-
-ansi_scrubber.o: ../src/ansi_scrubber.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ansi_scrubber.o -MD -MP -MF $(DEPDIR)/ansi_scrubber.Tpo -c -o ansi_scrubber.o `test -f '../src/ansi_scrubber.cc' || echo '$(srcdir)/'`../src/ansi_scrubber.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ansi_scrubber.Tpo $(DEPDIR)/ansi_scrubber.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/ansi_scrubber.cc' object='ansi_scrubber.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 ansi_scrubber.o `test -f '../src/ansi_scrubber.cc' || echo '$(srcdir)/'`../src/ansi_scrubber.cc
-
-ansi_scrubber.obj: ../src/ansi_scrubber.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ansi_scrubber.obj -MD -MP -MF $(DEPDIR)/ansi_scrubber.Tpo -c -o ansi_scrubber.obj `if test -f '../src/ansi_scrubber.cc'; then $(CYGPATH_W) '../src/ansi_scrubber.cc'; else $(CYGPATH_W) '$(srcdir)/../src/ansi_scrubber.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ansi_scrubber.Tpo $(DEPDIR)/ansi_scrubber.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/ansi_scrubber.cc' object='ansi_scrubber.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 ansi_scrubber.obj `if test -f '../src/ansi_scrubber.cc'; then $(CYGPATH_W) '../src/ansi_scrubber.cc'; else $(CYGPATH_W) '$(srcdir)/../src/ansi_scrubber.cc'; fi`
-
-vt52_curses.o: ../src/vt52_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vt52_curses.o -MD -MP -MF $(DEPDIR)/vt52_curses.Tpo -c -o vt52_curses.o `test -f '../src/vt52_curses.cc' || echo '$(srcdir)/'`../src/vt52_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/vt52_curses.Tpo $(DEPDIR)/vt52_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/vt52_curses.cc' object='vt52_curses.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 vt52_curses.o `test -f '../src/vt52_curses.cc' || echo '$(srcdir)/'`../src/vt52_curses.cc
-
-vt52_curses.obj: ../src/vt52_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT vt52_curses.obj -MD -MP -MF $(DEPDIR)/vt52_curses.Tpo -c -o vt52_curses.obj `if test -f '../src/vt52_curses.cc'; then $(CYGPATH_W) '../src/vt52_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/vt52_curses.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/vt52_curses.Tpo $(DEPDIR)/vt52_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/vt52_curses.cc' object='vt52_curses.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 vt52_curses.obj `if test -f '../src/vt52_curses.cc'; then $(CYGPATH_W) '../src/vt52_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/vt52_curses.cc'; fi`
-
-readline_curses.o: ../src/readline_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT readline_curses.o -MD -MP -MF $(DEPDIR)/readline_curses.Tpo -c -o readline_curses.o `test -f '../src/readline_curses.cc' || echo '$(srcdir)/'`../src/readline_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readline_curses.Tpo $(DEPDIR)/readline_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/readline_curses.cc' object='readline_curses.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 readline_curses.o `test -f '../src/readline_curses.cc' || echo '$(srcdir)/'`../src/readline_curses.cc
-
-readline_curses.obj: ../src/readline_curses.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT readline_curses.obj -MD -MP -MF $(DEPDIR)/readline_curses.Tpo -c -o readline_curses.obj `if test -f '../src/readline_curses.cc'; then $(CYGPATH_W) '../src/readline_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/readline_curses.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/readline_curses.Tpo $(DEPDIR)/readline_curses.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/readline_curses.cc' object='readline_curses.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 readline_curses.obj `if test -f '../src/readline_curses.cc'; then $(CYGPATH_W) '../src/readline_curses.cc'; else $(CYGPATH_W) '$(srcdir)/../src/readline_curses.cc'; fi`
-
-sequence_matcher.o: ../src/sequence_matcher.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sequence_matcher.o -MD -MP -MF $(DEPDIR)/sequence_matcher.Tpo -c -o sequence_matcher.o `test -f '../src/sequence_matcher.cc' || echo '$(srcdir)/'`../src/sequence_matcher.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sequence_matcher.Tpo $(DEPDIR)/sequence_matcher.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/sequence_matcher.cc' object='sequence_matcher.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 sequence_matcher.o `test -f '../src/sequence_matcher.cc' || echo '$(srcdir)/'`../src/sequence_matcher.cc
-
-sequence_matcher.obj: ../src/sequence_matcher.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT sequence_matcher.obj -MD -MP -MF $(DEPDIR)/sequence_matcher.Tpo -c -o sequence_matcher.obj `if test -f '../src/sequence_matcher.cc'; then $(CYGPATH_W) '../src/sequence_matcher.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sequence_matcher.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/sequence_matcher.Tpo $(DEPDIR)/sequence_matcher.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/sequence_matcher.cc' object='sequence_matcher.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 sequence_matcher.obj `if test -f '../src/sequence_matcher.cc'; then $(CYGPATH_W) '../src/sequence_matcher.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sequence_matcher.cc'; fi`
-
-bookmarks.o: ../src/bookmarks.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bookmarks.o -MD -MP -MF $(DEPDIR)/bookmarks.Tpo -c -o bookmarks.o `test -f '../src/bookmarks.cc' || echo '$(srcdir)/'`../src/bookmarks.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bookmarks.Tpo $(DEPDIR)/bookmarks.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/bookmarks.cc' object='bookmarks.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 bookmarks.o `test -f '../src/bookmarks.cc' || echo '$(srcdir)/'`../src/bookmarks.cc
-
-bookmarks.obj: ../src/bookmarks.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT bookmarks.obj -MD -MP -MF $(DEPDIR)/bookmarks.Tpo -c -o bookmarks.obj `if test -f '../src/bookmarks.cc'; then $(CYGPATH_W) '../src/bookmarks.cc'; else $(CYGPATH_W) '$(srcdir)/../src/bookmarks.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/bookmarks.Tpo $(DEPDIR)/bookmarks.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/bookmarks.cc' object='bookmarks.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 bookmarks.obj `if test -f '../src/bookmarks.cc'; then $(CYGPATH_W) '../src/bookmarks.cc'; else $(CYGPATH_W) '$(srcdir)/../src/bookmarks.cc'; fi`
-
-hist_source.o: ../src/hist_source.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hist_source.o -MD -MP -MF $(DEPDIR)/hist_source.Tpo -c -o hist_source.o `test -f '../src/hist_source.cc' || echo '$(srcdir)/'`../src/hist_source.cc
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hist_source.Tpo $(DEPDIR)/hist_source.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/hist_source.cc' object='hist_source.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 hist_source.o `test -f '../src/hist_source.cc' || echo '$(srcdir)/'`../src/hist_source.cc
-
-hist_source.obj: ../src/hist_source.cc
-@am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hist_source.obj -MD -MP -MF $(DEPDIR)/hist_source.Tpo -c -o hist_source.obj `if test -f '../src/hist_source.cc'; then $(CYGPATH_W) '../src/hist_source.cc'; else $(CYGPATH_W) '$(srcdir)/../src/hist_source.cc'; fi`
-@am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hist_source.Tpo $(DEPDIR)/hist_source.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='../src/hist_source.cc' object='hist_source.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 hist_source.obj `if test -f '../src/hist_source.cc'; then $(CYGPATH_W) '../src/hist_source.cc'; else $(CYGPATH_W) '$(srcdir)/../src/hist_source.cc'; fi`
-
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
 tags: tags-am
@@ -1576,6 +1430,8 @@ clean-generic:
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+	-rm -f ../src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f ../src/$(am__dirstamp)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -1586,7 +1442,7 @@ clean: clean-am
 clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ../src/$(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -1632,7 +1488,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ../src/$(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/test/test_yajlpp.cc b/test/test_yajlpp.cc
index 3821bc14..41adbd03 100644
--- a/test/test_yajlpp.cc
+++ b/test/test_yajlpp.cc
@@ -41,10 +41,8 @@ const char *TEST_DATA =
 
 static int FOO_COUNT = 0;
 
-static int read_foo(void *ctx, long long value)
+static int read_foo(yajlpp_parse_context *ypc, long long value)
 {
-    yajlpp_parse_context *ypc = (yajlpp_parse_context *)ctx;
-
     assert(value == FOO_COUNT);
     assert(ypc->ypc_array_index.back() == FOO_COUNT);
 
@@ -61,7 +59,7 @@ int main(int argc, char *argv[])
         json_path_handler()
     };
 
-    yajlpp_parse_context ypc(test_handlers);
+    yajlpp_parse_context ypc("test_data", test_handlers);
     yajl_handle handle;
 
     handle = yajl_alloc(&ypc.ypc_callbacks, NULL, &ypc);