change link order to resolve symbols
Merge branch 'master' of github.com:woolstar/tools

merge makefile changes