tests_data_sack_CFLAGS = $(AM_CFLAGS)
tests_libpspp_line_reader_test_SOURCES = tests/libpspp/line-reader-test.c
-tests_libpspp_line_reader_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_line_reader_test_LDADD = src/libpspp-core.la
tests_libpspp_ll_test_SOURCES = \
src/libpspp/ll.c \
tests_libpspp_encoding_guesser_test_SOURCES = \
tests/libpspp/encoding-guesser-test.c
-tests_libpspp_encoding_guesser_test_LDADD = \
- src/libpspp/liblibpspp.la \
- gl/libgl.la
+tests_libpspp_encoding_guesser_test_LDADD = src/libpspp-core.la
tests_libpspp_heap_test_SOURCES = \
tests/libpspp/heap-test.c
tests_libpspp_hmapx_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
tests_libpspp_i18n_test_SOURCES = tests/libpspp/i18n-test.c
-tests_libpspp_i18n_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_i18n_test_LDADD = src/libpspp-core.la
tests_libpspp_abt_test_SOURCES = \
src/libpspp/abt.c \
tests_libpspp_stringi_map_test_SOURCES = \
tests/libpspp/stringi-map-test.c
tests_libpspp_stringi_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_stringi_map_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_stringi_map_test_LDADD = src/libpspp-core.la
tests_libpspp_string_set_test_SOURCES = \
src/libpspp/hash-functions.c \
tests_libpspp_stringi_set_test_SOURCES = \
tests/libpspp/stringi-set-test.c
tests_libpspp_stringi_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
-tests_libpspp_stringi_set_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_stringi_set_test_LDADD = src/libpspp-core.la
tests_libpspp_tower_test_SOURCES = \
tests/libpspp/tower-test.c
tests_libpspp_tower_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
-tests_libpspp_u8_istream_test_LDADD = src/libpspp/liblibpspp.la gl/libgl.la
+tests_libpspp_u8_istream_test_LDADD = src/libpspp-core.la
tests_libpspp_sparse_array_test_SOURCES = \
tests/libpspp/sparse-array-test.c