Change to using pure Makefiles