diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-24 16:35:38 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-24 16:35:38 +0000 |
| commit | cd4e91c65624062b5504c10b2af0a05aefbf4878 (patch) | |
| tree | e2655497781456a180130744d211ef3f23416584 | |
| parent | 09ca5de0f38d3cc30b8d149b2a8c9f0ad810a09a (diff) | |
| download | dbus-python-cd4e91c65624062b5504c10b2af0a05aefbf4878.tar.gz | |
Move PY3PORT into doc, use the same extension as other rst, and render it
| -rw-r--r-- | Makefile.am | 16 | ||||
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/PY3PORT.txt (renamed from PY3PORT.rst) | 0 |
4 files changed, 16 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 01c8a5a..04073b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -67,8 +67,16 @@ dist-hook: fi; \ fi -TXT_RSTDOCS = doc/tutorial.txt doc/API_CHANGES.txt doc/HACKING.txt -RSTDOCS = README NEWS TODO +TXT_RSTDOCS = \ + doc/tutorial.txt \ + doc/API_CHANGES.txt \ + doc/HACKING.txt \ + doc/PY3PORT.txt \ + $(NULL) +RSTDOCS = \ + README \ + NEWS \ + TODO dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS) maintainer-upload: @@ -84,8 +92,8 @@ _maintainer-update-htmldocs: $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS) $(RSTDOCS) $(HTML_RSTDOCS) \ dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/ -HTML_TXT_RSTDOCS = doc/tutorial.html doc/API_CHANGES.html doc/HACKING.html -HTML_RSTDOCS = README.html NEWS.html TODO.html +HTML_TXT_RSTDOCS = $(patsubst %.txt,%.html,$(TXT_RSTDOCS)) +HTML_RSTDOCS = $(patsubst %,%.html,$(RSTDOCS)) nodist_doc_DATA = $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS) CLEANFILES += $(nodist_doc_DATA) @@ -8,6 +8,9 @@ Dependencies: * Python 2.6 or later is now required. If Python 3 is used, it must be version 3.2 or later. +* GNU make (or, at your own risk, another make with the GNU $(patsubst) + extension) is now required. + API changes: * dbus_bindings, which was never meant to be public API and has been diff --git a/configure.ac b/configure.ac index 3208542..25afc43 100644 --- a/configure.ac +++ b/configure.ac @@ -31,7 +31,7 @@ AC_SUBST(DBUS_PYTHON_MICRO_VERSION, dbus_python_micro_version) AC_CONFIG_SRCDIR([_dbus_bindings/module.c]) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE([1.9]) +AM_INIT_AUTOMAKE([1.9 -Wno-portability]) AC_CANONICAL_BUILD AC_CANONICAL_HOST diff --git a/PY3PORT.rst b/doc/PY3PORT.txt index 31bb9d8..31bb9d8 100644 --- a/PY3PORT.rst +++ b/doc/PY3PORT.txt |