gcc4X: rework some makefiles