Simplify build system (but now make doesn't accurately track changes to files)