Index: app/src/compiledic/Makefile
===================================================================
--- app/src/compiledic/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/compiledic/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,2 +1,5 @@
+CFLAG1 = -m32 -Wno-deprecated -O3 -fpermissive
+CFLAG_ST = -Wno-deprecated -O3 -fpermissive -static
+
 all: compiledic aut2fsa
 
@@ -4,5 +7,6 @@
 
 aut2fsa: aut2fsa.cc
-	g++ -Wno-deprecated -O3 -fpermissive -static -o aut2fsa aut2fsa.cc
+	#g++ -m32 -Wno-deprecated -O3 -fpermissive -static -o aut2fsa aut2fsa.cc
+	g++ $(CFLAG1) -o aut2fsa aut2fsa.cc
 
 
@@ -11,2 +15,6 @@
 	cp compiledic fsm2aut aut2fsa ${UTT_BIN_DIR}
 endif
+
+clean:
+	rm aut2fsa
+
Index: app/src/cor/Makefile
===================================================================
--- app/src/cor/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/cor/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -26,6 +26,6 @@
 	gengetopt -i cmdline.ggo --conf-parser
 
-cmdline.ggo: cmdline_cor.ggo ../common/cmdline_common.ggo
-	cat cmdline_cor.ggo ../common/cmdline_common.ggo > cmdline.ggo
+cmdline.ggo: cmdline_cor.ggo $(COMMON_PATH)/cmdline_common.ggo
+	cat cmdline_cor.ggo $(COMMON_PATH)/cmdline_common.ggo > cmdline.ggo
 
 copy:
Index: app/src/fla/Makefile
===================================================================
--- app/src/fla/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/fla/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,5 +1,7 @@
+PAR = -m32
+# -static
 
 fla: fla.c
-	gcc -static -o fla fla.c
+	gcc $(PAR) -o fla fla.c
 
 copy:
@@ -10,4 +12,2 @@
 clean:
 	rm fla
-
-uninstall:
Index: app/src/gph/Makefile
===================================================================
--- app/src/gph/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/gph/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -6,2 +6,4 @@
 	cp gph ${UTT_BIN_DIR}
 endif
+
+clean:
Index: app/src/grp/Makefile
===================================================================
--- app/src/grp/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/grp/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -5,2 +5,4 @@
 	cp grp ${UTT_BIN_DIR}
 endif
+
+clean:
Index: app/src/gue/Makefile
===================================================================
--- app/src/gue/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/gue/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,4 +1,5 @@
-PAR=-Wno-deprecated -O3 -fpermissive -static
-PAR2=-c -Wno-deprecated -O3 -fpermissive
+PAR=-Wno-deprecated -O3 -fpermissive -m32
+#-static
+PAR2=-c -Wno-deprecated -O3 -fpermissive -m32
 LIB_PATH=../lib
 COMMON_PATH=../common
@@ -25,6 +26,6 @@
 	gengetopt -i cmdline.ggo --conf-parser
 
-cmdline.ggo: cmdline_guess.ggo ../common/cmdline_common.ggo
-	cat cmdline_guess.ggo ../common/cmdline_common.ggo > cmdline.ggo
+cmdline.ggo: cmdline_guess.ggo $(COMMON_PATH)/cmdline_common.ggo
+	cat cmdline_guess.ggo $(COMMON_PATH)/cmdline_common.ggo > cmdline.ggo
 
 
Index: app/src/gue/cmdline_guess.ggo
===================================================================
--- app/src/gue/cmdline_guess.ggo	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/gue/cmdline_guess.ggo	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -5,6 +5,6 @@
 option "delta"			-	"Stop displaying answers after fall of weight" float default="0.2" no
 option "cut-off"		-	"Do not display answers with less weight than cut-off" int default="200" no
-option "dictionary-home"	-	"dh" hidden
-option "dictionary"		d	"File with dictionary information" string typestr="filename" default="~/.utt/lang/pl_PL.ISO-8859-2/gue.bin" no
+option "dictionary-home"	-	"dh" string typestr="FILENAME" no hidden
+option "dictionary"		d	"File with dictionary information" string typestr="filename" default="gue.bin" no
 option "per-info"		v	"Display performance information" flag off
 option "weights"		w	"Print weights" flag off hidden
Index: app/src/kon/Makefile
===================================================================
--- app/src/kon/Makefile	(revision 52bccead730bb580f6b4cb5ee2a732f8188a0b6a)
+++ app/src/kon/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,4 +1,4 @@
 
-con:
+kon:
 
 copy:
@@ -6,2 +6,4 @@
 	    cp kon ${UTT_BIN_DIR}
 endif
+
+clean:
Index: app/src/kot/Makefile
===================================================================
--- app/src/kot/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/kot/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -6,2 +6,4 @@
 	cp kot ${UTT_BIN_DIR}
 endif
+
+clean:
Index: app/src/lib/Makefile
===================================================================
--- app/src/lib/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/lib/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,4 +1,5 @@
 PAR=-Wno-deprecated -m32 -O3
-PAR2=-c -Wno-deprecated -m32 -O3 -static -fpermissive
+PAR2=-c -Wno-deprecated -m32 -O3 -fpermissive
+# -static
 LIB_PATH=../lib
 COMMON_PATH=../common
@@ -16,5 +17,5 @@
 
 copy:
-ifdef UTT_LIB_DIR
-	cp -r perl $(UTT_LIB_DIR)/
-endif
+#ifdef UTT_LIB_DIR
+#	cp -r perl $(UTT_LIB_DIR)/
+#endif
Index: app/src/mar/Makefile
===================================================================
--- app/src/mar/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/mar/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -5,2 +5,4 @@
 	cp mar ${UTT_BIN_DIR}
 endif
+
+clean:
Index: app/src/rm12/Makefile
===================================================================
--- app/src/rm12/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/rm12/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -5,2 +5,4 @@
 	cp rm12 ${UTT_BIN_DIR}
 endif
+
+clean:
Index: app/src/rs12/Makefile
===================================================================
--- app/src/rs12/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/rs12/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,6 +1,9 @@
+PAR = -m32
+# -static
+
 main: rs12
 
 rs12: rs12.c
-	gcc -static -o rs12 rs12.c
+	gcc $(PAR) -o rs12 rs12.c
 
 clean:
Index: app/src/sen-l/Makefile
===================================================================
--- app/src/sen-l/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/sen-l/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,3 +1,2 @@
-
 
 sen: sen.l
@@ -12,4 +11,2 @@
 clean:
 	rm sen.c sen
-
-uninstall:
Index: app/src/ser/Makefile
===================================================================
--- app/src/ser/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/ser/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -8,4 +8,2 @@
 
 clean:
-
-uninstall:
Index: app/src/tags/Makefile
===================================================================
--- app/src/tags/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/tags/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -2,6 +2,6 @@
 
 copy:
-ifdef UTT_TAGS_DIR
-	cp *.tag2re ${UTT_TAGS_DIR}
+ifdef UTT_BIN_DIR
+	cp *.tag2re ${UTT_BIN_DIR}
 endif
 
Index: app/src/tok.l/Makefile
===================================================================
--- app/src/tok.l/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/tok.l/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -1,3 +1,4 @@
-PAR=-O3 -static
+PAR=-O3 -m32
+#-static
 
 tok: tok.c cmdline.c
Index: app/src/unfla/Makefile
===================================================================
--- app/src/unfla/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/src/unfla/Makefile	(revision 8d3e6ab33b2b6727eb54bb3498a0ba2af9ca9ea1)
@@ -5,2 +5,4 @@
 	cp unfla ${UTT_BIN_DIR}
 endif
+
+clean: