trying to fix the build and eliminate more Make stuff.