[tepl] autotools: remove gtk-doc
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [tepl] autotools: remove gtk-doc
- Date: Sun, 29 Mar 2020 14:23:32 +0000 (UTC)
commit bbd7164de1839cab2dd29de353a4747cb8779be1
Author: Sébastien Wilmet <swilmet gnome org>
Date: Sun Mar 29 13:53:30 2020 +0200
autotools: remove gtk-doc
Autotools will be replaced by Meson. During a short period of time there
will be both Autotools and Meson support to compile Tepl, to not break
CI, gnome-build-meta etc. But with Meson the files in docs/reference/
can be reorganized, to avoid hard-coding the API version in the filename
for example.
So it's easier to first remove the Autotools support for building the
API documentation, then implement the Meson support for building the
docs and changing at the same time the files in docs/reference/ to
better accomodate Meson. Then the full Autotools build system can be
removed from Tepl once the Meson migration is complete and works fine.
Makefile.am | 2 +-
autogen.sh | 1 -
configure.ac | 9 ------
docs/Makefile.am | 3 --
docs/reference/Makefile.am | 77 ----------------------------------------------
5 files changed, 1 insertion(+), 91 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8b7bb5a..8f0a5e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po tepl tests testsuite docs
+SUBDIRS = po tepl tests testsuite
include $(top_srcdir)/aminclude_static.am
clean-local: code-coverage-clean
diff --git a/autogen.sh b/autogen.sh
index b6efba6..abadb9a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,6 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
fi
aclocal --install || exit 1
-gtkdocize --copy || exit 1
autoreconf --verbose --force --install || exit 1
cd "$olddir"
diff --git a/configure.ac b/configure.ac
index d763927..686123c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,10 +108,6 @@ AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
AC_SUBST([GETTEXT_PACKAGE], [tepl-$TEPL_API_VERSION])
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Define to the gettext package name.])
-# Documentation
-AX_REQUIRE_DEFINED([GTK_DOC_CHECK])
-GTK_DOC_CHECK([1.25], [--flavour=no-tmpl])
-
# Installed Tests for gnome continuous integration
AC_ARG_ENABLE(installed_tests,
AS_HELP_STRING([--enable-installed-tests],
@@ -139,10 +135,6 @@ PKG_CHECK_VAR([GLIB_PREFIX], [glib-2.0], [prefix])
AC_CONFIG_FILES([
tepl-${TEPL_API_VERSION}.pc:tepl.pc.in
Makefile
- docs/Makefile
- docs/reference/intro.xml
- docs/reference/Makefile
- docs/reference/tepl-docs.xml
tepl/Makefile
po/Makefile.in
tests/Makefile
@@ -160,7 +152,6 @@ Configuration:
Prefix: ${prefix}
Compiler: ${CC}
GVfs metadata: ${enable_gvfs_metadata}
- Documentation: ${enable_gtk_doc}
GObject introspection: ${found_introspection}
Code coverage: ${enable_code_coverage}
Valgrind check: ${enable_valgrind}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]