From c5cff90a3a4bf76864d41e43f4d6c61b80096603 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Fri, 24 Aug 2012 12:06:48 +0000
Subject: [PATCH] in lib/src/, make dict compiles the unilingual dictionaries
 to alltenses/.

---
 lib/src/Make.hs            |  2 +-
 lib/src/Makefile           | 38 ++++++++++++++++++++++++++++++++++++--
 lib/src/french/DictFre.gf  |  2 ++
 lib/src/german/DictGer.gf  |  2 +-
 lib/src/russian/DictRus.gf |  2 +-
 lib/src/swedish/DictSwe.gf |  2 +-
 6 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/lib/src/Make.hs b/lib/src/Make.hs
index f46b608bb..45e1662b2 100644
--- a/lib/src/Make.hs
+++ b/lib/src/Make.hs
@@ -81,7 +81,7 @@ langsIncomplete = ["Amh","Ara","Lat","Tur"]
 langsAPI = langsLang `except` langsIncomplete
 
 -- languages for which to compile Symbolic
-langsSymbolic = langsLang `except` (langsIncomplete ++ ["Afr","Ina","Jpn","Nep","Pnb","Rus", "Snd"])
+langsSymbolic = langsLang `except` (langsIncomplete ++ ["Afr","Hin","Ina","Jpn","Nep","Pnb","Rus", "Snd"])
 
 -- languages for which to compile minimal Syntax
 langsMinimal = langs `only` ["Ara","Eng","Bul","Rus"]
diff --git a/lib/src/Makefile b/lib/src/Makefile
index 547c01884..2088a0ec2 100644
--- a/lib/src/Makefile
+++ b/lib/src/Makefile
@@ -27,12 +27,41 @@ lang:
 api:
 	$(RUNMAKE) alltenses api
 
+dict: DictBul DictEng DictFin DictFre DictRus DictGer DictSwe
+
+DictBul:
+	gf -batch bulgarian/DictBul.gf +RTS -K100M
+	cp -p bulgarian/DictBul*.gfo ../alltenses
+
+DictEng:
+	gf -batch english/DictEng.gf +RTS -K100M
+	cp -p english/DictEng*.gfo ../alltenses
+
+DictFin:
+	gf -batch finnish/DictFin.gf +RTS -K100M
+	cp -p finnish/DictFin*.gfo ../alltenses
+
+DictFre:
+	gf -batch french/DictFre.gf +RTS -K100M
+	cp -p french/DictFre*.gfo ../alltenses
+
+DictGer:
+	gf -batch german/DictGer.gf +RTS -K100M
+	cp -p german/DictGer*.gfo ../alltenses
+
+DictRus:
+	gf -batch russian/DictRus.gf +RTS -K100M
+	cp -p russian/DictRus*.gfo ../alltenses
+
+DictSwe:
+	gf -batch swedish/DictSwe.gf +RTS -K100M
+	cp -p swedish/DictSwe*.gfo ../alltenses
+
+
 # thai with pronunciation
 thp:
 	cd thai ; runghc ThaiScript.hs ; cd ..
 
-compatibility:
-	$(RUNMAKE) present compat
 
 prelude:
 	gf -batch -path=prelude prelude/*.gf
@@ -47,6 +76,11 @@ MakeStructural:
 	cp -p */MakeStructural*.gfo ../present
 	cp -p */MakeStructural*.gfo ../alltenses
 
+# the rest is mostly obsolete 24/8/2012
+
+compatibility:
+	$(RUNMAKE) present compat
+
 test:
 	$(RUNMAKE) test
 
diff --git a/lib/src/french/DictFre.gf b/lib/src/french/DictFre.gf
index 7d0e0141c..ce469758d 100644
--- a/lib/src/french/DictFre.gf
+++ b/lib/src/french/DictFre.gf
@@ -1,3 +1,5 @@
+--# -path=.:alltenses
+
 concrete DictFre of DictFreAbs = CatFre ** 
   open  ParadigmsFre, (Irreg=IrregFre) in
   {
diff --git a/lib/src/german/DictGer.gf b/lib/src/german/DictGer.gf
index eec72918a..805acf9f1 100644
--- a/lib/src/german/DictGer.gf
+++ b/lib/src/german/DictGer.gf
@@ -1,4 +1,4 @@
---# -path=.:/Users/erzsebet/GF/lib/src/abstract:/Users/erzsebet/GF/lib/src/german:/Users/erzsebet/GF/lib/src/common:/Users/erzsebet/GF/lib/src/prelude:/Users/erzsebet/GF/lib/src/api:/Users/erzsebet/GF/:/usr/local/share/gf-3.3.3/lib/alltenses/:/usr/local/share/gf-3.3.3/lib/present/
+--# -path=.:alltenses
 
 concrete DictGer of DictGerAbs = CatGer **
   open ParadigmsGer, IrregGer in  {
diff --git a/lib/src/russian/DictRus.gf b/lib/src/russian/DictRus.gf
index 82216f3e8..c59b6ded4 100644
--- a/lib/src/russian/DictRus.gf
+++ b/lib/src/russian/DictRus.gf
@@ -1,4 +1,4 @@
---# -path=.:../prelude:../abstract:../common
+--# -path=.:alltenses
 
 concrete DictRus of DictRusAbs = CatRus ** 
   open ParadigmsRus, Prelude, StructuralRus, MorphoRus in {
diff --git a/lib/src/swedish/DictSwe.gf b/lib/src/swedish/DictSwe.gf
index 8987ac90f..cb0afd28e 100644
--- a/lib/src/swedish/DictSwe.gf
+++ b/lib/src/swedish/DictSwe.gf
@@ -1,4 +1,4 @@
---# -path=.:swedish:scandinavian:abstract:common:alltenses
+--# -path=.:alltenses
 
 -- This dictionary is derived from SALDO, see:
 --