Modified makefiles to be compatible with Travis CI