modified makefiles for easier building