X-Git-Url: https://git.dlugolecki.net.pl/?a=blobdiff_plain;f=t%2FMakefile.am;h=16854ff9333ae5ad0201de502582823a8a166608;hb=6336a31c95e662cf8664acf8eb1ebeb1e03799a4;hp=626019e8cfbd36496694cf4f857474702dd57b7f;hpb=7ea4ef8cae7b52f2bf66371a5e7b493cbd12900e;p=gedcom-parse.git

diff --git a/t/Makefile.am b/t/Makefile.am
index 626019e..16854ff 100644
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -3,16 +3,16 @@
 # $Name$
 
 SUBDIRS=input
-INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../include
+INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../include \
+           -I $(srcdir)/../utf8
 CFLAGS   = -g -O2
 
 noinst_PROGRAMS = testgedcom pathtest gomtest @EXTRA_PROGS@
 EXTRA_PROGRAMS  = gomtest_static
 
-testgedcom_SOURCES = standalone.c utf8-locale.c
-noinst_HEADERS     = utf8-locale.h
+testgedcom_SOURCES = standalone.c
 testgedcom_LDFLAGS = -L ../gedcom/.libs -lgedcom
-testgedcom_LDADD  = @INTLLIBS@
+testgedcom_LDADD  = @INTLLIBS@ ../utf8/libutf8.la
 
 pathtest_SOURCES = pathtest.c
 pathtest_LDFLAGS = -L ../gedcom/.libs -lgedcom
@@ -22,14 +22,15 @@ gomtest_LDFLAGS = -L ../gedcom/.libs -L ../gom/.libs -lgedcom_gom -lgedcom
 
 gomtest_static_SOURCES = gomtest.c
 gomtest_static_LDADD = ../gedcom/.libs/libgedcom.a ../gom/.libs/libgedcom_gom.a
+DMALLOC_LOG = dmalloc.log
 
-TEST_SCRIPT=test_script test_gom test_gom_static
+TEST_SCRIPT=test_script test_gom
 TESTS := $(wildcard $(srcdir)/*.test)
 
 EXTRA_DIST=$(TEST_SCRIPT) $(TESTS)
 
 all-local:
-	@rm -f testgedcom.out dmalloc.log
+	@rm -f testgedcom.out $(DMALLOC_LOG)
 
 check-% :	%.test all-local
 	@srcdir=$(srcdir); export srcdir; \
@@ -45,7 +46,7 @@ check-dmalloc-%:	%.test all-local
 	  exit; \
 	fi; \
 	srcdir=$(srcdir); export srcdir; \
-	GOM_DMALLOC_TEST=1; export GOM_DMALLOC_TEST; \
+	GOM_DMALLOC_TEST=$(DMALLOC_LOG); export GOM_DMALLOC_TEST; \
         if $(TESTS_ENVIRONMENT) ./$<; then \
 	  echo "Test succeeded"; \
 	else \