[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 11/26] [ng] texi: reorganize '.am' fragments a bit
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 11/26] [ng] texi: reorganize '.am' fragments a bit |
Date: |
Sat, 16 Jun 2012 23:29:58 +0200 |
* lib/am/texinfos.am (%.ps: %.dvi): Move ...
* lib/am/texibuild.am: ... here, which is a more appropriate place
for such a rule.
* automake.in (handle_texinfo): Drop '%AM_V_DVIPS%' when processing
'texinfos.am'; instead, use it when processing 'texibuild.am'.
Signed-off-by: Stefano Lattarini <address@hidden>
---
automake.in | 2 +-
lib/am/texibuild.am | 5 +++++
lib/am/texinfos.am | 9 +--------
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/automake.in b/automake.in
index 244c12b..00046bc 100644
--- a/automake.in
+++ b/automake.in
@@ -3185,6 +3185,7 @@ sub handle_texinfo ()
AM_V_MAKEINFO => verbose_flag('MAKEINFO'),
AM_V_TEXI2DVI => verbose_flag('TEXI2DVI'),
AM_V_TEXI2PDF => verbose_flag('TEXI2PDF'),
+ AM_V_DVIPS => verbose_flag('DVIPS'),
TEXIQUIET => verbose_flag('texinfo'),
TEXIDEVNULL => verbose_flag('texidevnull'),
'TEXI-SUFFIXES' => "@valid_texinfo_suffixes",
@@ -3197,7 +3198,6 @@ sub handle_texinfo ()
$output_rules .= file_contents ('texinfos',
new Automake::Location,
- AM_V_DVIPS => verbose_flag('DVIPS'),
MOSTLYCLEAN => $mostlyclean,
TEXICLEAN => $clean,
MAINTCLEAN => $maintclean,
diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am
index 09905d5..ccefd0b 100644
--- a/lib/am/texibuild.am
+++ b/lib/am/texibuild.am
@@ -101,3 +101,8 @@ define am__texi_rules_for_suffix
endef
$(foreach s,%TEXI-SUFFIXES%,$(eval $(call am__texi_rules_for_suffix,$s)))
+
+## The way to make PostScript, for those who want it.
+%.ps: %.dvi
+
%AM_V_DVIPS%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
+ $(DVIPS) %TEXIQUIET% -o $@ $<
diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index fc3981a..ec8fd09 100644
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -25,6 +25,7 @@ am__create_installdir = $(if $(and $1,$^),$(MKDIR_P)
'$(DESTDIR)$1',@:)
if %?LOCAL-TEXIS%
TEXI2DVI = texi2dvi
TEXI2PDF = $(TEXI2DVI) --pdf --batch
+DVIPS = dvips
MAKEINFOHTML = $(MAKEINFO) --html
AM_MAKEINFOHTMLFLAGS = $(AM_MAKEINFOFLAGS)
endif %?LOCAL-TEXIS%
@@ -34,14 +35,6 @@ endif %?LOCAL-TEXIS%
## Building. ##
## ---------- ##
-## The way to make PostScript, for those who want it.
-if %?LOCAL-TEXIS%
-DVIPS = dvips
-%.ps: %.dvi
-
%AM_V_DVIPS%TEXINPUTS="$(am__TEXINFO_TEX_DIR)$(PATH_SEPARATOR)$$TEXINPUTS" \
- $(DVIPS) %TEXIQUIET% -o $@ $<
-endif %?LOCAL-TEXIS%
-
.PHONY: dvi dvi-am html html-am info info-am pdf pdf-am ps ps-am
if %?SUBDIRS%
RECURSIVE_TARGETS += dvi-recursive html-recursive info-recursive
--
1.7.9.5
- Re: [Automake-NG] [PATCH 06/26] [ng] texi: be sure to only emit generic pattern rules once, (continued)
[Automake-NG] [PATCH 09/26] [ng] texi: refactoring in texibuild.am, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 10/26] [ng] texi: reduce code duplication in output Makefile, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 11/26] [ng] texi: reorganize '.am' fragments a bit,
Stefano Lattarini <=
[Automake-NG] [PATCH 12/26] [ng] texi: reorganize '.am' fragments even more, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 13/26] [ng] texi: drop transforms when reading texibuild.am, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 14/26] [ng] texi: adjust names of vars used for silent rules support, Stefano Lattarini, 2012/06/16
[Automake-NG] [PATCH 15/26] [ng] texi: drop a useless transform when processing texinfos.am, Stefano Lattarini, 2012/06/16