Rename espeak => espeak-ng.

.gitignore

@@ -44,7 +44,7 @@ libespeak.so*
 # programs
 
 platforms/*/espeak-phoneme-data
-espeak
+espeak-ng
 espeakedit
 speak
 

Makefile.am

@@ -161,11 +161,11 @@ src_speak_LDFLAGS  = $(wave_LIBS) -lpthread -lm
 src_speak_CFLAGS = $(common_FLAGS) $(wave_FLAGS) -I src/libespeak-ng
 src_speak_SOURCES  = src/speak.c $(common_SOURCE) $(wave_SOURCE)
 
-bin_PROGRAMS += src/espeak
+bin_PROGRAMS += src/espeak-ng
 
-src_espeak_LDADD   = src/libespeak.la
-src_espeak_CFLAGS  = -I src/include/espeak-ng
-src_espeak_SOURCES = src/espeak.c
+src_espeak_ng_LDADD   = src/libespeak.la
+src_espeak_ng_CFLAGS  = -I src/include/espeak-ng
+src_espeak_ng_SOURCES = src/espeak-ng.c
 
 bin_PROGRAMS += src/espeakedit
 
@@ -367,350 +367,350 @@ dictionaries: \
 af: espeak-data/af_dict
 dictsource/af_extra:
 	touch dictsource/af_extra
-espeak-data/af_dict: src/espeak phsource/phonemes.stamp dictsource/af_list dictsource/af_rules dictsource/af_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=af && cd ..
+espeak-data/af_dict: src/espeak-ng phsource/phonemes.stamp dictsource/af_list dictsource/af_rules dictsource/af_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=af && cd ..
 
 am: espeak-data/am_dict
 dictsource/am_extra:
 	touch dictsource/am_extra
-espeak-data/am_dict: src/espeak phsource/phonemes.stamp dictsource/am_list dictsource/am_rules dictsource/am_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=am && cd ..
+espeak-data/am_dict: src/espeak-ng phsource/phonemes.stamp dictsource/am_list dictsource/am_rules dictsource/am_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=am && cd ..
 
 an: espeak-data/an_dict
 dictsource/an_extra:
 	touch dictsource/an_extra
-espeak-data/an_dict: src/espeak phsource/phonemes.stamp 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 ..
+espeak-data/an_dict: src/espeak-ng phsource/phonemes.stamp dictsource/an_list dictsource/an_rules dictsource/an_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=an && cd ..
 
 as: espeak-data/as_dict
 dictsource/as_extra:
 	touch dictsource/as_extra
-espeak-data/as_dict: src/espeak phsource/phonemes.stamp 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 ..
+espeak-data/as_dict: src/espeak-ng phsource/phonemes.stamp dictsource/as_list dictsource/as_rules dictsource/as_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=as && cd ..
 
 az: espeak-data/az_dict
 dictsource/az_extra:
 	touch dictsource/az_extra
-espeak-data/az_dict: src/espeak phsource/phonemes.stamp dictsource/az_list dictsource/az_rules dictsource/az_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=az && cd ..
+espeak-data/az_dict: src/espeak-ng phsource/phonemes.stamp dictsource/az_list dictsource/az_rules dictsource/az_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=az && cd ..
 
 bg: espeak-data/bg_dict
 dictsource/bg_extra:
 	touch dictsource/bg_extra
-espeak-data/bg_dict: src/espeak phsource/phonemes.stamp dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=bg && cd ..
+espeak-data/bg_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=bg && cd ..
 
 bn: espeak-data/bn_dict
 dictsource/bn_extra:
 	touch dictsource/bn_extra
-espeak-data/bn_dict: src/espeak phsource/phonemes.stamp dictsource/bn_list dictsource/bn_rules dictsource/bn_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=bn && cd ..
+espeak-data/bn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/bn_list dictsource/bn_rules dictsource/bn_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=bn && cd ..
 
 ca: espeak-data/ca_dict
 dictsource/ca_extra:
 	touch dictsource/ca_extra
-espeak-data/ca_dict: src/espeak phsource/phonemes.stamp dictsource/ca_list dictsource/ca_rules dictsource/ca_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ca && cd ..
+espeak-data/ca_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ca_list dictsource/ca_rules dictsource/ca_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ca && cd ..
 
 cs: espeak-data/cs_dict
 dictsource/cs_extra:
 	touch dictsource/cs_extra
-espeak-data/cs_dict: src/espeak phsource/phonemes.stamp dictsource/cs_list dictsource/cs_rules dictsource/cs_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=cs && cd ..
+espeak-data/cs_dict: src/espeak-ng phsource/phonemes.stamp dictsource/cs_list dictsource/cs_rules dictsource/cs_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=cs && cd ..
 
 cy: espeak-data/cy_dict
 dictsource/cy_extra:
 	touch dictsource/cy_extra
-espeak-data/cy_dict: src/espeak phsource/phonemes.stamp dictsource/cy_list dictsource/cy_rules dictsource/cy_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=cy && cd ..
+espeak-data/cy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/cy_list dictsource/cy_rules dictsource/cy_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=cy && cd ..
 
 da: espeak-data/da_dict
 dictsource/da_extra:
 	touch dictsource/da_extra
-espeak-data/da_dict: src/espeak phsource/phonemes.stamp dictsource/da_list dictsource/da_rules dictsource/da_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=da && cd ..
+espeak-data/da_dict: src/espeak-ng phsource/phonemes.stamp dictsource/da_list dictsource/da_rules dictsource/da_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=da && cd ..
 
 de: espeak-data/de_dict
 dictsource/de_extra:
 	touch dictsource/de_extra
-espeak-data/de_dict: src/espeak phsource/phonemes.stamp dictsource/de_list dictsource/de_rules dictsource/de_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=de && cd ..
+espeak-data/de_dict: src/espeak-ng phsource/phonemes.stamp dictsource/de_list dictsource/de_rules dictsource/de_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=de && cd ..
 
 el: espeak-data/el_dict
 dictsource/el_extra:
 	touch dictsource/el_extra
-espeak-data/el_dict: src/espeak phsource/phonemes.stamp dictsource/el_list dictsource/el_rules dictsource/el_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=el && cd ..
+espeak-data/el_dict: src/espeak-ng phsource/phonemes.stamp dictsource/el_list dictsource/el_rules dictsource/el_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=el && cd ..
 
 en: espeak-data/en_dict
 dictsource/en_extra:
 	touch dictsource/en_extra
-espeak-data/en_dict: src/espeak phsource/phonemes.stamp dictsource/en_list dictsource/en_rules dictsource/en_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=en && cd ..
+espeak-data/en_dict: src/espeak-ng phsource/phonemes.stamp dictsource/en_list dictsource/en_rules dictsource/en_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=en && cd ..
 
 eo: espeak-data/eo_dict
 dictsource/eo_extra:
 	touch dictsource/eo_extra
-espeak-data/eo_dict: src/espeak phsource/phonemes.stamp dictsource/eo_list dictsource/eo_rules dictsource/eo_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=eo && cd ..
+espeak-data/eo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/eo_list dictsource/eo_rules dictsource/eo_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=eo && cd ..
 
 es: espeak-data/es_dict
 dictsource/es_extra:
 	touch dictsource/es_extra
-espeak-data/es_dict: src/espeak phsource/phonemes.stamp dictsource/es_list dictsource/es_rules dictsource/es_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=es && cd ..
+espeak-data/es_dict: src/espeak-ng phsource/phonemes.stamp dictsource/es_list dictsource/es_rules dictsource/es_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=es && cd ..
 
 et: espeak-data/et_dict
 dictsource/et_extra:
 	touch dictsource/et_extra
-espeak-data/et_dict: src/espeak phsource/phonemes.stamp dictsource/et_list dictsource/et_rules dictsource/et_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=et && cd ..
+espeak-data/et_dict: src/espeak-ng phsource/phonemes.stamp dictsource/et_list dictsource/et_rules dictsource/et_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=et && cd ..
 
 eu: espeak-data/eu_dict
 dictsource/eu_extra:
 	touch dictsource/eu_extra
-espeak-data/eu_dict: src/espeak phsource/phonemes.stamp dictsource/eu_list dictsource/eu_rules dictsource/eu_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=eu && cd ..
+espeak-data/eu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/eu_list dictsource/eu_rules dictsource/eu_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=eu && cd ..
 
 fa: espeak-data/fa_dict
 dictsource/fa_extra:
 	touch dictsource/fa_extra
-espeak-data/fa_dict: src/espeak phsource/phonemes.stamp dictsource/fa_list dictsource/fa_rules dictsource/fa_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=fa && cd ..
+espeak-data/fa_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fa_list dictsource/fa_rules dictsource/fa_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=fa && cd ..
 
 fi: espeak-data/fi_dict
 dictsource/fi_extra:
 	touch dictsource/fi_extra
-espeak-data/fi_dict: src/espeak phsource/phonemes.stamp dictsource/fi_list dictsource/fi_rules dictsource/fi_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=fi && cd ..
+espeak-data/fi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fi_list dictsource/fi_rules dictsource/fi_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=fi && cd ..
 
 fr: espeak-data/fr_dict
 dictsource/fr_extra:
 	touch dictsource/fr_extra
-espeak-data/fr_dict: src/espeak phsource/phonemes.stamp dictsource/fr_list dictsource/fr_rules dictsource/fr_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=fr && cd ..
+espeak-data/fr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/fr_list dictsource/fr_rules dictsource/fr_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=fr && cd ..
 
 ga: espeak-data/ga_dict
 dictsource/ga_extra:
 	touch dictsource/ga_extra
-espeak-data/ga_dict: src/espeak phsource/phonemes.stamp dictsource/ga_list dictsource/ga_rules dictsource/ga_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ga && cd ..
+espeak-data/ga_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ga_list dictsource/ga_rules dictsource/ga_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ga && cd ..
 
 gd: espeak-data/gd_dict
 dictsource/gd_extra:
 	touch dictsource/gd_extra
-espeak-data/gd_dict: src/espeak phsource/phonemes.stamp dictsource/gd_list dictsource/gd_rules dictsource/gd_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=gd && cd ..
+espeak-data/gd_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gd_list dictsource/gd_rules dictsource/gd_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gd && cd ..
 
 grc: espeak-data/grc_dict
 dictsource/grc_extra:
 	touch dictsource/grc_extra
-espeak-data/grc_dict: src/espeak phsource/phonemes.stamp 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 ..
+espeak-data/grc_dict: src/espeak-ng phsource/phonemes.stamp dictsource/grc_list dictsource/grc_rules dictsource/grc_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=grc && cd ..
 
 gu: espeak-data/gu_dict
 dictsource/gu_extra:
 	touch dictsource/gu_extra
-espeak-data/gu_dict: src/espeak phsource/phonemes.stamp 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 ..
+espeak-data/gu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/gu_list dictsource/gu_rules dictsource/gu_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=gu && cd ..
 
 hbs: espeak-data/hbs_dict
 dictsource/hbs_extra:
 	touch dictsource/hbs_extra
-espeak-data/hbs_dict: src/espeak phsource/phonemes.stamp dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=hbs && cd ..
+espeak-data/hbs_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hbs && cd ..
 
 hi: espeak-data/hi_dict
 dictsource/hi_extra:
 	touch dictsource/hi_extra
-espeak-data/hi_dict: src/espeak phsource/phonemes.stamp dictsource/hi_list dictsource/hi_rules dictsource/hi_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=hi && cd ..
+espeak-data/hi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hi_list dictsource/hi_rules dictsource/hi_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hi && cd ..
 
 hu: espeak-data/hu_dict
 dictsource/hu_extra:
 	touch dictsource/hu_extra
-espeak-data/hu_dict: src/espeak phsource/phonemes.stamp dictsource/hu_list dictsource/hu_rules dictsource/hu_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=hu && cd ..
+espeak-data/hu_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hu_list dictsource/hu_rules dictsource/hu_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hu && cd ..
 
 hy: espeak-data/hy_dict
 dictsource/hy_extra:
 	touch dictsource/hy_extra
-espeak-data/hy_dict: src/espeak phsource/phonemes.stamp dictsource/hy_list dictsource/hy_rules dictsource/hy_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=hy && cd ..
+espeak-data/hy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/hy_list dictsource/hy_rules dictsource/hy_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=hy && cd ..
 
 ia: espeak-data/ia_dict
 dictsource/ia_extra:
 	touch dictsource/ia_extra
-espeak-data/ia_dict: src/espeak phsource/phonemes.stamp dictsource/ia_list dictsource/ia_rules dictsource/ia_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ia && cd ..
+espeak-data/ia_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ia_list dictsource/ia_rules dictsource/ia_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ia && cd ..
 
 id: espeak-data/id_dict
 dictsource/id_extra:
 	touch dictsource/id_extra
-espeak-data/id_dict: src/espeak phsource/phonemes.stamp dictsource/id_list dictsource/id_rules dictsource/id_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=id && cd ..
+espeak-data/id_dict: src/espeak-ng phsource/phonemes.stamp dictsource/id_list dictsource/id_rules dictsource/id_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=id && cd ..
 
 is: espeak-data/is_dict
 dictsource/is_extra:
 	touch dictsource/is_extra
-espeak-data/is_dict: src/espeak phsource/phonemes.stamp dictsource/is_list dictsource/is_rules dictsource/is_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=is && cd ..
+espeak-data/is_dict: src/espeak-ng phsource/phonemes.stamp dictsource/is_list dictsource/is_rules dictsource/is_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=is && cd ..
 
 it: espeak-data/it_dict
 dictsource/it_extra:
 	touch dictsource/it_extra
-espeak-data/it_dict: src/espeak phsource/phonemes.stamp dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=it && cd ..
+espeak-data/it_dict: src/espeak-ng phsource/phonemes.stamp dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=it && cd ..
 
 jbo: espeak-data/jbo_dict
 dictsource/jbo_extra:
 	touch dictsource/jbo_extra
-espeak-data/jbo_dict: src/espeak phsource/phonemes.stamp dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=jbo && cd ..
+espeak-data/jbo_dict: src/espeak-ng phsource/phonemes.stamp dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=jbo && cd ..
 
 ka: espeak-data/ka_dict
 dictsource/ka_extra:
 	touch dictsource/ka_extra
-espeak-data/ka_dict: src/espeak phsource/phonemes.stamp dictsource/ka_list dictsource/ka_rules dictsource/ka_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ka && cd ..
+espeak-data/ka_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ka_list dictsource/ka_rules dictsource/ka_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ka && cd ..
 
 kl: espeak-data/kl_dict
 dictsource/kl_extra:
 	touch dictsource/kl_extra
-espeak-data/kl_dict: src/espeak phsource/phonemes.stamp dictsource/kl_list dictsource/kl_rules dictsource/kl_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=kl && cd ..
+espeak-data/kl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/kl_list dictsource/kl_rules dictsource/kl_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=kl && cd ..
 
 kn: espeak-data/kn_dict
 dictsource/kn_extra:
 	touch dictsource/kn_extra
-espeak-data/kn_dict: src/espeak phsource/phonemes.stamp dictsource/kn_list dictsource/kn_rules dictsource/kn_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=kn && cd ..
+espeak-data/kn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/kn_list dictsource/kn_rules dictsource/kn_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=kn && cd ..
 
 ko: espeak-data/ko_dict
 dictsource/ko_extra:
 	touch dictsource/ko_extra
-espeak-data/ko_dict: src/espeak phsource/phonemes.stamp dictsource/ko_list dictsource/ko_rules dictsource/ko_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ko && cd ..
+espeak-data/ko_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ko_list dictsource/ko_rules dictsource/ko_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ko && cd ..
 
 ku: espeak-data/ku_dict
 dictsource/ku_extra:
 	touch dictsource/ku_extra
-espeak-data/ku_dict: src/espeak phsource/phonemes.stamp dictsource/ku_list dictsource/ku_rules dictsource/ku_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ku && cd ..
+espeak-data/ku_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ku_list dictsource/ku_rules dictsource/ku_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ku && cd ..
 
 la: espeak-data/la_dict
 dictsource/la_extra:
 	touch dictsource/la_extra
-espeak-data/la_dict: src/espeak phsource/phonemes.stamp dictsource/la_list dictsource/la_rules dictsource/la_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=la && cd ..
+espeak-data/la_dict: src/espeak-ng phsource/phonemes.stamp dictsource/la_list dictsource/la_rules dictsource/la_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=la && cd ..
 
 lfn: espeak-data/lfn_dict
 dictsource/lfn_extra:
 	touch dictsource/lfn_extra
-espeak-data/lfn_dict: src/espeak phsource/phonemes.stamp dictsource/lfn_list dictsource/lfn_rules dictsource/lfn_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=lfn && cd ..
+espeak-data/lfn_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lfn_list dictsource/lfn_rules dictsource/lfn_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lfn && cd ..
 
 lt: espeak-data/lt_dict
 dictsource/lt_extra:
 	touch dictsource/lt_extra
-espeak-data/lt_dict: src/espeak phsource/phonemes.stamp dictsource/lt_list dictsource/lt_rules dictsource/lt_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=lt && cd ..
+espeak-data/lt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lt_list dictsource/lt_rules dictsource/lt_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lt && cd ..
 
 lv: espeak-data/lv_dict
 dictsource/lv_extra:
 	touch dictsource/lv_extra
-espeak-data/lv_dict: src/espeak phsource/phonemes.stamp dictsource/lv_list dictsource/lv_rules dictsource/lv_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=lv && cd ..
+espeak-data/lv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/lv_list dictsource/lv_rules dictsource/lv_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=lv && cd ..
 
 mk: espeak-data/mk_dict
 dictsource/mk_extra:
 	touch dictsource/mk_extra
-espeak-data/mk_dict: src/espeak phsource/phonemes.stamp dictsource/mk_list dictsource/mk_rules dictsource/mk_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=mk && cd ..
+espeak-data/mk_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mk_list dictsource/mk_rules dictsource/mk_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mk && cd ..
 
 ml: espeak-data/ml_dict
 dictsource/ml_extra:
 	touch dictsource/ml_extra
-espeak-data/ml_dict: src/espeak phsource/phonemes.stamp dictsource/ml_list dictsource/ml_rules dictsource/ml_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ml && cd ..
+espeak-data/ml_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ml_list dictsource/ml_rules dictsource/ml_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ml && cd ..
 
 mr: espeak-data/mr_dict
 dictsource/mr_extra:
 	touch dictsource/mr_extra
-espeak-data/mr_dict: src/espeak phsource/phonemes.stamp dictsource/mr_list dictsource/mr_rules dictsource/mr_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=mr && cd ..
+espeak-data/mr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/mr_list dictsource/mr_rules dictsource/mr_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=mr && cd ..
 
 ms: espeak-data/ms_dict
 dictsource/ms_extra:
 	touch dictsource/ms_extra
-espeak-data/ms_dict: src/espeak phsource/phonemes.stamp dictsource/ms_list dictsource/ms_rules dictsource/ms_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ms && cd ..
+espeak-data/ms_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ms_list dictsource/ms_rules dictsource/ms_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ms && cd ..
 
 nci: espeak-data/nci_dict
 dictsource/nci_extra:
 	touch dictsource/nci_extra
-espeak-data/nci_dict: src/espeak phsource/phonemes.stamp dictsource/nci_list dictsource/nci_rules dictsource/nci_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=nci && cd ..
+espeak-data/nci_dict: src/espeak-ng phsource/phonemes.stamp dictsource/nci_list dictsource/nci_rules dictsource/nci_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=nci && cd ..
 
 ne: espeak-data/ne_dict
 dictsource/ne_extra:
 	touch dictsource/ne_extra
-espeak-data/ne_dict: src/espeak phsource/phonemes.stamp dictsource/ne_list dictsource/ne_rules dictsource/ne_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ne && cd ..
+espeak-data/ne_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ne_list dictsource/ne_rules dictsource/ne_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ne && cd ..
 
 nl: espeak-data/nl_dict
 dictsource/nl_extra:
 	touch dictsource/nl_extra
-espeak-data/nl_dict: src/espeak phsource/phonemes.stamp dictsource/nl_list dictsource/nl_rules dictsource/nl_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=nl && cd ..
+espeak-data/nl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/nl_list dictsource/nl_rules dictsource/nl_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=nl && cd ..
 
 no: espeak-data/no_dict
 dictsource/no_extra:
 	touch dictsource/no_extra
-espeak-data/no_dict: src/espeak phsource/phonemes.stamp 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 ..
+espeak-data/no_dict: src/espeak-ng phsource/phonemes.stamp dictsource/no_list dictsource/no_rules dictsource/no_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=no && cd ..
 
 om: espeak-data/om_dict
 dictsource/om_extra:
 	touch dictsource/om_extra
-espeak-data/om_dict: src/espeak phsource/phonemes.stamp 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 ..
+espeak-data/om_dict: src/espeak-ng phsource/phonemes.stamp dictsource/om_list dictsource/om_rules dictsource/om_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=om && cd ..
 
 or: espeak-data/or_dict
 dictsource/or_extra:
 	touch dictsource/or_extra
-espeak-data/or_dict: src/espeak phsource/phonemes.stamp dictsource/or_list dictsource/or_rules dictsource/or_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=or && cd ..
+espeak-data/or_dict: src/espeak-ng phsource/phonemes.stamp dictsource/or_list dictsource/or_rules dictsource/or_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=or && cd ..
 
 pa: espeak-data/pa_dict
 dictsource/pa_extra:
 	touch dictsource/pa_extra
-espeak-data/pa_dict: src/espeak phsource/phonemes.stamp dictsource/pa_list dictsource/pa_rules dictsource/pa_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=pa && cd ..
+espeak-data/pa_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pa_list dictsource/pa_rules dictsource/pa_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pa && cd ..
 
 pap: espeak-data/pap_dict
 dictsource/pap_extra:
 	touch dictsource/pap_extra
-espeak-data/pap_dict: src/espeak phsource/phonemes.stamp dictsource/pap_list dictsource/pap_rules dictsource/pap_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=pap && cd ..
+espeak-data/pap_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pap_list dictsource/pap_rules dictsource/pap_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pap && cd ..
 
 pl: espeak-data/pl_dict
 dictsource/pl_extra:
 	touch dictsource/pl_extra
-espeak-data/pl_dict: src/espeak phsource/phonemes.stamp dictsource/pl_list dictsource/pl_rules dictsource/pl_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=pl && cd ..
+espeak-data/pl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pl_list dictsource/pl_rules dictsource/pl_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pl && cd ..
 
 pt: espeak-data/pt_dict
 dictsource/pt_extra:
 	touch dictsource/pt_extra
-espeak-data/pt_dict: src/espeak phsource/phonemes.stamp dictsource/pt_list dictsource/pt_rules dictsource/pt_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=pt && cd ..
+espeak-data/pt_dict: src/espeak-ng phsource/phonemes.stamp dictsource/pt_list dictsource/pt_rules dictsource/pt_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=pt && cd ..
 
 ro: espeak-data/ro_dict
 dictsource/ro_extra:
 	touch dictsource/ro_extra
-espeak-data/ro_dict: src/espeak phsource/phonemes.stamp dictsource/ro_list dictsource/ro_rules dictsource/ro_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ro && cd ..
+espeak-data/ro_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ro_list dictsource/ro_rules dictsource/ro_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ro && cd ..
 
 ru: espeak-data/ru_dict
 dictsource/ru_extra:
@@ -720,75 +720,75 @@ dictsource/ru_listx:
 if HAVE_RU_EXTENDED_DICTIONARY
 espeak-data/ru_dict: src/espeak phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra dictsource/ru_listx
 else
-espeak-data/ru_dict: src/espeak phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra
+espeak-data/ru_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ru_list dictsource/ru_rules dictsource/ru_extra
 endif
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ru && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ru && cd ..
 
 si: espeak-data/si_dict
 dictsource/si_extra:
 	touch dictsource/si_extra
-espeak-data/si_dict: src/espeak phsource/phonemes.stamp dictsource/si_list dictsource/si_rules dictsource/si_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=si && cd ..
+espeak-data/si_dict: src/espeak-ng phsource/phonemes.stamp dictsource/si_list dictsource/si_rules dictsource/si_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=si && cd ..
 
 sk: espeak-data/sk_dict
 dictsource/sk_extra:
 	touch dictsource/sk_extra
-espeak-data/sk_dict: src/espeak phsource/phonemes.stamp dictsource/sk_list dictsource/sk_rules dictsource/sk_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=sk && cd ..
+espeak-data/sk_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sk_list dictsource/sk_rules dictsource/sk_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sk && cd ..
 
 sl: espeak-data/sl_dict
 dictsource/sl_extra:
 	touch dictsource/sl_extra
-espeak-data/sl_dict: src/espeak phsource/phonemes.stamp dictsource/sl_list dictsource/sl_rules dictsource/sl_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=sl && cd ..
+espeak-data/sl_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sl_list dictsource/sl_rules dictsource/sl_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sl && cd ..
 
 sq: espeak-data/sq_dict
 dictsource/sq_extra:
 	touch dictsource/sq_extra
-espeak-data/sq_dict: src/espeak phsource/phonemes.stamp dictsource/sq_list dictsource/sq_rules dictsource/sq_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=sq && cd ..
+espeak-data/sq_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sq_list dictsource/sq_rules dictsource/sq_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sq && cd ..
 
 sv: espeak-data/sv_dict
 dictsource/sv_extra:
 	touch dictsource/sv_extra
-espeak-data/sv_dict: src/espeak phsource/phonemes.stamp dictsource/sv_list dictsource/sv_rules dictsource/sv_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=sv && cd ..
+espeak-data/sv_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sv_list dictsource/sv_rules dictsource/sv_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sv && cd ..
 
 sw: espeak-data/sw_dict
 dictsource/sw_extra:
 	touch dictsource/sw_extra
-espeak-data/sw_dict: src/espeak phsource/phonemes.stamp dictsource/sw_list dictsource/sw_rules dictsource/sw_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=sw && cd ..
+espeak-data/sw_dict: src/espeak-ng phsource/phonemes.stamp dictsource/sw_list dictsource/sw_rules dictsource/sw_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=sw && cd ..
 
 ta: espeak-data/ta_dict
 dictsource/ta_extra:
 	touch dictsource/ta_extra
-espeak-data/ta_dict: src/espeak phsource/phonemes.stamp dictsource/ta_list dictsource/ta_rules dictsource/ta_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ta && cd ..
+espeak-data/ta_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ta_list dictsource/ta_rules dictsource/ta_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ta && cd ..
 
 te: espeak-data/te_dict
 dictsource/te_extra:
 	touch dictsource/te_extra
-espeak-data/te_dict: src/espeak phsource/phonemes.stamp dictsource/te_list dictsource/te_rules dictsource/te_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=te && cd ..
+espeak-data/te_dict: src/espeak-ng phsource/phonemes.stamp dictsource/te_list dictsource/te_rules dictsource/te_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=te && cd ..
 
 tr: espeak-data/tr_dict
 dictsource/tr_extra:
 	touch dictsource/tr_extra
-espeak-data/tr_dict: src/espeak phsource/phonemes.stamp dictsource/tr_list dictsource/tr_rules dictsource/tr_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=tr && cd ..
+espeak-data/tr_dict: src/espeak-ng phsource/phonemes.stamp dictsource/tr_list dictsource/tr_rules dictsource/tr_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=tr && cd ..
 
 ur: espeak-data/ur_dict
 dictsource/ur_extra:
 	touch dictsource/ur_extra
-espeak-data/ur_dict: src/espeak phsource/phonemes.stamp dictsource/ur_list dictsource/ur_rules dictsource/ur_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=ur && cd ..
+espeak-data/ur_dict: src/espeak-ng phsource/phonemes.stamp dictsource/ur_list dictsource/ur_rules dictsource/ur_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=ur && cd ..
 
 vi: espeak-data/vi_dict
 dictsource/vi_extra:
 	touch dictsource/vi_extra
-espeak-data/vi_dict: src/espeak phsource/phonemes.stamp dictsource/vi_list dictsource/vi_rules dictsource/vi_extra
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=vi && cd ..
+espeak-data/vi_dict: src/espeak-ng phsource/phonemes.stamp dictsource/vi_list dictsource/vi_rules dictsource/vi_extra
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=vi && cd ..
 
 zh: espeak-data/zh_dict
 dictsource/zh_extra:
@@ -798,9 +798,9 @@ dictsource/zh_listx:
 if HAVE_ZH_EXTENDED_DICTIONARY
 espeak-data/zh_dict: src/espeak phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra dictsource/zh_listx
 else
-espeak-data/zh_dict: src/espeak phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra
+espeak-data/zh_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zh_list dictsource/zh_rules dictsource/zh_extra
 endif
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=zh && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=zh && cd ..
 
 zhy: espeak-data/zhy_dict
 dictsource/zhy_extra:
@@ -810,9 +810,9 @@ dictsource/zhy_list:
 if HAVE_ZHY_EXTENDED_DICTIONARY
 espeak-data/zhy_dict: src/espeak phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra dictsource/zhy_list
 else
-espeak-data/zhy_dict: src/espeak phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra
+espeak-data/zhy_dict: src/espeak-ng phsource/phonemes.stamp dictsource/zhy_rules dictsource/zhy_extra
 endif
-	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=zhy && cd ..
+	cd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=zhy && cd ..
 
 ##### mbrola:
 

mkdictlist

@@ -102,10 +102,10 @@ def write_dictionary_make_rules(f):
 			f.write('if HAVE_%s_EXTENDED_DICTIONARY\n' % name.upper())
 			f.write('espeak-data/%s_dict: src/espeak phsource/phonemes.stamp %s dictsource/%s_extra dictsource/%s\n' % (name, ' '.join(sorted(files)), name, ext))
 			f.write('else\n')
-		f.write('espeak-data/%s_dict: src/espeak phsource/phonemes.stamp %s dictsource/%s_extra\n' % (name, ' '.join(sorted(files)), name))
+		f.write('espeak-data/%s_dict: src/espeak-ng phsource/phonemes.stamp %s dictsource/%s_extra\n' % (name, ' '.join(sorted(files)), name))
 		if name in extended_dictionaries.keys():
 			f.write('endif\n')
-		f.write('\tcd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak --compile=%s && cd ..\n' % name)
+		f.write('\tcd dictsource && ESPEAK_DATA_PATH=$(PWD) LD_LIBRARY_PATH=../src:${LD_LIBRARY_PATH} ../src/espeak-ng --compile=%s && cd ..\n' % name)
 
 def write_mbrola_make_rules(f):
 	f.write('\n##### mbrola:\n')

src/espeak.c → src/espeak-ng.c

@@ -41,7 +41,7 @@
 
 
 static const char *help_text =
-"\nespeak [options] [\"<words>\"]\n\n"
+"\nespeak-ng [options] [\"<words>\"]\n\n"
 "-f <text file>   Text file to speak\n"
 "--stdin    Read text input from stdin instead of a file\n\n"
 "If neither -f nor --stdin, then <words> are spoken, or if none then text\n"