Alf improve makefile again