summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2015-01-06 19:44:01 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2015-01-06 19:44:01 (GMT)
commit5dfd8dd432785ca8d8b6d2c11bac9e110feda52b (patch) (unidiff)
treebfe12bf71b50e7916ab5b957ba216def8c41cbf9
parentc5e668cfd92985ff7e3e4be7c6be8c3ea3e6d57f (diff)
downloadellinika-5dfd8dd432785ca8d8b6d2c11bac9e110feda52b.tar.gz
ellinika-5dfd8dd432785ca8d8b6d2c11bac9e110feda52b.tar.bz2
Update for Guile 2.0
* .gitmodules: New file * gint: New module. * Makefile.am (ACLOCAL_AMFLAGS, SUBDIRS): Add gint * autogen.sh: Create a placeholder for ChangeLog. * configure.ac: Add gint. * scm/Makefile.am: Add silent rule magic. * src/cgi-bin/Makefile.am: Likewise. * src/ellinika/Makefile.am: Likewise. * xml/Makefile.am: Likewise. * scm/dictrans.scm: Load (ice-9 syncase) only for Guile 1.x * scm/neatrans.scm: Likewise. * src/ellinika/conjugator.scm: Likewise. * src/ellinika/elmorph.c (elstr)<phoneme_count,nsyl>: Change type to size_t. * xml/pl/Makefile.am: Force UTF-8 locale when building html. Add silent rule magic. * xml/ru/Makefile.am: Likewise. * xml/uk/Makefile.am: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitmodules3
-rw-r--r--Makefile.am4
-rwxr-xr-xautogen.sh8
-rw-r--r--configure.ac9
m---------gint0
-rw-r--r--scm/Makefile.am24
-rw-r--r--scm/dictrans.scm3
-rw-r--r--scm/neatrans.scm5
-rw-r--r--src/cgi-bin/Makefile.am48
-rw-r--r--src/ellinika/Makefile.am62
-rw-r--r--src/ellinika/conjugator.scm3
-rw-r--r--src/ellinika/elmorph.c10
-rw-r--r--src/ellinika/i18n.scm1
-rw-r--r--xml/Makefile.am24
-rw-r--r--xml/pl/Makefile.am4
-rw-r--r--xml/ru/Makefile.am4
-rw-r--r--xml/uk/Makefile.am4
17 files changed, 117 insertions, 99 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..7c369d4
--- a/dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
1[submodule "gint"]
2 path = gint
3 url = git://git.gnu.org.ua/gint.git
diff --git a/Makefile.am b/Makefile.am
index 678c978..521b3e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,9 +15,9 @@
15# along with this program. If not, see <http://www.gnu.org/licenses/>. 15# along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16
17AUTOMAKE_OPTIONS = gnits 1.8 17AUTOMAKE_OPTIONS = gnits 1.8
18ACLOCAL_AMFLAGS = -I m4 -I am 18ACLOCAL_AMFLAGS = -I m4 -I am -I gint
19 19
20SUBDIRS=src elisp data scm xml html-files po 20SUBDIRS=gint src elisp data scm xml html-files po
21 21
22htmldir = $(HTMLDIR) 22htmldir = $(HTMLDIR)
23 23
diff --git a/autogen.sh b/autogen.sh
index 1f3cdfc..c63ecd6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,13 @@
1#! /bin/sh 1#! /bin/sh
2 2
3git submodule init
4git submodule update
5
6cat > ChangeLog <<EOT
7This file is a placeholder. It will be replaced with the actual ChangeLog
8by make.
9EOT
10
3if [ ! -d html ]; then 11if [ ! -d html ]; then
4 mkdir html 12 mkdir html
5fi 13fi
diff --git a/configure.ac b/configure.ac
index 540b4f6..e545dfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
1# This file is part of Ellinika -*- autoconf -*- 1# This file is part of Ellinika -*- autoconf -*-
2# Copyright (C) 2004, 2005, 2007, 2008, 2010 Sergey Poznyakoff 2# Copyright (C) 2004, 2005, 2007, 2008, 2010, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
17 17
18AC_PREREQ(2.61) 18AC_PREREQ(2.61)
19 19
20AC_REVISION(2015-01-06 13:50:03 gray) 20AC_REVISION(2015-01-06 14:33:57 gray)
21AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua]) 21AC_INIT(ellinika, 1.99.99, [gray+ellinika@gnu.org.ua])
22AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4) 22AC_CONFIG_SRCDIR(src/cgi-bin/dict.scm4)
23AC_CONFIG_AUX_DIR([build-aux]) 23AC_CONFIG_AUX_DIR([build-aux])
@@ -41,8 +41,7 @@ AM_GNU_GETTEXT([external], [need-ngettext])
41 41
42AM_GNU_GETTEXT_VERSION([0.17]) 42AM_GNU_GETTEXT_VERSION([0.17])
43 43
44MU_CHECK_GUILE(,, 44GINT_INIT(,[nodoc])
45 [AC_MSG_ERROR([You need Guile 1.8 or newer])])
46 45
47RA_CHECK_LIB(mysqlclient, 46RA_CHECK_LIB(mysqlclient,
48 mysql_real_connect, 47 mysql_real_connect,
@@ -53,6 +52,7 @@ RA_CHECK_LIB(mysqlclient,
53 52
54LIBS="$LIBS $ra_cv_lib_mysqlclient" 53LIBS="$LIBS $ra_cv_lib_mysqlclient"
55 54
55
56## ************** 56## **************
57## Directories 57## Directories
58## ************** 58## **************
@@ -133,6 +133,7 @@ AC_SUBST(AUTOGENERATED,
133 133
134AC_CONFIG_FILES(Makefile 134AC_CONFIG_FILES(Makefile
135 .htaccess 135 .htaccess
136 gint/Makefile
136 src/Makefile 137 src/Makefile
137 src/cgi-bin/Makefile 138 src/cgi-bin/Makefile
138 src/ellinika/Makefile 139 src/ellinika/Makefile
diff --git a/gint b/gint
new file mode 160000
Subproject fd86bf7d44b0c970771830692ae7491447ebe8b
diff --git a/scm/Makefile.am b/scm/Makefile.am
index 481676f..73b3e84 100644
--- a/scm/Makefile.am
+++ b/scm/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2004, 2005, 2007 Sergey Poznyakoff 2# Copyright (C) 2004, 2005, 2007, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -20,20 +20,20 @@ CLEANFILES=dictrans.sed dictrans neatrans verbop
20EXTRA_DIST=dictrans.scm 20EXTRA_DIST=dictrans.scm
21 21
22dictrans.sed: Makefile 22dictrans.sed: Makefile
23 echo 's,=GUILE_BINDIR=,$(GUILE_BINDIR),' > $@ 23 $(AM_V_GEN){ \
24 echo 's,=GUILE_SITE=,@GUILE_SITE@,' >> $@ 24 echo 's,=GUILE_BINDIR=,$(GUILE_BINDIR),'; \
25 echo 's,\;=GUILE_COMMENT=\;,@GUILE_COMMENT@,' >> $@ 25 echo 's,=GUILE_SITE=,@GUILE_SITE@,'; \
26 echo 's,=SYSCONFDIR=,$(sysconfdir),' >> $@ 26 echo 's,\;=GUILE_COMMENT=\;,@GUILE_COMMENT@,'; \
27 echo 's,=AUTOGENERATED=,@AUTOGENERATED@,' >> $@ 27 echo 's,=SYSCONFDIR=,$(sysconfdir),'; \
28 echo 's,=AUTOGENERATED=,@AUTOGENERATED@,'; \
29 } > dictrans.sed
30
31%: %.scm
32 $(AM_V_GEN)sed -f dictrans.sed $< > $@
33 @chmod +x $@
28 34
29dictrans: $(srcdir)/dictrans.scm dictrans.sed 35dictrans: $(srcdir)/dictrans.scm dictrans.sed
30 sed -f dictrans.sed $(srcdir)/dictrans.scm > $@
31 chmod +x $@
32 36
33neatrans: $(srcdir)/neatrans.scm dictrans.sed 37neatrans: $(srcdir)/neatrans.scm dictrans.sed
34 sed -f dictrans.sed $(srcdir)/neatrans.scm > $@
35 chmod +x $@
36 38
37verbop: $(srcdir)/verbop.scm dictrans.sed 39verbop: $(srcdir)/verbop.scm dictrans.sed
38 sed -f dictrans.sed $(srcdir)/verbop.scm > $@
39 chmod +x $@
diff --git a/scm/dictrans.scm b/scm/dictrans.scm
index d76479e..2148929 100644
--- a/scm/dictrans.scm
+++ b/scm/dictrans.scm
@@ -90,7 +90,8 @@
90 (ellinika xlat) 90 (ellinika xlat)
91 (ice-9 getopt-long)) 91 (ice-9 getopt-long))
92 92
93(use-syntax (ice-9 syncase)) 93(if (= (string->number (major-version)) 1)
94 (use-modules (ice-9 syncase)))
94 95
95(define compile-only #f) 96(define compile-only #f)
96(define cleanup-option #f) 97(define cleanup-option #f)
diff --git a/scm/neatrans.scm b/scm/neatrans.scm
index e92e585..333453f 100644
--- a/scm/neatrans.scm
+++ b/scm/neatrans.scm
@@ -2,7 +2,7 @@
2=AUTOGENERATED= 2=AUTOGENERATED=
3!# 3!#
4;;;; This file is part of Ellinika 4;;;; This file is part of Ellinika
5;;;; Copyright (C) 2006, 2007, 2010 Sergey Poznyakoff 5;;;; Copyright (C) 2006, 2007, 2010, 2015 Sergey Poznyakoff
6;;;; 6;;;;
7;;;; Ellinika is free software; you can redistribute it and/or modify 7;;;; Ellinika is free software; you can redistribute it and/or modify
8;;;; it under the terms of the GNU General Public License as published by 8;;;; it under the terms of the GNU General Public License as published by
@@ -37,7 +37,8 @@
37 (ellinika xlat) 37 (ellinika xlat)
38 (ice-9 getopt-long)) 38 (ice-9 getopt-long))
39 39
40(use-syntax (ice-9 syncase)) 40(if (= (string->number (major-version)) 1)
41 (use-modules (ice-9 syncase)))
41 42
42(define compile-only #f) 43(define compile-only #f)
43(define cleanup-option #f) 44(define cleanup-option #f)
diff --git a/src/cgi-bin/Makefile.am b/src/cgi-bin/Makefile.am
index 6b32b42..f085e57 100644
--- a/src/cgi-bin/Makefile.am
+++ b/src/cgi-bin/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2004, 2005, 2007, 2008 Sergey Poznyakoff 2# Copyright (C) 2004, 2005, 2007, 2008, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -20,34 +20,36 @@ EXTRA_DIST=dict.scm4 nea.scm4 conj.scm4
20CLEANFILES=dict.m4 dict.scm nea.scm dict.cgi nea.cgi conj.cgi 20CLEANFILES=dict.m4 dict.scm nea.scm dict.cgi nea.cgi conj.cgi
21 21
22dict.m4: Makefile 22dict.m4: Makefile
23 echo 'divert(-1)' > $@ 23 $(AM_V_GEN){ \
24 echo 'changequote([,])' >> $@ 24 echo 'divert(-1)'; \
25 echo 'changecom([;],[' >> $@ 25 echo 'changequote([,])'; \
26 echo '])' >> $@ 26 echo 'changecom([;],['; \
27 echo 'undefine([format])' >> $@ 27 echo '])'; \
28 echo 'define([IFACE], [$(APACHE_IFACE)])' >> $@ 28 echo 'undefine([format])'; \
29 echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@ 29 echo 'define([IFACE], [$(APACHE_IFACE)])'; \
30 echo 'define([GUILE_BINDIR], [$(GUILE_BINDIR)])' >> $@ 30 echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])';\
31 echo 'define([GUILE_SITE], [@GUILE_SITE@])' >> $@ 31 echo 'define([GUILE_BINDIR], [$(GUILE_BINDIR)])';\
32 echo 'define([PACKAGE], [$(PACKAGE)])'>> $@ 32 echo 'define([GUILE_SITE], [@GUILE_SITE@])'; \
33 echo 'define([PREFIX], [$(prefix)])' >> $@ 33 echo 'define([PACKAGE], [$(PACKAGE)])'; \
34 echo 'define([SYSCONFDIR], [$(sysconfdir)])' >> $@ 34 echo 'define([PREFIX], [$(prefix)])'; \
35 echo 'define([LOCALEDIR], [$(datadir)/locale])' >> $@ 35 echo 'define([SYSCONFDIR], [$(sysconfdir)])'; \
36 echo 'define([HTMLDIR], [$(HTMLDIR)])' >> $@ 36 echo 'define([LOCALEDIR], [$(datadir)/locale])';\
37 echo 'divert(0)dnl' >> $@ 37 echo 'define([HTMLDIR], [$(HTMLDIR)])'; \
38 echo 'ifelse(IFACE,[CGI],[#! $(GUILE_BINDIR)/guile -s]' >> $@ 38 echo 'divert(0)dnl'; \
39 echo ')dnl' >> $@ 39 echo 'ifelse(IFACE,[CGI],[#! $(GUILE_BINDIR)/guile -s]';\
40 echo '@AUTOGENERATED@' >> $@ 40 echo ')dnl'; \
41 echo 'ifelse(IFACE,[CGI],!#' >> $@ 41 echo '@AUTOGENERATED@'; \
42 echo ')dnl' >> $@ 42 echo 'ifelse(IFACE,[CGI],!#'; \
43 echo ')dnl'; \
44 } > dict.m4
43 45
44SUFFIXES = .scm4 .scm .cgi 46SUFFIXES = .scm4 .scm .cgi
45 47
46.scm4.scm: 48.scm4.scm:
47 m4 dict.m4 $< > $@ 49 $(AM_V_GEN)m4 dict.m4 $< > $@
48 50
49.scm.cgi: 51.scm.cgi:
50 cp $< $@ 52 $(AM_V_GEN)cp $< $@
51 53
52dict.scm: dict.scm4 dict.m4 54dict.scm: dict.scm4 dict.m4
53nea.scm: nea.scm4 dict.m4 55nea.scm: nea.scm4 dict.m4
diff --git a/src/ellinika/Makefile.am b/src/ellinika/Makefile.am
index 12e0392..5f476ef 100644
--- a/src/ellinika/Makefile.am
+++ b/src/ellinika/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2004,2006,2007,2008,2011 Sergey Poznyakoff 2# Copyright (C) 2004, 2006-2008, 2011, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with this program. If not, see <http://www.gnu.org/licenses/>. 15# along with this program. If not, see <http://www.gnu.org/licenses/>.
16 16
17guiledir=$(GUILE_SITE)/$(PACKAGE) 17sitedir=$(GUILE_SITE)/$(PACKAGE)
18guile_DATA=\ 18site_DATA=\
19 xlat.scm\ 19 xlat.scm\
20 cgi.scm\ 20 cgi.scm\
21 i18n.scm\ 21 i18n.scm\
@@ -27,29 +27,31 @@ guile_DATA=\
27 conjugator.scm 27 conjugator.scm
28 28
29cgi.m4: Makefile 29cgi.m4: Makefile
30 echo 'divert(-1)' > $@ 30 $(AM_V_GEN){ \
31 echo 'changequote([,])' >> $@ 31 echo 'divert(-1)'; \
32 echo 'changecom([;],[' >> $@ 32 echo 'changequote([,])'; \
33 echo '])' >> $@ 33 echo 'changecom([;],['; \
34 echo 'undefine([format])' >> $@ 34 echo '])'; \
35 echo 'define([IFACE],[$(APACHE_IFACE)])' >> $@ 35 echo 'undefine([format])'; \
36 echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@ 36 echo 'define([IFACE],[$(APACHE_IFACE)])'; \
37 echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])' >> $@ 37 echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])';\
38 echo 'define([GUILE_SITE],[@GUILE_SITE@])' >> $@ 38 echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])';\
39 echo 'define([PACKAGE],[$(PACKAGE)])'>> $@ 39 echo 'define([GUILE_SITE],[@GUILE_SITE@])'; \
40 echo 'define([PREFIX],[$(prefix)])' >> $@ 40 echo 'define([PACKAGE],[$(PACKAGE)])'; \
41 echo 'define([SYSCONFDIR],[$(sysconfdir)])' >> $@ 41 echo 'define([PREFIX],[$(prefix)])'; \
42 echo 'define([LOCALEDIR],[$(datadir)/locale])' >> $@ 42 echo 'define([SYSCONFDIR],[$(sysconfdir)])'; \
43 echo 'define([HTMLDIR],[$(HTMLDIR)])' >> $@ 43 echo 'define([LOCALEDIR],[$(datadir)/locale])'; \
44 echo 'define([VERSION],[$(VERSION)])' >> $@ 44 echo 'define([HTMLDIR],[$(HTMLDIR)])'; \
45 echo 'define([LIBDIR],[$(pkglibdir)])' >> $@ 45 echo 'define([VERSION],[$(VERSION)])'; \
46 echo 'divert(0)dnl' >> $@ 46 echo 'define([LIBDIR],[$(pkglibdir)])'; \
47 echo '@AUTOGENERATED@' >> $@ 47 echo 'divert(0)dnl'; \
48 echo '@AUTOGENERATED@'; \
49 } > cgi.m4
48 50
49SUFFIXES = .scm4 .scm .x 51SUFFIXES = .scm4 .scm .x
50 52
51.scm4.scm: 53.scm4.scm:
52 m4 -I$(srcdir) cgi.m4 $< > $@ 54 $(AM_V_GEN)m4 -I$(srcdir) cgi.m4 $< > $@
53 55
54cgi.scm: cgi.scm4 cgi.m4 56cgi.scm: cgi.scm4 cgi.m4
55config.scm: config.scm4 cgi.m4 57config.scm: config.scm4 cgi.m4
@@ -68,17 +70,9 @@ libelmorph_la_SOURCES = \
68 syllabificator.c 70 syllabificator.c
69 71
70DOT_X_FILES = elmorph.x utf8scm.x 72DOT_X_FILES = elmorph.x utf8scm.x
71
72BUILT_SOURCES = $(DOT_X_FILES) 73BUILT_SOURCES = $(DOT_X_FILES)
73
74DISTCLEANFILES = $(DOT_X_FILES) 74DISTCLEANFILES = $(DOT_X_FILES)
75 75
76snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
77
78.c.x:
79 AWK=$(AWK) \
80 guile-snarf -o $@ $< $(snarfcppopts)
81
82pkglibnames=elmorph 76pkglibnames=elmorph
83 77
84install-data-hook: 78install-data-hook:
@@ -95,4 +89,10 @@ install-data-hook:
95 89
96AM_YFLAGS = -d 90AM_YFLAGS = -d
97YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)' 91YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)'
98EXTRA_DIST = yyrename elmorph-public.scm \ No newline at end of file 92EXTRA_DIST = yyrename elmorph-public.scm
93
94AM_CPPFLAGS=-I.
95CLEANFILES=
96MAINTAINERCLEANFILES=
97include ../../gint/gint.mk
98
diff --git a/src/ellinika/conjugator.scm b/src/ellinika/conjugator.scm
index eae4ad0..f8b1eb0 100644
--- a/src/ellinika/conjugator.scm
+++ b/src/ellinika/conjugator.scm
@@ -23,7 +23,8 @@
23 (ellinika tenses) 23 (ellinika tenses)
24 (ellinika sql)) 24 (ellinika sql))
25 25
26(use-syntax (ice-9 syncase)) 26(if (= (string->number (major-version)) 1)
27 (use-modules (ice-9 syncase)))
27 28
28 29
29;; Verb info 30;; Verb info
diff --git a/src/ellinika/elmorph.c b/src/ellinika/elmorph.c
index a06d43b..5094db8 100644
--- a/src/ellinika/elmorph.c
+++ b/src/ellinika/elmorph.c
@@ -1,5 +1,5 @@
1/* This file is part of Ellinika project. 1/* This file is part of Ellinika project.
2 Copyright (C) 2011 Sergey Poznyakoff 2 Copyright (C) 2011, 2015 Sergey Poznyakoff
3 3
4 Ellinika is free software; you can redistribute it and/or modify 4 Ellinika is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
@@ -28,10 +28,10 @@ struct elstr {
28 size_t len; /* Its length */ 28 size_t len; /* Its length */
29 29
30 struct phoneme *phoneme; /* Phonetical map*/ 30 struct phoneme *phoneme; /* Phonetical map*/
31 unsigned phoneme_count; /* Number of phonemes */ 31 size_t phoneme_count; /* Number of phonemes */
32 32
33 struct syllable *sylmap; /* Syllable map (nsyl elements) */ 33 struct syllable *sylmap; /* Syllable map (nsyl elements) */
34 unsigned nsyl; /* Number of syllables. */ 34 size_t nsyl; /* Number of syllables. */
35 unsigned acc_syl; /* Number of the accented syllable 35 unsigned acc_syl; /* Number of the accented syllable
36 (1-based, from the last syllable) */ 36 (1-based, from the last syllable) */
37 unsigned acc_pos; /* Number of the accented character 37 unsigned acc_pos; /* Number of the accented character
@@ -44,7 +44,7 @@ scm_t_bits _elstr_tag;
44static void 44static void
45_elstr_syllabize(struct elstr *elstr, const char *func_name) 45_elstr_syllabize(struct elstr *elstr, const char *func_name)
46{ 46{
47 unsigned i; 47 size_t i;
48 48
49 free(elstr->phoneme); 49 free(elstr->phoneme);
50 free(elstr->sylmap); 50 free(elstr->sylmap);
@@ -196,7 +196,7 @@ static int
196_elstr_print(SCM smob, SCM port, scm_print_state *pstate) 196_elstr_print(SCM smob, SCM port, scm_print_state *pstate)
197{ 197{
198 struct elstr *elstr = (struct elstr *) SCM_CDR(smob); 198 struct elstr *elstr = (struct elstr *) SCM_CDR(smob);
199 int i, j; 199 size_t i, j;
200 char *s; 200 char *s;
201 201
202 scm_puts("#<elstr ", port); 202 scm_puts("#<elstr ", port);
diff --git a/src/ellinika/i18n.scm b/src/ellinika/i18n.scm
index 474c8c9..c05d727 100644
--- a/src/ellinika/i18n.scm
+++ b/src/ellinika/i18n.scm
@@ -23,7 +23,6 @@
23 (syntax-rules () 23 (syntax-rules ()
24 ((_ msg) (gettext msg)))) 24 ((_ msg) (gettext msg))))
25 25
26
27;;; ISO 639 language code => ISO 3166 country code 26;;; ISO 639 language code => ISO 3166 country code
28;;; The corresponding country codes where selected using the following 27;;; The corresponding country codes where selected using the following
29;;; principles: 28;;; principles:
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 3ec5c4d..151d03d 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2004, 2006, 2007 Sergey Poznyakoff 2# Copyright (C) 2004, 2006, 2007, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -21,16 +21,18 @@ CLEANFILES=conf.sed
21noinst_DATA= lingua.conf 21noinst_DATA= lingua.conf
22 22
23conf.sed: Makefile 23conf.sed: Makefile
24 echo 's,=TMPDIR=,$(top_builddir)/../tmp,g' > conf.sed 24 $(AM_V_GEN){ \
25 echo 's,=OUTDIR=,$(top_builddir)/../html,g' >> conf.sed 25 echo 's,=TMPDIR=,$(top_builddir)/../tmp,g'; \
26 echo 's,=TARGET_DIR=,$(TARGET_DIR),g' >> conf.sed 26 echo 's,=OUTDIR=,$(top_builddir)/../html,g'; \
27 echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),g' >> conf.sed 27 echo 's,=TARGET_DIR=,$(TARGET_DIR),g'; \
28 echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),g' >> conf.sed 28 echo 's,=SCRIPT_SUFFIX=,$(SCRIPT_SUFFIX),g'; \
29 echo 's,=BASE_HREF=,$(BASE_HREF),g' >> conf.sed 29 echo 's,=SCRIPT_DIR=,$(SCRIPT_DIR),g'; \
30 echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g' >> conf.sed 30 echo 's,=BASE_HREF=,$(BASE_HREF),g'; \
31 echo 's,=PROD_URL=,$(PROD_URL),g' >> conf.sed 31 echo 's,=PACKAGE_BUGREPORT=,$(PACKAGE_BUGREPORT),g';\
32 echo 's,=EXP_URL=,$(EXP_URL),g' >> conf.sed 32 echo 's,=PROD_URL=,$(PROD_URL),g'; \
33 echo 's,=EXP_URL=,$(EXP_URL),g'; \
34 } > conf.sed
33 35
34lingua.conf: $(srcdir)/lingua.conf.in conf.sed 36lingua.conf: $(srcdir)/lingua.conf.in conf.sed
35 sed -f conf.sed $(srcdir)/lingua.conf.in > $@ 37 $(AM_V_GEN)sed -f conf.sed $(srcdir)/lingua.conf.in > $@
36 38
diff --git a/xml/pl/Makefile.am b/xml/pl/Makefile.am
index 1dcc4dd..b4fb8d4 100644
--- a/xml/pl/Makefile.am
+++ b/xml/pl/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2006-2011 Sergey Poznyakoff 2# Copyright (C) 2006-2011, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua
44all: stamp-lingua 44all: stamp-lingua
45 45
46stamp-lingua: $(EXTRA_DIST) ../lingua.conf 46stamp-lingua: $(EXTRA_DIST) ../lingua.conf
47 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua 47 $(AM_V_GEN)LC_ALL=en_US.UTF-8 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
48 48
diff --git a/xml/ru/Makefile.am b/xml/ru/Makefile.am
index d64f4cc..3bf9e85 100644
--- a/xml/ru/Makefile.am
+++ b/xml/ru/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2004-2011 Sergey Poznyakoff 2# Copyright (C) 2004-2011, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua
44all: stamp-lingua 44all: stamp-lingua
45 45
46stamp-lingua: $(EXTRA_DIST) ../lingua.conf 46stamp-lingua: $(EXTRA_DIST) ../lingua.conf
47 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua 47 $(AM_V_GEN)LC_ALL=en_US.UTF-8 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
48 48
diff --git a/xml/uk/Makefile.am b/xml/uk/Makefile.am
index 1dcc4dd..b4fb8d4 100644
--- a/xml/uk/Makefile.am
+++ b/xml/uk/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of Ellinika project. 1# This file is part of Ellinika project.
2# Copyright (C) 2006-2011 Sergey Poznyakoff 2# Copyright (C) 2006-2011, 2015 Sergey Poznyakoff
3# 3#
4# Ellinika is free software; you can redistribute it and/or modify 4# Ellinika is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -44,5 +44,5 @@ CLEANFILES=stamp-lingua
44all: stamp-lingua 44all: stamp-lingua
45 45
46stamp-lingua: $(EXTRA_DIST) ../lingua.conf 46stamp-lingua: $(EXTRA_DIST) ../lingua.conf
47 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua 47 $(AM_V_GEN)LC_ALL=en_US.UTF-8 xmlt lingua -D STATE=$(STATE) -D VCSID="`git describe --always`" --config-file ../lingua.conf ellinika.xml && echo "timestamp" > stamp-lingua
48 48

Return to:

Send suggestions and report system problems to the System administrator.