--- a/src/Makefile.in	Thu Sep 12 13:44:23 2013 +0200
+++ b/src/Makefile.in	Thu Sep 12 14:11:38 2013 +0200
@@ -66,14 +66,23 @@
 assemble_system.o: assemble_system.cc form.h boundarycondition.h
 	$(MKOCTFILE) $(CPPFLAGS) -c assemble_system.cc $(LDFLAGS) -o $@ -I.
 
-save.oct: save.o
-	$(MKOCTFILE) $(CPPFLAGS) -s save.o -o $@ $(LDFLAGS) $(LIBS)
+save.oct: save.o mkfunction
+	$(MKOCTFILE) $(CPPFLAGS) -s save.o -o ./@function/save.oct $(LDFLAGS) $(LIBS)
 
 save.o: save.cc 
 	$(MKOCTFILE) $(CPPFLAGS) -c save.cc $(LDFLAGS) -o $@ -I.
 
-plot_mesh.oct: plot_mesh.cc Plot_2d.h mesh.h Plot_3d.h
-	$(MKOCTFILE) $(CPPFLAGS) -I. plot_mesh.cc $(LDFLAGS) $(LIBS)
+mkfunction:
+	 mkdir @function
+
+mkmesh:
+	 mkdir @mesh
+
+plot_mesh.oct: plot_mesh.o mkmesh
+	$(MKOCTFILE) $(CPPFLAGS) -s plot_mesh.o -o ./@mesh/plot.oct $(LDFLAGS) $(LIBS)
+
+plot_mesh.o: plot_mesh.cc Plot_2d.h mesh.h Plot_3d.h
+	$(MKOCTFILE) $(CPPFLAGS) -c plot_mesh.cc $(LDFLAGS) -o $@ -I.
 
 Plot_2d.h: Plot_2d.ufl
 	$(FFC) -l dolfin Plot_2d.ufl
@@ -81,15 +90,20 @@
 Plot_3d.h: Plot_3d.ufl
 	$(FFC) -l dolfin Plot_3d.ufl
 
-plot_func.oct: plot_func.cc function.h
-	$(MKOCTFILE) $(CPPFLAGS) -I. plot_func.cc $(LDFLAGS) $(LIBS)
+plot_func.oct: plot_func.o mkfunction
+	$(MKOCTFILE) $(CPPFLAGS) -s plot_func.o -o ./@function/plot.oct $(LDFLAGS) $(LIBS)
+
+plot_func.o: plot_func.cc Plot_2d.h mesh.h Plot_3d.h
+	$(MKOCTFILE) $(CPPFLAGS) -c plot_func.cc $(LDFLAGS) -o $@ -I.
 
 SubSpace.oct: SubSpace.cc functionspace.h
 	$(MKOCTFILE) $(CPPFLAGS) -I. SubSpace.cc $(LDFLAGS) $(LIBS)
 
-feval.oct: feval.cc function.h
-	$(MKOCTFILE) $(CPPFLAGS) -I. feval.cc $(LDFLAGS) $(LIBS)
+feval.oct: feval.o mkfunction
+	$(MKOCTFILE) $(CPPFLAGS) -s feval.o -o ./@function/feval.oct $(LDFLAGS) $(LIBS)
 
+feval.o: feval.cc function.h
+	$(MKOCTFILE) $(CPPFLAGS) -c feval.cc $(LDFLAGS) -o $@ -I.
 
 clean:
 	-rm -f *.o core octave-core *.oct *~ *.xml