diff --git a/src/Makefile b/src/Makefile
index c20ab31..a13a4e1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,23 @@
-CC = gcc
-CFLAGS= -lncurses -Wall -Wextra
-LFLAGS=
+CC=cc
+BUILDDIR=../build
+TESTSDIR=../tests
 
-SRCFILES= main.c
-OBJFILES= gxt
+CFLAGS=-Wall -Wextra 
+LIBFLAGS=-lncurses
 
-.PHONY: all clean 
+CFILES=$(wildcard *.c)
+GXTBIN=$(BUILDDIR)/gxt
 
-all: main
+.PHONY: all clean test 
+.SUFFIXES: .o .c
 
-main: 
-	$(CC) $(CFLAGS) $(SRCFILES) -o $(OBJFILES) 
+all: $(BUILDDIR) $(GXTBIN)
 
+$(BUILDDIR):
+	mkdir -p $(BUILDDIR)
+
+$(GXTBIN): $(CFILES)
+	$(CC) $(CFILES) -o $@ $(CFLAGS) $(LIBFLAGS)
+
+clean:
+	rm -rf $(BUILDDIR)