Minor changes to make it work with new Top Makefile. Also have generated code separat...

No match.