Makefile improvements

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>