Improved makefile versatility