Further tuning of the makefiles.