Fix an editing blunder which broke incremental builds, and add removal of the build dir to the clean target in the toplevel Makefile.