diff --git a/displayclient/Makefile b/displayclient/Makefile
new file mode 100644
index 0000000..4eb131d
--- /dev/null
+++ b/displayclient/Makefile
@@ -0,0 +1,2 @@
+displayclient:
+	g++ -O2 -march=pentium-m -pipe -fomit-frame-pointer -lboost_system `pkg-config --libs --cflags gdkmm-2.4` `pkg-config --libs --cflags gtkmm-2.4` `pkg-config --libs --cflags gthread-2.0`  -o displayclient Renderer.cpp AppWindow.cpp main.cpp
diff --git a/frameserver/Makefile b/frameserver/Makefile
new file mode 100644
index 0000000..4144e55
--- /dev/null
+++ b/frameserver/Makefile
@@ -0,0 +1,4 @@
+frameserver:
+	g++ -O2 -ggdb -lncurses `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0` -lboost_system -o frameserver Buffer.cpp Buffers.cpp Server.cpp frameserver.cpp
+test:
+	g++ -O2 -pipe -fomit-frame-pointer `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0`  -o test Buffer.cpp Buffers.cpp test.cpp
diff --git a/frameserver/make_frameserver b/frameserver/make_frameserver
deleted file mode 100755
index 4762762..0000000
--- a/frameserver/make_frameserver
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-g++ -O2 -ggdb -lncurses `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0` -lboost_system -o frameserver Buffer.cpp Buffers.cpp Server.cpp frameserver.cpp
\ No newline at end of file
diff --git a/frameserver/maketest b/frameserver/maketest
deleted file mode 100755
index 363baeb..0000000
--- a/frameserver/maketest
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-g++ -O2 -pipe -fomit-frame-pointer `pkg-config --libs --cflags glibmm-2.4` `pkg-config --libs --cflags gthread-2.0`  -o test Buffer.cpp Buffers.cpp test.cpp
\ No newline at end of file