Improved Makefile (untested on Linux!)