Move functionality from make.sh to Makefile (#1138)

simplifies builds, prevents overriding of options
2 files changed