* clean up to get build in VC
* improve makefile targets for re-use