diff options
Diffstat (limited to 'src/ellinika')
-rw-r--r-- | src/ellinika/Makefile.am | 60 | ||||
-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, 37 insertions, 37 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 @@ # This file is part of Ellinika project. -# Copyright (C) 2004,2006,2007,2008,2011 Sergey Poznyakoff +# Copyright (C) 2004, 2006-2008, 2011, 2015 Sergey Poznyakoff # # Ellinika is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -guiledir=$(GUILE_SITE)/$(PACKAGE) -guile_DATA=\ +sitedir=$(GUILE_SITE)/$(PACKAGE) +site_DATA=\ xlat.scm\ cgi.scm\ i18n.scm\ @@ -27,29 +27,31 @@ guile_DATA=\ conjugator.scm cgi.m4: Makefile - echo 'divert(-1)' > $@ - echo 'changequote([,])' >> $@ - echo 'changecom([;],[' >> $@ - echo '])' >> $@ - echo 'undefine([format])' >> $@ - echo 'define([IFACE],[$(APACHE_IFACE)])' >> $@ - echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'>>$@ - echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])' >> $@ - echo 'define([GUILE_SITE],[@GUILE_SITE@])' >> $@ - echo 'define([PACKAGE],[$(PACKAGE)])'>> $@ - echo 'define([PREFIX],[$(prefix)])' >> $@ - echo 'define([SYSCONFDIR],[$(sysconfdir)])' >> $@ - echo 'define([LOCALEDIR],[$(datadir)/locale])' >> $@ - echo 'define([HTMLDIR],[$(HTMLDIR)])' >> $@ - echo 'define([VERSION],[$(VERSION)])' >> $@ - echo 'define([LIBDIR],[$(pkglibdir)])' >> $@ - echo 'divert(0)dnl' >> $@ - echo '@AUTOGENERATED@' >> $@ + $(AM_V_GEN){ \ + echo 'divert(-1)'; \ + echo 'changequote([,])'; \ + echo 'changecom([;],['; \ + echo '])'; \ + echo 'undefine([format])'; \ + echo 'define([IFACE],[$(APACHE_IFACE)])'; \ + echo 'define([SCRIPT_SUFFIX], [@SCRIPT_SUFFIX@])'; \ + echo 'define([GUILE_BINDIR],[$(GUILE_BINDIR)])'; \ + echo 'define([GUILE_SITE],[@GUILE_SITE@])'; \ + echo 'define([PACKAGE],[$(PACKAGE)])'; \ + echo 'define([PREFIX],[$(prefix)])'; \ + echo 'define([SYSCONFDIR],[$(sysconfdir)])'; \ + echo 'define([LOCALEDIR],[$(datadir)/locale])'; \ + echo 'define([HTMLDIR],[$(HTMLDIR)])'; \ + echo 'define([VERSION],[$(VERSION)])'; \ + echo 'define([LIBDIR],[$(pkglibdir)])'; \ + echo 'divert(0)dnl'; \ + echo '@AUTOGENERATED@'; \ + } > cgi.m4 SUFFIXES = .scm4 .scm .x .scm4.scm: - m4 -I$(srcdir) cgi.m4 $< > $@ + $(AM_V_GEN)m4 -I$(srcdir) cgi.m4 $< > $@ cgi.scm: cgi.scm4 cgi.m4 config.scm: config.scm4 cgi.m4 @@ -68,17 +70,9 @@ libelmorph_la_SOURCES = \ syllabificator.c DOT_X_FILES = elmorph.x utf8scm.x - BUILT_SOURCES = $(DOT_X_FILES) - DISTCLEANFILES = $(DOT_X_FILES) -snarfcppopts = $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - -.c.x: - AWK=$(AWK) \ - guile-snarf -o $@ $< $(snarfcppopts) - pkglibnames=elmorph install-data-hook: @@ -96,3 +90,9 @@ install-data-hook: AM_YFLAGS = -d YACCCOMPILE = $(srcdir)/yyrename '$(YACC) $(YFLAGS) $(AM_YFLAGS)' EXTRA_DIST = yyrename elmorph-public.scm + +AM_CPPFLAGS=-I. +CLEANFILES= +MAINTAINERCLEANFILES= +include ../../gint/gint.mk + 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 @@ (ellinika tenses) (ellinika sql)) -(use-syntax (ice-9 syncase)) +(if (= (string->number (major-version)) 1) + (use-modules (ice-9 syncase))) ;; 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 @@ /* This file is part of Ellinika project. - Copyright (C) 2011 Sergey Poznyakoff + Copyright (C) 2011, 2015 Sergey Poznyakoff Ellinika is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,10 +28,10 @@ struct elstr { size_t len; /* Its length */ struct phoneme *phoneme; /* Phonetical map*/ - unsigned phoneme_count; /* Number of phonemes */ + size_t phoneme_count; /* Number of phonemes */ struct syllable *sylmap; /* Syllable map (nsyl elements) */ - unsigned nsyl; /* Number of syllables. */ + size_t nsyl; /* Number of syllables. */ unsigned acc_syl; /* Number of the accented syllable (1-based, from the last syllable) */ unsigned acc_pos; /* Number of the accented character @@ -44,7 +44,7 @@ scm_t_bits _elstr_tag; static void _elstr_syllabize(struct elstr *elstr, const char *func_name) { - unsigned i; + size_t i; free(elstr->phoneme); free(elstr->sylmap); @@ -196,7 +196,7 @@ static int _elstr_print(SCM smob, SCM port, scm_print_state *pstate) { struct elstr *elstr = (struct elstr *) SCM_CDR(smob); - int i, j; + size_t i, j; char *s; 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 @@ (syntax-rules () ((_ msg) (gettext msg)))) - ;;; ISO 639 language code => ISO 3166 country code ;;; The corresponding country codes where selected using the following ;;; principles: |