Improving the Holmakefiles