diff --git a/.gitignore b/.gitignore
index ff69bfa3..36968d45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ catalog/flexcat
 .vs
 *_.3
 doxygen.warn
+*.deb
diff --git a/Makefile.clang b/Makefile.clang
new file mode 100644
index 00000000..d8c88459
--- /dev/null
+++ b/Makefile.clang
@@ -0,0 +1,454 @@
+
+CC       = clang
+CXX      = clang++
+AR       = ar
+RANLIB   = ranlib
+CFLAGS   =  -DWITHTEST 
+CXXFLAGS =  -DWITHTEST -I.
+LFLAGS   = -lamathapp -lcomplex -lamath -lcamath -lstdc++
+
+FLXCAT   = build/flexcat/flexcat
+MKDIR    = mkdir
+COPY     = cp
+DEL      = rm -f
+DELREC   = rm -Rf
+
+all:	libs app
+
+libs:	libamath libcomplex libcamath libamathapp
+
+evaluator.o:	app/main/evaluator.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/evaluator.cpp
+
+functions.o:	app/main/functions.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/functions.cpp
+
+graphlist.o:	app/main/graphlist.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/graphlist.cpp
+
+lexer.o:	app/main/lexer.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/lexer.cpp
+
+nodes.o:	app/main/nodes.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/nodes.cpp
+
+operators.o:	app/main/operators.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/operators.cpp
+
+optimizer.o:	app/main/optimizer.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/optimizer.cpp
+
+parser.o:	app/main/parser.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/parser.cpp
+
+statements.o:	app/main/statements.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/statements.cpp
+
+token.o:	app/main/token.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/token.cpp
+
+values.o:	app/main/values.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/values.cpp
+
+viewer.o:	app/main/viewer.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main/viewer.cpp
+
+console.o:	app/system/console.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/console.cpp
+
+console_amiga.o:	app/system/console_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/console_amiga.cpp
+
+console_stdc.o:	app/system/console_stdc.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/console_stdc.cpp
+
+filesystem_amiga.o:	app/system/filesystem_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/filesystem_amiga.cpp
+
+filesystem_stdc.o:	app/system/filesystem_stdc.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/filesystem_stdc.cpp
+
+graph.o:	app/system/graph.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/graph.cpp
+
+graph_amiga.o:	app/system/graph_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/graph_amiga.cpp
+
+graph_gtk.o:	app/system/graph_gtk.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/graph_gtk.cpp
+
+language.o:	app/system/language.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/language.cpp
+
+language_amiga.o:	app/system/language_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/language_amiga.cpp
+
+language_posix.o:	app/system/language_posix.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/language_posix.cpp
+
+language_stdc.o:	app/system/language_stdc.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/language_stdc.cpp
+
+preferences.o:	app/system/preferences.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/preferences.cpp
+
+preferences_amiga.o:	app/system/preferences_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/preferences_amiga.cpp
+
+preferences_stdc.o:	app/system/preferences_stdc.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/preferences_stdc.cpp
+
+proc_amiga.o:	app/system/proc_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/proc_amiga.cpp
+
+program.o:	app/system/program.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/program.cpp
+
+program_amiga.o:	app/system/program_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/program_amiga.cpp
+
+program_stdc.o:	app/system/program_stdc.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/program_stdc.cpp
+
+program_test.o:	app/system/program_test.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/program_test.cpp
+
+task_amiga.o:	app/system/task_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/task_amiga.cpp
+
+task_stdc.o:	app/system/task_stdc.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/task_stdc.cpp
+
+window_amiga.o:	app/system/window_amiga.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/window_amiga.cpp
+
+io.o:	app/system/base/io.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/system/base/io.cpp
+
+main.o:	app/main.cpp
+	${CXX} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/main.cpp
+
+aengine.o:	app/lib/aengine.cpp
+	${CC} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/lib/aengine.cpp
+
+charbuf.o:	app/lib/charbuf.cpp
+	${CC} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/lib/charbuf.cpp
+
+cplex.o:	app/lib/cplex.cpp
+	${CC} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/lib/cplex.cpp
+
+fgrid.o:	app/lib/fgrid.cpp
+	${CC} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/lib/fgrid.cpp
+
+ntext.o:	app/lib/ntext.cpp
+	${CC} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/lib/ntext.cpp
+
+real.o:	app/lib/real.cpp
+	${CC} -O2 ${CXXFLAGS} -Ilib -Iapp -Wall -Werror -c app/lib/real.cpp
+
+acos.o:	lib/real/acos.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/acos.c
+
+acosh.o:	lib/real/acosh.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/acosh.c
+
+asin.o:	lib/real/asin.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/asin.c
+
+asinh.o:	lib/real/asinh.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/asinh.c
+
+atan.o:	lib/real/atan.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/atan.c
+
+atan2.o:	lib/real/atan2.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/atan2.c
+
+atanh.o:	lib/real/atanh.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/atanh.c
+
+cbrt.o:	lib/real/cbrt.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/cbrt.c
+
+ceil.o:	lib/real/ceil.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/ceil.c
+
+copysign.o:	lib/real/copysign.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/copysign.c
+
+cos.o:	lib/real/cos.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/cos.c
+
+cosh.o:	lib/real/cosh.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/cosh.c
+
+exp.o:	lib/real/exp.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/exp.c
+
+expm1.o:	lib/real/expm1.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/expm1.c
+
+fabs.o:	lib/real/fabs.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/fabs.c
+
+finite.o:	lib/real/finite.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/finite.c
+
+floor.o:	lib/real/floor.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/floor.c
+
+fmod.o:	lib/real/fmod.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/fmod.c
+
+hypot.o:	lib/real/hypot.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/hypot.c
+
+isnan.o:	lib/real/isnan.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/isnan.c
+
+kcos.o:	lib/real/kcos.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/kcos.c
+
+kremp2.o:	lib/real/kremp2.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/kremp2.c
+
+ksin.o:	lib/real/ksin.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/ksin.c
+
+ktan.o:	lib/real/ktan.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/ktan.c
+
+log.o:	lib/real/log.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/log.c
+
+log10.o:	lib/real/log10.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/log10.c
+
+log1p.o:	lib/real/log1p.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/log1p.c
+
+pow.o:	lib/real/pow.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/pow.c
+
+remp2.o:	lib/real/remp2.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/remp2.c
+
+round.o:	lib/real/round.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/round.c
+
+scalbn.o:	lib/real/scalbn.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/scalbn.c
+
+sin.o:	lib/real/sin.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/sin.c
+
+sinh.o:	lib/real/sinh.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/sinh.c
+
+sqrt.o:	lib/real/sqrt.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/sqrt.c
+
+tan.o:	lib/real/tan.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/tan.c
+
+tanh.o:	lib/real/tanh.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/tanh.c
+
+trunc.o:	lib/real/trunc.c
+	${CC} -O3 -std=c9x ${CLAGS} -fno-builtin  -Wall -Werror -Ilib -Ilib/real -c lib/real/trunc.c
+
+cacos.o:	lib/cplex/cacos.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cacos.c
+
+cacosh.o:	lib/cplex/cacosh.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cacosh.c
+
+cacot.o:	lib/cplex/cacot.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cacot.c
+
+cacoth.o:	lib/cplex/cacoth.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cacoth.c
+
+cacsc.o:	lib/cplex/cacsc.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cacsc.c
+
+cacsch.o:	lib/cplex/cacsch.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cacsch.c
+
+casec.o:	lib/cplex/casec.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/casec.c
+
+casech.o:	lib/cplex/casech.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/casech.c
+
+casin.o:	lib/cplex/casin.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/casin.c
+
+casinh.o:	lib/cplex/casinh.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/casinh.c
+
+catan.o:	lib/cplex/catan.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/catan.c
+
+catanh.o:	lib/cplex/catanh.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/catanh.c
+
+ccbrt.o:	lib/cplex/ccbrt.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccbrt.c
+
+ccos.o:	lib/cplex/ccos.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccos.c
+
+ccosh.o:	lib/cplex/ccosh.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccosh.c
+
+ccot.o:	lib/cplex/ccot.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccot.c
+
+ccoth.o:	lib/cplex/ccoth.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccoth.c
+
+ccsc.o:	lib/cplex/ccsc.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccsc.c
+
+ccsch.o:	lib/cplex/ccsch.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ccsch.c
+
+cexp.o:	lib/cplex/cexp.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cexp.c
+
+clog.o:	lib/cplex/clog.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/clog.c
+
+clog10.o:	lib/cplex/clog10.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/clog10.c
+
+clogb.o:	lib/cplex/clogb.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/clogb.c
+
+cpow.o:	lib/cplex/cpow.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/cpow.c
+
+csec.o:	lib/cplex/csec.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/csec.c
+
+csech.o:	lib/cplex/csech.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/csech.c
+
+csgn.o:	lib/cplex/csgn.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/csgn.c
+
+csin.o:	lib/cplex/csin.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/csin.c
+
+csinh.o:	lib/cplex/csinh.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/csinh.c
+
+csqrt.o:	lib/cplex/csqrt.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/csqrt.c
+
+ctan.o:	lib/cplex/ctan.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ctan.c
+
+ctanh.o:	lib/cplex/ctanh.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/ctanh.c
+
+prim.o:	lib/cplex/prim.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/cplex -c lib/cplex/prim.c
+
+alloccpy.o:	lib/clib/alloccpy.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/alloccpy.c
+
+mem.o:	lib/clib/mem.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/mem.c
+
+memcpy.o:	lib/clib/memcpy.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/memcpy.c
+
+memset.o:	lib/clib/memset.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/memset.c
+
+strcmp.o:	lib/clib/strcmp.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/strcmp.c
+
+strlen.o:	lib/clib/strlen.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/strlen.c
+
+untag.o:	lib/clib/untag.c
+	${CC} -O3 -std=c9x ${CFLAGS} -fno-builtin -Wall -Werror -Ilib -c lib/clib/untag.c
+
+dragon4.o:	lib/dconv/dragon4.cpp
+	${CXX} -O3 ${CXXFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/dconv -c lib/dconv/dragon4.cpp
+
+dmath.o:	lib/dconv/dmath.cpp
+	${CXX} -O3 ${CXXFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/dconv -c lib/dconv/dmath.cpp
+
+dprint.o:	lib/dconv/dprint.cpp
+	${CXX} -O3 ${CXXFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/dconv -c lib/dconv/dprint.cpp
+
+memoo.o:	lib/clib/memoo.cpp
+	${CXX} -O3 ${CXXFLAGS} -fno-builtin -Wall -Werror -Ilib -Ilib/dconv -c lib/clib/memoo.cpp
+
+catalogsa:
+	${FLXCAT} text/keyword.cd app/localize/kword.h=text/keyword.sd
+	${FLXCAT} text/help.cd app/localize/help.h=text/help.sd
+	${FLXCAT} text/ident.cd app/localize/ident.h=text/ident.sd
+	${FLXCAT} text/text.cd app/localize/text.h=text/text.sd
+
+catalogsu:
+	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-help.ct >utext/dk-help.dict
+	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-ident.ct >utext/dk-ident.dict
+	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-text.ct >utext/dk-text.dict
+	iconv -f ISO-8859-15 -t UTF-8 catalog/dansk/amath-keyword.ct >utext/dk-keyword.dict
+
+catalogsw:
+	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-help.ct >utext/dk-help.dict
+	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-ident.ct >utext/dk-ident.dict
+	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-text.ct >utext/dk-text.dict
+	iconv -f ISO-8859-15 -t CP850 catalog/dansk/amath-keyword.ct >utext/dk-keyword.dict
+
+libamathapp:	 aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o
+	${AR} rcs libamathapp.a  aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o
+	${RANLIB} libamathapp.a
+
+libamath:	 acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o
+	${AR} rcs libamath.a  acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o
+	${RANLIB} libamath.a
+
+libcomplex:	 cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o
+	${AR} rcs libcomplex.a  cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o
+	${RANLIB} libcomplex.a
+
+libcamath:	 alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o memoo.o
+	${AR} rcs libcamath.a  alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o memoo.o
+	${RANLIB} libcamath.a
+
+app:	libs  evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_posix.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o
+	${CC} ${CFLAGS} -s -L. -o amath  evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_posix.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o ${LFLAGS}
+
+dist: app catalogs
+	${COPY} amath dist/
+	${COPY} LICENSE dist/
+	${COPY} COPYRIGHT dist/
+
+amigacatalogs:
+	${MKDIR}  dist/catalog
+	${MKDIR}  dist/catalog/english
+	${FLXCAT} text/help.cd catalog/english/amath-help.ct CATALOG dist/catalog/english/amath-help.catalog
+	${FLXCAT} text/ident.cd catalog/english/amath-ident.ct CATALOG dist/catalog/english/amath-ident.catalog
+	${FLXCAT} text/text.cd catalog/english/amath-text.ct CATALOG dist/catalog/english/amath-text.catalog
+	${MKDIR}  dist/catalog/dansk
+	${FLXCAT} text/help.cd catalog/dansk/amath-help.ct CATALOG dist/catalog/dansk/amath-help.catalog
+	${FLXCAT} text/ident.cd catalog/dansk/amath-ident.ct CATALOG dist/catalog/dansk/amath-ident.catalog
+	${FLXCAT} text/text.cd catalog/dansk/amath-text.ct CATALOG dist/catalog/dansk/amath-text.catalog
+	${FLXCAT} text/keyword.cd catalog/dansk/amath-keyword.ct CATALOG dist/catalog/dansk/amath-keyword.catalog
+
+clean:
+	${DEL}  aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o  acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o  cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o  alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o memoo.o  evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_posix.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o libamath.a libcamath.a libcomplex.a libamathapp.a amath
+
+distclean:
+	${DEL}  aengine.o charbuf.o cplex.o fgrid.o ntext.o real.o  acos.o acosh.o asin.o asinh.o atan.o atan2.o atanh.o cbrt.o ceil.o copysign.o cos.o cosh.o exp.o expm1.o fabs.o finite.o floor.o fmod.o hypot.o isnan.o kcos.o kremp2.o ksin.o ktan.o log.o log10.o log1p.o pow.o remp2.o round.o scalbn.o sin.o sinh.o sqrt.o tan.o tanh.o trunc.o  cacos.o cacosh.o cacot.o cacoth.o cacsc.o cacsch.o casec.o casech.o casin.o casinh.o catan.o catanh.o ccbrt.o ccos.o ccosh.o ccot.o ccoth.o ccsc.o ccsch.o cexp.o clog.o clog10.o clogb.o cpow.o csec.o csech.o csgn.o csin.o csinh.o csqrt.o ctan.o ctanh.o prim.o  alloccpy.o mem.o memcpy.o memset.o strcmp.o strlen.o untag.o dragon4.o dmath.o dprint.o memoo.o  evaluator.o functions.o graphlist.o lexer.o nodes.o operators.o optimizer.o parser.o statements.o token.o values.o viewer.o console.o console_amiga.o console_stdc.o filesystem_amiga.o filesystem_stdc.o graph.o graph_amiga.o graph_gtk.o language.o language_amiga.o language_posix.o language_stdc.o preferences.o preferences_amiga.o preferences_stdc.o proc_amiga.o program.o program_amiga.o program_stdc.o program_test.o task_amiga.o task_stdc.o window_amiga.o io.o main.o libamath.a libcamath.a libcomplex.a libamathapp.a amath
+	${DELREC} dist
+
+depend:
+	@echo Dependencies already done
diff --git a/build/debian/control-amd64 b/build/debian/control-amd64
index c63a37a1..f58d014a 100644
--- a/build/debian/control-amd64
+++ b/build/debian/control-amd64
@@ -2,7 +2,7 @@ Package: amath
 Version: 1.6.4
 Architecture: amd64
 Maintainer: Carsten Larsen <cs@innolan.dk>
-Installed-Size: 276
+Installed-Size: 259
 Depends: libc6
 Section: math
 Essential: no
diff --git a/build/debian/control-i386 b/build/debian/control-i386
index 31c6e2c5..131681a2 100644
--- a/build/debian/control-i386
+++ b/build/debian/control-i386
@@ -2,7 +2,7 @@ Package: amath
 Version: 1.6.4
 Architecture: i386
 Maintainer: Carsten Larsen <cs@innolan.dk>
-Installed-Size: 140
+Installed-Size: 262
 Depends: libc6
 Section: math
 Essential: no
diff --git a/configure b/configure
index ec21187f..7a3c14c5 100755
--- a/configure
+++ b/configure
@@ -243,8 +243,6 @@ if $VALID ; then
 	echo "RANLIB   = ${CROSSCOMPILE}ranlib"
 	echo "CFLAGS   = ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}"
 	echo "CXXFLAGS = ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}-I."
-#	echo "CXXFLAGS = -Wno-inline-new-delete ${ARCFLAG}$options ${CROSSCOMPILEFLAGS}-I."
-#	echo "LFLAGS   = $gcclib -lamathapp${outext} -lcamath${outext} -lcomplex${outext} -lamath${outext}"
 	echo "LFLAGS   = -lamathapp${outext} -lcomplex${outext} -lamath${outext} -lcamath${outext} $gcclib"
 	echo
 	echo "FLXCAT   = build/flexcat/flexcat"