Tizen 2.1 base
[platform/upstream/glib2.0.git] / tests / Makefile.in
index 28136c2..240cacd 100644 (file)
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in 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.
@@ -42,17 +42,22 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 noinst_PROGRAMS = $(am__EXEEXT_5) testgdate$(EXEEXT) \
        testgdateparser$(EXEEXT) unicode-normalize$(EXEEXT) \
        unicode-collate$(EXEEXT) $(am__EXEEXT_6) \
-       errorcheck-mutex-test$(EXEEXT) assert-msg-test$(EXEEXT)
+       assert-msg-test$(EXEEXT) datetime$(EXEEXT)
 check_PROGRAMS = $(am__EXEEXT_3) $(am__EXEEXT_4)
 TESTS = $(am__EXEEXT_3) $(test_scripts)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-       $(top_srcdir)/acglib.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
+       $(top_srcdir)/m4macros/libtool.m4 \
+       $(top_srcdir)/m4macros/ltoptions.m4 \
+       $(top_srcdir)/m4macros/ltsugar.m4 \
+       $(top_srcdir)/m4macros/ltversion.m4 \
+       $(top_srcdir)/m4macros/lt~obsolete.m4 \
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/acglib.m4 \
        $(top_srcdir)/glib/libcharset/codeset.m4 \
        $(top_srcdir)/glib/libcharset/glibc21.m4 \
        $(top_srcdir)/m4macros/glib-gettext.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -66,8 +71,8 @@ libmoduletestplugin_a_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 am_libmoduletestplugin_a_la_OBJECTS = libmoduletestplugin_a.lo
 libmoduletestplugin_a_la_OBJECTS =  \
        $(am_libmoduletestplugin_a_la_OBJECTS)
-AM_V_lt = $(am__v_lt_$(V))
-am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 libmoduletestplugin_a_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -84,30 +89,21 @@ libmoduletestplugin_b_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(LDFLAGS) -o $@
 @HAVE_CXX_TRUE@am__EXEEXT_1 = cxx-test$(EXEEXT)
 @PLATFORM_WIN32_TRUE@am__EXEEXT_2 = spawn-test-win32-gui$(EXEEXT)
-am__EXEEXT_3 = atomic-test$(EXEEXT) base64-test$(EXEEXT) \
-       bit-test$(EXEEXT) $(am__EXEEXT_1) checksum-test$(EXEEXT) \
+am__EXEEXT_3 = atomic-test$(EXEEXT) bit-test$(EXEEXT) $(am__EXEEXT_1) \
        child-test$(EXEEXT) completion-test$(EXEEXT) \
-       convert-test$(EXEEXT) date-test$(EXEEXT) dirname-test$(EXEEXT) \
-       file-test$(EXEEXT) env-test$(EXEEXT) gio-test$(EXEEXT) \
-       hash-test$(EXEEXT) iochannel-test$(EXEEXT) list-test$(EXEEXT) \
+       dirname-test$(EXEEXT) file-test$(EXEEXT) env-test$(EXEEXT) \
+       gio-test$(EXEEXT) iochannel-test$(EXEEXT) \
        mainloop-test$(EXEEXT) mapping-test$(EXEEXT) \
-       markup-collect$(EXEEXT) markup-escape-test$(EXEEXT) \
-       module-test$(EXEEXT) node-test$(EXEEXT) onceinit$(EXEEXT) \
-       patterntest$(EXEEXT) queue-test$(EXEEXT) \
+       module-test$(EXEEXT) onceinit$(EXEEXT) \
        asyncqueue-test$(EXEEXT) qsort-test$(EXEEXT) \
-       relation-test$(EXEEXT) sequence-test$(EXEEXT) \
-       shell-test$(EXEEXT) slist-test$(EXEEXT) slice-test$(EXEEXT) \
+       relation-test$(EXEEXT) slice-test$(EXEEXT) \
        slice-color$(EXEEXT) slice-concurrent$(EXEEXT) \
        slice-threadinit$(EXEEXT) spawn-test$(EXEEXT) $(am__EXEEXT_2) \
        thread-test$(EXEEXT) threadpool-test$(EXEEXT) \
-       tree-test$(EXEEXT) type-test$(EXEEXT) \
-       unicode-caseconv$(EXEEXT) unicode-encoding$(EXEEXT) \
-       utf8-validate$(EXEEXT) utf8-pointer$(EXEEXT) uri-test$(EXEEXT) \
-       regex-test$(EXEEXT)
-am__EXEEXT_4 = markup-test$(EXEEXT) unicode-collate$(EXEEXT) \
-       bookmarkfile-test$(EXEEXT)
-am__EXEEXT_5 = scannerapi$(EXEEXT) testglib$(EXEEXT) \
-       testingbase64$(EXEEXT)
+       type-test$(EXEEXT) unicode-caseconv$(EXEEXT) \
+       unicode-encoding$(EXEEXT)
+am__EXEEXT_4 = unicode-collate$(EXEEXT)
+am__EXEEXT_5 = testglib$(EXEEXT)
 @ENABLE_TIMELOOP_TRUE@am__EXEEXT_6 = timeloop$(EXEEXT) \
 @ENABLE_TIMELOOP_TRUE@ timeloop-closure$(EXEEXT)
 PROGRAMS = $(noinst_PROGRAMS)
@@ -124,74 +120,43 @@ asyncqueue_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
 atomic_test_SOURCES = atomic-test.c
 atomic_test_OBJECTS = atomic-test.$(OBJEXT)
 atomic_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-base64_test_SOURCES = base64-test.c
-base64_test_OBJECTS = base64-test.$(OBJEXT)
-base64_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 bit_test_SOURCES = bit-test.c
 bit_test_OBJECTS = bit-test.$(OBJEXT)
 bit_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-bookmarkfile_test_SOURCES = bookmarkfile-test.c
-bookmarkfile_test_OBJECTS = bookmarkfile-test.$(OBJEXT)
-bookmarkfile_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-checksum_test_SOURCES = checksum-test.c
-checksum_test_OBJECTS = checksum-test.$(OBJEXT)
-checksum_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 child_test_SOURCES = child-test.c
 child_test_OBJECTS = child-test.$(OBJEXT)
 child_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
 completion_test_SOURCES = completion-test.c
 completion_test_OBJECTS = completion-test.$(OBJEXT)
 completion_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-convert_test_SOURCES = convert-test.c
-convert_test_OBJECTS = convert-test.$(OBJEXT)
-convert_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am__cxx_test_SOURCES_DIST = cxx-test.C
 @HAVE_CXX_TRUE@am_cxx_test_OBJECTS = cxx-test.$(OBJEXT)
 cxx_test_OBJECTS = $(am_cxx_test_OBJECTS)
 @HAVE_CXX_TRUE@cxx_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-date_test_SOURCES = date-test.c
-date_test_OBJECTS = date-test.$(OBJEXT)
-date_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
+datetime_SOURCES = datetime.c
+datetime_OBJECTS = datetime.$(OBJEXT)
+datetime_DEPENDENCIES = $(libglib)
 dirname_test_SOURCES = dirname-test.c
 dirname_test_OBJECTS = dirname-test.$(OBJEXT)
 dirname_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 env_test_SOURCES = env-test.c
 env_test_OBJECTS = env-test.$(OBJEXT)
 env_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-errorcheck_mutex_test_SOURCES = errorcheck-mutex-test.c
-errorcheck_mutex_test_OBJECTS = errorcheck-mutex-test.$(OBJEXT)
-errorcheck_mutex_test_DEPENDENCIES = $(libglib) $(libgthread) \
-       $(am__DEPENDENCIES_1)
 file_test_SOURCES = file-test.c
 file_test_OBJECTS = file-test.$(OBJEXT)
 file_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 gio_test_SOURCES = gio-test.c
 gio_test_OBJECTS = gio-test.$(OBJEXT)
 gio_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-hash_test_SOURCES = hash-test.c
-hash_test_OBJECTS = hash-test.$(OBJEXT)
-hash_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 iochannel_test_SOURCES = iochannel-test.c
 iochannel_test_OBJECTS = iochannel-test.$(OBJEXT)
 iochannel_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-list_test_SOURCES = list-test.c
-list_test_OBJECTS = list-test.$(OBJEXT)
-list_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 mainloop_test_SOURCES = mainloop-test.c
 mainloop_test_OBJECTS = mainloop-test.$(OBJEXT)
 mainloop_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
 mapping_test_SOURCES = mapping-test.c
 mapping_test_OBJECTS = mapping-test.$(OBJEXT)
 mapping_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-markup_collect_SOURCES = markup-collect.c
-markup_collect_OBJECTS = markup-collect.$(OBJEXT)
-markup_collect_DEPENDENCIES = $(am__DEPENDENCIES_2)
-markup_escape_test_SOURCES = markup-escape-test.c
-markup_escape_test_OBJECTS = markup-escape-test.$(OBJEXT)
-markup_escape_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-markup_test_SOURCES = markup-test.c
-markup_test_OBJECTS = markup-test.$(OBJEXT)
-markup_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 module_test_SOURCES = module-test.c
 module_test_OBJECTS = module-test.$(OBJEXT)
 am__DEPENDENCIES_4 = $(libgmodule) $(am__DEPENDENCIES_1) \
@@ -200,36 +165,15 @@ module_test_DEPENDENCIES = $(am__DEPENDENCIES_4) $(module_test_exp)
 module_test_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(module_test_LDFLAGS) $(LDFLAGS) -o $@
-node_test_SOURCES = node-test.c
-node_test_OBJECTS = node-test.$(OBJEXT)
-node_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 onceinit_SOURCES = onceinit.c
 onceinit_OBJECTS = onceinit.$(OBJEXT)
 onceinit_DEPENDENCIES = $(am__DEPENDENCIES_3)
-patterntest_SOURCES = patterntest.c
-patterntest_OBJECTS = patterntest.$(OBJEXT)
-patterntest_DEPENDENCIES = $(libglib)
 qsort_test_SOURCES = qsort-test.c
 qsort_test_OBJECTS = qsort-test.$(OBJEXT)
 qsort_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-queue_test_SOURCES = queue-test.c
-queue_test_OBJECTS = queue-test.$(OBJEXT)
-queue_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-regex_test_SOURCES = regex-test.c
-regex_test_OBJECTS = regex-test.$(OBJEXT)
-regex_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 relation_test_SOURCES = relation-test.c
 relation_test_OBJECTS = relation-test.$(OBJEXT)
 relation_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-am_scannerapi_OBJECTS = scannerapi.$(OBJEXT)
-scannerapi_OBJECTS = $(am_scannerapi_OBJECTS)
-scannerapi_DEPENDENCIES = $(am__DEPENDENCIES_2)
-sequence_test_SOURCES = sequence-test.c
-sequence_test_OBJECTS = sequence-test.$(OBJEXT)
-sequence_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-shell_test_SOURCES = shell-test.c
-shell_test_OBJECTS = shell-test.$(OBJEXT)
-shell_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 am_slice_color_OBJECTS = slice-color.$(OBJEXT) memchunks.$(OBJEXT)
 slice_color_OBJECTS = $(am_slice_color_OBJECTS)
 slice_color_DEPENDENCIES = $(am__DEPENDENCIES_3)
@@ -242,9 +186,6 @@ slice_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_slice_threadinit_OBJECTS = slice-threadinit.$(OBJEXT)
 slice_threadinit_OBJECTS = $(am_slice_threadinit_OBJECTS)
 slice_threadinit_DEPENDENCIES = $(am__DEPENDENCIES_3)
-slist_test_SOURCES = slist-test.c
-slist_test_OBJECTS = slist-test.$(OBJEXT)
-slist_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 spawn_test_SOURCES = spawn-test.c
 spawn_test_OBJECTS = spawn-test.$(OBJEXT)
 spawn_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -264,9 +205,6 @@ testgdateparser_DEPENDENCIES = $(libglib)
 am_testglib_OBJECTS = testglib.$(OBJEXT)
 testglib_OBJECTS = $(am_testglib_OBJECTS)
 testglib_DEPENDENCIES = $(libglib)
-am_testingbase64_OBJECTS = testingbase64.$(OBJEXT)
-testingbase64_OBJECTS = $(am_testingbase64_OBJECTS)
-testingbase64_DEPENDENCIES = $(am__DEPENDENCIES_2)
 thread_test_SOURCES = thread-test.c
 thread_test_OBJECTS = thread-test.$(OBJEXT)
 thread_test_DEPENDENCIES = $(am__DEPENDENCIES_3)
@@ -280,9 +218,6 @@ timeloop_closure_SOURCES = timeloop-closure.c
 timeloop_closure_OBJECTS = timeloop-closure.$(OBJEXT)
 @ENABLE_TIMELOOP_TRUE@timeloop_closure_DEPENDENCIES = $(libglib) \
 @ENABLE_TIMELOOP_TRUE@ $(libgobject)
-tree_test_SOURCES = tree-test.c
-tree_test_OBJECTS = tree-test.$(OBJEXT)
-tree_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
 type_test_SOURCES = type-test.c
 type_test_OBJECTS = type-test.$(OBJEXT)
 type_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
@@ -291,22 +226,13 @@ unicode_caseconv_OBJECTS = unicode-caseconv.$(OBJEXT)
 unicode_caseconv_DEPENDENCIES = $(am__DEPENDENCIES_2)
 unicode_collate_SOURCES = unicode-collate.c
 unicode_collate_OBJECTS = unicode-collate.$(OBJEXT)
-unicode_collate_DEPENDENCIES = $(am__DEPENDENCIES_2)
+unicode_collate_DEPENDENCIES = $(libglib)
 unicode_encoding_SOURCES = unicode-encoding.c
 unicode_encoding_OBJECTS = unicode-encoding.$(OBJEXT)
 unicode_encoding_DEPENDENCIES = $(am__DEPENDENCIES_2)
 unicode_normalize_SOURCES = unicode-normalize.c
 unicode_normalize_OBJECTS = unicode-normalize.$(OBJEXT)
 unicode_normalize_DEPENDENCIES = $(libglib)
-uri_test_SOURCES = uri-test.c
-uri_test_OBJECTS = uri-test.$(OBJEXT)
-uri_test_DEPENDENCIES = $(am__DEPENDENCIES_2)
-utf8_pointer_SOURCES = utf8-pointer.c
-utf8_pointer_OBJECTS = utf8-pointer.$(OBJEXT)
-utf8_pointer_DEPENDENCIES = $(am__DEPENDENCIES_2)
-utf8_validate_SOURCES = utf8-validate.c
-utf8_validate_OBJECTS = utf8-validate.$(OBJEXT)
-utf8_validate_DEPENDENCIES = $(am__DEPENDENCIES_2)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -317,18 +243,18 @@ LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
        $(AM_CXXFLAGS) $(CXXFLAGS)
-AM_V_CXX = $(am__v_CXX_$(V))
-am__v_CXX_ = $(am__v_CXX_$(AM_DEFAULT_VERBOSITY))
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX   " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
        $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CXXLD = $(am__v_CXXLD_$(V))
-am__v_CXXLD_ = $(am__v_CXXLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD " $@;
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -336,59 +262,45 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
        $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
        $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_$(V))
-am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY))
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC    " $@;
 CCLD = $(CC)
 LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
        $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_$(V))
-am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY))
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD  " $@;
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
 am__v_GEN_0 = @echo "  GEN   " $@;
 SOURCES = $(libmoduletestplugin_a_la_SOURCES) \
        $(libmoduletestplugin_b_la_SOURCES) assert-msg-test.c \
-       asyncqueue-test.c atomic-test.c base64-test.c bit-test.c \
-       bookmarkfile-test.c checksum-test.c child-test.c \
-       completion-test.c convert-test.c $(cxx_test_SOURCES) \
-       date-test.c dirname-test.c env-test.c errorcheck-mutex-test.c \
-       file-test.c gio-test.c hash-test.c iochannel-test.c \
-       list-test.c mainloop-test.c mapping-test.c markup-collect.c \
-       markup-escape-test.c markup-test.c module-test.c node-test.c \
-       onceinit.c patterntest.c qsort-test.c queue-test.c \
-       regex-test.c relation-test.c $(scannerapi_SOURCES) \
-       sequence-test.c shell-test.c $(slice_color_SOURCES) \
+       asyncqueue-test.c atomic-test.c bit-test.c child-test.c \
+       completion-test.c $(cxx_test_SOURCES) datetime.c \
+       dirname-test.c env-test.c file-test.c gio-test.c \
+       iochannel-test.c mainloop-test.c mapping-test.c module-test.c \
+       onceinit.c qsort-test.c relation-test.c $(slice_color_SOURCES) \
        $(slice_concurrent_SOURCES) $(slice_test_SOURCES) \
-       $(slice_threadinit_SOURCES) slist-test.c spawn-test.c \
+       $(slice_threadinit_SOURCES) spawn-test.c \
        spawn-test-win32-gui.c testgdate.c testgdateparser.c \
-       $(testglib_SOURCES) $(testingbase64_SOURCES) thread-test.c \
-       threadpool-test.c timeloop.c timeloop-closure.c tree-test.c \
-       type-test.c unicode-caseconv.c unicode-collate.c \
-       unicode-encoding.c unicode-normalize.c uri-test.c \
-       utf8-pointer.c utf8-validate.c
+       $(testglib_SOURCES) thread-test.c threadpool-test.c timeloop.c \
+       timeloop-closure.c type-test.c unicode-caseconv.c \
+       unicode-collate.c unicode-encoding.c unicode-normalize.c
 DIST_SOURCES = $(libmoduletestplugin_a_la_SOURCES) \
        $(libmoduletestplugin_b_la_SOURCES) assert-msg-test.c \
-       asyncqueue-test.c atomic-test.c base64-test.c bit-test.c \
-       bookmarkfile-test.c checksum-test.c child-test.c \
-       completion-test.c convert-test.c $(am__cxx_test_SOURCES_DIST) \
-       date-test.c dirname-test.c env-test.c errorcheck-mutex-test.c \
-       file-test.c gio-test.c hash-test.c iochannel-test.c \
-       list-test.c mainloop-test.c mapping-test.c markup-collect.c \
-       markup-escape-test.c markup-test.c module-test.c node-test.c \
-       onceinit.c patterntest.c qsort-test.c queue-test.c \
-       regex-test.c relation-test.c $(scannerapi_SOURCES) \
-       sequence-test.c shell-test.c $(slice_color_SOURCES) \
+       asyncqueue-test.c atomic-test.c bit-test.c child-test.c \
+       completion-test.c $(am__cxx_test_SOURCES_DIST) datetime.c \
+       dirname-test.c env-test.c file-test.c gio-test.c \
+       iochannel-test.c mainloop-test.c mapping-test.c module-test.c \
+       onceinit.c qsort-test.c relation-test.c $(slice_color_SOURCES) \
        $(slice_concurrent_SOURCES) $(slice_test_SOURCES) \
-       $(slice_threadinit_SOURCES) slist-test.c spawn-test.c \
+       $(slice_threadinit_SOURCES) spawn-test.c \
        spawn-test-win32-gui.c testgdate.c testgdateparser.c \
-       $(testglib_SOURCES) $(testingbase64_SOURCES) thread-test.c \
-       threadpool-test.c timeloop.c timeloop-closure.c tree-test.c \
-       type-test.c unicode-caseconv.c unicode-collate.c \
-       unicode-encoding.c unicode-normalize.c uri-test.c \
-       utf8-pointer.c utf8-validate.c
+       $(testglib_SOURCES) thread-test.c threadpool-test.c timeloop.c \
+       timeloop-closure.c type-test.c unicode-caseconv.c \
+       unicode-collate.c unicode-encoding.c unicode-normalize.c
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
        html-recursive info-recursive install-data-recursive \
        install-dvi-recursive install-exec-recursive \
@@ -433,6 +345,7 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 ABS_GLIB_RUNTIME_LIBDIR = @ABS_GLIB_RUNTIME_LIBDIR@
+ABS_TAPSET_DIR = @ABS_TAPSET_DIR@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
@@ -457,11 +370,13 @@ CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DATADIRNAME = @DATADIRNAME@
+DBUS1_CFLAGS = @DBUS1_CFLAGS@
+DBUS1_LIBS = @DBUS1_LIBS@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-DISABLE_MEM_POOLS = @DISABLE_MEM_POOLS@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
+DTRACE = @DTRACE@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
@@ -475,10 +390,13 @@ GIO = @GIO@
 GIO_MODULE_DIR = @GIO_MODULE_DIR@
 GLIBC21 = @GLIBC21@
 GLIB_BINARY_AGE = @GLIB_BINARY_AGE@
+GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
 GLIB_DEBUG_FLAGS = @GLIB_DEBUG_FLAGS@
 GLIB_EXTRA_CFLAGS = @GLIB_EXTRA_CFLAGS@
 GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
 GLIB_INTERFACE_AGE = @GLIB_INTERFACE_AGE@
+GLIB_LINK_FLAGS = @GLIB_LINK_FLAGS@
 GLIB_MAJOR_VERSION = @GLIB_MAJOR_VERSION@
 GLIB_MICRO_VERSION = @GLIB_MICRO_VERSION@
 GLIB_MINOR_VERSION = @GLIB_MINOR_VERSION@
@@ -491,6 +409,8 @@ GREP = @GREP@
 GSPAWN = @GSPAWN@
 GTHREAD_COMPILE_IMPL_DEFINES = @GTHREAD_COMPILE_IMPL_DEFINES@
 GTKDOC_CHECK = @GTKDOC_CHECK@
+GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@
+GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@
 GTKDOC_MKPDF = @GTKDOC_MKPDF@
 GTKDOC_REBASE = @GTKDOC_REBASE@
 G_LIBS_EXTRA = @G_LIBS_EXTRA@
@@ -519,7 +439,10 @@ INSTOBJEXT = @INSTOBJEXT@
 INTLLIBS = @INTLLIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBASYNCNS_LIBADD = @LIBASYNCNS_LIBADD@
+LIBELF_CFLAGS = @LIBELF_CFLAGS@
+LIBELF_LIBS = @LIBELF_LIBS@
+LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
+LIBFFI_LIBS = @LIBFFI_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -528,6 +451,8 @@ LIB_EXE_MACHINE_FLAG = @LIB_EXE_MACHINE_FLAG@
 LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LTP = @LTP@
+LTP_GENHTML = @LTP_GENHTML@
 LT_AGE = @LT_AGE@
 LT_CURRENT = @LT_CURRENT@
 LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
@@ -535,10 +460,12 @@ LT_RELEASE = @LT_RELEASE@
 LT_REVISION = @LT_REVISION@
 MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 MSGFMT_OPTS = @MSGFMT_OPTS@
+NETWORK_LIBS = @NETWORK_LIBS@
 NM = @NM@
 NMEDIT = @NMEDIT@
 OBJDUMP = @OBJDUMP@
@@ -560,6 +487,8 @@ PCRE_WARN_CFLAGS = @PCRE_WARN_CFLAGS@
 PERL = @PERL@
 PERL_PATH = @PERL_PATH@
 PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 PLATFORMDEP = @PLATFORMDEP@
 POFILES = @POFILES@
 POSUB = @POSUB@
@@ -576,6 +505,7 @@ SED = @SED@
 SELINUX_LIBS = @SELINUX_LIBS@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SHTOOL = @SHTOOL@
 STRIP = @STRIP@
 USE_NLS = @USE_NLS@
 VERSION = @VERSION@
@@ -585,11 +515,13 @@ XGETTEXT = @XGETTEXT@
 XMLCATALOG = @XMLCATALOG@
 XML_CATALOG_FILE = @XML_CATALOG_FILE@
 XSLTPROC = @XSLTPROC@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -605,11 +537,17 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
 builddir = @builddir@
+config_h_INCLUDES = @config_h_INCLUDES@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gio_INCLUDES = @gio_INCLUDES@
+glib_INCLUDES = @glib_INCLUDES@
+gmodule_INCLUDES = @gmodule_INCLUDES@
+gobject_INCLUDES = @gobject_INCLUDES@
+gthread_INCLUDES = @gthread_INCLUDES@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -623,7 +561,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 ms_librarian = @ms_librarian@
@@ -653,12 +590,11 @@ GTESTER_REPORT = $(top_builddir)/glib/gtester-report      # for the GLIB package
 EXTRA_DIST = $(test_scripts) makefile.msc.in casefold.txt casemap.txt \
        gen-casefold-txt.pl gen-casemap-txt.pl iochannel-test-infile \
        utf8.txt timeloop-basic.c
-TEST_PROGS = scannerapi testglib testingbase64
+TEST_PROGS = testglib
 SUBDIRS = gobject refcount
 AM_CPPFLAGS = \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
+       $(gmodule_INCLUDES)                     \
+       -DGLIB_DISABLE_DEPRECATION_WARNINGS     \
        $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g
@@ -681,52 +617,34 @@ BUILT_EXTRA_DIST = \
 @HAVE_CXX_TRUE@cxx_test_LDADD = $(progs_ldadd)
 @HAVE_CXX_TRUE@cxx_test_SOURCES = cxx-test.C
 @ENABLE_TIMELOOP_TRUE@timeloop = timeloop timeloop-closure
-scannerapi_SOURCES = scannerapi.c
-scannerapi_LDADD = $(progs_ldadd)
 testglib_SOURCES = testglib.c
 testglib_LDADD = $(libglib)
-testingbase64_SOURCES = testingbase64.c
-testingbase64_LDADD = $(progs_ldadd)
-patterntest_LDADD = $(libglib)
 testgdate_LDADD = $(libglib)
 testgdateparser_LDADD = $(libglib)
 unicode_normalize_LDADD = $(libglib)
-errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS) 
+unicode_collate_LDADD = $(libglib)
 assert_msg_test_LDADD = $(libglib)
 @ENABLE_TIMELOOP_TRUE@timeloop_LDADD = $(libglib)
 @ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject)
+datetime_LDADD = $(libglib)
 test_programs = \
        atomic-test                             \
-       base64-test                             \
        bit-test                                \
        $(CXX_TEST)                             \
-       checksum-test                           \
        child-test                              \
        completion-test                         \
-       convert-test                            \
-       date-test                               \
        dirname-test                            \
        file-test                               \
        env-test                                \
        gio-test                                \
-       hash-test                               \
        iochannel-test                          \
-       list-test                               \
        mainloop-test                           \
        mapping-test                            \
-       markup-collect                          \
-       markup-escape-test                      \
        module-test                             \
-       node-test                               \
        onceinit                                \
-       patterntest                             \
-       queue-test                              \
        asyncqueue-test                         \
        qsort-test                              \
        relation-test                           \
-       sequence-test                           \
-       shell-test                              \
-       slist-test                              \
        slice-test                              \
        slice-color                             \
        slice-concurrent                        \
@@ -735,17 +653,12 @@ test_programs = \
        $(spawn_test_win32_gui)                 \
        thread-test                             \
        threadpool-test                         \
-       tree-test                               \
        type-test                               \
        unicode-caseconv                        \
-       unicode-encoding                        \
-       utf8-validate                           \
-       utf8-pointer                            \
-       uri-test                                \
-       regex-test
-
-test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
-test_script_support_programs = markup-test unicode-collate bookmarkfile-test
+       unicode-encoding
+
+test_scripts = run-collate-tests.sh run-assert-msg-test.sh
+test_script_support_programs = unicode-collate
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
        LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
        MALLOC_CHECK_=2 \
@@ -755,36 +668,22 @@ progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)
 thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
 module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 atomic_test_LDADD = $(progs_ldadd)
-base64_test_LDADD = $(progs_ldadd)
 bit_test_LDADD = $(progs_ldadd)
-bookmarkfile_test_LDADD = $(progs_ldadd)
-checksum_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
-convert_test_LDADD = $(progs_ldadd)
-date_test_LDADD = $(progs_ldadd)
 dirname_test_LDADD = $(progs_ldadd)
 file_test_LDADD = $(progs_ldadd)
 env_test_LDADD = $(progs_ldadd)
 gio_test_LDADD = $(progs_ldadd)
-hash_test_LDADD = $(progs_ldadd)
 iochannel_test_LDADD = $(progs_ldadd)
-list_test_LDADD = $(progs_ldadd)
 mainloop_test_LDADD = $(thread_ldadd)
-markup_test_LDADD = $(progs_ldadd)
 mapping_test_LDADD = $(progs_ldadd)
-markup_escape_test_LDADD = $(progs_ldadd)
 module_test_LDADD = $(module_ldadd) $(module_test_exp)
 module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
-node_test_LDADD = $(progs_ldadd)
 onceinit_LDADD = $(thread_ldadd)
-queue_test_LDADD = $(progs_ldadd)
 asyncqueue_test_LDADD = $(thread_ldadd)
 qsort_test_LDADD = $(progs_ldadd)
 relation_test_LDADD = $(progs_ldadd)
-sequence_test_LDADD = $(progs_ldadd)
-shell_test_LDADD = $(progs_ldadd)
-slist_test_LDADD = $(progs_ldadd)
 slice_test_SOURCES = slice-test.c memchunks.c
 slice_test_LDADD = $(thread_ldadd)
 slice_color_SOURCES = slice-color.c memchunks.c
@@ -796,16 +695,9 @@ slice_threadinit_LDADD = $(thread_ldadd)
 spawn_test_LDADD = $(progs_ldadd)
 thread_test_LDADD = $(thread_ldadd)
 threadpool_test_LDADD = $(thread_ldadd)
-tree_test_LDADD = $(progs_ldadd)
 type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
-unicode_collate_LDADD = $(progs_ldadd)
-utf8_validate_LDADD = $(progs_ldadd)
-utf8_pointer_LDADD = $(progs_ldadd)
-uri_test_LDADD = $(progs_ldadd)
-regex_test_LDADD = $(progs_ldadd)
-markup_collect_LDADD = $(progs_ldadd)
 noinst_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
 libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
 libmoduletestplugin_a_la_LDFLAGS = $(G_MODULE_LDFLAGS) -avoid-version -module $(no_undefined) -rpath $(libdir)
@@ -845,6 +737,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
        esac;
+$(top_srcdir)/Makefile.decl:
 
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
@@ -865,9 +758,9 @@ clean-noinstLTLIBRARIES:
          echo "rm -f \"$${dir}/so_locations\""; \
          rm -f "$${dir}/so_locations"; \
        done
-libmoduletestplugin_a.la: $(libmoduletestplugin_a_la_OBJECTS) $(libmoduletestplugin_a_la_DEPENDENCIES) 
+libmoduletestplugin_a.la: $(libmoduletestplugin_a_la_OBJECTS) $(libmoduletestplugin_a_la_DEPENDENCIES) $(EXTRA_libmoduletestplugin_a_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libmoduletestplugin_a_la_LINK)  $(libmoduletestplugin_a_la_OBJECTS) $(libmoduletestplugin_a_la_LIBADD) $(LIBS)
-libmoduletestplugin_b.la: $(libmoduletestplugin_b_la_OBJECTS) $(libmoduletestplugin_b_la_DEPENDENCIES) 
+libmoduletestplugin_b.la: $(libmoduletestplugin_b_la_OBJECTS) $(libmoduletestplugin_b_la_DEPENDENCIES) $(EXTRA_libmoduletestplugin_b_la_DEPENDENCIES) 
        $(AM_V_CCLD)$(libmoduletestplugin_b_la_LINK)  $(libmoduletestplugin_b_la_OBJECTS) $(libmoduletestplugin_b_la_LIBADD) $(LIBS)
 
 clean-checkPROGRAMS:
@@ -887,186 +780,117 @@ clean-noinstPROGRAMS:
        list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
        echo " rm -f" $$list; \
        rm -f $$list
-assert-msg-test$(EXEEXT): $(assert_msg_test_OBJECTS) $(assert_msg_test_DEPENDENCIES) 
+assert-msg-test$(EXEEXT): $(assert_msg_test_OBJECTS) $(assert_msg_test_DEPENDENCIES) $(EXTRA_assert_msg_test_DEPENDENCIES) 
        @rm -f assert-msg-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(assert_msg_test_OBJECTS) $(assert_msg_test_LDADD) $(LIBS)
-asyncqueue-test$(EXEEXT): $(asyncqueue_test_OBJECTS) $(asyncqueue_test_DEPENDENCIES) 
+asyncqueue-test$(EXEEXT): $(asyncqueue_test_OBJECTS) $(asyncqueue_test_DEPENDENCIES) $(EXTRA_asyncqueue_test_DEPENDENCIES) 
        @rm -f asyncqueue-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(asyncqueue_test_OBJECTS) $(asyncqueue_test_LDADD) $(LIBS)
-atomic-test$(EXEEXT): $(atomic_test_OBJECTS) $(atomic_test_DEPENDENCIES) 
+atomic-test$(EXEEXT): $(atomic_test_OBJECTS) $(atomic_test_DEPENDENCIES) $(EXTRA_atomic_test_DEPENDENCIES) 
        @rm -f atomic-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(atomic_test_OBJECTS) $(atomic_test_LDADD) $(LIBS)
-base64-test$(EXEEXT): $(base64_test_OBJECTS) $(base64_test_DEPENDENCIES) 
-       @rm -f base64-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(base64_test_OBJECTS) $(base64_test_LDADD) $(LIBS)
-bit-test$(EXEEXT): $(bit_test_OBJECTS) $(bit_test_DEPENDENCIES) 
+bit-test$(EXEEXT): $(bit_test_OBJECTS) $(bit_test_DEPENDENCIES) $(EXTRA_bit_test_DEPENDENCIES) 
        @rm -f bit-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(bit_test_OBJECTS) $(bit_test_LDADD) $(LIBS)
-bookmarkfile-test$(EXEEXT): $(bookmarkfile_test_OBJECTS) $(bookmarkfile_test_DEPENDENCIES) 
-       @rm -f bookmarkfile-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(bookmarkfile_test_OBJECTS) $(bookmarkfile_test_LDADD) $(LIBS)
-checksum-test$(EXEEXT): $(checksum_test_OBJECTS) $(checksum_test_DEPENDENCIES) 
-       @rm -f checksum-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(checksum_test_OBJECTS) $(checksum_test_LDADD) $(LIBS)
-child-test$(EXEEXT): $(child_test_OBJECTS) $(child_test_DEPENDENCIES) 
+child-test$(EXEEXT): $(child_test_OBJECTS) $(child_test_DEPENDENCIES) $(EXTRA_child_test_DEPENDENCIES) 
        @rm -f child-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(child_test_OBJECTS) $(child_test_LDADD) $(LIBS)
-completion-test$(EXEEXT): $(completion_test_OBJECTS) $(completion_test_DEPENDENCIES) 
+completion-test$(EXEEXT): $(completion_test_OBJECTS) $(completion_test_DEPENDENCIES) $(EXTRA_completion_test_DEPENDENCIES) 
        @rm -f completion-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(completion_test_OBJECTS) $(completion_test_LDADD) $(LIBS)
-convert-test$(EXEEXT): $(convert_test_OBJECTS) $(convert_test_DEPENDENCIES) 
-       @rm -f convert-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(convert_test_OBJECTS) $(convert_test_LDADD) $(LIBS)
-cxx-test$(EXEEXT): $(cxx_test_OBJECTS) $(cxx_test_DEPENDENCIES) 
+cxx-test$(EXEEXT): $(cxx_test_OBJECTS) $(cxx_test_DEPENDENCIES) $(EXTRA_cxx_test_DEPENDENCIES) 
        @rm -f cxx-test$(EXEEXT)
        $(AM_V_CXXLD)$(CXXLINK) $(cxx_test_OBJECTS) $(cxx_test_LDADD) $(LIBS)
-date-test$(EXEEXT): $(date_test_OBJECTS) $(date_test_DEPENDENCIES) 
-       @rm -f date-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(date_test_OBJECTS) $(date_test_LDADD) $(LIBS)
-dirname-test$(EXEEXT): $(dirname_test_OBJECTS) $(dirname_test_DEPENDENCIES) 
+datetime$(EXEEXT): $(datetime_OBJECTS) $(datetime_DEPENDENCIES) $(EXTRA_datetime_DEPENDENCIES) 
+       @rm -f datetime$(EXEEXT)
+       $(AM_V_CCLD)$(LINK) $(datetime_OBJECTS) $(datetime_LDADD) $(LIBS)
+dirname-test$(EXEEXT): $(dirname_test_OBJECTS) $(dirname_test_DEPENDENCIES) $(EXTRA_dirname_test_DEPENDENCIES) 
        @rm -f dirname-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(dirname_test_OBJECTS) $(dirname_test_LDADD) $(LIBS)
-env-test$(EXEEXT): $(env_test_OBJECTS) $(env_test_DEPENDENCIES) 
+env-test$(EXEEXT): $(env_test_OBJECTS) $(env_test_DEPENDENCIES) $(EXTRA_env_test_DEPENDENCIES) 
        @rm -f env-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(env_test_OBJECTS) $(env_test_LDADD) $(LIBS)
-errorcheck-mutex-test$(EXEEXT): $(errorcheck_mutex_test_OBJECTS) $(errorcheck_mutex_test_DEPENDENCIES) 
-       @rm -f errorcheck-mutex-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(errorcheck_mutex_test_OBJECTS) $(errorcheck_mutex_test_LDADD) $(LIBS)
-file-test$(EXEEXT): $(file_test_OBJECTS) $(file_test_DEPENDENCIES) 
+file-test$(EXEEXT): $(file_test_OBJECTS) $(file_test_DEPENDENCIES) $(EXTRA_file_test_DEPENDENCIES) 
        @rm -f file-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(file_test_OBJECTS) $(file_test_LDADD) $(LIBS)
-gio-test$(EXEEXT): $(gio_test_OBJECTS) $(gio_test_DEPENDENCIES) 
+gio-test$(EXEEXT): $(gio_test_OBJECTS) $(gio_test_DEPENDENCIES) $(EXTRA_gio_test_DEPENDENCIES) 
        @rm -f gio-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(gio_test_OBJECTS) $(gio_test_LDADD) $(LIBS)
-hash-test$(EXEEXT): $(hash_test_OBJECTS) $(hash_test_DEPENDENCIES) 
-       @rm -f hash-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(hash_test_OBJECTS) $(hash_test_LDADD) $(LIBS)
-iochannel-test$(EXEEXT): $(iochannel_test_OBJECTS) $(iochannel_test_DEPENDENCIES) 
+iochannel-test$(EXEEXT): $(iochannel_test_OBJECTS) $(iochannel_test_DEPENDENCIES) $(EXTRA_iochannel_test_DEPENDENCIES) 
        @rm -f iochannel-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(iochannel_test_OBJECTS) $(iochannel_test_LDADD) $(LIBS)
-list-test$(EXEEXT): $(list_test_OBJECTS) $(list_test_DEPENDENCIES) 
-       @rm -f list-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(list_test_OBJECTS) $(list_test_LDADD) $(LIBS)
-mainloop-test$(EXEEXT): $(mainloop_test_OBJECTS) $(mainloop_test_DEPENDENCIES) 
+mainloop-test$(EXEEXT): $(mainloop_test_OBJECTS) $(mainloop_test_DEPENDENCIES) $(EXTRA_mainloop_test_DEPENDENCIES) 
        @rm -f mainloop-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(mainloop_test_OBJECTS) $(mainloop_test_LDADD) $(LIBS)
-mapping-test$(EXEEXT): $(mapping_test_OBJECTS) $(mapping_test_DEPENDENCIES) 
+mapping-test$(EXEEXT): $(mapping_test_OBJECTS) $(mapping_test_DEPENDENCIES) $(EXTRA_mapping_test_DEPENDENCIES) 
        @rm -f mapping-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(mapping_test_OBJECTS) $(mapping_test_LDADD) $(LIBS)
-markup-collect$(EXEEXT): $(markup_collect_OBJECTS) $(markup_collect_DEPENDENCIES) 
-       @rm -f markup-collect$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(markup_collect_OBJECTS) $(markup_collect_LDADD) $(LIBS)
-markup-escape-test$(EXEEXT): $(markup_escape_test_OBJECTS) $(markup_escape_test_DEPENDENCIES) 
-       @rm -f markup-escape-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(markup_escape_test_OBJECTS) $(markup_escape_test_LDADD) $(LIBS)
-markup-test$(EXEEXT): $(markup_test_OBJECTS) $(markup_test_DEPENDENCIES) 
-       @rm -f markup-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(markup_test_OBJECTS) $(markup_test_LDADD) $(LIBS)
-module-test$(EXEEXT): $(module_test_OBJECTS) $(module_test_DEPENDENCIES) 
+module-test$(EXEEXT): $(module_test_OBJECTS) $(module_test_DEPENDENCIES) $(EXTRA_module_test_DEPENDENCIES) 
        @rm -f module-test$(EXEEXT)
        $(AM_V_CCLD)$(module_test_LINK) $(module_test_OBJECTS) $(module_test_LDADD) $(LIBS)
-node-test$(EXEEXT): $(node_test_OBJECTS) $(node_test_DEPENDENCIES) 
-       @rm -f node-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(node_test_OBJECTS) $(node_test_LDADD) $(LIBS)
-onceinit$(EXEEXT): $(onceinit_OBJECTS) $(onceinit_DEPENDENCIES) 
+onceinit$(EXEEXT): $(onceinit_OBJECTS) $(onceinit_DEPENDENCIES) $(EXTRA_onceinit_DEPENDENCIES) 
        @rm -f onceinit$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(onceinit_OBJECTS) $(onceinit_LDADD) $(LIBS)
-patterntest$(EXEEXT): $(patterntest_OBJECTS) $(patterntest_DEPENDENCIES) 
-       @rm -f patterntest$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(patterntest_OBJECTS) $(patterntest_LDADD) $(LIBS)
-qsort-test$(EXEEXT): $(qsort_test_OBJECTS) $(qsort_test_DEPENDENCIES) 
+qsort-test$(EXEEXT): $(qsort_test_OBJECTS) $(qsort_test_DEPENDENCIES) $(EXTRA_qsort_test_DEPENDENCIES) 
        @rm -f qsort-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(qsort_test_OBJECTS) $(qsort_test_LDADD) $(LIBS)
-queue-test$(EXEEXT): $(queue_test_OBJECTS) $(queue_test_DEPENDENCIES) 
-       @rm -f queue-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(queue_test_OBJECTS) $(queue_test_LDADD) $(LIBS)
-regex-test$(EXEEXT): $(regex_test_OBJECTS) $(regex_test_DEPENDENCIES) 
-       @rm -f regex-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(regex_test_OBJECTS) $(regex_test_LDADD) $(LIBS)
-relation-test$(EXEEXT): $(relation_test_OBJECTS) $(relation_test_DEPENDENCIES) 
+relation-test$(EXEEXT): $(relation_test_OBJECTS) $(relation_test_DEPENDENCIES) $(EXTRA_relation_test_DEPENDENCIES) 
        @rm -f relation-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(relation_test_OBJECTS) $(relation_test_LDADD) $(LIBS)
-scannerapi$(EXEEXT): $(scannerapi_OBJECTS) $(scannerapi_DEPENDENCIES) 
-       @rm -f scannerapi$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(scannerapi_OBJECTS) $(scannerapi_LDADD) $(LIBS)
-sequence-test$(EXEEXT): $(sequence_test_OBJECTS) $(sequence_test_DEPENDENCIES) 
-       @rm -f sequence-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(sequence_test_OBJECTS) $(sequence_test_LDADD) $(LIBS)
-shell-test$(EXEEXT): $(shell_test_OBJECTS) $(shell_test_DEPENDENCIES) 
-       @rm -f shell-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(shell_test_OBJECTS) $(shell_test_LDADD) $(LIBS)
-slice-color$(EXEEXT): $(slice_color_OBJECTS) $(slice_color_DEPENDENCIES) 
+slice-color$(EXEEXT): $(slice_color_OBJECTS) $(slice_color_DEPENDENCIES) $(EXTRA_slice_color_DEPENDENCIES) 
        @rm -f slice-color$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(slice_color_OBJECTS) $(slice_color_LDADD) $(LIBS)
-slice-concurrent$(EXEEXT): $(slice_concurrent_OBJECTS) $(slice_concurrent_DEPENDENCIES) 
+slice-concurrent$(EXEEXT): $(slice_concurrent_OBJECTS) $(slice_concurrent_DEPENDENCIES) $(EXTRA_slice_concurrent_DEPENDENCIES) 
        @rm -f slice-concurrent$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(slice_concurrent_OBJECTS) $(slice_concurrent_LDADD) $(LIBS)
-slice-test$(EXEEXT): $(slice_test_OBJECTS) $(slice_test_DEPENDENCIES) 
+slice-test$(EXEEXT): $(slice_test_OBJECTS) $(slice_test_DEPENDENCIES) $(EXTRA_slice_test_DEPENDENCIES) 
        @rm -f slice-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(slice_test_OBJECTS) $(slice_test_LDADD) $(LIBS)
-slice-threadinit$(EXEEXT): $(slice_threadinit_OBJECTS) $(slice_threadinit_DEPENDENCIES) 
+slice-threadinit$(EXEEXT): $(slice_threadinit_OBJECTS) $(slice_threadinit_DEPENDENCIES) $(EXTRA_slice_threadinit_DEPENDENCIES) 
        @rm -f slice-threadinit$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(slice_threadinit_OBJECTS) $(slice_threadinit_LDADD) $(LIBS)
-slist-test$(EXEEXT): $(slist_test_OBJECTS) $(slist_test_DEPENDENCIES) 
-       @rm -f slist-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(slist_test_OBJECTS) $(slist_test_LDADD) $(LIBS)
-spawn-test$(EXEEXT): $(spawn_test_OBJECTS) $(spawn_test_DEPENDENCIES) 
+spawn-test$(EXEEXT): $(spawn_test_OBJECTS) $(spawn_test_DEPENDENCIES) $(EXTRA_spawn_test_DEPENDENCIES) 
        @rm -f spawn-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(spawn_test_OBJECTS) $(spawn_test_LDADD) $(LIBS)
-spawn-test-win32-gui$(EXEEXT): $(spawn_test_win32_gui_OBJECTS) $(spawn_test_win32_gui_DEPENDENCIES) 
+spawn-test-win32-gui$(EXEEXT): $(spawn_test_win32_gui_OBJECTS) $(spawn_test_win32_gui_DEPENDENCIES) $(EXTRA_spawn_test_win32_gui_DEPENDENCIES) 
        @rm -f spawn-test-win32-gui$(EXEEXT)
        $(AM_V_CCLD)$(spawn_test_win32_gui_LINK) $(spawn_test_win32_gui_OBJECTS) $(spawn_test_win32_gui_LDADD) $(LIBS)
-testgdate$(EXEEXT): $(testgdate_OBJECTS) $(testgdate_DEPENDENCIES) 
+testgdate$(EXEEXT): $(testgdate_OBJECTS) $(testgdate_DEPENDENCIES) $(EXTRA_testgdate_DEPENDENCIES) 
        @rm -f testgdate$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(testgdate_OBJECTS) $(testgdate_LDADD) $(LIBS)
-testgdateparser$(EXEEXT): $(testgdateparser_OBJECTS) $(testgdateparser_DEPENDENCIES) 
+testgdateparser$(EXEEXT): $(testgdateparser_OBJECTS) $(testgdateparser_DEPENDENCIES) $(EXTRA_testgdateparser_DEPENDENCIES) 
        @rm -f testgdateparser$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(testgdateparser_OBJECTS) $(testgdateparser_LDADD) $(LIBS)
-testglib$(EXEEXT): $(testglib_OBJECTS) $(testglib_DEPENDENCIES) 
+testglib$(EXEEXT): $(testglib_OBJECTS) $(testglib_DEPENDENCIES) $(EXTRA_testglib_DEPENDENCIES) 
        @rm -f testglib$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(testglib_OBJECTS) $(testglib_LDADD) $(LIBS)
-testingbase64$(EXEEXT): $(testingbase64_OBJECTS) $(testingbase64_DEPENDENCIES) 
-       @rm -f testingbase64$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(testingbase64_OBJECTS) $(testingbase64_LDADD) $(LIBS)
-thread-test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) 
+thread-test$(EXEEXT): $(thread_test_OBJECTS) $(thread_test_DEPENDENCIES) $(EXTRA_thread_test_DEPENDENCIES) 
        @rm -f thread-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(thread_test_OBJECTS) $(thread_test_LDADD) $(LIBS)
-threadpool-test$(EXEEXT): $(threadpool_test_OBJECTS) $(threadpool_test_DEPENDENCIES) 
+threadpool-test$(EXEEXT): $(threadpool_test_OBJECTS) $(threadpool_test_DEPENDENCIES) $(EXTRA_threadpool_test_DEPENDENCIES) 
        @rm -f threadpool-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(threadpool_test_OBJECTS) $(threadpool_test_LDADD) $(LIBS)
-timeloop$(EXEEXT): $(timeloop_OBJECTS) $(timeloop_DEPENDENCIES) 
+timeloop$(EXEEXT): $(timeloop_OBJECTS) $(timeloop_DEPENDENCIES) $(EXTRA_timeloop_DEPENDENCIES) 
        @rm -f timeloop$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(timeloop_OBJECTS) $(timeloop_LDADD) $(LIBS)
-timeloop-closure$(EXEEXT): $(timeloop_closure_OBJECTS) $(timeloop_closure_DEPENDENCIES) 
+timeloop-closure$(EXEEXT): $(timeloop_closure_OBJECTS) $(timeloop_closure_DEPENDENCIES) $(EXTRA_timeloop_closure_DEPENDENCIES) 
        @rm -f timeloop-closure$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(timeloop_closure_OBJECTS) $(timeloop_closure_LDADD) $(LIBS)
-tree-test$(EXEEXT): $(tree_test_OBJECTS) $(tree_test_DEPENDENCIES) 
-       @rm -f tree-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(tree_test_OBJECTS) $(tree_test_LDADD) $(LIBS)
-type-test$(EXEEXT): $(type_test_OBJECTS) $(type_test_DEPENDENCIES) 
+type-test$(EXEEXT): $(type_test_OBJECTS) $(type_test_DEPENDENCIES) $(EXTRA_type_test_DEPENDENCIES) 
        @rm -f type-test$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(type_test_OBJECTS) $(type_test_LDADD) $(LIBS)
-unicode-caseconv$(EXEEXT): $(unicode_caseconv_OBJECTS) $(unicode_caseconv_DEPENDENCIES) 
+unicode-caseconv$(EXEEXT): $(unicode_caseconv_OBJECTS) $(unicode_caseconv_DEPENDENCIES) $(EXTRA_unicode_caseconv_DEPENDENCIES) 
        @rm -f unicode-caseconv$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(unicode_caseconv_OBJECTS) $(unicode_caseconv_LDADD) $(LIBS)
-unicode-collate$(EXEEXT): $(unicode_collate_OBJECTS) $(unicode_collate_DEPENDENCIES) 
+unicode-collate$(EXEEXT): $(unicode_collate_OBJECTS) $(unicode_collate_DEPENDENCIES) $(EXTRA_unicode_collate_DEPENDENCIES) 
        @rm -f unicode-collate$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(unicode_collate_OBJECTS) $(unicode_collate_LDADD) $(LIBS)
-unicode-encoding$(EXEEXT): $(unicode_encoding_OBJECTS) $(unicode_encoding_DEPENDENCIES) 
+unicode-encoding$(EXEEXT): $(unicode_encoding_OBJECTS) $(unicode_encoding_DEPENDENCIES) $(EXTRA_unicode_encoding_DEPENDENCIES) 
        @rm -f unicode-encoding$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(unicode_encoding_OBJECTS) $(unicode_encoding_LDADD) $(LIBS)
-unicode-normalize$(EXEEXT): $(unicode_normalize_OBJECTS) $(unicode_normalize_DEPENDENCIES) 
+unicode-normalize$(EXEEXT): $(unicode_normalize_OBJECTS) $(unicode_normalize_DEPENDENCIES) $(EXTRA_unicode_normalize_DEPENDENCIES) 
        @rm -f unicode-normalize$(EXEEXT)
        $(AM_V_CCLD)$(LINK) $(unicode_normalize_OBJECTS) $(unicode_normalize_LDADD) $(LIBS)
-uri-test$(EXEEXT): $(uri_test_OBJECTS) $(uri_test_DEPENDENCIES) 
-       @rm -f uri-test$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(uri_test_OBJECTS) $(uri_test_LDADD) $(LIBS)
-utf8-pointer$(EXEEXT): $(utf8_pointer_OBJECTS) $(utf8_pointer_DEPENDENCIES) 
-       @rm -f utf8-pointer$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(utf8_pointer_OBJECTS) $(utf8_pointer_LDADD) $(LIBS)
-utf8-validate$(EXEEXT): $(utf8_validate_OBJECTS) $(utf8_validate_DEPENDENCIES) 
-       @rm -f utf8-validate$(EXEEXT)
-       $(AM_V_CCLD)$(LINK) $(utf8_validate_OBJECTS) $(utf8_validate_LDADD) $(LIBS)
 
 mostlyclean-compile:
        -rm -f *.$(OBJEXT)
@@ -1077,114 +901,85 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assert-msg-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asyncqueue-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/atomic-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/base64-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bit-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bookmarkfile-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/checksum-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/child-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/completion-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cxx-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/date-test.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datetime.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dirname-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/env-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errorcheck-mutex-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gio-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iochannel-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoduletestplugin_a.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmoduletestplugin_b.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainloop-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mapping-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-collect.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-escape-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/markup-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/memchunks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/module-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/onceinit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterntest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qsort-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/queue-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/regex-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relation-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scannerapi.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sequence-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-color.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-concurrent.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slice-threadinit.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/slist-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn-test-win32-gui.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testgdate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testgdateparser.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testglib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testingbase64.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/thread-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threadpool-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timeloop-closure.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timeloop.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tree-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/type-test.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode-caseconv.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode-collate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode-encoding.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unicode-normalize.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uri-test.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8-pointer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utf8-validate.Po@am__quote@
 
 .C.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_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@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@ $(CXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
 .C.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_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@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@ $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
 .C.lo:
 @am__fastdepCXX_TRUE@  $(AM_V_CXX)$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCXX_TRUE@  $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCXX_FALSE@ $(AM_V_CXX) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@     source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@     $(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@     DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $<
+@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
 
 .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_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@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@  $(COMPILE) -c $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c $<
 
 .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_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@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@  $(COMPILE) -c `$(CYGPATH_W) '$<'`
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(LTCOMPILE) -c -o $@ $<
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
 mostlyclean-libtool:
        -rm -f *.lo
@@ -1408,14 +1203,15 @@ check-TESTS: $(TESTS)
          fi; \
          dashes=`echo "$$dashes" | sed s/./=/g`; \
          if test "$$failed" -eq 0; then \
-           echo "$$grn$$dashes"; \
+           col="$$grn"; \
          else \
-           echo "$$red$$dashes"; \
+           col="$$red"; \
          fi; \
-         echo "$$banner"; \
-         test -z "$$skipped" || echo "$$skipped"; \
-         test -z "$$report" || echo "$$report"; \
-         echo "$$dashes$$std"; \
+         echo "$${col}$$dashes$${std}"; \
+         echo "$${col}$$banner$${std}"; \
+         test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+         test -z "$$report" || echo "$${col}$$report$${std}"; \
+         echo "$${col}$$dashes$${std}"; \
          test "$$failed" -eq 0; \
        else :; fi
 
@@ -1497,10 +1293,15 @@ install-am: all-am
 
 installcheck: installcheck-recursive
 install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+       if test -z '$(STRIP)'; then \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+             install; \
+       else \
+         $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+           install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+           "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+       fi
 mostlyclean-generic:
 
 clean-generic:
@@ -1607,13 +1408,17 @@ uninstall-am:
 ### testing rules
 
 # test: run all tests in cwd and subdirs
-test:  ${TEST_PROGS}
-@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
+test: test-nonrecursive
 @OS_UNIX_TRUE@ @ for subdir in $(SUBDIRS) . ; do \
 @OS_UNIX_TRUE@     test "$$subdir" = "." -o "$$subdir" = "po" || \
 @OS_UNIX_TRUE@     ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
 @OS_UNIX_TRUE@   done
 
+# test-nonrecursive: run tests only in cwd
+@OS_UNIX_TRUE@test-nonrecursive: ${TEST_PROGS}
+@OS_UNIX_TRUE@ @test -z "${TEST_PROGS}" || G_DEBUG=gc-friendly MALLOC_CHECK_=2 MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) ${GTESTER} --verbose ${TEST_PROGS}
+@OS_UNIX_FALSE@test-nonrecursive:
+
 # test-report: run tests in subdirs and generate report
 # perf-report: run tests in subdirs with -m perf and generate report
 # full-report: like test-report: with -m perf and -m slow
@@ -1635,13 +1440,23 @@ test-report perf-report full-report:    ${TEST_PROGS}
            GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
            ignore_logdir=false ; \
          fi ; \
+         if test -d "$(top_srcdir)/.git" ; then \
+           REVISION=`git describe` ; \
+         else \
+           REVISION=$(VERSION) ; \
+         fi ; \
          for subdir in $(SUBDIRS) . ; do \
            test "$$subdir" = "." -o "$$subdir" = "po" || \
            ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
          done ; \
          $$ignore_logdir || { \
-           echo '<?xml version="1.0"?>' > $@.xml ; \
-           echo '<report-collection>'  >> $@.xml ; \
+           echo '<?xml version="1.0"?>'              > $@.xml ; \
+           echo '<report-collection>'               >> $@.xml ; \
+           echo '<info>'                            >> $@.xml ; \
+           echo '  <package>$(PACKAGE)</package>'   >> $@.xml ; \
+           echo '  <version>$(VERSION)</version>'   >> $@.xml ; \
+           echo "  <revision>$$REVISION</revision>" >> $@.xml ; \
+           echo '</info>'                           >> $@.xml ; \
            for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
              sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
            done ; \
@@ -1650,9 +1465,30 @@ test-report perf-report full-report:     ${TEST_PROGS}
            rm -rf "$$GTESTER_LOGDIR"/ ; \
            ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
          }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
+.PHONY: test test-report perf-report full-report test-nonrecursive
+
+.PHONY: lcov genlcov lcov-clean
+# use recursive makes in order to ignore errors during check
+lcov:
+       -$(MAKE) $(AM_MAKEFLAGS) -k check
+       $(MAKE) $(AM_MAKEFLAGS) genlcov
+
+# we have to massage the lcov.info file slightly to hide the effect of libtool
+# placing the objects files in the .libs/ directory separate from the *.c
+# we also have to delete tests/.libs/libmoduletestplugin_*.gcda
+genlcov:
+       rm -f $(top_builddir)/tests/.libs/libmoduletestplugin_*.gcda
+       $(LTP) --directory $(top_builddir) --capture --output-file glib-lcov.info --test-name GLIB_PERF --no-checksum --compat-libtool
+       LANG=C $(LTP_GENHTML) --prefix $(top_builddir) --output-directory glib-lcov --title "GLib Code Coverage" --legend --show-details glib-lcov.info
+       @echo "file://$(abs_top_builddir)/glib-lcov/index.html"
+
+lcov-clean:
+       -$(LTP) --directory $(top_builddir) -z
+       -rm -rf glib-lcov.info glib-lcov
+       -find -name '*.gcda' -print | xargs rm
+
+# run tests in cwd as part of make check
+check-local: test-nonrecursive
 
 @PLATFORM_WIN32_TRUE@module-test.exp: module-test.o
 @PLATFORM_WIN32_TRUE@  dlltool --output-exp module-test.exp module-test.o
@@ -1662,15 +1498,9 @@ dist-hook: $(BUILT_EXTRA_DIST)
        for f in $$files; do                                    \
          if test -f $$f; then d=.; else d=$(srcdir); fi;       \
          cp $$d/$$f $(distdir) || exit 1; done
-       mkdir $(distdir)/markups;                               \
-       for f in $(srcdir)/markups/* ; do                       \
-         cp $$f $(distdir)/markups; done 
        mkdir $(distdir)/collate;                               \
        for f in $(srcdir)/collate/* ; do                       \
           if test -f $$f; then cp $$f $(distdir)/collate; fi; done
-       mkdir $(distdir)/bookmarks;                             \
-       for f in $(srcdir)/bookmarks/* ; do                     \
-         cp $$f $(distdir)/bookmarks; done 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.