revert makefile change
Merge branch 'r_update'