Makefile is now in a satisfactory state