[amtk/wip/swilmet/meson: 6/10] autotools: remove gtk-doc
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [amtk/wip/swilmet/meson: 6/10] autotools: remove gtk-doc
- Date: Mon, 28 Sep 2020 17:47:51 +0000 (UTC)
commit f337c13394c7a02a912d2959c94b4d3bbc8e2f21
Author: Sébastien Wilmet <swilmet gnome org>
Date: Tue Sep 8 05:15:27 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 Amtk, 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 Amtk 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 | 67 ----------------------------------------------
5 files changed, 1 insertion(+), 81 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ffa3407..307fa1b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = po amtk tests testsuite docs win32
+SUBDIRS = po amtk tests testsuite win32
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 7ace76d..bffcab8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,10 +95,6 @@ AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.6])
AC_SUBST([GETTEXT_PACKAGE], [amtk-$AMTK_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],
@@ -127,10 +123,6 @@ AC_CONFIG_FILES([
amtk-${AMTK_API_VERSION}.pc:amtk.pc.in
Makefile
amtk/Makefile
- docs/Makefile
- docs/reference/amtk-docs.xml
- docs/reference/amtk-intro.xml
- docs/reference/Makefile
po/Makefile.in
tests/Makefile
testsuite/Makefile
@@ -149,7 +141,6 @@ Configuration:
Source code location: ${srcdir}
Prefix: ${prefix}
Compiler: ${CC}
- 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]