Tidied up Makefiles

Makefiles no longer default to paths on Isaac's computer.  They must be passed
the paths to their dependencies.