Finally get the Makefile right