tests: build convenience library for common utilities.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c3d4666..c6f7317 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,34 +44,41 @@ endif
 test_codecs_source_c   = test-mpeg2.c test-h264.c test-vc1.c test-jpeg.c
 test_codecs_source_h   = $(test_codecs_source_c:%.c=%.h)
 
+test_utils_source_c    = image.c
+test_utils_source_h    = image.h
+
+noinst_LTLIBRARIES     = libutils.la
+libutils_la_SOURCES    = $(test_utils_source_c)
+libutils_la_CFLAGS     = $(TEST_CFLAGS)
+
 test_decode_SOURCES    = test-decode.c $(test_codecs_source_c)
 test_decode_CFLAGS     = $(TEST_CFLAGS)
-test_decode_LDADD      = $(TEST_LIBS)
+test_decode_LDADD      = libutils.la $(TEST_LIBS)
 
 test_display_SOURCES   = test-display.c
 test_display_CFLAGS    = $(TEST_CFLAGS)
-test_display_LDADD     = $(TEST_LIBS)
+test_display_LDADD     = libutils.la $(TEST_LIBS)
 
 test_surfaces_SOURCES  = test-surfaces.c
 test_surfaces_CFLAGS   = $(TEST_CFLAGS)
-test_surfaces_LDADD    = $(TEST_LIBS)
+test_surfaces_LDADD    = libutils.la $(TEST_LIBS)
 
 test_subpicture_SOURCES = test-subpicture.c test-mpeg2.c test-subpicture-data.c
 test_subpicture_CFLAGS  = $(TEST_CFLAGS)
-test_subpicture_LDADD   = $(TEST_LIBS)
+test_subpicture_LDADD   = libutils.la $(TEST_LIBS)
 
-test_windows_SOURCES   = test-windows.c image.c
+test_windows_SOURCES   = test-windows.c
 test_windows_CFLAGS    = $(TEST_CFLAGS)
-test_windows_LDADD     = $(TEST_LIBS)
+test_windows_LDADD     = libutils.la $(TEST_LIBS)
 
-test_textures_SOURCES  = test-textures.c image.c
+test_textures_SOURCES  = test-textures.c
 test_textures_CFLAGS   = $(TEST_CFLAGS)
-test_textures_LDADD    = $(TEST_LIBS)
+test_textures_LDADD    = libutils.la $(TEST_LIBS)
 
 EXTRA_DIST = \
-       image.h                 \
        test-decode.h           \
        test-subpicture-data.h  \
+       $(test_utils_source_h)  \
        $(test_codecs_source_c) \
        $(test_codecs_source_h) \
        $(NULL)