From: Stefano Lattarini Date: Mon, 16 Apr 2012 11:34:35 +0000 (+0200) Subject: [ng] build: simplify rules for ChangeLog generation X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d605ac1891ab238a493516dae32095ac9b1d70b5;p=thirdparty%2Fautomake.git [ng] build: simplify rules for ChangeLog generation The pre-existing rules used an hacky indirection, only to work around a Solaris make bug in '.PHONY' support. GNU make does not suffer of this bug, so we can simplify our rules accordingly. * Makefile.am (am--changelog-regen-hook): Remove this dummy target. (.PHONY, ChangeLog): Do not depend on it. (.PHONY): Depend directly on 'ChangeLog' instead. Remove outdated comments. Signed-off-by: Stefano Lattarini --- diff --git a/Makefile.am b/Makefile.am index 6b5695c19..8c29aee13 100644 --- a/Makefile.am +++ b/Makefile.am @@ -595,15 +595,8 @@ EXTRA_DIST += $(gitlog_to_changelog_fixes) # copy the distributed ChangeLog in the build directory (and if this # fails, or if no distributed ChangeLog file is present, complain and # give an error). -# -# We need the apparently useless dependency from another .PHONY target -# 'am--changelog-regen-hook' to work around a bug of Solaris make, which -# doesn't execute the recipe of a target named as an existing file, even -# if such target is declared '.PHONY' (yikes!) -# -.PHONY: am--changelog-regen-hook -am--changelog-regen-hook: -ChangeLog: am--changelog-regen-hook +.PHONY: ChangeLog +ChangeLog: $(AM_V_GEN)set -e; set -u; \ ## The ChangeLog should be regenerated unconditionally when working from ## checked-out sources; otherwise, if we're working from a distribution