Update makefile for linux
Merge remote-tracking branch 'origin/master'

* origin/master:
  Fix problems for linux compilation
Ignore linux binary