-EXTRA_DIST=zebra.cfg zebra6.cfg zebra8.cfg zebrazv.cfg zebraxpath.cfg
-
-t1_SOURCES = t1.c testlib.c testlib.h
-t2_SOURCES = t2.c testlib.c testlib.h
-t3_SOURCES = t3.c testlib.c testlib.h
-t4_SOURCES = t4.c testlib.c testlib.h
-t5_SOURCES = t5.c testlib.c testlib.h
-t6_SOURCES = t6.c testlib.c testlib.h
-t7_SOURCES = t7.c testlib.c testlib.h
-t8_SOURCES = t8.c testlib.c testlib.h
-t9_SOURCES = t9.c testlib.c testlib.h rankingrecords.h
-t10_SOURCES = t10.c testlib.c testlib.h rankingrecords.h
-
-xpath1_SOURCES = xpath1.c testlib.c testlib.h
-xpath2_SOURCES = xpath2.c testlib.c testlib.h
-xpath3_SOURCES = xpath3.c testlib.c testlib.h
-xpath4_SOURCES = xpath4.c testlib.c testlib.h
+EXTRA_DIST=zebra.cfg zebra6.cfg zebra8.cfg zebra10.cfg zebra15.cfg safari.cfg \
+ t10.att t10.abs zebra17.cfg indextypes17.xml
+
+noinst_LIBRARIES = libtestlib.a
+
+libtestlib_a_SOURCES = testlib.c testlib.h
+
+t0_SOURCES = t0.c
+t1_SOURCES = t1.c
+t2_SOURCES = t2.c
+t3_SOURCES = t3.c
+t4_SOURCES = t4.c
+t5_SOURCES = t5.c
+t6_SOURCES = t6.c
+t7_SOURCES = t7.c
+t8_SOURCES = t8.c
+t9_SOURCES = t9.c rankingrecords.h
+t10_SOURCES = t10.c
+t11_SOURCES = t11.c
+t12_SOURCES = t12.c
+t13_SOURCES = t13.c
+t14_SOURCES = t14.c
+t15_SOURCES = t15.c
+t16_SOURCES = t16.c
+t17_SOURCES = t17.c
+
+safari1_SOURCES = safari1.c testlib.c