Consolidated the rest of the makefiles.