renamed makefile to avoid a name clash on merge