More tidying of makefiles