* lib/am/python.am: Cleanup the cleaning section.

* automake.texi (Python): Remove documentation for PYCFILES
and PYOFILES.  Update the first paragraphes.

diff --git a/ChangeLog b/ChangeLog
index 70ffb51ebcfd7c377d2a06e9378c1af0d80ab312..31d9df0a676277e1091c1d3e5d14199c1b9663db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-11-05  Alexandre Duret-Lutz  <duret_g@epita.fr>
+
+       * lib/am/python.am: Cleanup the cleaning section.
+       * automake.texi (Python): Remove documentation for PYCFILES
+       and PYOFILES.  Update the first paragraphes.
+
 2001-11-05  Alexandre Duret-Lutz  <duret_g@epita.fr>
 
        * automake.in (FOREIGN, GNU, GNITS, AC_CANONICAL_HOST,

diff --git a/automake.texi b/automake.texi
index 583ef7f1fcb48b2c2750f4168a86b0f6d508df86..31a24b429be05a264b624a043ef8aad9a740cdc4 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -3135,14 +3135,25 @@ This variable is an @code{sh} expression which is used to set the
 @cindex Primary variable, PYTHON
 
 
-Automake provides support for Python modules.  Automake will turn on
-Python support if the @code{AM_PATH_PYTHON} macro is used in
-@file{configure.in}.  The @samp{PYTHON} primary is used to hold a list
-of @file{.py} files.  Possible prefixes for this primary are
-@samp{python_} and @samp{noinst_}.  Note that if @code{python_PYTHON} is
-defined, then @file{configure.in} must run @code{AM_PATH_PYTHON}.
+Automake provides support for Python compilation with the @samp{PYTHON}
+primary.
+
+Any files listed in a @samp{_PYTHON} variable will be byte-compiled with
+@code{py-compile} at install time.  @code{py-compile} actually creates
+both standard (@file{.pyc}) and byte-compiled (@file{.pyo}) versions of
+the source files.  Note that because byte-compilation occurs at install
+time, any files listed in @samp{noinst_PYTHON} will not be compiled.
 Python source files are included in the distribution by default.
 
+Automake ships with an Autoconf macro called @code{AM_PATH_PYTHON} which
+will determine some Python-related directory variables (see below).  If
+have called @code{AM_PATH_PYTHON} from you @file{configure.in}, then you
+may use the following variables to list you Python source files in your
+variables: @samp{python_PYTHON}, @samp{pkgpython_PYTHON},
+@samp{pkgpython_PYTHON}, @samp{pyexecdir_PYTHON},
+@samp{pkgpyexecdir_PYTHON}, depending where you want your files
+installed.
+
 @code{AM_PATH_PYTHON} takes a single optional argument.  This argument,
 if present, is the minimum version of Python which can be used for this
 package.  If the version of Python found on the system is older than the
@@ -3193,15 +3204,6 @@ This is a convenience variable which is defined as
 @samp{$(pyexecdir)/$(PACKAGE)}.
 @end vtable
 
-@vindex PYCFILES
-@vindex PYOFILES
-
-By default Automake will byte-compile all Python source files to both
-@file{.pyc} and @file{.pyo} forms.  If you wish to avoid generating the
-optimized byte-code files, simply define the variable @code{PYOFILES} to
-be empty.  Similarly, if you don't wish to generate the standard
-byte-compiled files, define the variable @code{PYCFILES} to be empty.
-
 
 @node Documentation, Install, Other GNU Tools, Top
 @chapter Building documentation

diff --git a/lib/am/python.am b/lib/am/python.am
index c0fd5dc0f2b5bc62149f049de0c69c99e2b67cfe..4686576caea07e86fe03975bf351d207a710c933 100644 (file)
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -71,20 +71,8 @@ endif %?INSTALL%
 ## Cleaning.  ##
 ## ---------- ##
 
-## FIXME: There is nothing to clean here since files are
-##        byte-compiled when (and where) they are installed.
-##        Some points thought:
-##          1) clean-python ought to be named clean-%DIR%PYTHON, to allow
-##             multiple _PYTHON targets.
-##          2) PYCFILES and PYOFILES are documented but not used anywhere
-##             else.
-##          3) PYCFILES and PYOFILES shoud be target-dependent for the same
-##             reason.
-##
-##.PHONY clean-am: clean-python
-##clean-python:
-##     -test -z "$(PYCFILES)$(PYOFILES)" || rm -f $(PYCFILES) $(PYOFILES)
-
+## There is nothing to clean here since files are
+## byte-compiled when (and where) they are installed.
 
 ## -------------- ##
 ## Distributing.  ##

diff --git a/stamp-vti b/stamp-vti
index 5e7b156dc6b127d993c7b71de199b5a03480ab72..33ff40b8188fde32d6b9119b5acd96cf23f9bcd2 100644 (file)
--- a/stamp-vti
+++ b/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 21 October 2001
-@set UPDATED-MONTH October 2001
+@set UPDATED 5 November 2001
+@set UPDATED-MONTH November 2001
 @set EDITION 1.5a
 @set VERSION 1.5a

diff --git a/version.texi b/version.texi
index 5e7b156dc6b127d993c7b71de199b5a03480ab72..33ff40b8188fde32d6b9119b5acd96cf23f9bcd2 100644 (file)
--- a/version.texi
+++ b/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 21 October 2001
-@set UPDATED-MONTH October 2001
+@set UPDATED 5 November 2001
+@set UPDATED-MONTH November 2001
 @set EDITION 1.5a
 @set VERSION 1.5a