Merge branch 'maint'

* maint:
  sync: update files from upstream with "make fetch"
  gitignore: align with recent changes
  fixup: add dummy rule for ChangeLog generation in Makefile.am
  maint: no longer use AM_MAKEFLAGS in maintainer rules
  maint: use more GNU make features in maintainer rules
  maint: move maintainer make rules in maint.mk

diff --cc .gitignore
Simple merge

diff --cc Makefile.am
Simple merge