Merge branch 'tmp-for-master-merge' into ng/master

Merge branch 'tmp-for-master-merge' into ng/master

* tmp-for-master-merge:
  build: remove temporary files, used for merging master
  build: adapt the per-subdir Makefile.inc files
  tmp: re-add old top-level Makefile.am from master
  tmp: backup-and-move top-level Makefile
  automake: typofix in comments: s/AC_CONFIG_HEADER/AC_CONFIG_HEADERS/
  build: move automake and aclocal in 'bin' subdir
  build: break up monolithic Makefile.am in subdir-specific fragments