Various portability modifications.

diff --git a/t/src/Makefile.am b/t/src/Makefile.am
index 9ae986fa490002021cefc2706bf8768048b6099f..7fe179798333f59fb8b93f15ec6ffa26eff69cf7 100644 (file)
--- a/t/src/Makefile.am
+++ b/t/src/Makefile.am
@@ -4,31 +4,31 @@
 
 INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../../include \
            -I $(srcdir)/../../utf8
-CFLAGS   = -g -O2
+CFLAGS   = -g -O2 @EXTRA_CFLAGS@
 
 noinst_PROGRAMS = testgedcom pathtest gomtest updatetest @EXTRA_PROGS@
 EXTRA_PROGRAMS  = gomtest_static
-noinst_HEADERS = output.h dump_gom.h
+noinst_HEADERS = output.h dump_gom.h portability.h
 
-testgedcom_SOURCES = standalone.c output.c
+testgedcom_SOURCES = standalone.c output.c portability.c
 testgedcom_LDFLAGS = -L../../gedcom/.libs
-testgedcom_LDADD  = -lgedcom ../../utf8/libutf8.la $(LIBICONV)
+testgedcom_LDADD  = -lgedcom ../../utf8/libutf8.la @INTLLIBS@
 
 pathtest_SOURCES = pathtest.c
 pathtest_LDFLAGS = -L../../gedcom/.libs
-pathtest_LDADD = -lgedcom $(LIBICONV)
+pathtest_LDADD = -lgedcom @INTLLIBS@
 
-gomtest_SOURCES = gomtest.c output.c dump_gom.c
+gomtest_SOURCES = gomtest.c output.c dump_gom.c portability.c
 gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-gomtest_LDADD = -lgedcom_gom -lgedcom $(LIBICONV)
+gomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@
 
-gomtest_static_SOURCES = gomtest.c output.c
+gomtest_static_SOURCES = gomtest.c output.c dump_gom.c portability.c
 gomtest_static_LDADD = ../../gedcom/.libs/libgedcom.a \
                       ../../gom/.libs/libgedcom_gom.a
 
-updatetest_SOURCES = update.c output.c
+updatetest_SOURCES = update.c output.c portability.c
 updatetest_LDFLAGS = -L../../gedcom/.libs
-updatetest_LDADD = -lgedcom $(LIBICONV)
+updatetest_LDADD = -lgedcom @INTLLIBS@
 
 TEST_SCRIPT=test_script test_gom test_update