New upstream version 1.2.8

1 files changed, 102 insertions, 152 deletions

diff --git a/Makefile.in b/Makefile.in
index 7d00c95..f622aa1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,7 +115,6 @@ TESTS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_1)
 @ENABLE_INSTALLED_TESTS_TRUE@nobase_installed_test_PROGRAMS =  \
 @ENABLE_INSTALLED_TESTS_TRUE@	$(am__EXEEXT_1)
 @ENABLE_INSTALLED_TESTS_FALSE@noinst_PROGRAMS = $(am__EXEEXT_1)
-@ENABLE_DOCS_TRUE@am__append_6 = $(nodist_doc_DATA)
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
@@ -132,7 +131,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_append_compile_flags.m4 \
 	$(top_srcdir)/m4/ax_python_devel.m4 \
 	$(top_srcdir)/m4/ax_python_module.m4 \
 	$(top_srcdir)/m4/ax_require_defined.m4 \
-	$(top_srcdir)/m4/dbus-py-add-rst2htmlflag.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/pkg.m4 \
@@ -143,8 +141,8 @@ DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
 	$(am__configure_deps) $(am__dist_noinst_SCRIPTS_DIST) \
 	$(am__nobase_dist_installed_test_SCRIPTS_DIST) \
 	$(am__nobase_dist_installed_test_PYTHON_DIST) \
-	$(am__nobase_python_PYTHON_DIST) $(dist_doc_DATA) \
-	$(dbusinclude_HEADERS) $(am__DIST_COMMON)
+	$(am__nobase_python_PYTHON_DIST) $(dbusinclude_HEADERS) \
+	$(am__DIST_COMMON)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
@@ -182,8 +180,8 @@ am__installdirs = "$(DESTDIR)$(installed_testdir)" \
 	"$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(installed_testdir)" \
 	"$(DESTDIR)$(installed_testdir)" \
 	"$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pythondir)" \
-	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(installed_test_metadir)" \
-	"$(DESTDIR)$(installed_test_testdir)" "$(DESTDIR)$(docdir)" \
+	"$(DESTDIR)$(installed_test_metadir)" \
+	"$(DESTDIR)$(installed_test_testdir)" \
 	"$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(dbusincludedir)"
 LTLIBRARIES = $(nobase_installed_test_LTLIBRARIES) \
 	$(noinst_LTLIBRARIES) $(pyexec_LTLIBRARIES)
@@ -326,9 +324,8 @@ am__nobase_python_PYTHON_DIST = dbus/bus.py dbus/connection.py \
 	dbus/mainloop/glib.py dbus/proxies.py dbus/server.py \
 	dbus/service.py dbus/types.py dbus/gobject_service.py
 py_compile = $(top_srcdir)/build-aux/py-compile
-DATA = $(dist_doc_DATA) $(installed_test_meta_DATA) \
-	$(installed_test_test_DATA) $(nodist_doc_DATA) $(noinst_DATA) \
-	$(pkgconfig_DATA)
+DATA = $(installed_test_meta_DATA) $(installed_test_test_DATA) \
+	$(noinst_DATA) $(pkgconfig_DATA)
 HEADERS = $(dbusinclude_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -625,7 +622,6 @@ ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
-EPYDOC = @EPYDOC@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GIT = @GIT@
@@ -680,8 +676,6 @@ PYTHON_PREFIX = @PYTHON_PREFIX@
 PYTHON_SITE_PKG = @PYTHON_SITE_PKG@
 PYTHON_VERSION = @PYTHON_VERSION@
 RANLIB = @RANLIB@
-RST2HTML = @RST2HTML@
-RST2HTMLFLAGS = @RST2HTMLFLAGS@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
@@ -753,33 +747,23 @@ installed_test_metadir = ${datadir}/installed-tests/${PACKAGE_TARNAME}
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = dbus-gmain .
 CLEANFILES = test/test-service.log $(NULL) $(noinst_DATA) \
-	$(installed_test_test_data) $(installed_test_metadata) \
-	$(am__append_6)
-EXTRA_DIST = \
-	.travis.yml \
-	AUTHORS \
-	COPYING \
-	ChangeLog \
-	dbus-python.pc.in \
-	examples/example-async-client.py \
-	examples/example-client.py \
-	examples/example-service.py \
+	$(installed_test_test_data) $(installed_test_metadata)
+
+# A hack used for the HTML documentation on dbus.freedesktop.org
+EXTRA_DIST = .travis.yml AUTHORS COPYING ChangeLog dbus-python.pc.in \
+	doc/_static/.gitignore examples/example-async-client.py \
+	examples/example-client.py examples/example-service.py \
 	examples/example-signal-emitter.py \
 	examples/example-signal-recipient.py \
 	examples/gconf-proxy-client.py \
 	examples/gconf-proxy-service2.py \
-	examples/list-system-services.py \
-	examples/unix-fd-client.py \
-	examples/unix-fd-service.py \
-	m4/dbus-py-add-rst2htmlflag.m4 \
-	setup.py \
+	examples/list-system-services.py examples/unix-fd-client.py \
+	examples/unix-fd-service.py setup.py \
 	test/TestSuitePythonService.service.in \
-	test/tmp-session-bus.conf.in \
-	tools/check-c-style.sh \
-	tools/check-coding-style.mk \
-	tools/check-py-style.sh \
-	tools/check-whitespace.sh
-
+	test/tmp-session-bus.conf.in tools/check-c-style.sh \
+	tools/check-coding-style.mk tools/check-py-style.sh \
+	tools/check-whitespace.sh $(sphinx_sources) doc/redirects \
+	doc/redirects.py $(NULL)
 
 # === C code ===
 AM_CPPFLAGS = \
@@ -982,23 +966,32 @@ installed_test_metadata = \
 	$(patsubst %,%.test,$(test_programs)) \
 	$(NULL)
 
-TXT_RSTDOCS = \
-	doc/tutorial.txt \
+sphinx_sources = \
 	doc/API_CHANGES.txt \
+	doc/conf.py \
+	doc/dbus.bus.rst \
+	doc/dbus.connection.rst \
+	doc/dbus.decorators.rst \
+	doc/dbus.exceptions.rst \
+	doc/dbus.gi_service.rst \
+	doc/dbus.glib.rst \
+	doc/dbus.gobject_service.rst \
+	doc/dbus.lowlevel.rst \
+	doc/dbus.mainloop.rst \
+	doc/dbus.proxies.rst \
+	doc/dbus.rst \
+	doc/dbus.server.rst \
+	doc/dbus.service.rst \
+	doc/dbus.types.rst \
 	doc/HACKING.txt \
+	doc/index.rst \
+	doc/news.rst \
 	doc/PY3PORT.txt \
-	$(NULL)
-
-RSTDOCS = \
-	README \
+	doc/tutorial.txt \
 	NEWS \
+	README \
 	$(NULL)
 
-dist_doc_DATA = $(TXT_RSTDOCS) $(RSTDOCS)
-@ENABLE_DOCS_TRUE@HTML_TXT_RSTDOCS = $(patsubst %.txt,%.html,$(TXT_RSTDOCS))
-@ENABLE_DOCS_TRUE@HTML_RSTDOCS = $(patsubst %,%.html,$(RSTDOCS))
-@ENABLE_DOCS_TRUE@nodist_doc_DATA = $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS)
-@ENABLE_API_DOCS_TRUE@APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/.libs
 check_c_sources = \
 	$(_dbus_bindings_la_SOURCES) \
 	$(_dbus_glib_bindings_la_SOURCES) \
@@ -1521,27 +1514,6 @@ uninstall-nobase_pythonPYTHON:
 	  $(am__uninstall_files_from_dir) || st=$$?; \
 	done; \
 	exit $$st
-install-dist_docDATA: $(dist_doc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-dist_docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 install-installed_test_metaDATA: $(installed_test_meta_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(installed_test_meta_DATA)'; test -n "$(installed_test_metadir)" || list=; \
@@ -1584,27 +1556,6 @@ uninstall-installed_test_testDATA:
 	@list='$(installed_test_test_DATA)'; test -n "$(installed_test_testdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(installed_test_testdir)'; $(am__uninstall_files_from_dir)
-install-nodist_docDATA: $(nodist_doc_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(nodist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
-	done
-
-uninstall-nodist_docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(nodist_doc_DATA)'; test -n "$(docdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 install-pkgconfigDATA: $(pkgconfig_DATA)
 	@$(NORMAL_INSTALL)
 	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
@@ -2129,7 +2080,7 @@ all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) \
 		$(HEADERS) config.h
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_test_testdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(dbusincludedir)"; do \
+	for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pyexecdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(pythondir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_test_testdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(dbusincludedir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -2172,7 +2123,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@ENABLE_API_DOCS_FALSE@clean-local:
 clean: clean-recursive
 
 clean-am: clean-generic clean-libtool clean-local \
@@ -2199,15 +2149,14 @@ info: info-recursive
 
 info-am:
 
-install-data-am: install-dbusincludeHEADERS install-dist_docDATA \
+install-data-am: install-data-local install-dbusincludeHEADERS \
 	install-installed_test_metaDATA \
 	install-installed_test_testDATA \
 	install-nobase_dist_installed_testPYTHON \
 	install-nobase_dist_installed_testSCRIPTS \
 	install-nobase_installed_testLTLIBRARIES \
 	install-nobase_installed_testPROGRAMS \
-	install-nobase_pythonPYTHON install-nodist_docDATA \
-	install-pkgconfigDATA
+	install-nobase_pythonPYTHON install-pkgconfigDATA
 
 install-dvi: install-dvi-recursive
 
@@ -2255,15 +2204,15 @@ ps: ps-recursive
 
 ps-am:
 
-uninstall-am: uninstall-dbusincludeHEADERS uninstall-dist_docDATA \
+uninstall-am: uninstall-dbusincludeHEADERS \
 	uninstall-installed_test_metaDATA \
-	uninstall-installed_test_testDATA \
+	uninstall-installed_test_testDATA uninstall-local \
 	uninstall-nobase_dist_installed_testPYTHON \
 	uninstall-nobase_dist_installed_testSCRIPTS \
 	uninstall-nobase_installed_testLTLIBRARIES \
 	uninstall-nobase_installed_testPROGRAMS \
-	uninstall-nobase_pythonPYTHON uninstall-nodist_docDATA \
-	uninstall-pkgconfigDATA uninstall-pyexecLTLIBRARIES
+	uninstall-nobase_pythonPYTHON uninstall-pkgconfigDATA \
+	uninstall-pyexecLTLIBRARIES
 
 .MAKE: $(am__recursive_targets) all check-am install-am install-strip
 
@@ -2279,31 +2228,30 @@ uninstall-am: uninstall-dbusincludeHEADERS uninstall-dist_docDATA \
 	distclean-generic distclean-hdr distclean-libtool \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-dbusincludeHEADERS \
-	install-dist_docDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-installed_test_metaDATA \
+	install-data install-data-am install-data-local \
+	install-dbusincludeHEADERS install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-installed_test_metaDATA \
 	install-installed_test_testDATA install-man \
 	install-nobase_dist_installed_testPYTHON \
 	install-nobase_dist_installed_testSCRIPTS \
 	install-nobase_installed_testLTLIBRARIES \
 	install-nobase_installed_testPROGRAMS \
-	install-nobase_pythonPYTHON install-nodist_docDATA install-pdf \
-	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
+	install-nobase_pythonPYTHON install-pdf install-pdf-am \
+	install-pkgconfigDATA install-ps install-ps-am \
 	install-pyexecLTLIBRARIES install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	recheck tags tags-am uninstall uninstall-am \
-	uninstall-dbusincludeHEADERS uninstall-dist_docDATA \
-	uninstall-installed_test_metaDATA \
-	uninstall-installed_test_testDATA \
+	uninstall-dbusincludeHEADERS uninstall-installed_test_metaDATA \
+	uninstall-installed_test_testDATA uninstall-local \
 	uninstall-nobase_dist_installed_testPYTHON \
 	uninstall-nobase_dist_installed_testSCRIPTS \
 	uninstall-nobase_installed_testLTLIBRARIES \
 	uninstall-nobase_installed_testPROGRAMS \
-	uninstall-nobase_pythonPYTHON uninstall-nodist_docDATA \
-	uninstall-pkgconfigDATA uninstall-pyexecLTLIBRARIES
+	uninstall-nobase_pythonPYTHON uninstall-pkgconfigDATA \
+	uninstall-pyexecLTLIBRARIES
 
 .PRECIOUS: Makefile
 
@@ -2365,18 +2313,21 @@ $(installed_test_test_data): test/installable/%: test/%.in
 		$< > $@
 
 $(patsubst %,%.test,$(dist_test_py)): %.test: Makefile
+	@$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
 	echo 'Exec=$(installed_log_compiler) $(PYTHON) $(installed_testdir)/$*' >> $@.tmp; \
 	mv $@.tmp $@)
 
 $(patsubst %,%.test,$(dist_test_sh)): %.test: Makefile
+	@$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
 	echo 'Exec=$(installed_log_compiler) $(installed_testdir)/$*' >> $@.tmp; \
 	mv $@.tmp $@)
 
 $(patsubst %,%.test,$(test_programs)): %.test: Makefile
+	@$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN) (echo '[Test]' > $@.tmp; \
 	echo 'Type=session' >> $@.tmp; \
 	echo 'Exec=$(installed_log_compiler) $(installed_testdir)/$*$(EXEEXT)' >> $@.tmp; \
@@ -2390,60 +2341,60 @@ dist-hook: dist-ChangeLog
 	echo $(VERSION) > $(distdir)/.version
 	touch $(distdir)/MANIFEST
 	touch $(distdir)/MANIFEST.in
+	( cd $(distdir) && $(PYTHON) setup.py egg_info )
+	cp $(distdir)/dbus_python.egg-info/PKG-INFO $(distdir)
 	( cd $(distdir) && find -type d -o -print ) | \
 		LC_ALL=C sort | \
 		$(SED) -e 's|^\./||' \
 		> $(distdir)/MANIFEST
 	sed -e 's/.*/include &/' < $(distdir)/MANIFEST > $(distdir)/MANIFEST.in
+	cp $(distdir)/MANIFEST $(distdir)/dbus_python.egg-info/SOURCES.txt
 
 maintainer-upload:
 	rsync -tvpP --chmod=ugo=r $(DIST_ARCHIVES) $(DIST_ARCHIVES:%=%.asc) \
 	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/releases/dbus-python/
 
-maintainer-update-website: _maintainer-update-apidocs \
-	_maintainer-update-htmldocs
-
-@ENABLE_DOCS_TRUE@_maintainer-update-htmldocs: $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS)
-@ENABLE_DOCS_TRUE@	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc \
-@ENABLE_DOCS_TRUE@	$(patsubst %,$(srcdir)/%,$(RSTDOCS)) $(HTML_RSTDOCS) \
-@ENABLE_DOCS_TRUE@	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/
-
-@ENABLE_DOCS_TRUE@$(HTML_TXT_RSTDOCS) : %.html: %.txt
-@ENABLE_DOCS_TRUE@	$(INSTALL) -d doc
-@ENABLE_DOCS_TRUE@	$(RST2HTML) $(RST2HTMLFLAGS) $< $@
-@ENABLE_DOCS_TRUE@$(HTML_RSTDOCS) : %.html: %
-@ENABLE_DOCS_TRUE@	$(RST2HTML) $(RST2HTMLFLAGS) $< $@
-@ENABLE_DOCS_FALSE@_maintainer-update-htmldocs:
-@ENABLE_DOCS_FALSE@	@echo "*** Not updating the HTML docs on the website - install rst2html"
-@ENABLE_DOCS_FALSE@	@echo "*** from http://docutils.sourceforge.net/ and configure with "
-@ENABLE_DOCS_FALSE@	@echo "*** --enable-html-docs"
-
-@ENABLE_API_DOCS_TRUE@all: api/index.html
-
-@ENABLE_API_DOCS_TRUE@clean-local:
-@ENABLE_API_DOCS_TRUE@	rm -rf api
-
-@ENABLE_API_DOCS_TRUE@api api/index.html: $(nobase_python_PYTHON) \
-@ENABLE_API_DOCS_TRUE@		    _dbus_bindings.la \
-@ENABLE_API_DOCS_TRUE@		    _dbus_glib_bindings.la
-@ENABLE_API_DOCS_TRUE@	rm -rf api
-@ENABLE_API_DOCS_TRUE@	mkdir api
-@ENABLE_API_DOCS_TRUE@	cd $(abs_top_srcdir) && \
-@ENABLE_API_DOCS_TRUE@	PYTHONPATH=$(APIDOC_PYTHONPATH) DBUS_PYTHON_NO_DEPRECATED=1 \
-@ENABLE_API_DOCS_TRUE@	$(PYTHON) -Wignore::DeprecationWarning \
-@ENABLE_API_DOCS_TRUE@	$(EPYDOC) -o $(abs_top_builddir)/api --html \
-@ENABLE_API_DOCS_TRUE@		--docformat restructuredtext -v \
-@ENABLE_API_DOCS_TRUE@		`find dbus -name '*.py' \
-@ENABLE_API_DOCS_TRUE@			| sed -e 's#/__init__\.py##g' \
-@ENABLE_API_DOCS_TRUE@				-e 's/\.py\>//g' -e 's#/#.#'g` \
-@ENABLE_API_DOCS_TRUE@		|| { rm -rf api; exit 1; }
-
-@ENABLE_API_DOCS_TRUE@_maintainer-update-apidocs: api
-@ENABLE_API_DOCS_TRUE@	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX api/ \
-@ENABLE_API_DOCS_TRUE@	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/api/
-@ENABLE_API_DOCS_FALSE@_maintainer-update-apidocs:
-@ENABLE_API_DOCS_FALSE@	@echo "*** Not updating the API docs on the website - install epydoc 3"
-@ENABLE_API_DOCS_FALSE@	@echo "*** alpha (or newer) and configure with --enable-api-docs"
+install-data-local: install-data-local-sphinx
+uninstall-local: uninstall-local-sphinx
+
+@ENABLE_DOCUMENTATION_TRUE@all: doc/_build/.stamp
+
+@ENABLE_DOCUMENTATION_TRUE@doc/_build/.stamp: $(nobase_python_PYTHON) \
+@ENABLE_DOCUMENTATION_TRUE@			_dbus_bindings.la \
+@ENABLE_DOCUMENTATION_TRUE@			_dbus_glib_bindings.la \
+@ENABLE_DOCUMENTATION_TRUE@			$(sphinx_sources) \
+@ENABLE_DOCUMENTATION_TRUE@			Makefile \
+@ENABLE_DOCUMENTATION_TRUE@			$(NULL)
+@ENABLE_DOCUMENTATION_TRUE@	rm -rf doc/_build
+@ENABLE_DOCUMENTATION_TRUE@	$(MKDIR_P) doc/_build
+@ENABLE_DOCUMENTATION_TRUE@	abs_top_srcdir='$(abs_top_srcdir)' \
+@ENABLE_DOCUMENTATION_TRUE@	abs_top_builddir='$(abs_top_builddir)' \
+@ENABLE_DOCUMENTATION_TRUE@	DBUS_PYTHON_NO_DEPRECATED=1 \
+@ENABLE_DOCUMENTATION_TRUE@	$(PYTHON) -m sphinx -b html $(abs_top_srcdir)/doc doc/_build
+@ENABLE_DOCUMENTATION_TRUE@	touch $@
+
+@ENABLE_DOCUMENTATION_TRUE@maintainer-update-website: doc/_build/.stamp
+@ENABLE_DOCUMENTATION_TRUE@	DBUS_TOP_SRCDIR="$(abs_top_srcdir)" \
+@ENABLE_DOCUMENTATION_TRUE@	$(PYTHON) $(srcdir)/doc/redirects.py
+@ENABLE_DOCUMENTATION_TRUE@	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/_build/ \
+@ENABLE_DOCUMENTATION_TRUE@	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/
+
+@ENABLE_DOCUMENTATION_TRUE@install-data-local-sphinx: doc/_build/.stamp
+@ENABLE_DOCUMENTATION_TRUE@	$(mkinstalldirs) $(DESTDIR)$(htmldir)
+@ENABLE_DOCUMENTATION_TRUE@	cp -R doc/_build/* $(DESTDIR)$(htmldir)
+
+@ENABLE_DOCUMENTATION_TRUE@uninstall-local-sphinx:
+@ENABLE_DOCUMENTATION_TRUE@	rm -fr $(DESTDIR)$(htmldir)
+@ENABLE_DOCUMENTATION_FALSE@maintainer-update-website:
+@ENABLE_DOCUMENTATION_FALSE@	@echo "*** Not updating the API docs on the website - install sphinx"
+@ENABLE_DOCUMENTATION_FALSE@	@echo "*** and configure with --enable-api-docs"
+@ENABLE_DOCUMENTATION_FALSE@install-data-local-sphinx:
+@ENABLE_DOCUMENTATION_FALSE@	@:
+@ENABLE_DOCUMENTATION_FALSE@uninstall-local-sphinx:
+@ENABLE_DOCUMENTATION_FALSE@	@:
+
+clean-local:
+	rm -rf doc/_build
 check-local::
 	@fail=0; \
 	cd $(srcdir) || exit $$?; \
@@ -2473,7 +2424,6 @@ check-local::
 
 .PHONY: cross-test-compile cross-test-server cross-test-client \
 	always-rebuild maintainer-update-website \
-	_maintainer-update-apidocs _maintainer-update-htmldocs \
 	maintainer-upload
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.