Some more makefile cleanup