Updated makefiles for Travis integration.