Finally get Makefile correct?