Update makefiles to latest version