[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04-no-xform.patch
|
From: |
Akim Demaille |
|
Subject: |
04-no-xform.patch |
|
Date: |
Sun, 04 Mar 2001 22:13:08 +0100 |
Index: ChangeLog
from Akim Demaille <address@hidden>
Always use hashes with &file_contents.
* automake.in (&handle_texinfo): texibuild.am does not need
TEXINFODIR.
texinfos.am wants only TEXICLEANS.
(&handle_dist, &add_depend2, &handle_clean): Replace $xform with
%transform.
* texinfos.am: Adjust.
Index: automake.in
--- automake.in Sun, 04 Mar 2001 21:00:13 +0100 akim (am/f/39_automake.i 1.111
755)
+++ automake.in Sun, 04 Mar 2001 21:26:35 +0100 akim (am/f/39_automake.i 1.111
755)
@@ -2855,18 +2855,18 @@ sub handle_texinfo
$need_texi_file = 1;
}
- my $xform =
- &transform ('TEXINFODIR' => $texinfodir,
- 'TEXICLEAN' => &pretty_print_internal ("\t-rm -f",
- "\t ",
- @texi_cleans));
foreach my $txsfx (sort keys %texi_suffixes)
{
- $output_rules .= &file_contents ('texibuild',
- $xform
- . &transform ('SUFFIX' => $txsfx));
+ $output_rules .=
+ &file_contents ('texibuild',
+ &transform ('TEXINFODIR' => $texinfodir,
+ 'SUFFIX' => $txsfx));
}
- $output_rules .= &file_contents ('texinfos', $xform);
+
+ my $texiclean = &pretty_print_internal ("", "\t ", @texi_cleans);
+ $output_rules .= &file_contents ('texinfos',
+ &transform ('TEXICLEAN' => $texiclean));
+
push (@dist_targets, 'dist-info');
push (@suffixes, '.texi', '.texinfo', '.txi', '.info', '.dvi', '.ps');
@@ -3139,15 +3139,14 @@ sub handle_dist
}
# Rule to check whether a distribution is viable.
- my $xform =
- &transform ('TOPDIR' => ($relative_dir eq '.'),
- 'DISTCHECK-HOOK' => &target_defined ('distcheck-hook'),
- 'GETTEXT' => $seen_gettext);
+ my %transform = ('TOPDIR' => ($relative_dir eq '.'),
+ 'DISTCHECK-HOOK' => &target_defined ('distcheck-hook'),
+ 'GETTEXT' => $seen_gettext);
# Prepend $(distdir) to each directory given.
my %rewritten;
grep ($rewritten{'$(distdir)/' . $_} = 1, keys %dist_dirs);
- $xform .= &transform ('DISTDIRS', join (' ', sort keys %rewritten));
+ $transform{'DISTDIRS'} = join (' ', sort keys %rewritten);
# If we have SUBDIRS, create all dist subdirectories and do
# recursive build.
@@ -3176,7 +3175,7 @@ sub handle_dist
&define_pretty_variable ('DIST_SUBDIRS', '', '$(SUBDIRS)');
}
- $xform .= &transform ('DIST_SUBDIR_NAME' => $dist_subdir_name);
+ $transform{'DIST_SUBDIR_NAME'} = $dist_subdir_name;
}
# If the target `dist-hook' exists, make sure it is run. This
@@ -3184,15 +3183,13 @@ sub handle_dist
# before it is packaged up.
push (@dist_targets, 'dist-hook')
if &target_defined ('dist-hook');
+ $transform{'DIST-TARGETS'} = join(' ', @dist_targets);
- my $top_distdir = backname ($relative_dir);
+ # Defining $(DISTDIR).
+ $transform{'DISTDIR'} = !&variable_defined('distdir');
+ $transform{'TOP_DISTDIR'} = backname ($relative_dir);
- $output_rules .=
- &file_contents ('distdir',
- $xform
- . &transform ('DISTDIR' => !&variable_defined('distdir'),
- 'DIST-TARGETS' => join(' ', @dist_targets),
- 'TOP_DISTDIR' => $top_distdir));
+ $output_rules .= &file_contents ('distdir', &transform (%transform));
}
@@ -3210,10 +3207,10 @@ sub add_depend2
my $flag = $language_map{"$lang-flags"};
# First include code for ordinary objects.
- my $xform = &transform ('PFX' => $pfx,
- 'FPFX' => $fpfx,
- 'LIBTOOL' => $seen_libtool,
- 'AMDEP' => $use_dependencies);
+ my %transform = ('PFX' => $pfx,
+ 'FPFX' => $fpfx,
+ 'LIBTOOL' => $seen_libtool,
+ 'AMDEP' => $use_dependencies);
# This function can be called even when we don't want dependency
# tracking. This happens when we need an explicit rule for some
@@ -3222,21 +3219,21 @@ sub add_depend2
{
my $compile = '$(' . $pfx . 'COMPILE)';
my $ltcompile = '$(LT' . $pfx . 'COMPILE)';
- my $xform1 = ($xform
- . &transform ('GENERIC' => 1,
- 'BASE' => '$*',
- 'SOURCE' => '$<',
- 'OBJ' => '$@',
- 'LTOBJ' => '$@',
- 'OBJOBJ' => '$@',
- 'COMPILE' => $compile,
- 'LTCOMPILE' => $ltcompile));
+ my %transform = (%transform,
+ 'GENERIC' => 1,
+ 'BASE' => '$*',
+ 'SOURCE' => '$<',
+ 'OBJ' => '$@',
+ 'LTOBJ' => '$@',
+ 'OBJOBJ' => '$@',
+ 'COMPILE' => $compile,
+ 'LTCOMPILE' => $ltcompile);
foreach my $ext (&lang_extensions ($lang))
{
$output_rules .= (&file_contents ('depend2',
- &transform ('EXT' => $ext)
- . $xform1)
+ &transform (%transform,
+ 'EXT' => $ext))
. "\n");
}
}
@@ -3263,17 +3260,16 @@ sub add_depend2
# depend2.am into real targets for the particular objects we
# are building.
$output_rules .=
- &file_contents
- ('depend2',
- $xform
- . &transform ('GENERIC' => 0,
- 'BASE' => $obj,
- 'SOURCE' => $source,
- 'OBJ' => "$obj.o",
- 'OBJOBJ' => "$obj.obj",
- 'LTOBJ' => "$obj.lo",
- 'COMPILE' => $obj_compile,
- 'LTCOMPILE' => $obj_ltcompile))
+ &file_contents ('depend2',
+ &transform (%transform,
+ 'GENERIC' => 0,
+ 'BASE' => $obj,
+ 'SOURCE' => $source,
+ 'OBJ' => "$obj.o",
+ 'OBJOBJ' => "$obj.obj",
+ 'LTOBJ' => "$obj.lo",
+ 'COMPILE' => $obj_compile,
+ 'LTCOMPILE' => $obj_ltcompile))
}
}
@@ -3952,13 +3948,12 @@ sub do_check_merge_target
# Handle all 'clean' targets.
sub handle_clean
{
- my $xform = '';
+ my %transform;
# Don't include `MAINTAINER'; it is handled specially below.
foreach my $name ('MOSTLY', '', 'DIST')
{
- $xform .= &transform ("${name}CLEAN"
- => &variable_defined ("${name}CLEANFILES"));
+ $transform{"${name}CLEAN"} = &variable_defined ("${name}CLEANFILES");
}
# Built sources are automatically removed by maintainer-clean.
@@ -3969,15 +3964,15 @@ sub handle_clean
$output_rules .=
&file_contents ('clean',
- $xform
- . &transform ('MCFILES'
- # Join with no space to avoid
- # spurious `test -z' success at
- # runtime.
- => join ('', @maintainer_clean_files),
- 'MFILES'
- # A space is required in the join here.
- => join (' ', @maintainer_clean_files)));
+ &transform (%transform,
+ 'MCFILES'
+ # Join with no space to avoid
+ # spurious `test -z' success at
+ # runtime.
+ => join ('', @maintainer_clean_files),
+ 'MFILES'
+ # A space is required in the join here.
+ => join (' ', @maintainer_clean_files)));
# We special-case config.status here. If we do it as part of the
# normal clean processing for this directory, then it might be
Index: texinfos.am
--- texinfos.am Sun, 04 Mar 2001 15:17:55 +0100 akim (am/g/10_texinfos.a 1.14
644)
+++ texinfos.am Sun, 04 Mar 2001 21:23:40 +0100 akim (am/g/10_texinfos.a 1.14
644)
@@ -155,7 +155,7 @@
.PHONY: mostlyclean-aminfo
mostlyclean-am: mostlyclean-aminfo
mostlyclean-aminfo:
-%TEXICLEAN%
+ -rm -f %TEXICLEAN%
.PHONY: maintainer-clean-aminfo
maintainer-clean-am: maintainer-clean-aminfo
- 04-no-xform.patch,
Akim Demaille <=