move idxdict to l10ntools

Change-Id: I If670e3732177ef4f21c48b062c43d6a6c3867687

24 files changed, 71 insertions, 192 deletions

diff --git a/dictionaries/ar/makefile.mk b/dictionaries/ar/makefile.mk
index 2608e3f..f303cf0 100644
--- a/dictionaries/ar/makefile.mk
+++ b/dictionaries/ar/makefile.mk
@@ -91,4 +91,4 @@ $(DESCRIPTION_SRC) : description.xml
 .ENDIF
 
 $(EXTENSIONDIR)$/th_ar.idx : "$(EXTENSIONDIR)$/th_ar.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx <$(EXTENSIONDIR)$/th_ar.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ar.idx <$(EXTENSIONDIR)$/th_ar.dat
diff --git a/dictionaries/bg_BG/makefile.mk b/dictionaries/bg_BG/makefile.mk
index 4730011..ebeaaf9 100644
--- a/dictionaries/bg_BG/makefile.mk
+++ b/dictionaries/bg_BG/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_bg_BG_v2.idx : "$(EXTENSIONDIR)$/th_bg_BG_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx <$(EXTENSIONDIR)$/th_bg_BG_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_bg_BG_v2.idx <$(EXTENSIONDIR)$/th_bg_BG_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/ca/makefile.mk b/dictionaries/ca/makefile.mk
index eeac8a1..98ecc6a 100644
--- a/dictionaries/ca/makefile.mk
+++ b/dictionaries/ca/makefile.mk
@@ -97,7 +97,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ca_ES_v3.idx : "$(EXTENSIONDIR)$/th_ca_ES_v3.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ca_ES_v3.idx <$(EXTENSIONDIR)$/th_ca_ES_v3.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/cs_CZ/makefile.mk b/dictionaries/cs_CZ/makefile.mk
index c2b1c60..3e807c0 100644
--- a/dictionaries/cs_CZ/makefile.mk
+++ b/dictionaries/cs_CZ/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_cs_CZ_v3.idx : "$(EXTENSIONDIR)$/th_cs_CZ_v3.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v3.idx <$(EXTENSIONDIR)$/th_cs_CZ_v3.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_cs_CZ_v3.idx <$(EXTENSIONDIR)$/th_cs_CZ_v3.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/da_DK/makefile.mk b/dictionaries/da_DK/makefile.mk
index 8dc64c0..184f9c7 100644
--- a/dictionaries/da_DK/makefile.mk
+++ b/dictionaries/da_DK/makefile.mk
@@ -91,7 +91,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_da_DK.idx : "$(EXTENSIONDIR)$/th_da_DK.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx <$(EXTENSIONDIR)$/th_da_DK.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_da_DK.idx <$(EXTENSIONDIR)$/th_da_DK.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/de/makefile.mk b/dictionaries/de/makefile.mk
index ee8a954..d7eb6a6 100644
--- a/dictionaries/de/makefile.mk
+++ b/dictionaries/de/makefile.mk
@@ -98,9 +98,9 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_de_DE_v2.idx : "$(EXTENSIONDIR)$/th_de_DE_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_DE_v2.idx <$(EXTENSIONDIR)$/th_de_DE_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_DE_v2.idx <$(EXTENSIONDIR)$/th_de_DE_v2.dat
 $(EXTENSIONDIR)$/th_de_AT_v2.idx : "$(EXTENSIONDIR)$/th_de_AT_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_AT_v2.idx <$(EXTENSIONDIR)$/th_de_AT_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_de_AT_v2.idx <$(EXTENSIONDIR)$/th_de_AT_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/en/makefile.mk b/dictionaries/en/makefile.mk
index 4afb061..1e8e5cd 100644
--- a/dictionaries/en/makefile.mk
+++ b/dictionaries/en/makefile.mk
@@ -123,7 +123,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_en_US_v2.idx : "$(EXTENSIONDIR)$/th_en_US_v2.dat"
-        $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_en_US_v2.idx <$(EXTENSIONDIR)$/th_en_US_v2.dat
+        $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_en_US_v2.idx <$(EXTENSIONDIR)$/th_en_US_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/fr_FR/makefile.mk b/dictionaries/fr_FR/makefile.mk
index 9314f99..eb89191 100644
--- a/dictionaries/fr_FR/makefile.mk
+++ b/dictionaries/fr_FR/makefile.mk
@@ -89,7 +89,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/thes_fr.idx : "$(EXTENSIONDIR)$/thes_fr.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/thes_fr.idx <$(EXTENSIONDIR)$/thes_fr.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/hu_HU/makefile.mk b/dictionaries/hu_HU/makefile.mk
index 4ade9a0..532da4b 100644
--- a/dictionaries/hu_HU/makefile.mk
+++ b/dictionaries/hu_HU/makefile.mk
@@ -109,7 +109,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_hu_HU_v2.idx : "$(EXTENSIONDIR)$/th_hu_HU_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx <$(EXTENSIONDIR)$/th_hu_HU_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_hu_HU_v2.idx <$(EXTENSIONDIR)$/th_hu_HU_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/it_IT/makefile.mk b/dictionaries/it_IT/makefile.mk
index e226e71..959272f 100644
--- a/dictionaries/it_IT/makefile.mk
+++ b/dictionaries/it_IT/makefile.mk
@@ -93,4 +93,4 @@ $(DESCRIPTION_SRC) : description.xml
 .ENDIF
 
 $(EXTENSIONDIR)$/th_it_IT_v2.idx : "$(EXTENSIONDIR)$/th_it_IT_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_it_IT_v2.idx <$(EXTENSIONDIR)$/th_it_IT_v2.dat
diff --git a/dictionaries/lv_LV/makefile.mk b/dictionaries/lv_LV/makefile.mk
index 4243da5..0024bd3 100644
--- a/dictionaries/lv_LV/makefile.mk
+++ b/dictionaries/lv_LV/makefile.mk
@@ -87,7 +87,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_lv_LV_v2.idx : "$(EXTENSIONDIR)$/th_lv_LV_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_lv_LV_v2.idx <$(EXTENSIONDIR)$/th_lv_LV_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_lv_LV_v2.idx <$(EXTENSIONDIR)$/th_lv_LV_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/ne_NP/makefile.mk b/dictionaries/ne_NP/makefile.mk
index dd7ce74..df1c04a 100644
--- a/dictionaries/ne_NP/makefile.mk
+++ b/dictionaries/ne_NP/makefile.mk
@@ -84,7 +84,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ne_NP_v2.idx : "$(EXTENSIONDIR)$/th_ne_NP_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ne_NP_v2.idx <$(EXTENSIONDIR)$/th_ne_NP_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/no/makefile.mk b/dictionaries/no/makefile.mk
index 618308a..71aae40 100644
--- a/dictionaries/no/makefile.mk
+++ b/dictionaries/no/makefile.mk
@@ -90,10 +90,10 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_nb_NO_v2.idx : "$(EXTENSIONDIR)$/th_nb_NO_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nb_NO_v2.idx <$(EXTENSIONDIR)$/th_nb_NO_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nb_NO_v2.idx <$(EXTENSIONDIR)$/th_nb_NO_v2.dat
 
 $(EXTENSIONDIR)$/th_nn_NO_v2.idx : "$(EXTENSIONDIR)$/th_nn_NO_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nn_NO_v2.idx <$(EXTENSIONDIR)$/th_nn_NO_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_nn_NO_v2.idx <$(EXTENSIONDIR)$/th_nn_NO_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/pl_PL/makefile.mk b/dictionaries/pl_PL/makefile.mk
index eb2c412..ca7c52d 100644
--- a/dictionaries/pl_PL/makefile.mk
+++ b/dictionaries/pl_PL/makefile.mk
@@ -86,7 +86,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_pl_PL_v2.idx : "$(EXTENSIONDIR)$/th_pl_PL_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pl_PL_v2.idx <$(EXTENSIONDIR)$/th_pl_PL_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/prj/build.lst b/dictionaries/prj/build.lst
index 2cb4508..c60892a 100644
--- a/dictionaries/prj/build.lst
+++ b/dictionaries/prj/build.lst
@@ -1,50 +1,49 @@
-di      dictionaries : sal soltools mythes TRANSLATIONS:translations NULL
+di      dictionaries : sal soltools DESKTOP:l10ntools mythes TRANSLATIONS:translations NULL
 di	dictionaries					usr1 - all di_mkout NULL
-di	dictionaries\source	nmake   -       all	di_src NULL
-di      dictionaries\af_ZA      nmake   -       all     di_af_ZA di_src NULL
-di      dictionaries\ar         nmake   -       all     di_ar di_src NULL
-di      dictionaries\an_ES      nmake   -       all     di_an_ES di_src NULL
-di      dictionaries\be_BY      nmake   -       all     di_be_BY di_src NULL
-di      dictionaries\bg_BG      nmake   -       all     di_bg_BG di_src NULL
-di      dictionaries\bn_BD      nmake   -       all     di_bn_BD di_src NULL
-di      dictionaries\br_FR      nmake   -       all     di_br_FR di_src NULL
-di      dictionaries\ca         nmake   -       all     di_ca di_src NULL
-di      dictionaries\cs_CZ      nmake   -       all     di_cs_CZ di_src NULL
-di      dictionaries\da_DK      nmake   -       all     di_da_DK di_src NULL
-di      dictionaries\de         nmake   -       all     di_de di_src NULL
-di      dictionaries\el_GR      nmake   -       all     di_el_GR di_src NULL
-di      dictionaries\en         nmake   -       all     di_en di_src NULL
-di      dictionaries\es_ES      nmake   -       all     di_es_ES di_src NULL
-di      dictionaries\et_EE      nmake   -       all     di_et_EE di_src NULL
-di      dictionaries\fr_FR      nmake   -       all     di_fr_FR di_src NULL
-di      dictionaries\gd_GB      nmake   -       all     di_gd_GB di_src NULL
-di      dictionaries\gl         nmake   -       all     di_gl di_src NULL
-di      dictionaries\gu_IN      nmake   -       all     di_gu_IN di_src NULL
-di      dictionaries\he_IL      nmake   -       all     di_he_IL di_src NULL
-di      dictionaries\hi_IN      nmake   -       all     di_hi_IN di_src NULL
-di      dictionaries\hr_HR      nmake   -       all     di_hr_HR di_src NULL
-di      dictionaries\hu_HU      nmake   -       all     di_hu_HU di_src NULL
-di      dictionaries\it_IT      nmake   -       all     di_it_IT di_src NULL
-di      dictionaries\ku_TR      nmake   -       all     di_ku_TR di_src NULL
-di      dictionaries\lt_LT      nmake   -       all     di_lt_LT di_src NULL
-di      dictionaries\lv_LV      nmake   -       all     di_lv_LV di_src NULL
-di      dictionaries\ne_NP      nmake   -       all     di_ne_NP di_src NULL
-di      dictionaries\nl_NL      nmake   -       all     di_nl_NL di_src NULL
-di      dictionaries\no         nmake   -       all     di_no di_src NULL
-di      dictionaries\oc_FR      nmake   -       all     di_oc_FR di_src NULL
-di      dictionaries\pl_PL      nmake   -       all     di_pl_PL di_src NULL
-di      dictionaries\pt_BR      nmake   -       all     di_pt_BR di_src NULL
-di      dictionaries\pt_PT      nmake   -       all     di_pt_PT di_src NULL
-di      dictionaries\ro         nmake   -       all     di_ro di_src NULL
-di      dictionaries\ru_RU      nmake   -       all     di_ru_RU di_src NULL
-di      dictionaries\si_LK      nmake   -       all     di_si_LK di_src NULL
-di      dictionaries\sk_SK      nmake   -       all     di_sk_SK di_src NULL
-di      dictionaries\sl_SI      nmake   -       all     di_sl_SI di_src NULL
-di      dictionaries\sr         nmake   -       all     di_sr di_src NULL
-di      dictionaries\sv_SE      nmake   -       all     di_sv_SE di_src NULL
-di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ di_src NULL
-di      dictionaries\te_IN      nmake   -       all     di_te_IN di_src NULL
-di      dictionaries\th_TH      nmake   -       all     di_th_TH di_src NULL
-di      dictionaries\uk_UA      nmake   -       all     di_uk_UA di_src NULL
-di      dictionaries\vi         nmake   -       all     di_vi di_src NULL
-di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA di_src NULL
+di      dictionaries\af_ZA      nmake   -       all     di_af_ZA NULL
+di      dictionaries\ar         nmake   -       all     di_ar NULL
+di      dictionaries\an_ES      nmake   -       all     di_an_ES NULL
+di      dictionaries\be_BY      nmake   -       all     di_be_BY NULL
+di      dictionaries\bg_BG      nmake   -       all     di_bg_BG NULL
+di      dictionaries\bn_BD      nmake   -       all     di_bn_BD NULL
+di      dictionaries\br_FR      nmake   -       all     di_br_FR NULL
+di      dictionaries\ca         nmake   -       all     di_ca NULL
+di      dictionaries\cs_CZ      nmake   -       all     di_cs_CZ NULL
+di      dictionaries\da_DK      nmake   -       all     di_da_DK NULL
+di      dictionaries\de         nmake   -       all     di_de NULL
+di      dictionaries\el_GR      nmake   -       all     di_el_GR NULL
+di      dictionaries\en         nmake   -       all     di_en NULL
+di      dictionaries\es_ES      nmake   -       all     di_es_ES NULL
+di      dictionaries\et_EE      nmake   -       all     di_et_EE NULL
+di      dictionaries\fr_FR      nmake   -       all     di_fr_FR NULL
+di      dictionaries\gd_GB      nmake   -       all     di_gd_GB NULL
+di      dictionaries\gl         nmake   -       all     di_gl NULL
+di      dictionaries\gu_IN      nmake   -       all     di_gu_IN NULL
+di      dictionaries\he_IL      nmake   -       all     di_he_IL NULL
+di      dictionaries\hi_IN      nmake   -       all     di_hi_IN NULL
+di      dictionaries\hr_HR      nmake   -       all     di_hr_HR NULL
+di      dictionaries\hu_HU      nmake   -       all     di_hu_HU NULL
+di      dictionaries\it_IT      nmake   -       all     di_it_IT NULL
+di      dictionaries\ku_TR      nmake   -       all     di_ku_TR NULL
+di      dictionaries\lt_LT      nmake   -       all     di_lt_LT NULL
+di      dictionaries\lv_LV      nmake   -       all     di_lv_LV NULL
+di      dictionaries\ne_NP      nmake   -       all     di_ne_NP NULL
+di      dictionaries\nl_NL      nmake   -       all     di_nl_NL NULL
+di      dictionaries\no         nmake   -       all     di_no NULL
+di      dictionaries\oc_FR      nmake   -       all     di_oc_FR NULL
+di      dictionaries\pl_PL      nmake   -       all     di_pl_PL NULL
+di      dictionaries\pt_BR      nmake   -       all     di_pt_BR NULL
+di      dictionaries\pt_PT      nmake   -       all     di_pt_PT NULL
+di      dictionaries\ro         nmake   -       all     di_ro NULL
+di      dictionaries\ru_RU      nmake   -       all     di_ru_RU NULL
+di      dictionaries\si_LK      nmake   -       all     di_si_LK NULL
+di      dictionaries\sk_SK      nmake   -       all     di_sk_SK NULL
+di      dictionaries\sl_SI      nmake   -       all     di_sl_SI NULL
+di      dictionaries\sr         nmake   -       all     di_sr NULL
+di      dictionaries\sv_SE      nmake   -       all     di_sv_SE NULL
+di      dictionaries\sw_TZ      nmake   -       all     di_sw_TZ NULL
+di      dictionaries\te_IN      nmake   -       all     di_te_IN NULL
+di      dictionaries\th_TH      nmake   -       all     di_th_TH NULL
+di      dictionaries\uk_UA      nmake   -       all     di_uk_UA NULL
+di      dictionaries\vi         nmake   -       all     di_vi NULL
+di      dictionaries\zu_ZA      nmake   -       all     di_zu_ZA NULL
diff --git a/dictionaries/pt_PT/makefile.mk b/dictionaries/pt_PT/makefile.mk
index b16774e..c8cf974 100644
--- a/dictionaries/pt_PT/makefile.mk
+++ b/dictionaries/pt_PT/makefile.mk
@@ -86,7 +86,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_pt_PT_v2.idx : "$(EXTENSIONDIR)$/th_pt_PT_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pt_PT_v2.idx <$(EXTENSIONDIR)$/th_pt_PT_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_pt_PT_v2.idx <$(EXTENSIONDIR)$/th_pt_PT_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/ro/makefile.mk b/dictionaries/ro/makefile.mk
index 3e8a163..d045c57 100644
--- a/dictionaries/ro/makefile.mk
+++ b/dictionaries/ro/makefile.mk
@@ -88,7 +88,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ro_RO_v2.idx : "$(EXTENSIONDIR)$/th_ro_RO_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ro_RO_v2.idx <$(EXTENSIONDIR)$/th_ro_RO_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/ru_RU/makefile.mk b/dictionaries/ru_RU/makefile.mk
index 1acb64d..65970e3 100644
--- a/dictionaries/ru_RU/makefile.mk
+++ b/dictionaries/ru_RU/makefile.mk
@@ -103,7 +103,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_ru_RU_v2.idx : "$(EXTENSIONDIR)$/th_ru_RU_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_ru_RU_v2.idx <$(EXTENSIONDIR)$/th_ru_RU_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/sk_SK/makefile.mk b/dictionaries/sk_SK/makefile.mk
index 73fe114..c412e55 100644
--- a/dictionaries/sk_SK/makefile.mk
+++ b/dictionaries/sk_SK/makefile.mk
@@ -90,7 +90,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 #.INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_sk_SK_v2.idx : "$(EXTENSIONDIR)$/th_sk_SK_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sk_SK_v2.idx <$(EXTENSIONDIR)$/th_sk_SK_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sk_SK_v2.idx <$(EXTENSIONDIR)$/th_sk_SK_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/sl_SI/makefile.mk b/dictionaries/sl_SI/makefile.mk
index 1730c41..6ab7f82 100644
--- a/dictionaries/sl_SI/makefile.mk
+++ b/dictionaries/sl_SI/makefile.mk
@@ -86,7 +86,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_sl_SI_v2.idx : "$(EXTENSIONDIR)$/th_sl_SI_v2.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sl_SI_v2.idx <$(EXTENSIONDIR)$/th_sl_SI_v2.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/source/idxdict.cpp b/dictionaries/source/idxdict.cpp
deleted file mode 100644
index 9b0cbc2..0000000
--- a/dictionaries/source/idxdict.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * Version: MPL 1.1 / GPLv3+ / LGPLv3+
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License or as specified alternatively below. You may obtain a copy of
- * the License at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Initial Developer of the Original Code is
- *       Steven Butler <sebutler@gmail.com>
- * Portions created by the Initial Developer are Copyright (C) 2011 the
- * Initial Developer. All Rights Reserved.
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
- * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
- * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
- * instead of those above.
- */
-#include <iostream>
-#include <fstream>
-#include <string>
-#include <map>
-#include <stdlib.h>
-#include <string.h>
-
-static const int MAXLINE = 1024*64;
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-        if (argc != 3 || strcmp(argv[1],"-o"))
-        {
-                cout << "Usage: idxdict -o outputfile < input\n";
-                ::exit(99);
-        }
-        // This call improves performance by approx 5x
-        cin.sync_with_stdio(false);
-
-        const char * outputFile(argv[2]);
-        char inputBuffer[MAXLINE];
-        multimap<string, size_t> entries;
-        multimap<string,size_t>::iterator ret(entries.begin());
-
-        int line(1);
-        cin.getline(inputBuffer, MAXLINE);
-        const string encoding(inputBuffer);
-        size_t currentOffset(encoding.size()+1);
-        while (true)
-        {
-                // Extract the next word, but not the entry count
-                cin.getline(inputBuffer, MAXLINE, '|');
-
-                if (cin.eof()) break;
-
-                string word(inputBuffer);
-                ret = entries.insert(ret, pair<string, size_t>(word, currentOffset));
-                currentOffset += word.size() + 1;
-                // Next is the entry count
-                cin.getline(inputBuffer, MAXLINE);
-                if (!cin.good())
-                {
-                        cerr << "Unable to read entry - insufficient buffer?.\n";
-                        exit(99);
-                }
-                currentOffset += strlen(inputBuffer)+1;
-                int entryCount(strtol(inputBuffer, NULL, 10));
-                for (int i(0); i < entryCount; ++i)
-                {
-                        cin.getline(inputBuffer, MAXLINE);
-                        currentOffset += strlen(inputBuffer)+1;
-                        ++line;
-                }
-        }
-
-        // Use binary mode to prevent any translation of LF to CRLF on Windows
-        ofstream outputStream(outputFile, ios_base::binary| ios_base::trunc|ios_base::out);
-        if (!outputStream.is_open())
-        {
-                cerr << "Unable to open output file " << outputFile << endl;
-                ::exit(99);
-        }
-
-        outputStream << encoding << '\n' << entries.size() << '\n';
-
-        for (multimap<string, size_t>::const_iterator ii(entries.begin());
-                ii != entries.end();
-                ++ii
-        )
-        {
-                outputStream << ii->first << '|' << ii->second << '\n';
-        }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dictionaries/source/makefile.mk b/dictionaries/source/makefile.mk
deleted file mode 100644
index f36db50..0000000
--- a/dictionaries/source/makefile.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-PRJ=..
-PRJNAME=dictionaries
-TARGET=idxdict
-TARGETTYPE=CUI
-LIBTARGET=NO
-LIBSALCPPRT=$(0)
-ENABLE_EXCEPTIONS:=TRUE
-
-.INCLUDE : settings.mk
-
-OBJFILES=$(OBJ)$/idxdict.obj
-APP1TARGET=idxdict
-APP1RPATH=NONE
-APP1OBJS=$(OBJFILES)
-
-.INCLUDE : target.mk
diff --git a/dictionaries/sv_SE/makefile.mk b/dictionaries/sv_SE/makefile.mk
index cb58223..410f30e 100644
--- a/dictionaries/sv_SE/makefile.mk
+++ b/dictionaries/sv_SE/makefile.mk
@@ -85,7 +85,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE :  $(PRJ)$/prj$/tests.mk
 
 $(EXTENSIONDIR)$/th_sv_SE.idx : "$(EXTENSIONDIR)$/th_sv_SE.dat"
-         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sv_SE.idx <$(EXTENSIONDIR)$/th_sv_SE.dat
+         $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_sv_SE.idx <$(EXTENSIONDIR)$/th_sv_SE.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml
diff --git a/dictionaries/uk_UA/makefile.mk b/dictionaries/uk_UA/makefile.mk
index e1e8d43..fb60b2e 100644
--- a/dictionaries/uk_UA/makefile.mk
+++ b/dictionaries/uk_UA/makefile.mk
@@ -84,7 +84,7 @@ EXTENSION_PACKDEPS=$(COMPONENT_FILES) $(COMPONENT_UNZIP_FILES)
 .INCLUDE : extension_post.mk
 
 $(EXTENSIONDIR)$/th_uk_UA.idx : "$(EXTENSIONDIR)$/th_uk_UA.dat"
-        $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(LOCAL_OUT_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_uk_UA.idx <$(EXTENSIONDIR)$/th_uk_UA.dat
+        $(COMMAND_ECHO)$(AUGMENT_LIBRARY_PATH) $(OUTDIR_FOR_BUILD)$/bin$/idxdict -o $(EXTENSIONDIR)$/th_uk_UA.idx <$(EXTENSIONDIR)$/th_uk_UA.dat
 
 .IF "$(WITH_LANG)" != ""
 $(DESCRIPTION_SRC) : description.xml