tidied up the src/Makefile somewhat