devel-docs: various documentation and build fixes

This commit is contained in:
Michael Natterer
2019-07-24 01:21:16 +02:00
parent aca5f806c4
commit c2a38f0631
12 changed files with 34 additions and 32 deletions

View File

@ -19,7 +19,12 @@ SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html
FIXXREF_OPTIONS = \
--extra-dir=../libgimpbase/html \
--extra-dir=../libgimpcolor/html \
--extra-dir=../libgimpconfig/html \
--extra-dir=../libgimpmath/html \
--extra-dir=../libgimpwidgets/html
# Used for dependencies
HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
@ -48,9 +53,8 @@ GTKDOC_CFLAGS = \
@CFLAGS@ \
-I$(top_srcdir) \
-I$(top_builddir) \
$(GEGL_CFLAGS) \
@GTK_CFLAGS@ \
-UGTK_DISABLE_SINGLE_INCLUDES
@GEGL_CFLAGS@ \
@GTK_CFLAGS@
GTKDOC_LIBS = \
$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
@ -60,6 +64,7 @@ GTKDOC_LIBS = \
$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la \
$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la \
@GEGL_LIBS@ \
@GTK_LIBS@

View File

@ -40,7 +40,6 @@
<chapter id="libgimp-image">
<title>Manupulating Images and their Properties</title>
<xi:include href="xml/gimpchannel.xml" />
<xi:include href="xml/gimpcolor.xml" />
<xi:include href="xml/gimpdisplay.xml" />
<xi:include href="xml/gimpdrawable.xml" />
<xi:include href="xml/gimpdrawablecolor.xml" />
@ -61,15 +60,11 @@
<xi:include href="xml/gimpitem.xml" />
<xi:include href="xml/gimpitemtransform.xml" />
<xi:include href="xml/gimplayer.xml" />
<xi:include href="xml/gimppaths.xml" />
<xi:include href="xml/gimppixbuf.xml" />
<xi:include href="xml/gimpselection.xml" />
<xi:include href="xml/gimptextlayer.xml" />
<xi:include href="xml/gimptexttool.xml" />
<xi:include href="xml/gimptile.xml" />
<xi:include href="xml/gimppainttools.xml" />
<xi:include href="xml/gimpselectiontools.xml" />
<xi:include href="xml/gimptransformtools.xml" />
<xi:include href="xml/gimpvectors.xml" />
</chapter>
@ -120,12 +115,6 @@
<xi:include href="xml/gimpitemcombobox.xml" />
<xi:include href="xml/gimpimagecombobox.xml" />
<xi:include href="xml/gimpprogressbar.xml" />
<xi:include href="xml/gimpmenu.xml" />
<xi:include href="xml/gimpbrushmenu.xml" />
<xi:include href="xml/gimpfontmenu.xml" />
<xi:include href="xml/gimpgradientmenu.xml" />
<xi:include href="xml/gimppalettemenu.xml" />
<xi:include href="xml/gimppatternmenu.xml" />
<xi:include href="xml/gimpprocbrowserdialog.xml" />
<xi:include href="xml/gimpprocview.xml" />
</part>