Revise Makefile and make this buildable at the beginning