aligned makefile to the 2.0 branch