Finalised initial makefile