Major updates to Makefile, some additional changes to AMBuild stuff, but it's not presently working due to lack of version.rc