* automake.in (required_targets): Add ps and ps-am.

(initialize_per_input): Reset them.
(handle_texinfo_helper): Fill @pss_list, and define the
PSS make variable.
* lib/am/texinfos.am (RECURSIVE_TARGETS): Add ps-recursive.
(ps, ps-am): New targets.
* automake.texi (Auxiliary Programs) <texinfo.tex>: Mention
`make ps' and `make pdf'.
(Texinfo): Document `make ps', `make pdf', and `make dvi'.
(Extending): The `ps' and `pdf' targets support a `-local' version.

diff --git a/ChangeLog b/ChangeLog
index 6cfca8a..ca3c57b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-06-26  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * automake.in (required_targets): Add ps and ps-am.
+       (initialize_per_input): Reset them.
+       (handle_texinfo_helper): Fill @pss_list, and define the
+       PSS make variable.
+       * lib/am/texinfos.am (RECURSIVE_TARGETS): Add ps-recursive.
+       (ps, ps-am): New targets.
+       * automake.texi (Auxiliary Programs) <texinfo.tex>: Mention
+       `make ps' and `make pdf'.
+       (Texinfo): Document `make ps', `make pdf', and `make dvi'.
+       (Extending): The `ps' and `pdf' targets support a `-local' version.
+
 2002-06-26  Art Haas  <ahaas@neosoft.com>
 
        * automake.texi: s/.../@dots{}/.

diff --git a/Makefile.in b/Makefile.in
index 874ee98..66e31c2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -116,11 +116,12 @@ TEXINFO_TEX = $(top_srcdir)/lib/texinfo.tex
 INFO_DEPS = automake.info
 DVIS = automake.dvi
 PDFS = automake.pdf
+PSS = automake.ps
 TEXINFOS = automake.texi
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-       install-info-recursive uninstall-info-recursive all-recursive \
-       install-data-recursive install-exec-recursive \
+       ps-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 \
@@ -582,6 +583,10 @@ pdf: pdf-recursive
 
 pdf-am: $(PDFS)
 
+ps: ps-recursive
+
+ps-am: $(PSS)
+
 uninstall-am: uninstall-binSCRIPTS uninstall-info-am
        @$(NORMAL_INSTALL)
        $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
@@ -602,9 +607,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 pdf pdf-am pdf-recursive tags tags-recursive \
-       uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
-       uninstall-info-recursive uninstall-recursive
+       mostlyclean-vti pdf pdf-am pdf-recursive ps ps-am ps-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 fcb3286..f3e1e9c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,7 @@
 New in 1.6a:
 * A new option, std-options, tests that programs support --help and --version
   when `make installcheck' is run.  This is enabled by --gnits.
-* PDF files are generated by Automake
+* Texinfo rules now support the `ps' and `pdf' targets.
 * `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 afc7fb7..74b6c72 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -387,6 +387,7 @@ my %required_targets =
    'all'          => 1,
    'dvi'         => 1,
    'pdf'         => 1,
+   'ps'                  => 1,
    'info'        => 1,
    'install-info' => 1,
    'install'      => 1,
@@ -399,6 +400,7 @@ my %required_targets =
    # targets will run them anyway...
    'dvi-am'          => 1,
    'pdf-am'          => 1,
+   'ps-am'           => 1,
    'info-am'         => 1,
    'install-data-am' => 1,
    'install-exec-am' => 1,
@@ -673,6 +675,8 @@ sub initialize_per_input ()
        'dvi-am'   => [],
        'pdf'      => [],
        'pdf-am'   => [],
+       'ps'       => [],
+       'ps-am'    => [],
        'info'     => [],
        'info-am'  => [],
 
@@ -3210,7 +3214,7 @@ sub handle_texinfo_helper
 
     my @texis = &variable_value_as_list_recursive ('info_TEXINFOS', 'all');
 
-    my (@info_deps_list, @dvis_list, @pdfs_list, @texi_deps);
+    my (@info_deps_list, @dvis_list, @pdfs_list, @pss_list, @texi_deps);
     my %versions;
     my $done = 0;
     my @texi_cleans;
@@ -3304,6 +3308,7 @@ sub handle_texinfo_helper
        push (@info_deps_list, $out_file);
        push (@dvis_list, $infobase . '.dvi');
        push (@pdfs_list, $infobase . '.pdf');
+       push (@pss_list, $infobase . '.ps');
     }
 
     # Handle location of texinfo.tex.
@@ -3356,6 +3361,7 @@ sub handle_texinfo_helper
     &define_variable ("INFO_DEPS", "@info_deps_list");
     &define_variable ("DVIS", "@dvis_list");
     &define_variable ("PDFS", "@pdfs_list");
+    &define_variable ("PSS", "@pss_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/automake.texi b/automake.texi
index cc82209..33f6e45 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -596,8 +596,8 @@ This works around the fact that @code{mkdir -p} is not portable.
 This is used to byte-compile Python scripts.
 
 @item texinfo.tex
-Not a program, this file is required for @code{make dvi} to work when
-Texinfo sources are in the package.
+Not a program, this file is required for @code{make dvi}, @code{make ps}
+and @code{make pdf} to work when Texinfo sources are in the package.
 
 @item ylwrap
 This program wraps @code{lex} and @code{yacc} and ensures that, for
@@ -3453,6 +3453,13 @@ for new manuals.
 @vindex TEXINFOS
 @vindex info_TEXINFOS
 
+Automake generates rules to build @file{.info}, @file{.dvi}, @file{.ps},
+and @file{.pdf} files from your Texinfo sources.  The @file{.info} files
+are built by @code{make all} and installed by @code{make install}
+(unless you use @code{no-installinfo}, see below).  The other files can
+be built on request by @code{make dvi}, @code{make ps}, and @code{make
+pdf}.
+
 @cindex Texinfo macro, VERSION
 @cindex Texinfo macro, UPDATED
 @cindex Texinfo macro, EDITION
@@ -3543,7 +3550,7 @@ TEXINFO_TEX = ../doc/texinfo.tex
 The option @samp{no-texinfo.tex} can be used to eliminate the
 requirement for @file{texinfo.tex}.  Use of the variable
 @code{TEXINFO_TEX} is preferable, however, because that allows the
-@code{dvi} target to still work.
+@code{dvi}, @code{ps}, and @code{pdf} targets to still work.
 
 @cindex Target, install-info
 @cindex Target, noinstall-info
@@ -4619,34 +4626,43 @@ various useful targets have a @samp{-local} version you can specify in
 your @file{Makefile.in}.  Automake will supplement the standard target
 with these user-supplied targets.
 
+@trindex  all
 @trindex  all-local
+@trindex  info
 @trindex  info-local
+@trindex  dvi
 @trindex  dvi-local
+@trindex  ps
+@trindex  ps-local
+@trindex  pdf
+@trindex  pdf-local
+@trindex  check
 @trindex  check-local
+@trindex  install
 @trindex  install-data-local
+@trindex  install-exec
 @trindex  install-exec-local
+@trindex  uninstall
 @trindex  uninstall-local
+@trindex  mostlyclean
 @trindex  mostlyclean-local
+@trindex  clean
 @trindex  clean-local
+@trindex  distclean
 @trindex  distclean-local
+@trindex  installdirs
 @trindex  installdirs-local
+@trindex  installcheck
 @trindex  installcheck-local
 
 The targets that support a local version are @code{all}, @code{info},
-@code{dvi}, @code{check}, @code{install-data}, @code{install-exec},
-@code{uninstall}, @code{installdirs}, @code{installcheck} and the
-various @code{clean} targets (@code{mostlyclean}, @code{clean},
-@code{distclean}, and @code{maintainer-clean}).  Note that there are no
+@code{dvi}, @code{ps}, @code{pdf}, @code{check}, @code{install-data},
+@code{install-exec}, @code{uninstall}, @code{installdirs},
+@code{installcheck} and the various @code{clean} targets
+(@code{mostlyclean}, @code{clean}, @code{distclean}, and
+@code{maintainer-clean}).  Note that there are no
 @code{uninstall-exec-local} or @code{uninstall-data-local} targets; just
 use @code{uninstall-local}.  It doesn't make sense to uninstall just
-data or just executables.
-@trindex all
-@trindex info
-@trindex dvi
-@trindex check
-@trindex install-data
-@trindex install-exec
-@trindex uninstall
 
 For instance, here is one way to install a file in @file{/etc}:
 

diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index 6ecca36..e39261d 100644 (file)
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -221,6 +221,10 @@ pdf: pdf-am
 
 pdf-am:
 
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-dist_perllibDATA uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -230,8 +234,8 @@ uninstall-am: uninstall-dist_perllibDATA uninstall-info-am
        install-info install-info-am install-man install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am uninstall uninstall-am uninstall-dist_perllibDATA \
-       uninstall-info-am
+       pdf-am ps ps-am uninstall uninstall-am \
+       uninstall-dist_perllibDATA 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/Makefile.in b/lib/Makefile.in
index 572d646..f5f425d 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -103,8 +103,8 @@ DATA = $(dist_pkgvdata_DATA) $(dist_script_DATA)
 
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-       install-info-recursive uninstall-info-recursive all-recursive \
-       install-data-recursive install-exec-recursive \
+       ps-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 \
@@ -363,6 +363,10 @@ pdf: pdf-recursive
 
 pdf-am:
 
+ps: ps-recursive
+
+ps-am:
+
 uninstall-am: uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \
        uninstall-info-am
 
@@ -380,8 +384,8 @@ 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 pdf pdf-am pdf-recursive tags \
-       tags-recursive uninstall uninstall-am \
+       mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
+       ps-recursive tags tags-recursive uninstall uninstall-am \
        uninstall-dist_pkgvdataDATA uninstall-dist_scriptDATA \
        uninstall-info-am uninstall-info-recursive uninstall-recursive
 

diff --git a/lib/am/Makefile.in b/lib/am/Makefile.in
index 2fbd3be..4c4db28 100644 (file)
--- a/lib/am/Makefile.in
+++ b/lib/am/Makefile.in
@@ -229,6 +229,10 @@ pdf: pdf-am
 
 pdf-am:
 
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-dist_amDATA uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -237,7 +241,7 @@ 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 pdf pdf-am uninstall \
+       mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
        uninstall-am uninstall-dist_amDATA uninstall-info-am
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

diff --git a/lib/am/texinfos.am b/lib/am/texinfos.am
index 9670a3f..89c00fe 100644 (file)
--- a/lib/am/texinfos.am
+++ b/lib/am/texinfos.am
@@ -61,24 +61,28 @@ endif %?LOCAL-TEXIS%
 
 .PHONY: info info-am dvi dvi-am pdf pdf-am
 if %?SUBDIRS%
-RECURSIVE_TARGETS += info-recursive dvi-recursive pdf-recursive
+RECURSIVE_TARGETS += info-recursive dvi-recursive pdf-recursive ps-recursive
 .PHONY info: info-recursive
 .PHONY dvi: dvi-recursive
 .PHONY pdf: pdf-recursive
+.PHONY ps: ps-recursive
 else !%?SUBDIRS%
 info: info-am
 dvi: dvi-am
 pdf: pdf-am
+ps: ps-am
 endif !%?SUBDIRS%
 
 if %?LOCAL-TEXIS%
 info-am: $(INFO_DEPS)
 dvi-am: $(DVIS)
 pdf-am: $(PDFS)
+ps-am: $(PSS)
 else ! %?LOCAL-TEXIS%
 info-am:
 dvi-am:
 pdf-am:
+ps-am:
 endif ! %?LOCAL-TEXIS%
 
 

diff --git a/m4/Makefile.in b/m4/Makefile.in
index e334456..0fc808e 100644 (file)
--- a/m4/Makefile.in
+++ b/m4/Makefile.in
@@ -251,6 +251,10 @@ pdf: pdf-am
 
 pdf-am:
 
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \
        uninstall-nodist_m4dataDATA
 
@@ -261,8 +265,9 @@ uninstall-am: uninstall-dist_m4dataDATA uninstall-info-am \
        install-man install-nodist_m4dataDATA install-strip \
        installcheck installcheck-am installdirs maintainer-clean \
        maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-       pdf-am uninstall uninstall-am uninstall-dist_m4dataDATA \
-       uninstall-info-am uninstall-nodist_m4dataDATA
+       pdf-am ps ps-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.
 # Otherwise a system limit (for SysV at least) may be exceeded.

diff --git a/tests/Makefile.in b/tests/Makefile.in
index d9676fa..076a3b5 100644 (file)
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -668,6 +668,10 @@ pdf: pdf-am
 
 pdf-am:
 
+ps: ps-am
+
+ps-am:
+
 uninstall-am: uninstall-info-am
 
 .PHONY: all all-am check check-TESTS check-am clean clean-generic \
@@ -676,7 +680,7 @@ 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 pdf pdf-am uninstall \
+       mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
        uninstall-am uninstall-info-am