Remove remnants of old documentation

Signed-off-by: Simon McVittie <smcv@collabora.com>

3 files changed, 4 insertions, 81 deletions

diff --git a/Makefile.am b/Makefile.am
index fd510de..c674a21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST = \
 	examples/list-system-services.py \
 	examples/unix-fd-client.py \
 	examples/unix-fd-service.py \
-	m4/dbus-py-add-rst2htmlflag.m4 \
 	setup.py \
 	test/TestSuitePythonService.service.in \
 	test/tmp-session-bus.conf.in \
@@ -390,33 +389,6 @@ 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
-
-if ENABLE_DOCS
-_maintainer-update-htmldocs: $(HTML_TXT_RSTDOCS) $(HTML_RSTDOCS)
-	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc \
-	$(patsubst %,$(srcdir)/%,$(RSTDOCS)) $(HTML_RSTDOCS) \
-	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/
-
-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)
-
-$(HTML_TXT_RSTDOCS) : %.html: %.txt
-	$(INSTALL) -d doc
-	$(RST2HTML) $(RST2HTMLFLAGS) $< $@
-$(HTML_RSTDOCS) : %.html: %
-	$(RST2HTML) $(RST2HTMLFLAGS) $< $@
-else
-_maintainer-update-htmldocs:
-	@echo "*** Not updating the HTML docs on the website - install rst2html"
-	@echo "*** from http://docutils.sourceforge.net/ and configure with "
-	@echo "*** --enable-html-docs"
-endif
-
 sphinx_sources = \
 	doc/API_CHANGES.txt \
 	doc/conf.py \
@@ -446,7 +418,7 @@ sphinx_sources = \
 	$(NULL)
 EXTRA_DIST += $(sphinx_sources)
 
-if ENABLE_API_DOCS
+if ENABLE_DOCUMENTATION
 all: doc/_build/stamp
 
 doc/_build/stamp: $(nobase_python_PYTHON) \
@@ -465,11 +437,11 @@ doc/_build/stamp: $(nobase_python_PYTHON) \
 	$(PYTHON) $(srcdir)/doc/redirects.py
 	touch $@
 
-_maintainer-update-apidocs: doc/_build/stamp
+maintainer-update-website: doc/_build/stamp
 	rsync -rtvzPp --chmod=Dg+s,ug+rwX,o=rX doc/_build/ \
 	dbus.freedesktop.org:/srv/dbus.freedesktop.org/www/doc/dbus-python/
 else
-_maintainer-update-apidocs:
+maintainer-update-website:
 	@echo "*** Not updating the API docs on the website - install sphinx"
 	@echo "*** and configure with --enable-api-docs"
 endif
@@ -486,5 +458,4 @@ include $(top_srcdir)/tools/check-coding-style.mk
 
 .PHONY: cross-test-compile cross-test-server cross-test-client \
 	always-rebuild maintainer-update-website \
-	_maintainer-update-apidocs _maintainer-update-htmldocs \
 	maintainer-upload
diff --git a/configure.ac b/configure.ac
index 0912a47..4a3d512 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,34 +121,7 @@ AC_ARG_VAR([DBUS_RUN_SESSION],
   [The dbus-run-session tool from dbus 1.8 or later])
 AC_PATH_PROG([DBUS_RUN_SESSION], [dbus-run-session], [dbus-run-session])
 
-RST2HTMLFLAGS=
-AS_IF([test "${enable_html_docs}" != no],
-  [
-  AC_CHECK_PROGS([RST2HTML], [rst2html rst2html.py], [])
-  AS_IF([test -z "$RST2HTML"],
-    [
-    AS_CASE(["$enable_html_docs"],
-      [if*possible],
-        [enable_html_docs=no],
-      [*],
-        [AC_MSG_ERROR([cannot compile HTML documentation without rst2html installed])])
-    ])
-  ],
-  [
-    DBUS_PY_ADD_RST2HTMLFLAG([--generator])
-    DBUS_PY_ADD_RST2HTMLFLAG([--date])
-    DBUS_PY_ADD_RST2HTMLFLAG([--time])
-    DBUS_PY_ADD_RST2HTMLFLAG([--exit-status=2])
-    DBUS_PY_ADD_RST2HTMLFLAG([--no-raw])
-    DBUS_PY_ADD_RST2HTMLFLAG([--no-file-insertion])
-    DBUS_PY_ADD_RST2HTMLFLAG([--cloak-email-addresses])
-    DBUS_PY_ADD_RST2HTMLFLAG([--input-encoding=UTF-8])
-  ])
-AC_SUBST([RST2HTML])
-AC_SUBST([RST2HTMLFLAGS])
-
-AM_CONDITIONAL([ENABLE_API_DOCS], [test "$enable_api_docs" != no])
-AM_CONDITIONAL([ENABLE_DOCS], [test "$enable_html_docs" != no])
+AM_CONDITIONAL([ENABLE_DOCUMENTATION], [test "$enable_documentation" != no])
 
 PKG_CHECK_MODULES(DBUS, [dbus-1 >= 1.8])
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40])
diff --git a/m4/dbus-py-add-rst2htmlflag.m4 b/m4/dbus-py-add-rst2htmlflag.m4
deleted file mode 100644
index 59e37ec..0000000
--- a/m4/dbus-py-add-rst2htmlflag.m4
+++ /dev/null
@@ -1,21 +0,0 @@
-dnl DBUS_PY_ADD_RST2HTMLFLAG(FLAG)
-dnl checks whether rst2html supports the given flag, and if so, adds
-dnl it to $RST2HTMLFLAGS. Same as JH_ADD_CFLAG, really.
-AC_DEFUN([DBUS_PY_ADD_RST2HTMLFLAG],
-[
-AS_CASE([" $RST2HTMLFLAGS "],
-[*@<:@\	\ @:>@$1@<:@\	\ @:>@*],
-  [],
-[*],
-  [
-  save_RST2HTMLFLAGS="$RST2HTMLFLAGS"
-  RST2HTMLFLAGS="$RST2HTMLFLAGS $1"
-  AC_MSG_CHECKING([whether [$]RST2HTML understands $1])
-  AS_IF([$RST2HTML --strict $RST2HTMLFLAGS /dev/null > /dev/null 2>/dev/null],
-    [dbuspy_has_option=yes],
-    [dbuspy_has_option=no])
-  AC_MSG_RESULT($dbuspy_has_option)
-  AS_IF([test $dbuspy_has_option = no],
-    [RST2HTMLFLAGS="$save_RST2HTMLFLAGS"])
-  ])
-])