Updated makefiles to suit different systems.