From 6c3b12129ee6789f1327532a74620645b4e56963 Mon Sep 17 00:00:00 2001 From: Shaun McCance Date: Sat, 12 Feb 2022 12:45:42 -0500 Subject: Stop building the gtk-docs Nobody is using libyelp outside of yelp. Nobody is publishing these docs. The only person reading these docs is me, and I just read the comments in the source. Meanwhile, building these docs is causing weird problems under Wayland for reasons I don't pretend to understand. Let's just make my life easier. --- Makefile.am | 36 ++---------------------------------- autogen.sh | 1 - configure.ac | 2 -- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/Makefile.am b/Makefile.am index 4a23c2e1..1c6b37b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -246,35 +246,6 @@ tests_test_view_LDADD = \ $(YELP_COMMON_LDADD) \ libyelp/libyelp.la -gtkdoc_builddir = $(top_builddir)/docs/libyelp -gtkdoc_distdir = $(top_distdir)/docs/libyelp -gtkdoc_srcdir = $(top_srcdir)/docs/libyelp - -all-local: $(bin_PROGRAMS) - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) all -check-local: - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) check -clean-local: - cd $(gtkdoc_builddir) && if test -e Makefile ; then \ - $(MAKE) $(AM_MAKEFLAGS) clean ; \ - fi -distclean-local: - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) distclean -docs: $(lib_LTLIBRARIES) - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) docs -install-data-local: - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) install-data -uninstall-local: - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) uninstall - -dist-hook: - $(MKDIR_P) $(gtkdoc_distdir) - cp $(gtkdoc_srcdir)/Makefile.am $(gtkdoc_srcdir)/Makefile.in $(gtkdoc_distdir) - cd $(gtkdoc_builddir) && $(MAKE) $(AM_MAKEFLAGS) \ - distdir="../../$(gtkdoc_distdir)" \ - top_distdir="../../$(top_distdir)" \ - dist-hook - install-exec-hook: rm -f $(DESTDIR)$(bindir)/gnome-help && \ $(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help @@ -864,10 +835,7 @@ dist_noinst_DATA = \ data/mathjax/unpacked/jax/output/NativeMML/jax.js \ data/mathjax/LICENSE \ data/mathjax/README \ - docs/libyelp/libyelp-docs.xml \ - docs/libyelp/version.xml.in \ - libyelp/yelp-marshal.list \ - gtk-doc.make + libyelp/yelp-marshal.list dist_noinst_SCRIPTS = \ autogen.sh @@ -893,8 +861,8 @@ MAINTAINERCLEANFILES = \ mkinstalldirs AM_DISTCHECK_CONFIGURE_FLAGS = \ + --with-webkit2gtk-4-0 \ --enable-bz2 \ - --enable-gtk-doc \ --enable-lzma .PHONY: docs diff --git a/autogen.sh b/autogen.sh index d7df4c83..53a80916 100755 --- a/autogen.sh +++ b/autogen.sh @@ -32,7 +32,6 @@ fi set -x -gtkdocize --copy || exit 1 autoreconf --verbose --force --install -Wno-portability || exit 1 cd "$olddir" diff --git a/configure.ac b/configure.ac index 939c822c..464b8038 100644 --- a/configure.ac +++ b/configure.ac @@ -168,8 +168,6 @@ GTK_DOC_CHECK([1.13],[--flavour no-tmpl]) AC_CONFIG_FILES([ Makefile -docs/libyelp/Makefile -docs/libyelp/version.xml data/dtd/catalog data/xslt/db2html.xsl data/xslt/info2html.xsl -- cgit v1.2.1