Ensuring top-level make works with 12.2 tools
More fixes to get things to build with 12.2 tools
More fixes for 12.2 build
Merge pull request #13 from pthedinger/master

Set of changes to ensure a "make" at the top-level succeeds