Finally get makefile right?