Unbreak build + further Makefile cleanups

Signed-off-by: Morten Hustveit <morten.hustveit@gmail.com>