diff --git a/Intel8080/src/Makefile b/Intel8080/src/Makefile
index b5fde43..d3c6b44 100644
--- a/Intel8080/src/Makefile
+++ b/Intel8080/src/Makefile
@@ -1,36 +1,8 @@
 LIB = libintel8080.a
 
-CXXFLAGS = -Wall -std=c++14 -pipe -I ../inc -I ../../inc
+CXXFLAGS = -I ../inc -I ../../inc
 
 CXXFILES = Disassembler.cpp Intel8080.cpp Profiler.cpp
 
-CXXOBJECTS = $(CXXFILES:.cpp=.o)
-
-SOURCES = $(CXXFILES)
-OBJECTS = $(CXXOBJECTS)
-
-PCH = stdafx.h.gch 
-
-all: opt
-
-opt: CXXFLAGS += -DNDEBUG -march=native -O3 -flto
-opt: $(LIB)
-
-debug: CXXFLAGS += -g -D_DEBUG
-debug: $(LIB)
-
-coverage: CXXFLAGS += -g -D_DEBUG -fprofile-arcs -ftest-coverage
-coverage: $(LIB)
-
-$(PCH): stdafx.h
-	$(CXX) $(CXXFLAGS) -x c++-header $<
-
-$(LIB): $(OBJECTS)
-	$(AR) $(ARFLAGS) $(LIB) $(OBJECTS)
-
-%.o: %.cpp $(PCH)
-	$(CXX) $(CXXFLAGS) $< -c -o $@
-
-.PHONY: clean
-clean:
-	-rm -f $(LIB) $(OBJECTS) $(PCH)
+include ../../compile.mk
+include ../../lib_build.mk
diff --git a/Intel8080/test/Makefile b/Intel8080/test/Makefile
new file mode 100644
index 0000000..2209b81
--- /dev/null
+++ b/Intel8080/test/Makefile
@@ -0,0 +1,10 @@
+EXE = test_intel8080
+
+CXXFLAGS = -I ../inc -I ../../inc
+
+CXXFILES = Board.cpp Configuration.cpp test.cpp
+
+LDFLAGS  = -L ../src -L ../../src -lintel8080 -leightbit
+
+include ../../compile.mk
+include ../../exe_build.mk