added modified Makefile from florent