From b380e47c0c81de143cf49256f0cb159ee1216cde Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 11 Aug 2012 14:09:25 +0200 Subject: [PATCH] [ng] dist: less use of transforms, prefer make variables (3) * automake.in (handle_dist): Turn the '%DIST-COMMON%' transform into the 'am.dist.common-files.internal' internal variable. * lib/am/distdir.am (distdir): Adjust accordingly. Signed-off-by: Stefano Lattarini --- automake.in | 4 ++-- lib/am/distdir.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/automake.in b/automake.in index ed4d14af2..59cb29e18 100644 --- a/automake.in +++ b/automake.in @@ -3302,11 +3302,11 @@ sub handle_dist () push (@dist_targets, 'dist-hook') if user_phony_rule 'dist-hook'; define_variable ('am.dist.extra-targets', INTERNAL, @dist_targets); + define_variable ('am.dist.common-files.internal', INTERNAL, @dist_common); $output_rules .= &file_contents ('distdir', new Automake::Location, - %transform, - 'DIST-COMMON' => "@dist_common"); + %transform); verbatim ('distcheck') if $relative_dir eq '.'; } diff --git a/lib/am/distdir.am b/lib/am/distdir.am index 7533e3dc7..b38116b54 100644 --- a/lib/am/distdir.am +++ b/lib/am/distdir.am @@ -14,7 +14,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -am.dist.common-files += %DIST-COMMON% +am.dist.common-files += $(am.dist.common-files.internal) # Makefile fragments used internally by automake-generated Makefiles. am.dist.mk-files = $(wildcard $(am.conf.aux-dir)/am-ng/*) -- 2.47.2