add all upstream changes to makefiles, make tags, results.{sh,cmd}