Makefiles adjustments