Added general Makefile
Updated makefiles