Fix the makefiles