diff -up ./svm-toy/gtk/callbacks.cpp.svm-toy ./svm-toy/gtk/callbacks.cpp
--- ./svm-toy/gtk/callbacks.cpp.svm-toy	2010-09-12 22:11:10.000000000 +1000
+++ ./svm-toy/gtk/callbacks.cpp	2011-06-14 13:36:25.726748304 +1000
@@ -3,6 +3,7 @@
 #include <stdlib.h>
 #include <ctype.h>
 #include <list>
+#include <cstdlib>
 #include "callbacks.h"
 #include "interface.h"
 #include "../../svm.h"
diff -up ./svm-toy/gtk/Makefile.svm-toy ./svm-toy/gtk/Makefile
--- ./svm-toy/gtk/Makefile.svm-toy	2010-11-14 10:59:28.000000000 +1000
+++ ./svm-toy/gtk/Makefile	2011-06-14 13:47:23.529749429 +1000
@@ -1,10 +1,12 @@
 CC? = gcc
 CXX? = g++
 CFLAGS = -Wall -O3 -g `pkg-config --cflags gtk+-2.0`
-LIBS = `pkg-config --libs gtk+-2.0`
+LOCAL_LIBDIR=../../
+LIBS = `pkg-config --libs gtk+-2.0` -L${LOCAL_LIBDIR} -lsvm
 
-svm-toy: main.o interface.o callbacks.o ../../svm.o
-	$(CXX) $(CFLAGS) main.o interface.o callbacks.o ../../svm.o -o svm-toy $(LIBS)
+
+svm-toy-gtk: main.o interface.o callbacks.o
+	$(CXX) $(CFLAGS) main.o interface.o callbacks.o $(LIBS) -o $@
 
 main.o: main.c
 	$(CC) $(CFLAGS) -c main.c
@@ -15,8 +17,5 @@ interface.o: interface.c interface.h
 callbacks.o: callbacks.cpp callbacks.h
 	$(CXX) $(CFLAGS) -c callbacks.cpp
 
-../../svm.o:
-	cd ../..; make svm.o
-
 clean:
-	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o ../../svm.o
+	rm -f *~ callbacks.o svm-toy main.o interface.o callbacks.o
diff -up ./svm-toy/qt/Makefile.svm-toy ./svm-toy/qt/Makefile
--- ./svm-toy/qt/Makefile.svm-toy	2008-12-19 16:42:05.000000000 +1000
+++ ./svm-toy/qt/Makefile	2011-06-14 13:50:02.634748539 +1000
@@ -1,17 +1,18 @@
 CXX? = g++
-CFLAGS = -Wall -O3 -I$(INCLUDE) -I$(INCLUDE)/QtGui -lQtGui
+CFLAGS = -Wall -O3 -I$(INCLUDE) `pkg-config --cflags --libs QtGui`
 INCLUDE = /usr/include/qt4
-MOC = /usr/bin/moc-qt4
+MOC=${MOC_PATH}
+LOCAL_LIBDIR=../../
+LIBS = `pkg-config --libs QtGui` -L${LOCAL_LIBDIR} -lsvm
 
-svm-toy: svm-toy.cpp svm-toy.moc ../../svm.o
-	$(CXX) $(CFLAGS) svm-toy.cpp ../../svm.o -o svm-toy
+all: svm-toy-qt
+
+svm-toy-qt: svm-toy.cpp svm-toy.moc 
+	$(CXX) $(CFLAGS) svm-toy.cpp ${LIBS} -o $@
 
 svm-toy.moc: svm-toy.cpp
 	$(MOC) svm-toy.cpp -o svm-toy.moc
 
-../../svm.o:
-	cd ../..; make svm.o
-
 clean:
-	rm -f *~ svm-toy svm-toy.moc ../../svm.o
+	rm -f *~ svm-toy svm-toy.moc