More work on bug #7679.  I fixed the build targets to be more consistant