Merge branch 'master' into android

Conflicts:
	README.md
This commit is contained in:
Reece H. Dunn
2013-09-25 08:57:56 +01:00
55 changed files with 3266 additions and 564 deletions
+21
View File
@@ -206,6 +206,7 @@ dictionaries: src/espeak \
espeak-data/af_dict \
espeak-data/am_dict \
espeak-data/an_dict \
espeak-data/as_dict \
espeak-data/az_dict \
espeak-data/bg_dict \
espeak-data/bn_dict \
@@ -224,6 +225,7 @@ dictionaries: src/espeak \
espeak-data/fr_dict \
espeak-data/ga_dict \
espeak-data/grc_dict \
espeak-data/gu_dict \
espeak-data/hi_dict \
espeak-data/hu_dict \
espeak-data/hy_dict \
@@ -246,6 +248,7 @@ dictionaries: src/espeak \
espeak-data/ne_dict \
espeak-data/nl_dict \
espeak-data/no_dict \
espeak-data/om_dict \
espeak-data/pa_dict \
espeak-data/pap_dict \
espeak-data/pl_dict \
@@ -284,6 +287,12 @@ dictsource/an_extra:
espeak-data/an_dict: src/espeak espeak-data/phontab dictsource/an_list dictsource/an_rules dictsource/an_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=an && cd ..
as: espeak-data/as_dict
dictsource/as_extra:
touch dictsource/as_extra
espeak-data/as_dict: src/espeak espeak-data/phontab dictsource/as_list dictsource/as_rules dictsource/as_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=as && cd ..
az: espeak-data/az_dict
dictsource/az_extra:
touch dictsource/az_extra
@@ -392,6 +401,12 @@ dictsource/grc_extra:
espeak-data/grc_dict: src/espeak espeak-data/phontab dictsource/grc_list dictsource/grc_rules dictsource/grc_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=grc && cd ..
gu: espeak-data/gu_dict
dictsource/gu_extra:
touch dictsource/gu_extra
espeak-data/gu_dict: src/espeak espeak-data/phontab dictsource/gu_list dictsource/gu_rules dictsource/gu_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=gu && cd ..
hi: espeak-data/hi_dict
dictsource/hi_extra:
touch dictsource/hi_extra
@@ -524,6 +539,12 @@ dictsource/no_extra:
espeak-data/no_dict: src/espeak espeak-data/phontab dictsource/no_list dictsource/no_rules dictsource/no_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=no && cd ..
om: espeak-data/om_dict
dictsource/om_extra:
touch dictsource/om_extra
espeak-data/om_dict: src/espeak espeak-data/phontab dictsource/om_list dictsource/om_rules dictsource/om_extra
cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=om && cd ..
pa: espeak-data/pa_dict
dictsource/pa_extra:
touch dictsource/pa_extra