Makefile now much more automatic