fixed makefile
Merge branch 'fixmake' into ohmage-2.14