Use greater-than-or-equal to sign instead of '>='.

[pspp] / tests / automake.mk

diff --git a/tests/automake.mk b/tests/automake.mk
index 7d4afef7071fa4fb6778292ad3e3b3f6fb10d3ea..dceb82f74be869328cb15ba222d56599b2d9c22d 100644 (file)
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -63,6 +63,7 @@ tests_libpspp_heap_test_SOURCES = \
        src/libpspp/temp-file.c \
        tests/libpspp/heap-test.c
 tests_libpspp_heap_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_heap_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_hmap_test_SOURCES = \
        src/libpspp/hmap.c \
@@ -101,6 +102,7 @@ tests_libpspp_range_set_test_SOURCES = \
        src/libpspp/temp-file.c \
        tests/libpspp/range-set-test.c
 tests_libpspp_range_set_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_range_set_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_str_test_SOURCES = \
        tests/libpspp/str-test.c
@@ -113,6 +115,7 @@ tests_libpspp_string_map_test_SOURCES = \
        src/libpspp/string-set.c \
        tests/libpspp/string-map-test.c
 tests_libpspp_string_map_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_string_map_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_stringi_map_test_SOURCES = \
        src/libpspp/hash-functions.c \
@@ -125,6 +128,7 @@ tests_libpspp_stringi_map_test_SOURCES = \
        src/libpspp/temp-file.c \
        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/libpspp.la gl/libgl.la
 
 tests_libpspp_string_set_test_SOURCES = \
        src/libpspp/hash-functions.c \
@@ -142,6 +146,7 @@ tests_libpspp_stringi_set_test_SOURCES = \
        src/libpspp/temp-file.c \
        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/libpspp.la gl/libgl.la
 
 tests_libpspp_tower_test_SOURCES = \
        src/libpspp/abt.c \
@@ -150,6 +155,7 @@ tests_libpspp_tower_test_SOURCES = \
        src/libpspp/tower.c \
        tests/libpspp/tower-test.c
 tests_libpspp_tower_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_tower_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_u8_istream_test_SOURCES = tests/libpspp/u8-istream-test.c
 tests_libpspp_u8_istream_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
@@ -160,6 +166,7 @@ tests_libpspp_sparse_array_test_SOURCES = \
        tests/libpspp/sparse-array-test.c \
        src/libpspp/temp-file.c
 tests_libpspp_sparse_array_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_sparse_array_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_libpspp_sparse_xarray_test_SOURCES = \
        src/libpspp/argv-parser.c \
@@ -175,6 +182,7 @@ tests_libpspp_sparse_xarray_test_SOURCES = \
        src/libpspp/temp-file.c \
        tests/libpspp/sparse-xarray-test.c
 tests_libpspp_sparse_xarray_test_CPPFLAGS = $(AM_CPPFLAGS) -DASSERT_LEVEL=10
+tests_libpspp_sparse_xarray_test_LDADD = src/libpspp/libpspp.la gl/libgl.la
 
 tests_data_inexactify_SOURCES = tests/data/inexactify.c
 
@@ -201,6 +209,9 @@ tests_language_lexer_scan_test_SOURCES = \
        src/libpspp/temp-file.c \
        tests/language/lexer/scan-test.c
 tests_language_lexer_scan_test_CFLAGS = $(AM_CFLAGS)
+tests_language_lexer_scan_test_LDADD = \
+       src/libpspp/libpspp.la \
+       gl/libgl.la 
 
 check_PROGRAMS += tests/language/lexer/segment-test
 tests_language_lexer_segment_test_SOURCES = \
@@ -213,6 +224,9 @@ tests_language_lexer_segment_test_SOURCES = \
        src/libpspp/temp-file.c \
        tests/language/lexer/segment-test.c
 tests_language_lexer_segment_test_CFLAGS = $(AM_CFLAGS)
+tests_language_lexer_segment_test_LDADD = \
+       src/libpspp/libpspp.la \
+       gl/libgl.la 
 
 check_PROGRAMS += tests/libpspp/zip-test
 tests_libpspp_zip_test_SOURCES = \
@@ -224,6 +238,9 @@ tests_libpspp_zip_test_SOURCES = \
        src/libpspp/zip-writer.c \
        tests/libpspp/zip-test.c
 tests_libpspp_zip_test_CFLAGS = $(AM_CFLAGS)
+tests_libpspp_zip_test_LDADD = \
+       src/libpspp/libpspp.la \
+       gl/libgl.la 
 
 
 check_PROGRAMS += tests/output/render-test
@@ -244,7 +261,8 @@ EXTRA_DIST += \
        tests/data/num-out.expected.cmp.gz \
        tests/data/v13.sav \
        tests/data/v14.sav \
-        tests/language/data-io/Book1.gnm.unzipped
+        tests/language/data-io/Book1.gnm.unzipped \
+        tests/language/data-io/test.ods
 
 CLEANFILES += *.save pspp.* foo*
 
@@ -279,7 +297,7 @@ TESTSUITE_AT = \
        tests/language/data-io/data-reader.at \
        tests/language/data-io/dataset.at \
        tests/language/data-io/file-handle.at \
-       tests/language/data-io/get-data-gnm.at \
+       tests/language/data-io/get-data-spreadsheet.at \
        tests/language/data-io/get-data-psql.at \
        tests/language/data-io/get-data-txt.at \
        tests/language/data-io/get.at \