am 0fdf0dc7: Merge "Refactor makefile."

* commit '0fdf0dc725a130b39a4232262b77c17ff053ef23':
  Refactor makefile.