dlugolecki.net.pl
Dziennik
Polecane
Software
projects
/
gedcom-parse.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5684a3c
)
UTF8 library is now a shared library.
author
Peter Verthez
<Peter.Verthez@advalvas.be>
Sat, 21 Dec 2002 18:15:24 +0000
(18:15 +0000)
committer
Peter Verthez
<Peter.Verthez@advalvas.be>
Sat, 21 Dec 2002 18:15:24 +0000
(18:15 +0000)
t/output/Makefile.am
patch
|
blob
|
history
t/path1.test
patch
|
blob
|
history
t/path2.test
patch
|
blob
|
history
t/src/Makefile.am
patch
|
blob
|
history
t/src/standalone.c
patch
|
blob
|
history
t/src/test_bulk.sh
patch
|
blob
|
history
diff --git
a/t/output/Makefile.am
b/t/output/Makefile.am
index 90c0520a51294c377025e984a5df8d1eb3a7088c..abf1931526631708ebedcc8830a3348509251422 100644
(file)
--- a/
t/output/Makefile.am
+++ b/
t/output/Makefile.am
@@
-3,5
+3,6
@@
# $Name$
REF_FILES := $(wildcard $(srcdir)/*.ref)
# $Name$
REF_FILES := $(wildcard $(srcdir)/*.ref)
+GED_FILES := $(wildcard $(srcdir)/*.ged)
-EXTRA_DIST=$(REF_FILES)
+EXTRA_DIST=$(REF_FILES)
$(GED_FILES)
diff --git
a/t/path1.test
b/t/path1.test
index 16459a475706949d7470a4218ba293d980186c48..d6457ee909ce85d738722df6841b395e319414ec 100755
(executable)
--- a/
t/path1.test
+++ b/
t/path1.test
@@
-1,7
+1,7
@@
#!/bin/sh
builddir=`pwd`
#!/bin/sh
builddir=`pwd`
-LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$
builddir/../utf8/.libs:$
LD_LIBRARY_PATH
export LD_LIBRARY_PATH
unset GCONV_PATH
$builddir/src/pathtest
export LD_LIBRARY_PATH
unset GCONV_PATH
$builddir/src/pathtest
diff --git
a/t/path2.test
b/t/path2.test
index 167e76967a12976b13e3429a3c85912cac750c92..a9a1948d5e73c9f2df2fddd52013979ae87c341d 100755
(executable)
--- a/
t/path2.test
+++ b/
t/path2.test
@@
-1,7
+1,7
@@
#!/bin/sh
builddir=`pwd`
#!/bin/sh
builddir=`pwd`
-LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$builddir/../gedcom/.libs:$
builddir/../utf8/.libs:$
LD_LIBRARY_PATH
export LD_LIBRARY_PATH
GCONV_PATH=./ansel
export GCONV_PATH
export LD_LIBRARY_PATH
GCONV_PATH=./ansel
export GCONV_PATH
diff --git
a/t/src/Makefile.am
b/t/src/Makefile.am
index 333bd0aa523f49094cc990dc44c0948a7efd2d9d..c325db153b86117742632afadea9fa4c5736641e 100644
(file)
--- a/
t/src/Makefile.am
+++ b/
t/src/Makefile.am
@@
-3,41
+3,43
@@
# $Name$
INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../../include \
# $Name$
INCLUDES = -DPKGDATADIR=\"$(pkgdatadir)\" -I $(srcdir)/../../include \
- -I $(srcdir)/../../utf8
+ -I $(srcdir)/../../utf8
-I $(srcdir)/../intl
CFLAGS = -O2 @EXTRA_CFLAGS@
CFLAGS = -O2 @EXTRA_CFLAGS@
-noinst_PROGRAMS = testgedcom pathtest gomtest updatetest testintl
updategomtest
\
- writegomtest
+noinst_PROGRAMS = testgedcom pathtest gomtest updatetest testintl \
+
updategomtest
writegomtest
noinst_HEADERS = output.h dump_gom.h portability.h
testgedcom_SOURCES = standalone.c output.c portability.c
noinst_HEADERS = output.h dump_gom.h portability.h
testgedcom_SOURCES = standalone.c output.c portability.c
-testgedcom_LDFLAGS = -L../../gedcom/.libs
-testgedcom_LDADD = -lgedcom
../../utf8/libutf8.la @INTLLIBS@
+testgedcom_LDFLAGS = -L../../gedcom/.libs
-L../../utf8/.libs
+testgedcom_LDADD = -lgedcom
-lutf8tools
pathtest_SOURCES = pathtest.c
pathtest_SOURCES = pathtest.c
-pathtest_LDFLAGS = -L../../gedcom/.libs
-pathtest_LDADD = -lgedcom
@INTLLIBS@
+pathtest_LDFLAGS = -L../../gedcom/.libs
-L../../utf8/.libs
+pathtest_LDADD = -lgedcom
-lutf8tools
gomtest_SOURCES = gomtest.c output.c dump_gom.c portability.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
@INTLLIBS@
+gomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-L../../utf8/.libs
+gomtest_LDADD = -lgedcom_gom -lgedcom
-lutf8tools
updatetest_SOURCES = update.c output.c portability.c
updatetest_SOURCES = update.c output.c portability.c
-updatetest_LDFLAGS = -L../../gedcom/.libs
-updatetest_LDADD = -lgedcom
@INTLLIBS@
+updatetest_LDFLAGS = -L../../gedcom/.libs
-L../../utf8/.libs
+updatetest_LDADD = -lgedcom
-lutf8tools
updategomtest_SOURCES = update_gom.c output.c dump_gom.c portability.c
updategomtest_SOURCES = update_gom.c output.c dump_gom.c portability.c
-updategomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-updategomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@
+updategomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs \
+ -L../../utf8/.libs
+updategomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools
writegomtest_SOURCES = gom_write.c output.c portability.c
writegomtest_SOURCES = gom_write.c output.c portability.c
-writegomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs
-writegomtest_LDADD = -lgedcom_gom -lgedcom @INTLLIBS@
+writegomtest_LDFLAGS = -L../../gedcom/.libs -L../../gom/.libs \
+ -L../../utf8/.libs
+writegomtest_LDADD = -lgedcom_gom -lgedcom -lutf8tools
testintl_SOURCES = testintl.c output.c
testintl_SOURCES = testintl.c output.c
-testintl_LDFLAGS = -L../../gedcom/.libs
-testintl_LDADD = -lgedcom @INTLLIBS@
+testintl_LDFLAGS = -L../../gedcom/.libs
-L../../utf8/.libs
+testintl_LDADD = -lgedcom
-lutf8tools
@INTLLIBS@
-TEST_SCRIPT=test_script test_gom test_update test_intl test_updategom test_writegom
+TEST_SCRIPT=test_script test_gom test_update test_intl test_updategom test_writegom
test_prologue.sh test_bulk.sh
EXTRA_DIST=$(TEST_SCRIPT)
EXTRA_DIST=$(TEST_SCRIPT)
diff --git
a/t/src/standalone.c
b/t/src/standalone.c
index 9c2228417782ceea1be48ee79ff7cea2b29321dc..2456a8456cde520c8c7a0255244f1d32134957ee 100644
(file)
--- a/
t/src/standalone.c
+++ b/
t/src/standalone.c
@@
-30,7
+30,7
@@
#include <locale.h>
#include <errno.h>
#include <iconv.h>
#include <locale.h>
#include <errno.h>
#include <iconv.h>
-#include "utf8.h"
+#include "utf8
tools
.h"
#define BOGUS_FILE_NAME "bogus.ged"
int total_conv_fails = 0;
#define BOGUS_FILE_NAME "bogus.ged"
int total_conv_fails = 0;
diff --git
a/t/src/test_bulk.sh
b/t/src/test_bulk.sh
index 47120413f9c15792bd548fd3cabf0c30752774f1..1c2fee2412ea2e5a50a63c678dec041f2408cf8f 100644
(file)
--- a/
t/src/test_bulk.sh
+++ b/
t/src/test_bulk.sh
@@
-3,7
+3,7
@@
# Common test part for the test scripts
ltcmd="$builddir/../libtool --mode=execute"
# Common test part for the test scripts
ltcmd="$builddir/../libtool --mode=execute"
-for lib in $test_libs
+for lib in $test_libs
$builddir/../utf8/libutf8tools.la
do
ltcmd="$ltcmd -dlopen $lib"
done
do
ltcmd="$ltcmd -dlopen $lib"
done