Plugging holes in the build system. We're able to build the calc
executable now.