[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 <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index ed4d14af2cde0e004021e96f9543238e47a88dcf..59cb29e18d1326b88359fee41e6e5a6a74675dd6 100644 (file)
--- 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 7533e3dc77fee6bbceb12251ac9ae44900a9f59e..b38116b54bce066838fff293cfc107be2efe215d 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
-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/*)