This is not the "right" way to do it since it should be internalized, but for a start it will do until we fix it.
While here, also dump another slew of goodies in the makefile.