ticket:1 Makefile rolled back to first version