Move of test programs to t subdirectory.

diff --git a/Makefile.am b/Makefile.am
index fd2524ab4358a54d3cc8c4b4c317c7dc429c7a34..f8c7be90874807d5370781a7bd6c721f1d6f755a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,16 +2,8 @@
 # $Id$
 # $Name$
 SUBDIRS = intl ansel gedcom include . t doc po
-INCLUDES = -I $(srcdir)/include
-CFLAGS   = -g -O2
 
 pkgdata_DATA = gedcom.enc
-noinst_PROGRAMS = testgedcom
-
-testgedcom_SOURCES = standalone.c utf8-locale.c
-noinst_HEADERS     = utf8-locale.h
-testgedcom_LDFLAGS = -L gedcom/.libs -lgedcom
-testgedcom_LDADD  = @INTLLIBS@
 
 EXTRA_DIST = $(pkgdata_DATA) Makefile.inc
 VERSIONED_FILES = README

diff --git a/configure.in b/configure.in
index e3a97b00e378e0cea2a8db15a1a995e162a6e423..6a1850e63a615055ad121934e3fc450f66811b19 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 # $Id$
 # $Name$
-AC_INIT(standalone.c)
+AC_INIT(gedcom.enc)
 
 dnl =============================================================
 dnl Global variables

diff --git a/t/Makefile.am b/t/Makefile.am
index 2d88839cf327fa85a5cf9a48ca4ba23498309ba0..44b16445f628e03f54bbbb8e8259bbeddf0961c3 100644 (file)
--- a/t/Makefile.am
+++ b/t/Makefile.am
@@ -3,6 +3,18 @@
 # $Name$
 
 SUBDIRS=input
+INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../include
+CFLAGS   = -g -O2
+
+noinst_PROGRAMS = testgedcom pathtest
+
+testgedcom_SOURCES = standalone.c utf8-locale.c
+noinst_HEADERS     = utf8-locale.h
+testgedcom_LDFLAGS = -L ../gedcom/.libs -lgedcom
+testgedcom_LDADD  = @INTLLIBS@
+
+pathtest_SOURCES = pathtest.c
+pathtest_LDFLAGS = -L ../gedcom/.libs -lgedcom
 
 TEST_SCRIPT=test_script
 TESTS := $(wildcard $(srcdir)/*.test)

diff --git a/t/test_script b/t/test_script
index cd943a33c6bd3f11fdd2b21dc44c827a31674b2f..ed62f9b31ffc403693ea457b6f01176438f493ce 100755 (executable)
--- a/t/test_script
+++ b/t/test_script
@@ -25,7 +25,7 @@ cd $srcdir/..
 export GCONV_PATH=./ansel:$GCONV_PATH
 export LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
 cp $builddir/../ansel/.libs/ANSI_Z39.47.so ansel
-$builddir/../testgedcom $options t/input/$file
+$builddir/testgedcom $options t/input/$file
 result=$?
 rm ansel/ANSI_Z39.47.so
 if [ "$result" -eq "$expected_result" ]