commit 4e9c51959e2124abf4fd61bcfbfa825fd7640e63
Merge: 8894583 b8c7e3f
Author: Stefano Lattarini <[email protected]>
Date: Fri Dec 14 15:49:40 2012 +0100
Merge branch 'master' into ng/master
Noe that, with this merge, we just discarde the changes done to
the maintainer rules in Makefile.am on the 'ng/master' branch;
now that the 'maint.mk' file from the 'master' branch assumes
GNU make as well, those changes have been either rendered obsolete,
or backported (or planned to be) in the master version of
'maint.mk'.
* master:
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
Signed-off-by: Stefano Lattarini <[email protected]>
