Finalised Makefile