modified Makefiles
modified Makefiles