diff --git a/src/Makefile b/src/Makefile
index 8dd6463..337ff71 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,15 +1,22 @@
-CC = gcc
-CFLAGS= -O2 -Wall -Wextra
-LIBS= -lreadline
-LFLAGS=
+CC=cc
 
-SRCFILES= main.c
-OBJFILES= orsh
+BUILDDIR=../build
+CFILES=$(wildcard *.c)
+ORSHBIN=$(BUILDDIR)/orsh
+
+CFLAGS=-O2 -Wall -Wextra
+LIBFLAGS=-lreadline
 
 .PHONY: all clean 
+.SUFFIXES: .o .c
 
-all: main
+all: $(BUILDDIR) $(ORSHBIN)
 
-main: 
-	$(CC) $(CFLAGS) $(SRCFILES) -o $(OBJFILES) $(LIBS)
+$(BUILDDIR):
+	mkdir -p $(BUILDDIR)
 
+$(ORSHBIN): $(CFILES)
+	$(CC) $(CFILES) -o $@ $(CFLAGS) $(LIBFLAGS)
+
+clean:
+	rm -rf $(BUILDDIR)