Bugs in build and installation process fixed, lem.bin and gram.dgp built while compilation

Makefile

@@ -35,12 +35,16 @@ libraries:
 
 .PHONY: share
 share:
+	@for lang in $(LANGUAGES); do\
+		cd $(CUR_DIR)/share/$$lang  && make; cd $(CUR_DIR); \
+	done
+	cd $(CUR_DIR)/share && make; cd $(CUR_DIR)
 
 # ------------------------------------------------------------------
 # cleanup section
 # ------------------------------------------------------------------
 .PHONY: clean
-clean: clean_components clean_documentation clean_config clean_config_mak
+clean: clean_components clean_share clean_documentation clean_config clean_config_mak
 	@echo "All files cleaned successfully!"
 
 .PHONY: clean_components
@@ -54,6 +58,13 @@ clean_components:
 clean_documentation:
 	cd $(CUR_DIR)/doc && make clean; cd $(CUR_DIR)
 
+.PHONY: clean_share
+clean_share:
+	@for lang in $(LANGUAGES); do\
+		cd $(CUR_DIR)/share/$$lang  && make clean; cd $(CUR_DIR); \
+	done
+	cd $(CUR_DIR)/share && make clean; cd $(CUR_DIR)
+
 .PHONY: clean_config
 clean_config:
 	cd $(CUR_DIR)/conf && make clean; cd $(CUR_DIR)
@@ -99,8 +110,9 @@ install_documentation: documentation
 .PHONY: install_share
 install_share: share
 	cd $(CUR_DIR)/share && make install; cd $(CUR_DIR)
+	#dictionaries compilation...
+	#compdic
 	#grammar compilation...
-	dgc
 
 # ------------------------------------------------------------------
 # uninstall section

conf/dgc.conf.m4

@@ -11,8 +11,5 @@
 # parameter_name [=] value
 #
 categories = LANG_DIR/LANGUAGE/lem.cats
-# categories = /home/to/dane/pmdbf/lem.cats
 grammar = LANG_DIR/gram.dgc
-# grammar = /home/to/dane/grammar/gram.dgc
 outputfile = LANG_DIR/gram.dgp
-# outputfile = /home/to/dane/grammar/gram.dgp

conf/dgp.conf.m4

@@ -12,7 +12,6 @@
 #
 
 grammar = LANG_DIR/gram.dgp
-# grammar = /home/to/dane/grammar/gram.dgp
 process = W
 process = BOS
 process = EOS

configure

@@ -89,6 +89,7 @@ docdir="${PREFIX}/share/doc/utt"
 langdir="${PREFIX}/share/utt"
 libdir="${PREFIX}/lib/utt"
 
+languages="pl_PL.ISO-8859-2"
 language="pl_PL.ISO-8859-2"
 
 cc_default="gcc"
@@ -242,6 +243,7 @@ echo "SHARE_DIR=$sharedir" >> config.mak
 echo "DOC_DIR=$docdir" >> config.mak
 echo "LANG_DIR=$langdir" >> config.mak
 echo "LIB_DIR=$libdir" >> config.mak
+echo "LANGUAGES=$languages" >> config.mak
 echo "LANGUAGE=$language" >> config.mak
 echo "CC=$cc" >> config.mak
 echo "CXX=$cxx" >> config.mak
@@ -283,6 +285,7 @@ echo "sharedir:   $sharedir"
 echo "docdir:     $docdir"
 echo "langdir:    $langdir"
 echo "libdir:     $libdir"
+echo "languages:  $languages"
 echo "language:   $language"
 enabled doc && {
 echo "makeinfo:   $makeinfo"

share/Makefile

@@ -1,5 +1,19 @@
 include ../config.mak
 
+
+TARGETS = gram.dgp
+
+.PHONY: all
+all: $(TARGETS)
+
+# ------------------------------------------------------------------
+# main section
+# ------------------------------------------------------------------
+
+gram.dgp: gram.dgc
+	dgc --grammar=gram.dgc --categories=$(LANGUAGE)/lem.cats --outputfile=gram.dgp 
+
+
 .PHONY: install
 install:
 ifdef LANG_DIR
@@ -12,7 +26,7 @@ ifdef LANG_DIR
 	install -m 0644 pl_PL.ISO-8859-2/lem.cats $(LANG_DIR)/pl_PL.ISO-8859-2
 	install -m 0644 pl_PL.ISO-8859-2/pl_PL.ISO-8859-2.sym $(LANG_DIR)/pl_PL.ISO-8859-2
 	install -m 0644 pl_PL.UTF-8/lem.bin $(LANG_DIR)/pl_PL.UTF-8
-	install -m 0644 gram.dgc $(LANG_DIR)
+	install -m 0644 gram.dgp $(LANG_DIR)
 	install -m 0644 weights.kor $(LANG_DIR)
 endif
 
@@ -31,3 +45,9 @@ ifdef LANG_DIR
 	rmdir $(LANG_DIR)/pl_PL.ISO-8859-2
 	rmdir $(LANG_DIR)/pl_PL.UTF-8
 endif
+
+
+.PHONY: clean
+clean:
+	rm -f gram.dgp
+

src/compdic/Makefile

@@ -19,6 +19,7 @@ ifdef BIN_DIR
 	install -m 0755 compdic-update-fst $(BIN_DIR)
 	install -m 0755 compdic-update-cats $(BIN_DIR)
 	install -m 0755 compdic-dic-to-fst $(BIN_DIR)
+	install -m 0755 compdic-dic-to-cats $(BIN_DIR)
 	install -m 0755 compdic-fst-to-bin $(BIN_DIR)
 
 	install -m 0755 fsm2aut $(BIN_DIR)
@@ -34,6 +35,7 @@ ifdef BIN_DIR
 	rm $(BIN_DIR)/compdic-update-fst
 	rm $(BIN_DIR)/compdic-update-cats
 	rm $(BIN_DIR)/compdic-dic-to-fst
+	rm $(BIN_DIR)/compdic-dic-to-cats
 	rm $(BIN_DIR)/compdic-fst-to-bin
 
 	rm $(BIN_DIR)/fsm2aut

src/compdic/compdic

@@ -138,6 +138,7 @@ _ 85
 / 92
 * 93
 + 94
+<EFBFBD> 95 
 EOF
 
 

src/compdic/compdic-dic-to-fst

@@ -143,6 +143,7 @@ _ 85
 / 92
 * 93
 + 94
+<EFBFBD> 95 
 EOF
 
 

src/compdic/compdic-fst-to-bin

@@ -110,6 +110,7 @@ _ 85
 / 92
 * 93
 + 94
+<EFBFBD> 95 
 EOF
 
 cat $1 | fstrmepsilon | fstdeterminize | fstminimize | fstprint --acceptor --isymbols=$alphabet | fsm2aut | aut2fsa > $2