59 files changed, 123 insertions, 229 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index fd3252dc..43e92f71 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,229 +1 @@
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-DCUR_WORKING_DIR='"@BASE_CUR_WORKING_DIR@/test"'
-
-AM_CFLAGS = @LIBFLTK_CFLAGS@
-AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
-
-noinst_PROGRAMS = \
-	dw-anchors-test \
-	dw-example \
-	dw-find-test \
-	dw-float-test \
-	dw-links \
-	dw-links2 \
-	dw-image-background \
-	dw-images-simple \
-	dw-images-scaled \
-	dw-images-scaled2 \
-	dw-lists \
-	dw-simple-container-test \
-	dw-table-aligned \
-	dw-table \
-	dw-border-test \
-	dw-imgbuf-mem-test \
-	dw-resource-test \
-	dw-ui-test \
-	containers \
-	identity \
-	shapes \
-	cookies \
-	liang \
-	trie \
-	notsosimplevector \
-	unicode-test
-
-dw_anchors_test_SOURCES = dw_anchors_test.cc
-dw_anchors_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_example_SOURCES = dw_example.cc
-dw_example_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_find_test_SOURCES = dw_find_test.cc
-dw_find_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_float_test_SOURCES = dw_float_test.cc
-dw_float_test_LDADD = \
-	../dw/libDw-widgets.a \
-	../dw/libDw-fltk.a \
-	../dw/libDw-core.a \
-	../lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_links_SOURCES = dw_links.cc
-dw_links_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_links2_SOURCES = dw_links2.cc
-dw_links2_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_image_background_SOURCES = dw_image_background.cc
-dw_image_background_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_images_simple_SOURCES = dw_images_simple.cc
-dw_images_simple_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_images_scaled_SOURCES = dw_images_scaled.cc
-dw_images_scaled_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_images_scaled2_SOURCES = dw_images_scaled2.cc
-dw_images_scaled2_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_lists_SOURCES = dw_lists.cc
-dw_lists_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_simple_container_test_SOURCES = \
-	dw_simple_container.hh \
-	dw_simple_container.cc \
-	dw_simple_container_test.cc
-dw_simple_container_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@
-
-dw_table_aligned_SOURCES = dw_table_aligned.cc
-dw_table_aligned_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_table_SOURCES = dw_table.cc
-dw_table_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_border_test_SOURCES = dw_border_test.cc
-dw_border_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-
-dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
-dw_imgbuf_mem_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_resource_test_SOURCES = dw_resource_test.cc
-dw_resource_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-dw_ui_test_SOURCES = \
-	dw_ui_test.cc \
-	form.cc \
-	form.hh
-dw_ui_test_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-shapes_SOURCES = shapes.cc
-shapes_LDADD = \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a
-
-containers_SOURCES = containers.cc
-containers_LDADD = $(top_builddir)/lout/liblout.a
-
-identity_SOURCES = identity.cc
-identity_LDADD = $(top_builddir)/lout/liblout.a
-
-cookies_SOURCES = cookies.c
-cookies_LDADD = \
-	$(top_builddir)/dpip/libDpip.a \
-	$(top_builddir)/dlib/libDlib.a
-
-liang_SOURCES = liang.cc
-
-liang_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-trie_SOURCES = trie.cc
-
-trie_LDADD = \
-	$(top_builddir)/dw/libDw-widgets.a \
-	$(top_builddir)/dw/libDw-fltk.a \
-	$(top_builddir)/dw/libDw-core.a \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
-
-notsosimplevector_SOURCES = notsosimplevector.cc
-
-notsosimplevector_LDADD = $(top_builddir)/lout/liblout.a
-
-unicode_test_SOURCES = unicode_test.cc
-
-unicode_test_LDADD = \
-	$(top_builddir)/lout/liblout.a \
-	@LIBFLTK_LIBS@ @LIBX11_LIBS@
+SUBDIRS = unit dw
diff --git a/test/dw/Makefile.am b/test/dw/Makefile.am
new file mode 100644
index 00000000..39bb8440
--- /dev/null
+++ b/test/dw/Makefile.am
@@ -0,0 +1,63 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-DCUR_WORKING_DIR='"@BASE_CUR_WORKING_DIR@/test"'
+
+AM_CFLAGS = @LIBFLTK_CFLAGS@
+AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+
+LDADD = \
+	$(top_builddir)/dw/libDw-widgets.a \
+	$(top_builddir)/dw/libDw-fltk.a \
+	$(top_builddir)/dw/libDw-core.a \
+	$(top_builddir)/lout/liblout.a \
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
+
+check_PROGRAMS = \
+	dw-anchors-test \
+	dw-border-test \
+	dw-example \
+	dw-find-test \
+	dw-float-test \
+	dw-image-background \
+	dw-images-scaled \
+	dw-images-scaled2 \
+	dw-images-simple \
+	dw-imgbuf-mem-test \
+	dw-links \
+	dw-links2 \
+	dw-lists \
+	dw-resource-test \
+	dw-simple-container-test \
+	dw-table \
+	dw-table-aligned \
+	dw-ui-test
+
+# Don't run most tests yet, as they require graphical display and human
+# intervention.
+TESTS = \
+	dw-imgbuf-mem-test
+
+dw_anchors_test_SOURCES = dw_anchors_test.cc
+dw_border_test_SOURCES = dw_border_test.cc
+dw_example_SOURCES = dw_example.cc
+dw_find_test_SOURCES = dw_find_test.cc
+dw_float_test_SOURCES = dw_float_test.cc
+dw_links_SOURCES = dw_links.cc
+dw_links2_SOURCES = dw_links2.cc
+dw_image_background_SOURCES = dw_image_background.cc
+dw_images_simple_SOURCES = dw_images_simple.cc
+dw_images_scaled_SOURCES = dw_images_scaled.cc
+dw_images_scaled2_SOURCES = dw_images_scaled2.cc
+dw_lists_SOURCES = dw_lists.cc
+dw_simple_container_test_SOURCES = \
+	dw_simple_container.hh \
+	dw_simple_container.cc \
+	dw_simple_container_test.cc
+dw_table_aligned_SOURCES = dw_table_aligned.cc
+dw_table_SOURCES = dw_table.cc
+dw_imgbuf_mem_test_SOURCES = dw_imgbuf_mem_test.cc
+dw_resource_test_SOURCES = dw_resource_test.cc
+dw_ui_test_SOURCES = \
+	dw_ui_test.cc \
+	form.cc \
+	form.hh
diff --git a/test/dw_anchors_test.cc b/test/dw/dw_anchors_test.cc
index d7201053..d7201053 100644
--- a/test/dw_anchors_test.cc
+++ b/test/dw/dw_anchors_test.cc
diff --git a/test/dw_border_test.cc b/test/dw/dw_border_test.cc
index ec5a09a5..ec5a09a5 100644
--- a/test/dw_border_test.cc
+++ b/test/dw/dw_border_test.cc
diff --git a/test/dw_example.cc b/test/dw/dw_example.cc
index 259650cf..259650cf 100644
--- a/test/dw_example.cc
+++ b/test/dw/dw_example.cc
diff --git a/test/dw_find_test.cc b/test/dw/dw_find_test.cc
index 5bddda10..5bddda10 100644
--- a/test/dw_find_test.cc
+++ b/test/dw/dw_find_test.cc
diff --git a/test/dw_float_test.cc b/test/dw/dw_float_test.cc
index 807002b2..807002b2 100644
--- a/test/dw_float_test.cc
+++ b/test/dw/dw_float_test.cc
diff --git a/test/dw_image_background.cc b/test/dw/dw_image_background.cc
index 14cb7b97..14cb7b97 100644
--- a/test/dw_image_background.cc
+++ b/test/dw/dw_image_background.cc
diff --git a/test/dw_images_scaled.cc b/test/dw/dw_images_scaled.cc
index e31abfaa..e31abfaa 100644
--- a/test/dw_images_scaled.cc
+++ b/test/dw/dw_images_scaled.cc
diff --git a/test/dw_images_scaled2.cc b/test/dw/dw_images_scaled2.cc
index 01a55bcf..01a55bcf 100644
--- a/test/dw_images_scaled2.cc
+++ b/test/dw/dw_images_scaled2.cc
diff --git a/test/dw_images_simple.cc b/test/dw/dw_images_simple.cc
index 361ede68..361ede68 100644
--- a/test/dw_images_simple.cc
+++ b/test/dw/dw_images_simple.cc
diff --git a/test/dw_imgbuf_mem_test.cc b/test/dw/dw_imgbuf_mem_test.cc
index e2532ea7..e2532ea7 100644
--- a/test/dw_imgbuf_mem_test.cc
+++ b/test/dw/dw_imgbuf_mem_test.cc
diff --git a/test/dw_links.cc b/test/dw/dw_links.cc
index 79ccbb54..79ccbb54 100644
--- a/test/dw_links.cc
+++ b/test/dw/dw_links.cc
diff --git a/test/dw_links2.cc b/test/dw/dw_links2.cc
index acb095f3..acb095f3 100644
--- a/test/dw_links2.cc
+++ b/test/dw/dw_links2.cc
diff --git a/test/dw_lists.cc b/test/dw/dw_lists.cc
index 2aa0abb7..2aa0abb7 100644
--- a/test/dw_lists.cc
+++ b/test/dw/dw_lists.cc
diff --git a/test/dw_resource_test.cc b/test/dw/dw_resource_test.cc
index e8a8b227..e8a8b227 100644
--- a/test/dw_resource_test.cc
+++ b/test/dw/dw_resource_test.cc
diff --git a/test/dw_simple_container.cc b/test/dw/dw_simple_container.cc
index e7fa563c..e7fa563c 100644
--- a/test/dw_simple_container.cc
+++ b/test/dw/dw_simple_container.cc
diff --git a/test/dw_simple_container.hh b/test/dw/dw_simple_container.hh
index bd40b41e..bd40b41e 100644
--- a/test/dw_simple_container.hh
+++ b/test/dw/dw_simple_container.hh
diff --git a/test/dw_simple_container_test.cc b/test/dw/dw_simple_container_test.cc
index 83d0a77f..83d0a77f 100644
--- a/test/dw_simple_container_test.cc
+++ b/test/dw/dw_simple_container_test.cc
diff --git a/test/dw_table.cc b/test/dw/dw_table.cc
index 9bec1a09..9bec1a09 100644
--- a/test/dw_table.cc
+++ b/test/dw/dw_table.cc
diff --git a/test/dw_table_aligned.cc b/test/dw/dw_table_aligned.cc
index bef3d521..bef3d521 100644
--- a/test/dw_table_aligned.cc
+++ b/test/dw/dw_table_aligned.cc
diff --git a/test/dw_ui_test.cc b/test/dw/dw_ui_test.cc
index f24cc9b9..f24cc9b9 100644
--- a/test/dw_ui_test.cc
+++ b/test/dw/dw_ui_test.cc
diff --git a/test/form.cc b/test/dw/form.cc
index 82938a16..82938a16 100644
--- a/test/form.cc
+++ b/test/dw/form.cc
diff --git a/test/form.hh b/test/dw/form.hh
index 6235c6cc..6235c6cc 100644
--- a/test/form.hh
+++ b/test/dw/form.hh
diff --git a/test/Anna_Karenina_1.html b/test/html/Anna_Karenina_1.html
index 6deb470d..6deb470d 100644
--- a/test/Anna_Karenina_1.html
+++ b/test/html/Anna_Karenina_1.html
diff --git a/test/KHM1-shy.html b/test/html/KHM1-shy.html
index b3924409..b3924409 100644
--- a/test/KHM1-shy.html
+++ b/test/html/KHM1-shy.html
diff --git a/test/KHM1.html b/test/html/KHM1.html
index c1665f00..c1665f00 100644
--- a/test/KHM1.html
+++ b/test/html/KHM1.html
diff --git a/test/KHM1b.html b/test/html/KHM1b.html
index adefc1ef..adefc1ef 100644
--- a/test/KHM1b.html
+++ b/test/html/KHM1b.html
diff --git a/test/KHM1c.html b/test/html/KHM1c.html
index 3f3271fc..3f3271fc 100644
--- a/test/KHM1c.html
+++ b/test/html/KHM1c.html
diff --git a/test/anchors.html b/test/html/anchors.html
index c04fdddc..c04fdddc 100644
--- a/test/anchors.html
+++ b/test/html/anchors.html
diff --git a/test/doxygen.html b/test/html/doxygen.html
index 24d7326e..24d7326e 100644
--- a/test/doxygen.html
+++ b/test/html/doxygen.html
diff --git a/test/floats-and-absolute.html b/test/html/floats-and-absolute.html
index 658ab16b..658ab16b 100644
--- a/test/floats-and-absolute.html
+++ b/test/html/floats-and-absolute.html
diff --git a/test/floats-and-margins.html b/test/html/floats-and-margins.html
index ac64b9e1..ac64b9e1 100644
--- a/test/floats-and-margins.html
+++ b/test/html/floats-and-margins.html
diff --git a/test/floats-table.html b/test/html/floats-table.html
index 77d77563..77d77563 100644
--- a/test/floats-table.html
+++ b/test/html/floats-table.html
diff --git a/test/floats-worm.html b/test/html/floats-worm.html
index 9e050933..9e050933 100644
--- a/test/floats-worm.html
+++ b/test/html/floats-worm.html
diff --git a/test/floats1.html b/test/html/floats1.html
index eae30c4a..eae30c4a 100644
--- a/test/floats1.html
+++ b/test/html/floats1.html
diff --git a/test/floats2.html b/test/html/floats2.html
index b7978706..b7978706 100644
--- a/test/floats2.html
+++ b/test/html/floats2.html
diff --git a/test/floats3.html b/test/html/floats3.html
index 4d57e453..4d57e453 100644
--- a/test/floats3.html
+++ b/test/html/floats3.html
diff --git a/test/floats4.html b/test/html/floats4.html
index 965ed68d..965ed68d 100644
--- a/test/floats4.html
+++ b/test/html/floats4.html
diff --git a/test/floats5.html b/test/html/floats5.html
index c8c6564a..c8c6564a 100644
--- a/test/floats5.html
+++ b/test/html/floats5.html
diff --git a/test/hyphenate-nbsp.html b/test/html/hyphenate-nbsp.html
index 1bfd9a25..1bfd9a25 100644
--- a/test/hyphenate-nbsp.html
+++ b/test/html/hyphenate-nbsp.html
diff --git a/test/hyphens-etc.html b/test/html/hyphens-etc.html
index cbc55b79..cbc55b79 100644
--- a/test/hyphens-etc.html
+++ b/test/html/hyphens-etc.html
diff --git a/test/lang.html b/test/html/lang.html
index c5a6f562..c5a6f562 100644
--- a/test/lang.html
+++ b/test/html/lang.html
diff --git a/test/table-1.html b/test/html/table-1.html
index 58635d2c..58635d2c 100644
--- a/test/table-1.html
+++ b/test/html/table-1.html
diff --git a/test/table-h1.html b/test/html/table-h1.html
index fb82c3ec..fb82c3ec 100644
--- a/test/table-h1.html
+++ b/test/html/table-h1.html
diff --git a/test/table-narrow.html b/test/html/table-narrow.html
index ad28417d..ad28417d 100644
--- a/test/table-narrow.html
+++ b/test/html/table-narrow.html
diff --git a/test/table-thead-tfoot.html b/test/html/table-thead-tfoot.html
index 66be2710..66be2710 100644
--- a/test/table-thead-tfoot.html
+++ b/test/html/table-thead-tfoot.html
diff --git a/test/white-space.html b/test/html/white-space.html
index abd61c41..abd61c41 100644
--- a/test/white-space.html
+++ b/test/html/white-space.html
diff --git a/test/unit/Makefile.am b/test/unit/Makefile.am
new file mode 100644
index 00000000..41bc56df
--- /dev/null
+++ b/test/unit/Makefile.am
@@ -0,0 +1,59 @@
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-DCUR_SRC_DIR="\"$(srcdir)\"" \
+	-DCUR_WORKING_DIR='"@BASE_CUR_WORKING_DIR@/test/unit"'
+
+AM_CFLAGS = @LIBFLTK_CFLAGS@
+AM_CXXFLAGS = @LIBFLTK_CXXFLAGS@
+
+LDADD = \
+	$(top_builddir)/lout/liblout.a
+
+TESTS = \
+	containers \
+	identity \
+	liang \
+	notsosimplevector \
+	shapes
+
+# Some test are broken, so only build them
+check_PROGRAMS = $(TESTS) \
+	cookies \
+	trie \
+	unicode_test
+
+containers_SOURCES = containers.cc
+notsosimplevector_SOURCES = notsosimplevector.cc
+hyphenation_LDADD = \
+	$(top_builddir)/dw/libDw-widgets.a \
+	$(top_builddir)/dw/libDw-fltk.a \
+	$(top_builddir)/dw/libDw-core.a \
+	$(top_builddir)/lout/liblout.a \
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
+identity_SOURCES = identity.cc
+cookies_SOURCES = cookies.c
+cookies_LDADD = \
+	$(top_builddir)/dpip/libDpip.a \
+	$(top_builddir)/dlib/libDlib.a
+shapes_SOURCES = shapes.cc
+shapes_LDADD = \
+	$(top_builddir)/dw/libDw-core.a \
+	$(top_builddir)/lout/liblout.a
+unicode_test_SOURCES = unicode_test.cc
+unicode_test_LDADD = \
+	$(top_builddir)/lout/liblout.a \
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
+liang_SOURCES = liang.cc
+liang_LDADD = \
+	$(top_builddir)/dw/libDw-widgets.a \
+	$(top_builddir)/dw/libDw-fltk.a \
+	$(top_builddir)/dw/libDw-core.a \
+	$(top_builddir)/lout/liblout.a \
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
+trie_SOURCES = trie.cc
+trie_LDADD = \
+	$(top_builddir)/dw/libDw-widgets.a \
+	$(top_builddir)/dw/libDw-fltk.a \
+	$(top_builddir)/dw/libDw-core.a \
+	$(top_builddir)/lout/liblout.a \
+	@LIBFLTK_LIBS@ @LIBX11_LIBS@
diff --git a/test/containers.cc b/test/unit/containers.cc
index af317d7e..af317d7e 100644
--- a/test/containers.cc
+++ b/test/unit/containers.cc
diff --git a/test/cookies.c b/test/unit/cookies.c
index eaa0f59d..eaa0f59d 100644
--- a/test/cookies.c
+++ b/test/unit/cookies.c
diff --git a/test/hyph-de-1996.pat b/test/unit/hyph-de.pat
index 302951de..302951de 100644
--- a/test/hyph-de-1996.pat
+++ b/test/unit/hyph-de.pat
diff --git a/test/hyph-en-us.pat b/test/unit/hyph-en-us.pat
index 7d54d034..7d54d034 100644
--- a/test/hyph-en-us.pat
+++ b/test/unit/hyph-en-us.pat
diff --git a/test/identity.cc b/test/unit/identity.cc
index a1a136eb..a1a136eb 100644
--- a/test/identity.cc
+++ b/test/unit/identity.cc
diff --git a/test/liang.cc b/test/unit/liang.cc
index ee3f8e9e..ee3f8e9e 100644
--- a/test/liang.cc
+++ b/test/unit/liang.cc
diff --git a/test/notsosimplevector.cc b/test/unit/notsosimplevector.cc
index d41288fb..d41288fb 100644
--- a/test/notsosimplevector.cc
+++ b/test/unit/notsosimplevector.cc
diff --git a/test/shapes.cc b/test/unit/shapes.cc
index 30aa7d81..30aa7d81 100644
--- a/test/shapes.cc
+++ b/test/unit/shapes.cc
diff --git a/test/trie.cc b/test/unit/trie.cc
index 41b56c70..41b56c70 100644
--- a/test/trie.cc
+++ b/test/unit/trie.cc
diff --git a/test/unicode_test.cc b/test/unit/unicode_test.cc
index 7c079305..7c079305 100644
--- a/test/unicode_test.cc
+++ b/test/unit/unicode_test.cc