Makefiles modified