More universal makefile
Modified makefiles