Reworking Makefiles.