From 166a3bfb6eb6575a7cd66bce734f037662652e58 Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Thu, 13 Jun 2002 08:09:27 +0000 Subject: [PATCH] 2002-05-03 Paolo Bonzini * automake.in (required_targets): Add the pdf and pdf-am targets. (initialize_per_input): Likewise. (scan_texinfo_file): Add pdf to @clean_suffixes. (handle_texinfo_helper): Output the .pdf dependencies, and define the PDFS variable. * lib/am/texinfos.am (TEXI2PDF): New variable. (pdf, pdf-am): New targets. (.PHONY): Add pdf, pdf-am, and pdf-recursive. * lib/am/texibuild.am (.%SUFFIX%.pdf): New rule. --- ChangeLog | 12 ++++++++++++ Makefile.in | 35 +++++++++++++++++++++++++---------- NEWS | 1 + automake.in | 12 ++++++++++-- lib/Automake/Makefile.in | 10 ++++++++-- lib/Makefile.in | 23 +++++++++++++++-------- lib/am/Makefile.in | 10 ++++++++-- lib/am/texibuild.am | 7 +++++++ lib/am/texinfos.am | 10 ++++++++-- m4/Makefile.in | 10 ++++++++-- tests/Makefile.in | 8 ++++++-- 11 files changed, 108 insertions(+), 30 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8d667ab1..d29c613f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2002-05-03 Paolo Bonzini + + * automake.in (required_targets): Add the pdf and pdf-am targets. + (initialize_per_input): Likewise. + (scan_texinfo_file): Add pdf to @clean_suffixes. + (handle_texinfo_helper): Output the .pdf dependencies, and define + the PDFS variable. + * lib/am/texinfos.am (TEXI2PDF): New variable. + (pdf, pdf-am): New targets. + (.PHONY): Add pdf, pdf-am, and pdf-recursive. + * lib/am/texibuild.am (.%SUFFIX%.pdf): New rule. + 2002-06-13 Alexandre Duret-Lutz Fix pr307.test failure with gcc 3.x. diff --git a/Makefile.in b/Makefile.in index ea20fcaf..e5c644f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -28,6 +28,7 @@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -113,12 +114,14 @@ DIST_SOURCES = TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex INFO_DEPS = automake.info DVIS = automake.dvi +PDFS = automake.pdf TEXINFOS = automake.texi -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + install-info-recursive uninstall-info-recursive all-recursive \ + install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ Makefile.in NEWS THANKS TODO aclocal.in aclocal.m4 automake.in \ configure configure.in install-sh mdate-sh missing \ @@ -127,7 +130,7 @@ DIST_SUBDIRS = $(SUBDIRS) all: all-recursive .SUFFIXES: -.SUFFIXES: .dvi .info .ps .texi +.SUFFIXES: .dvi .info .pdf .ps .texi am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) @@ -192,6 +195,7 @@ maintainer-clean-vti: automake.info: automake.texi $(srcdir)/version.texi automake.dvi: automake.texi $(srcdir)/version.texi +automake.pdf: automake.texi $(srcdir)/version.texi .texi.info: @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] @@ -204,12 +208,19 @@ automake.dvi: automake.texi $(srcdir)/version.texi MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) $< +.texi.pdf: + TEXINPUTS="$(top_srcdir)/lib$(PATH_SEPARATOR)$$TEXINPUTS" \ + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2PDF) $< + .texi: @cd $(srcdir) && rm -f $@ $@-[0-9] $@-[0-9][0-9] cd $(srcdir) \ && $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) \ `echo $< | sed 's,.*/,,'` TEXI2DVI = texi2dvi + +TEXI2PDF = $(TEXI2DVI) --pdf DVIPS = dvips .dvi.ps: $(DVIPS) $< -o $@ @@ -247,8 +258,8 @@ dist-info: $(INFO_DEPS) mostlyclean-aminfo: -rm -f automake.aux automake.cm automake.cp automake.cps automake.cv \ automake.dvi automake.fn automake.ky automake.log automake.op \ - automake.ov automake.pg automake.ps automake.toc automake.tp \ - automake.tr automake.vr automake.vrs + automake.ov automake.pdf automake.pg automake.ps automake.toc \ + automake.tp automake.tr automake.vr automake.vrs maintainer-clean-aminfo: cd $(srcdir) && \ @@ -566,6 +577,10 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-aminfo mostlyclean-generic mostlyclean-vti +pdf: pdf-recursive + +pdf-am: $(PDFS) + uninstall-am: uninstall-binSCRIPTS uninstall-info-am @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) uninstall-hook @@ -586,9 +601,9 @@ uninstall-info: uninstall-info-recursive maintainer-clean-aminfo maintainer-clean-generic \ maintainer-clean-recursive maintainer-clean-vti mostlyclean \ mostlyclean-aminfo mostlyclean-generic mostlyclean-recursive \ - mostlyclean-vti tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-info-am uninstall-info-recursive \ - uninstall-recursive + mostlyclean-vti pdf pdf-am pdf-recursive tags tags-recursive \ + uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \ + uninstall-info-recursive uninstall-recursive install-exec-hook: diff --git a/NEWS b/NEWS index 8133eca7..83d47ffb 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ New in 1.6a: +* PDF files are generated by Automake * `make distcheck' will enforce DESTDIR support by attempting a DESTDIR install. * `+=' can be used in conditionals, even if the augmented variable diff --git a/automake.in b/automake.in index 92f187fe..21faec3f 100755 --- a/automake.in +++ b/automake.in @@ -386,6 +386,7 @@ my %required_targets = ( 'all' => 1, 'dvi' => 1, + 'pdf' => 1, 'info' => 1, 'install-info' => 1, 'install' => 1, @@ -397,6 +398,7 @@ my %required_targets = # Well, actually they are sort of required: the -recursive # targets will run them anyway... 'dvi-am' => 1, + 'pdf-am' => 1, 'info-am' => 1, 'install-data-am' => 1, 'install-exec-am' => 1, @@ -669,6 +671,8 @@ sub initialize_per_input () # Texinfoing. 'dvi' => [], 'dvi-am' => [], + 'pdf' => [], + 'pdf-am' => [], 'info' => [], 'info-am' => [], @@ -3092,7 +3096,7 @@ sub scan_texinfo_file my ($filename) = @_; # These are always created, no matter whether indexes are used or not. - my @clean_suffixes = qw(aux dvi log ps toc + my @clean_suffixes = qw(aux dvi log pdf ps toc cp fn ky vr tp pg); # grep new.*index texinfo.tex # There are predefined indexes which don't follow the regular rules. @@ -3200,7 +3204,7 @@ sub handle_texinfo_helper my @texis = &variable_value_as_list_recursive ('info_TEXINFOS', 'all'); - my (@info_deps_list, @dvis_list, @texi_deps); + my (@info_deps_list, @dvis_list, @pdfs_list, @texi_deps); my %versions; my $done = 0; my @texi_cleans; @@ -3287,10 +3291,13 @@ sub handle_texinfo_helper . "@texi_deps" . "\n" . $infobase . ".dvi: " . "@texi_deps" + . "\n" . $infobase . ".pdf: " + . "@texi_deps" . "\n"); push (@info_deps_list, $out_file); push (@dvis_list, $infobase . '.dvi'); + push (@pdfs_list, $infobase . '.pdf'); } # Handle location of texinfo.tex. @@ -3342,6 +3349,7 @@ sub handle_texinfo_helper &define_variable ("INFO_DEPS", "@info_deps_list"); &define_variable ("DVIS", "@dvis_list"); + &define_variable ("PDFS", "@pdfs_list"); # This next isn't strictly needed now -- the places that look here # could easily be changed to look in info_TEXINFOS. But this is # probably better, in case noinst_TEXINFOS is ever supported. diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in index 19d3f625..d563dd57 100644 --- a/lib/Automake/Makefile.in +++ b/lib/Automake/Makefile.in @@ -26,7 +26,9 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -214,6 +216,10 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic +pdf: pdf-am + +pdf-am: + uninstall-am: uninstall-dist_perllibDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -222,8 +228,8 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-info-am install-dist_perllibDATA install-exec install-exec-am \ install-info install-info-am install-man install-strip \ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am uninstall-dist_perllibDATA \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am uninstall uninstall-am uninstall-dist_perllibDATA \ uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/lib/Makefile.in b/lib/Makefile.in index 9721c4c6..e177dd13 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -26,7 +26,9 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -99,10 +101,11 @@ DIST_SOURCES = DATA = $(dist_pkgvdata_DATA) $(dist_script_DATA) -RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ - uninstall-info-recursive all-recursive install-data-recursive \ - install-exec-recursive installdirs-recursive install-recursive \ - uninstall-recursive check-recursive installcheck-recursive +RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + install-info-recursive uninstall-info-recursive all-recursive \ + install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive DIST_COMMON = $(dist_pkgvdata_DATA) $(dist_script_DATA) COPYING INSTALL \ Makefile.am Makefile.in ansi2knr.1 ansi2knr.c compile \ config.guess config.sub depcomp elisp-comp install-sh mdate-sh \ @@ -355,6 +358,10 @@ mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-generic +pdf: pdf-recursive + +pdf-am: + uninstall-am: uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \ uninstall-info-am @@ -372,10 +379,10 @@ uninstall-info: uninstall-info-recursive installcheck-local installdirs installdirs-am \ installdirs-recursive maintainer-clean maintainer-clean-generic \ maintainer-clean-recursive mostlyclean mostlyclean-generic \ - mostlyclean-recursive tags tags-recursive uninstall \ - uninstall-am uninstall-dist_pkgvdataDATA \ - uninstall-dist_scriptDATA uninstall-info-am \ - uninstall-info-recursive uninstall-recursive + mostlyclean-recursive pdf pdf-am pdf-recursive tags \ + tags-recursive uninstall uninstall-am \ + uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \ + uninstall-info-am uninstall-info-recursive uninstall-recursive install-data-hook: diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in index d2b0ba58..b74ad4b9 100644 --- a/lib/am/Makefile.in +++ b/lib/am/Makefile.in @@ -26,7 +26,9 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -222,6 +224,10 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic +pdf: pdf-am + +pdf-am: + uninstall-am: uninstall-dist_amDATA uninstall-info-am .PHONY: all all-am check check-am clean clean-generic distclean \ @@ -230,8 +236,8 @@ uninstall-am: uninstall-dist_amDATA uninstall-info-am install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic uninstall uninstall-am \ - uninstall-dist_amDATA uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am uninstall \ + uninstall-am uninstall-dist_amDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/lib/am/texibuild.am b/lib/am/texibuild.am index f76010fc..41523487 100644 --- a/lib/am/texibuild.am +++ b/lib/am/texibuild.am @@ -41,6 +41,13 @@ MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ $(TEXI2DVI) $< +.%SUFFIX%.pdf: + TEXINPUTS="%TEXINFODIR%$(PATH_SEPARATOR)$$TEXINPUTS" \ +## Must set MAKEINFO like this so that version.texi will be found even +## if it is in srcdir. + MAKEINFO='$(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir)' \ + $(TEXI2PDF) $< + .%SUFFIX%: ## We want to force the .info file to be built in srcdir. This is ## probably the simplest way. However, at Cygnus .info files are diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am index 59230d3b..9670a3f4 100644 --- a/lib/am/texinfos.am +++ b/lib/am/texinfos.am @@ -43,6 +43,8 @@ TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then \ echo texi2dvi; \ fi` endif %?CYGNUS% + +TEXI2PDF = $(TEXI2DVI) --pdf endif %?LOCAL-TEXIS% @@ -57,22 +59,26 @@ DVIPS = dvips $(DVIPS) $< -o $@ endif %?LOCAL-TEXIS% -.PHONY: info info-am dvi dvi-am +.PHONY: info info-am dvi dvi-am pdf pdf-am if %?SUBDIRS% -RECURSIVE_TARGETS += info-recursive dvi-recursive +RECURSIVE_TARGETS += info-recursive dvi-recursive pdf-recursive .PHONY info: info-recursive .PHONY dvi: dvi-recursive +.PHONY pdf: pdf-recursive else !%?SUBDIRS% info: info-am dvi: dvi-am +pdf: pdf-am endif !%?SUBDIRS% if %?LOCAL-TEXIS% info-am: $(INFO_DEPS) dvi-am: $(DVIS) +pdf-am: $(PDFS) else ! %?LOCAL-TEXIS% info-am: dvi-am: +pdf-am: endif ! %?LOCAL-TEXIS% diff --git a/m4/Makefile.in b/m4/Makefile.in index 324fb5a2..474fdc21 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -26,7 +26,9 @@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : @@ -244,6 +246,10 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic +pdf: pdf-am + +pdf-am: + uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \ uninstall-nodist_m4dataDATA @@ -253,8 +259,8 @@ uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \ install-exec install-exec-am install-info install-info-am \ install-man install-nodist_m4dataDATA install-strip \ installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - uninstall uninstall-am uninstall-dist_m4dataDATA \ + maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ + pdf-am uninstall uninstall-am uninstall-dist_m4dataDATA \ uninstall-info-am uninstall-nodist_m4dataDATA # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/tests/Makefile.in b/tests/Makefile.in index 0204a4f7..0280de36 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -658,6 +658,10 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-generic +pdf: pdf-am + +pdf-am: + uninstall-am: uninstall-info-am .PHONY: all all-am check check-TESTS check-am clean clean-generic \ @@ -666,8 +670,8 @@ uninstall-am: uninstall-info-am install-exec install-exec-am install-info install-info-am \ install-man install-strip installcheck installcheck-am \ installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic uninstall uninstall-am \ - uninstall-info-am + mostlyclean mostlyclean-generic pdf pdf-am uninstall \ + uninstall-am uninstall-info-am distclean-local: -- 2.43.5