[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [FYI] [ng] texi: less use of transforms in 'texinfos.am'
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [FYI] [ng] texi: less use of transforms in 'texinfos.am' |
Date: |
Sat, 11 Aug 2012 20:17:09 +0200 |
* automake.in (handle_texinfo): Drop the 'MOSTLYCLEAN', 'TEXICLEAN'
and 'MAINTCLEAN' transforms, instead adding directly to '%clean_dirs'
as appropriate.
* lib/am/texinfos.am: Adjust.
Signed-off-by: Stefano Lattarini <address@hidden>
---
automake.in | 9 ++++++---
lib/am/texinfos.am | 8 --------
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/automake.in b/automake.in
index 7361945..77d38fe 100644
--- a/automake.in
+++ b/automake.in
@@ -2984,12 +2984,15 @@ sub handle_texinfo ()
chomp $clean;
chomp $maintclean;
}
+ # Append to dirs, not files, because the files in '$*clean' can also
+ # contain any directory created by "makeinfo --html", as well as the
+ # '*.t2d' and '*.t2p' directories used by texi2dvi and texi2pdf.
+ $clean_dirs{$mostlyclean} = MOSTLY_CLEAN;
+ $clean_dirs{$clean} = CLEAN;
+ $clean_dirs{$maintclean} = MAINTAINER_CLEAN;
$output_rules .= file_contents ('texinfos',
new Automake::Location,
- MOSTLYCLEAN => $mostlyclean,
- TEXICLEAN => $clean,
- MAINTCLEAN => $maintclean,
'LOCAL-TEXIS' => !!$info_texinfos);
}
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 2b47560..704c200 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -280,13 +280,5 @@ endif %?LOCAL-TEXIS%
## ---------- ##
if %?LOCAL-TEXIS%
-## Append to dirs, not files, because the %*CLEAN% substitutions can
-## also contain any directory created by "makeinfo --html", as well as
-## the '*.t2d' and '*.t2p' directories used by texi2dvi and texi2pdf.
-am.clean.mostly.d += %MOSTLYCLEAN%
-am.clean.normal.d += %TEXICLEAN%
-am.clean.maint.d += %MAINTCLEAN%
-
am.clean.maint.f += $(foreach f,$(INFO_DEPS),$f $f-[0-9] $f-[0-9][0-9])
-
endif %?LOCAL-TEXIS%
--
1.7.12.rc0
- [Automake-NG] [FYI] [ng] texi: less use of transforms in 'texinfos.am',
Stefano Lattarini <=