New makefile. Written by me, hence better