improve Makefile, disposing of separate Emakefile