diff options
Diffstat (limited to 'src/ellinika')
-rw-r--r-- | src/ellinika/Makefile.am | 62 | ||||
-rw-r--r-- | src/ellinika/conjugator.scm | 3 | ||||
-rw-r--r-- | src/ellinika/elmorph.c | 10 | ||||
-rw-r--r-- | src/ellinika/i18n.scm | 1 |
4 files changed, 38 insertions, 38 deletions
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 | ||
17 | guiledir=$(GUILE_SITE)/$(PACKAGE) | 17 | sitedir=$(GUILE_SITE)/$(PACKAGE) |
18 | guile_DATA=\ | 18 | site_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 | ||
29 | cgi.m4: Makefile | 29 | cgi.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 | ||
49 | SUFFIXES = .scm4 .scm .x | 51 | SUFFIXES = .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 | ||
54 | cgi.scm: cgi.scm4 cgi.m4 | 56 | cgi.scm: cgi.scm4 cgi.m4 |
55 | config.scm: config.scm4 cgi.m4 | 57 | config.scm: config.scm4 cgi.m4 |
@@ -68,17 +70,9 @@ libelmorph_la_SOURCES = \ | |||
68 | syllabificator.c | 70 | syllabificator.c |
69 | 71 | ||
70 | DOT_X_FILES = elmorph.x utf8scm.x | 72 | DOT_X_FILES = elmorph.x utf8scm.x |
71 | |||
72 | BUILT_SOURCES = $(DOT_X_FILES) | 73 | BUILT_SOURCES = $(DOT_X_FILES) |
73 | |||
74 | DISTCLEANFILES = $(DOT_X_FILES) | 74 | DISTCLEANFILES = $(DOT_X_FILES) |
75 | 75 | ||
76 | snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) | ||
77 | |||
78 | .c.x: | ||
79 | AWK=$(AWK) \ | ||
80 | guile-snarf -o $@ $< $(snarfcppopts) | ||
81 | |||
82 | pkglibnames=elmorph | 76 | pkglibnames=elmorph |
83 | 77 | ||
84 | install-data-hook: | 78 | install-data-hook: |
@@ -95,4 +89,10 @@ install-data-hook: | |||
95 | 89 | ||
96 | AM_YFLAGS = -d | 90 | AM_YFLAGS = -d |
97 | YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)' | 91 | YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)' |
98 | EXTRA_DIST = yyrename elmorph-public.scm \ No newline at end of file | 92 | EXTRA_DIST = yyrename elmorph-public.scm |
93 | |||
94 | AM_CPPFLAGS=-I. | ||
95 | CLEANFILES= | ||
96 | MAINTAINERCLEANFILES= | ||
97 | include ../../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; | |||
44 | static void | 44 | static 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: |