Makefiles revision for standardization