Switched to compiling using variables instead of adding new targets...
cleanup