Make the Makefile more atomic