Portability fixes.

diff --git a/t/src/Makefile.am b/t/src/Makefile.am
index de1139b1d3b729c4fed99629d0d71aac4cbeb6ae..75652e55d4961872bd561f06e08dc905479ea823 100644 (file)
--- a/t/src/Makefile.am
+++ b/t/src/Makefile.am
@@ -11,21 +11,24 @@ EXTRA_PROGRAMS  = gomtest_static
 noinst_HEADERS = output.h dump_gom.h
 
 testgedcom_SOURCES = standalone.c output.c
-testgedcom_LDFLAGS = -L ../../gedcom/.libs -lgedcom
-testgedcom_LDADD  = ../../utf8/libutf8.la
+testgedcom_LDFLAGS = -L../../gedcom/.libs
+testgedcom_LDADD  = -lgedcom ../../utf8/libutf8.la
 
 pathtest_SOURCES = pathtest.c
-pathtest_LDFLAGS = -L ../../gedcom/.libs -lgedcom
+pathtest_LDFLAGS = -L../../gedcom/.libs
+pathtest_LDADD = -lgedcom ../../utf8/libutf8.la
 
 gomtest_SOURCES = gomtest.c output.c dump_gom.c
-gomtest_LDFLAGS = -L ../../gedcom/.libs -L ../../gom/.libs -lgedcom_gom -lgedcom
+gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
+gomtest_LDADD = -lgedcom_gom -lgedcom ../../utf8/libutf8.la
 
 gomtest_static_SOURCES = gomtest.c output.c
 gomtest_static_LDADD = ../../gedcom/.libs/libgedcom.a \
-                      ../../gom/.libs/libgedcom_gom.a
+                      ../../gom/.libs/libgedcom_gom.a ../../utf8/libutf8.la
 
 updatetest_SOURCES = update.c output.c
-updatetest_LDFLAGS = -L ../../gedcom/.libs -lgedcom
+updatetest_LDFLAGS = -L../../gedcom/.libs
+updatetest_LDADD = -lgedcom ../../utf8/libutf8.la
 
 TEST_SCRIPT=test_script test_gom test_update