Merge branch 'maint'

* maint:
  cleanup: remove two almost-unused global variables: {am,in}_file_name
  cleanup: remove almost-unused global var 'topsrcdir'
  automake: remove an unused variable
  tests: make a test script more semantic
  tests: remove an obsolete, no-op test script
  tests: remove an obsolete test script

diff --cc automake.in
Simple merge

diff --cc t/list-of-tests.mk
Simple merge