Merge branch 'master' into android

Conflicts:

.gitignore

@@ -17,6 +17,7 @@ AUTHORS
 COPYING
 INSTALL
 NEWS
+README
 
 Makefile
 Makefile.in

Makefile.am

@@ -215,419 +215,419 @@ dictionaries: src/espeak \
 af: espeak-data/af_dict
 dictsource/af_extra:
 	touch dictsource/af_extra
-espeak-data/af_dict: dictsource/af_list dictsource/af_rules dictsource/af_extra
+espeak-data/af_dict: src/espeak espeak-data/phontab dictsource/af_list dictsource/af_rules dictsource/af_extra
 	cd dictsource && ../src/espeak --compile=af && cd ..
 
 ak: espeak-data/ak_dict
 dictsource/ak_extra:
 	touch dictsource/ak_extra
-espeak-data/ak_dict: dictsource/ak_rules dictsource/ak_extra
+espeak-data/ak_dict: src/espeak espeak-data/phontab dictsource/ak_rules dictsource/ak_extra
 	cd dictsource && ../src/espeak --compile=ak && cd ..
 
 am: espeak-data/am_dict
 dictsource/am_extra:
 	touch dictsource/am_extra
-espeak-data/am_dict: dictsource/am_list dictsource/am_rules dictsource/am_extra
+espeak-data/am_dict: src/espeak espeak-data/phontab dictsource/am_list dictsource/am_rules dictsource/am_extra
 	cd dictsource && ../src/espeak --compile=am && cd ..
 
 az: espeak-data/az_dict
 dictsource/az_extra:
 	touch dictsource/az_extra
-espeak-data/az_dict: dictsource/az_list dictsource/az_rules dictsource/az_extra
+espeak-data/az_dict: src/espeak espeak-data/phontab dictsource/az_list dictsource/az_rules dictsource/az_extra
 	cd dictsource && ../src/espeak --compile=az && cd ..
 
 bg: espeak-data/bg_dict
 dictsource/bg_extra:
 	touch dictsource/bg_extra
-espeak-data/bg_dict: dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra
+espeak-data/bg_dict: src/espeak espeak-data/phontab dictsource/bg_list dictsource/bg_listx dictsource/bg_rules dictsource/bg_extra
 	cd dictsource && ../src/espeak --compile=bg && cd ..
 
 bo: espeak-data/bo_dict
 dictsource/bo_extra:
 	touch dictsource/bo_extra
-espeak-data/bo_dict: dictsource/bo_rules dictsource/bo_extra
+espeak-data/bo_dict: src/espeak espeak-data/phontab dictsource/bo_rules dictsource/bo_extra
 	cd dictsource && ../src/espeak --compile=bo && cd ..
 
 ca: espeak-data/ca_dict
 dictsource/ca_extra:
 	touch dictsource/ca_extra
-espeak-data/ca_dict: dictsource/ca_list dictsource/ca_rules dictsource/ca_extra
+espeak-data/ca_dict: src/espeak espeak-data/phontab dictsource/ca_list dictsource/ca_rules dictsource/ca_extra
 	cd dictsource && ../src/espeak --compile=ca && cd ..
 
 cs: espeak-data/cs_dict
 dictsource/cs_extra:
 	touch dictsource/cs_extra
-espeak-data/cs_dict: dictsource/cs_list dictsource/cs_rules dictsource/cs_extra
+espeak-data/cs_dict: src/espeak espeak-data/phontab dictsource/cs_list dictsource/cs_rules dictsource/cs_extra
 	cd dictsource && ../src/espeak --compile=cs && cd ..
 
 cy: espeak-data/cy_dict
 dictsource/cy_extra:
 	touch dictsource/cy_extra
-espeak-data/cy_dict: dictsource/cy_list dictsource/cy_rules dictsource/cy_extra
+espeak-data/cy_dict: src/espeak espeak-data/phontab dictsource/cy_list dictsource/cy_rules dictsource/cy_extra
 	cd dictsource && ../src/espeak --compile=cy && cd ..
 
 da: espeak-data/da_dict
 dictsource/da_extra:
 	touch dictsource/da_extra
-espeak-data/da_dict: dictsource/da_list dictsource/da_rules dictsource/da_extra
+espeak-data/da_dict: src/espeak espeak-data/phontab dictsource/da_list dictsource/da_rules dictsource/da_extra
 	cd dictsource && ../src/espeak --compile=da && cd ..
 
 de: espeak-data/de_dict
 dictsource/de_extra:
 	touch dictsource/de_extra
-espeak-data/de_dict: dictsource/de_list dictsource/de_rules dictsource/de_extra
+espeak-data/de_dict: src/espeak espeak-data/phontab dictsource/de_list dictsource/de_rules dictsource/de_extra
 	cd dictsource && ../src/espeak --compile=de && cd ..
 
 dv: espeak-data/dv_dict
 dictsource/dv_extra:
 	touch dictsource/dv_extra
-espeak-data/dv_dict: dictsource/dv_list dictsource/dv_rules dictsource/dv_extra
+espeak-data/dv_dict: src/espeak espeak-data/phontab dictsource/dv_list dictsource/dv_rules dictsource/dv_extra
 	cd dictsource && ../src/espeak --compile=dv && cd ..
 
 el: espeak-data/el_dict
 dictsource/el_extra:
 	touch dictsource/el_extra
-espeak-data/el_dict: dictsource/el_list dictsource/el_rules dictsource/el_extra
+espeak-data/el_dict: src/espeak espeak-data/phontab dictsource/el_list dictsource/el_rules dictsource/el_extra
 	cd dictsource && ../src/espeak --compile=el && cd ..
 
 en: espeak-data/en_dict
 dictsource/en_extra:
 	touch dictsource/en_extra
-espeak-data/en_dict: dictsource/en_list dictsource/en_rules dictsource/en_extra
+espeak-data/en_dict: src/espeak espeak-data/phontab dictsource/en_list dictsource/en_rules dictsource/en_extra
 	cd dictsource && ../src/espeak --compile=en && cd ..
 
 eo: espeak-data/eo_dict
 dictsource/eo_extra:
 	touch dictsource/eo_extra
-espeak-data/eo_dict: dictsource/eo_list dictsource/eo_rules dictsource/eo_extra
+espeak-data/eo_dict: src/espeak espeak-data/phontab dictsource/eo_list dictsource/eo_rules dictsource/eo_extra
 	cd dictsource && ../src/espeak --compile=eo && cd ..
 
 es: espeak-data/es_dict
 dictsource/es_extra:
 	touch dictsource/es_extra
-espeak-data/es_dict: dictsource/es_list dictsource/es_rules dictsource/es_extra
+espeak-data/es_dict: src/espeak espeak-data/phontab dictsource/es_list dictsource/es_rules dictsource/es_extra
 	cd dictsource && ../src/espeak --compile=es && cd ..
 
 et: espeak-data/et_dict
 dictsource/et_extra:
 	touch dictsource/et_extra
-espeak-data/et_dict: dictsource/et_list dictsource/et_rules dictsource/et_extra
+espeak-data/et_dict: src/espeak espeak-data/phontab dictsource/et_list dictsource/et_rules dictsource/et_extra
 	cd dictsource && ../src/espeak --compile=et && cd ..
 
 fi: espeak-data/fi_dict
 dictsource/fi_extra:
 	touch dictsource/fi_extra
-espeak-data/fi_dict: dictsource/fi_list dictsource/fi_rules dictsource/fi_extra
+espeak-data/fi_dict: src/espeak espeak-data/phontab dictsource/fi_list dictsource/fi_rules dictsource/fi_extra
 	cd dictsource && ../src/espeak --compile=fi && cd ..
 
 fr: espeak-data/fr_dict
 dictsource/fr_extra:
 	touch dictsource/fr_extra
-espeak-data/fr_dict: dictsource/fr_list dictsource/fr_rules dictsource/fr_extra
+espeak-data/fr_dict: src/espeak espeak-data/phontab dictsource/fr_list dictsource/fr_rules dictsource/fr_extra
 	cd dictsource && ../src/espeak --compile=fr && cd ..
 
 grc: espeak-data/grc_dict
 dictsource/grc_extra:
 	touch dictsource/grc_extra
-espeak-data/grc_dict: dictsource/grc_list dictsource/grc_rules dictsource/grc_extra
+espeak-data/grc_dict: src/espeak espeak-data/phontab dictsource/grc_list dictsource/grc_rules dictsource/grc_extra
 	cd dictsource && ../src/espeak --compile=grc && cd ..
 
 hbs: espeak-data/hbs_dict
 dictsource/hbs_extra:
 	touch dictsource/hbs_extra
-espeak-data/hbs_dict: dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra
+espeak-data/hbs_dict: src/espeak espeak-data/phontab dictsource/hbs_list dictsource/hbs_rules dictsource/hbs_extra
 	cd dictsource && ../src/espeak --compile=hbs && cd ..
 
 hi: espeak-data/hi_dict
 dictsource/hi_extra:
 	touch dictsource/hi_extra
-espeak-data/hi_dict: dictsource/hi_list dictsource/hi_rules dictsource/hi_extra
+espeak-data/hi_dict: src/espeak espeak-data/phontab dictsource/hi_list dictsource/hi_rules dictsource/hi_extra
 	cd dictsource && ../src/espeak --compile=hi && cd ..
 
 ht: espeak-data/ht_dict
 dictsource/ht_extra:
 	touch dictsource/ht_extra
-espeak-data/ht_dict: dictsource/ht_list dictsource/ht_rules dictsource/ht_extra
+espeak-data/ht_dict: src/espeak espeak-data/phontab dictsource/ht_list dictsource/ht_rules dictsource/ht_extra
 	cd dictsource && ../src/espeak --compile=ht && cd ..
 
 hu: espeak-data/hu_dict
 dictsource/hu_extra:
 	touch dictsource/hu_extra
-espeak-data/hu_dict: dictsource/hu_list dictsource/hu_rules dictsource/hu_extra
+espeak-data/hu_dict: src/espeak espeak-data/phontab dictsource/hu_list dictsource/hu_rules dictsource/hu_extra
 	cd dictsource && ../src/espeak --compile=hu && cd ..
 
 hy: espeak-data/hy_dict
 dictsource/hy_extra:
 	touch dictsource/hy_extra
-espeak-data/hy_dict: dictsource/hy_list dictsource/hy_rules dictsource/hy_extra
+espeak-data/hy_dict: src/espeak espeak-data/phontab dictsource/hy_list dictsource/hy_rules dictsource/hy_extra
 	cd dictsource && ../src/espeak --compile=hy && cd ..
 
 id: espeak-data/id_dict
 dictsource/id_extra:
 	touch dictsource/id_extra
-espeak-data/id_dict: dictsource/id_list dictsource/id_rules dictsource/id_extra
+espeak-data/id_dict: src/espeak espeak-data/phontab dictsource/id_list dictsource/id_rules dictsource/id_extra
 	cd dictsource && ../src/espeak --compile=id && cd ..
 
 is: espeak-data/is_dict
 dictsource/is_extra:
 	touch dictsource/is_extra
-espeak-data/is_dict: dictsource/is_list dictsource/is_rules dictsource/is_extra
+espeak-data/is_dict: src/espeak espeak-data/phontab dictsource/is_list dictsource/is_rules dictsource/is_extra
 	cd dictsource && ../src/espeak --compile=is && cd ..
 
 it: espeak-data/it_dict
 dictsource/it_extra:
 	touch dictsource/it_extra
-espeak-data/it_dict: dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra
+espeak-data/it_dict: src/espeak espeak-data/phontab dictsource/it_list dictsource/it_listx dictsource/it_rules dictsource/it_extra
 	cd dictsource && ../src/espeak --compile=it && cd ..
 
 jbo: espeak-data/jbo_dict
 dictsource/jbo_extra:
 	touch dictsource/jbo_extra
-espeak-data/jbo_dict: dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra
+espeak-data/jbo_dict: src/espeak espeak-data/phontab dictsource/jbo_list dictsource/jbo_rules dictsource/jbo_extra
 	cd dictsource && ../src/espeak --compile=jbo && cd ..
 
 ka: espeak-data/ka_dict
 dictsource/ka_extra:
 	touch dictsource/ka_extra
-espeak-data/ka_dict: dictsource/ka_list dictsource/ka_rules dictsource/ka_extra
+espeak-data/ka_dict: src/espeak espeak-data/phontab dictsource/ka_list dictsource/ka_rules dictsource/ka_extra
 	cd dictsource && ../src/espeak --compile=ka && cd ..
 
 kk: espeak-data/kk_dict
 dictsource/kk_extra:
 	touch dictsource/kk_extra
-espeak-data/kk_dict: dictsource/kk_list dictsource/kk_rules dictsource/kk_extra
+espeak-data/kk_dict: src/espeak espeak-data/phontab dictsource/kk_list dictsource/kk_rules dictsource/kk_extra
 	cd dictsource && ../src/espeak --compile=kk && cd ..
 
 kl: espeak-data/kl_dict
 dictsource/kl_extra:
 	touch dictsource/kl_extra
-espeak-data/kl_dict: dictsource/kl_list dictsource/kl_rules dictsource/kl_extra
+espeak-data/kl_dict: src/espeak espeak-data/phontab dictsource/kl_list dictsource/kl_rules dictsource/kl_extra
 	cd dictsource && ../src/espeak --compile=kl && cd ..
 
 kn: espeak-data/kn_dict
 dictsource/kn_extra:
 	touch dictsource/kn_extra
-espeak-data/kn_dict: dictsource/kn_list dictsource/kn_rules dictsource/kn_extra
+espeak-data/kn_dict: src/espeak espeak-data/phontab dictsource/kn_list dictsource/kn_rules dictsource/kn_extra
 	cd dictsource && ../src/espeak --compile=kn && cd ..
 
 ko: espeak-data/ko_dict
 dictsource/ko_extra:
 	touch dictsource/ko_extra
-espeak-data/ko_dict: dictsource/ko_list dictsource/ko_rules dictsource/ko_extra
+espeak-data/ko_dict: src/espeak espeak-data/phontab dictsource/ko_list dictsource/ko_rules dictsource/ko_extra
 	cd dictsource && ../src/espeak --compile=ko && cd ..
 
 ku: espeak-data/ku_dict
 dictsource/ku_extra:
 	touch dictsource/ku_extra
-espeak-data/ku_dict: dictsource/ku_list dictsource/ku_rules dictsource/ku_extra
+espeak-data/ku_dict: src/espeak espeak-data/phontab dictsource/ku_list dictsource/ku_rules dictsource/ku_extra
 	cd dictsource && ../src/espeak --compile=ku && cd ..
 
 la: espeak-data/la_dict
 dictsource/la_extra:
 	touch dictsource/la_extra
-espeak-data/la_dict: dictsource/la_list dictsource/la_rules dictsource/la_extra
+espeak-data/la_dict: src/espeak espeak-data/phontab dictsource/la_list dictsource/la_rules dictsource/la_extra
 	cd dictsource && ../src/espeak --compile=la && cd ..
 
 lt: espeak-data/lt_dict
 dictsource/lt_extra:
 	touch dictsource/lt_extra
-espeak-data/lt_dict: dictsource/lt_list dictsource/lt_rules dictsource/lt_extra
+espeak-data/lt_dict: src/espeak espeak-data/phontab dictsource/lt_list dictsource/lt_rules dictsource/lt_extra
 	cd dictsource && ../src/espeak --compile=lt && cd ..
 
 lv: espeak-data/lv_dict
 dictsource/lv_extra:
 	touch dictsource/lv_extra
-espeak-data/lv_dict: dictsource/lv_list dictsource/lv_rules dictsource/lv_extra
+espeak-data/lv_dict: src/espeak espeak-data/phontab dictsource/lv_list dictsource/lv_rules dictsource/lv_extra
 	cd dictsource && ../src/espeak --compile=lv && cd ..
 
 mk: espeak-data/mk_dict
 dictsource/mk_extra:
 	touch dictsource/mk_extra
-espeak-data/mk_dict: dictsource/mk_list dictsource/mk_rules dictsource/mk_extra
+espeak-data/mk_dict: src/espeak espeak-data/phontab dictsource/mk_list dictsource/mk_rules dictsource/mk_extra
 	cd dictsource && ../src/espeak --compile=mk && cd ..
 
 ml: espeak-data/ml_dict
 dictsource/ml_extra:
 	touch dictsource/ml_extra
-espeak-data/ml_dict: dictsource/ml_list dictsource/ml_rules dictsource/ml_extra
+espeak-data/ml_dict: src/espeak espeak-data/phontab dictsource/ml_list dictsource/ml_rules dictsource/ml_extra
 	cd dictsource && ../src/espeak --compile=ml && cd ..
 
 mt: espeak-data/mt_dict
 dictsource/mt_extra:
 	touch dictsource/mt_extra
-espeak-data/mt_dict: dictsource/mt_list dictsource/mt_rules dictsource/mt_extra
+espeak-data/mt_dict: src/espeak espeak-data/phontab dictsource/mt_list dictsource/mt_rules dictsource/mt_extra
 	cd dictsource && ../src/espeak --compile=mt && cd ..
 
 nci: espeak-data/nci_dict
 dictsource/nci_extra:
 	touch dictsource/nci_extra
-espeak-data/nci_dict: dictsource/nci_list dictsource/nci_rules dictsource/nci_extra
+espeak-data/nci_dict: src/espeak espeak-data/phontab dictsource/nci_list dictsource/nci_rules dictsource/nci_extra
 	cd dictsource && ../src/espeak --compile=nci && cd ..
 
 ne: espeak-data/ne_dict
 dictsource/ne_extra:
 	touch dictsource/ne_extra
-espeak-data/ne_dict: dictsource/ne_list dictsource/ne_rules dictsource/ne_extra
+espeak-data/ne_dict: src/espeak espeak-data/phontab dictsource/ne_list dictsource/ne_rules dictsource/ne_extra
 	cd dictsource && ../src/espeak --compile=ne && cd ..
 
 nl: espeak-data/nl_dict
 dictsource/nl_extra:
 	touch dictsource/nl_extra
-espeak-data/nl_dict: dictsource/nl_list dictsource/nl_rules dictsource/nl_extra
+espeak-data/nl_dict: src/espeak espeak-data/phontab dictsource/nl_list dictsource/nl_rules dictsource/nl_extra
 	cd dictsource && ../src/espeak --compile=nl && cd ..
 
 no: espeak-data/no_dict
 dictsource/no_extra:
 	touch dictsource/no_extra
-espeak-data/no_dict: dictsource/no_list dictsource/no_rules dictsource/no_extra
+espeak-data/no_dict: src/espeak espeak-data/phontab dictsource/no_list dictsource/no_rules dictsource/no_extra
 	cd dictsource && ../src/espeak --compile=no && cd ..
 
 nso: espeak-data/nso_dict
 dictsource/nso_extra:
 	touch dictsource/nso_extra
-espeak-data/nso_dict: dictsource/nso_list dictsource/nso_rules dictsource/nso_extra
+espeak-data/nso_dict: src/espeak espeak-data/phontab dictsource/nso_list dictsource/nso_rules dictsource/nso_extra
 	cd dictsource && ../src/espeak --compile=nso && cd ..
 
 pa: espeak-data/pa_dict
 dictsource/pa_extra:
 	touch dictsource/pa_extra
-espeak-data/pa_dict: dictsource/pa_list dictsource/pa_rules dictsource/pa_extra
+espeak-data/pa_dict: src/espeak espeak-data/phontab dictsource/pa_list dictsource/pa_rules dictsource/pa_extra
 	cd dictsource && ../src/espeak --compile=pa && cd ..
 
 pap: espeak-data/pap_dict
 dictsource/pap_extra:
 	touch dictsource/pap_extra
-espeak-data/pap_dict: dictsource/pap_list dictsource/pap_rules dictsource/pap_extra
+espeak-data/pap_dict: src/espeak espeak-data/phontab dictsource/pap_list dictsource/pap_rules dictsource/pap_extra
 	cd dictsource && ../src/espeak --compile=pap && cd ..
 
 pl: espeak-data/pl_dict
 dictsource/pl_extra:
 	touch dictsource/pl_extra
-espeak-data/pl_dict: dictsource/pl_list dictsource/pl_rules dictsource/pl_extra
+espeak-data/pl_dict: src/espeak espeak-data/phontab dictsource/pl_list dictsource/pl_rules dictsource/pl_extra
 	cd dictsource && ../src/espeak --compile=pl && cd ..
 
 prs: espeak-data/prs_dict
 dictsource/prs_extra:
 	touch dictsource/prs_extra
-espeak-data/prs_dict: dictsource/prs_list dictsource/prs_rules dictsource/prs_extra
+espeak-data/prs_dict: src/espeak espeak-data/phontab dictsource/prs_list dictsource/prs_rules dictsource/prs_extra
 	cd dictsource && ../src/espeak --compile=prs && cd ..
 
 pt: espeak-data/pt_dict
 dictsource/pt_extra:
 	touch dictsource/pt_extra
-espeak-data/pt_dict: dictsource/pt_list dictsource/pt_rules dictsource/pt_extra
+espeak-data/pt_dict: src/espeak espeak-data/phontab dictsource/pt_list dictsource/pt_rules dictsource/pt_extra
 	cd dictsource && ../src/espeak --compile=pt && cd ..
 
 ro: espeak-data/ro_dict
 dictsource/ro_extra:
 	touch dictsource/ro_extra
-espeak-data/ro_dict: dictsource/ro_list dictsource/ro_rules dictsource/ro_extra
+espeak-data/ro_dict: src/espeak espeak-data/phontab dictsource/ro_list dictsource/ro_rules dictsource/ro_extra
 	cd dictsource && ../src/espeak --compile=ro && cd ..
 
 ru: espeak-data/ru_dict
 dictsource/ru_extra:
 	touch dictsource/ru_extra
-espeak-data/ru_dict: dictsource/ru_list dictsource/ru_rules dictsource/ru_extra
+espeak-data/ru_dict: src/espeak espeak-data/phontab dictsource/ru_list dictsource/ru_rules dictsource/ru_extra
 	cd dictsource && ../src/espeak --compile=ru && cd ..
 
 rw: espeak-data/rw_dict
 dictsource/rw_extra:
 	touch dictsource/rw_extra
-espeak-data/rw_dict: dictsource/rw_list dictsource/rw_rules dictsource/rw_extra
+espeak-data/rw_dict: src/espeak espeak-data/phontab dictsource/rw_list dictsource/rw_rules dictsource/rw_extra
 	cd dictsource && ../src/espeak --compile=rw && cd ..
 
 si: espeak-data/si_dict
 dictsource/si_extra:
 	touch dictsource/si_extra
-espeak-data/si_dict: dictsource/si_list dictsource/si_rules dictsource/si_extra
+espeak-data/si_dict: src/espeak espeak-data/phontab dictsource/si_list dictsource/si_rules dictsource/si_extra
 	cd dictsource && ../src/espeak --compile=si && cd ..
 
 sk: espeak-data/sk_dict
 dictsource/sk_extra:
 	touch dictsource/sk_extra
-espeak-data/sk_dict: dictsource/sk_list dictsource/sk_rules dictsource/sk_extra
+espeak-data/sk_dict: src/espeak espeak-data/phontab dictsource/sk_list dictsource/sk_rules dictsource/sk_extra
 	cd dictsource && ../src/espeak --compile=sk && cd ..
 
 sl: espeak-data/sl_dict
 dictsource/sl_extra:
 	touch dictsource/sl_extra
-espeak-data/sl_dict: dictsource/sl_list dictsource/sl_rules dictsource/sl_extra
+espeak-data/sl_dict: src/espeak espeak-data/phontab dictsource/sl_list dictsource/sl_rules dictsource/sl_extra
 	cd dictsource && ../src/espeak --compile=sl && cd ..
 
 sq: espeak-data/sq_dict
 dictsource/sq_extra:
 	touch dictsource/sq_extra
-espeak-data/sq_dict: dictsource/sq_list dictsource/sq_rules dictsource/sq_extra
+espeak-data/sq_dict: src/espeak espeak-data/phontab dictsource/sq_list dictsource/sq_rules dictsource/sq_extra
 	cd dictsource && ../src/espeak --compile=sq && cd ..
 
 sv: espeak-data/sv_dict
 dictsource/sv_extra:
 	touch dictsource/sv_extra
-espeak-data/sv_dict: dictsource/sv_list dictsource/sv_rules dictsource/sv_extra
+espeak-data/sv_dict: src/espeak espeak-data/phontab dictsource/sv_list dictsource/sv_rules dictsource/sv_extra
 	cd dictsource && ../src/espeak --compile=sv && cd ..
 
 sw: espeak-data/sw_dict
 dictsource/sw_extra:
 	touch dictsource/sw_extra
-espeak-data/sw_dict: dictsource/sw_list dictsource/sw_rules dictsource/sw_extra
+espeak-data/sw_dict: src/espeak espeak-data/phontab dictsource/sw_list dictsource/sw_rules dictsource/sw_extra
 	cd dictsource && ../src/espeak --compile=sw && cd ..
 
 ta: espeak-data/ta_dict
 dictsource/ta_extra:
 	touch dictsource/ta_extra
-espeak-data/ta_dict: dictsource/ta_list dictsource/ta_rules dictsource/ta_extra
+espeak-data/ta_dict: src/espeak espeak-data/phontab dictsource/ta_list dictsource/ta_rules dictsource/ta_extra
 	cd dictsource && ../src/espeak --compile=ta && cd ..
 
 te: espeak-data/te_dict
 dictsource/te_extra:
 	touch dictsource/te_extra
-espeak-data/te_dict: dictsource/te_list dictsource/te_rules dictsource/te_extra
+espeak-data/te_dict: src/espeak espeak-data/phontab dictsource/te_list dictsource/te_rules dictsource/te_extra
 	cd dictsource && ../src/espeak --compile=te && cd ..
 
 tn: espeak-data/tn_dict
 dictsource/tn_extra:
 	touch dictsource/tn_extra
-espeak-data/tn_dict: dictsource/tn_list dictsource/tn_rules dictsource/tn_extra
+espeak-data/tn_dict: src/espeak espeak-data/phontab dictsource/tn_list dictsource/tn_rules dictsource/tn_extra
 	cd dictsource && ../src/espeak --compile=tn && cd ..
 
 tr: espeak-data/tr_dict
 dictsource/tr_extra:
 	touch dictsource/tr_extra
-espeak-data/tr_dict: dictsource/tr_list dictsource/tr_rules dictsource/tr_extra
+espeak-data/tr_dict: src/espeak espeak-data/phontab dictsource/tr_list dictsource/tr_rules dictsource/tr_extra
 	cd dictsource && ../src/espeak --compile=tr && cd ..
 
 tt: espeak-data/tt_dict
 dictsource/tt_extra:
 	touch dictsource/tt_extra
-espeak-data/tt_dict: dictsource/tt_list dictsource/tt_rules dictsource/tt_extra
+espeak-data/tt_dict: src/espeak espeak-data/phontab dictsource/tt_list dictsource/tt_rules dictsource/tt_extra
 	cd dictsource && ../src/espeak --compile=tt && cd ..
 
 ur: espeak-data/ur_dict
 dictsource/ur_extra:
 	touch dictsource/ur_extra
-espeak-data/ur_dict: dictsource/ur_list dictsource/ur_rules dictsource/ur_extra
+espeak-data/ur_dict: src/espeak espeak-data/phontab dictsource/ur_list dictsource/ur_rules dictsource/ur_extra
 	cd dictsource && ../src/espeak --compile=ur && cd ..
 
 vi: espeak-data/vi_dict
 dictsource/vi_extra:
 	touch dictsource/vi_extra
-espeak-data/vi_dict: dictsource/vi_list dictsource/vi_rules dictsource/vi_extra
+espeak-data/vi_dict: src/espeak espeak-data/phontab dictsource/vi_list dictsource/vi_rules dictsource/vi_extra
 	cd dictsource && ../src/espeak --compile=vi && cd ..
 
 wo: espeak-data/wo_dict
 dictsource/wo_extra:
 	touch dictsource/wo_extra
-espeak-data/wo_dict: dictsource/wo_list dictsource/wo_rules dictsource/wo_extra
+espeak-data/wo_dict: src/espeak espeak-data/phontab dictsource/wo_list dictsource/wo_rules dictsource/wo_extra
 	cd dictsource && ../src/espeak --compile=wo && cd ..
 
 zh: espeak-data/zh_dict
 dictsource/zh_extra:
 	touch dictsource/zh_extra
-espeak-data/zh_dict: dictsource/zh_list dictsource/zh_rules dictsource/zh_extra
+espeak-data/zh_dict: src/espeak espeak-data/phontab dictsource/zh_list dictsource/zh_rules dictsource/zh_extra
 	cd dictsource && ../src/espeak --compile=zh && cd ..
 
 zhy: espeak-data/zhy_dict
 dictsource/zhy_extra:
 	touch dictsource/zhy_extra
-espeak-data/zhy_dict: dictsource/zhy_rules dictsource/zhy_extra
+espeak-data/zhy_dict: src/espeak espeak-data/phontab dictsource/zhy_rules dictsource/zhy_extra
 	cd dictsource && ../src/espeak --compile=zhy && cd ..

README

@@ -1,45 +0,0 @@
-Changes to eSpeak to support building on a POSIX system by using autotools.
-
-This does the following things:
-   1/  compile the libespeak library;
-   2/  compile the speak and espeak command-line applications;
-   3/  compile the espeakedit application;
-   4/  compile the voice data, creating an espeak-data directory.
-
-This branch also contains some bug fixes and improvements that get
-sent back upstream.
-
-
-BUILDING
-
-
-The espeak and espeakedit programs, along with the espeak voices, can
-be built via the standard autotools commands:
-
-	$ ./autogen.sh
-	$ ./configure
-	$ make
-	$ sudo make install
-
-NOTE: The configure command detects various platform differences that
-the espeak makefiles don't cater for (e.g. different wxWidgets version)
-and detect the available audio setup to use automatically.
-
-
-HISTORICAL RELEASES
-
-
-1.24.02 is the first version of eSpeak to appear in the subversion
-repository, but releases from 1.05 to 1.24 are available on the
-sourceforge website at http://sourceforge.net/projects/espeak/files/espeak/.
-
-These early releases have been checked into the historical branch,
-with the 1.24.02 release as the last entry. This makes it possible
-to use the replace functionality of git to see the earlier history:
-
-	$ git replace 8d59235f 63c1c019
-
-NOTE: The source releases contain the big_endian, espeak-edit, praat-mod,
-riskos, windows_dll and windows_sapi folders. These do not appear in the
-source repository until later releases, so have been excluded from the
-historical commits to align them better with the 1.24.02 source commit.

autogen.sh

@@ -3,6 +3,7 @@
 mkdir -p m4
 touch AUTHORS
 touch NEWS
+ln -sv README.md README
 
 aclocal -I m4 || exit 1
 

mkdictlist

@@ -31,5 +31,5 @@ for name, files in sorted(dictionaries.items()):
 	print '%s: espeak-data/%s_dict' % (name, name)
 	print 'dictsource/%s_extra:' % name
 	print '\ttouch dictsource/%s_extra' % name
-	print 'espeak-data/%s_dict: %s dictsource/%s_extra' % (name, ' '.join(sorted(files)), name)
+	print 'espeak-data/%s_dict: src/espeak espeak-data/phontab %s dictsource/%s_extra' % (name, ' '.join(sorted(files)), name)
 	print '\tcd dictsource && ../src/espeak --compile=%s && cd ..' % name