Imported Upstream version 8.2.2

[platform/upstream/harfbuzz.git] / docs / Makefile.am

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9b54b40..a9de8eb 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -29,15 +29,12 @@ SCANGOBJ_OPTIONS=
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED"
 SCAN_OPTIONS=--rebuild-types --deprecated-guards="HB_DISABLE_DEPRECATED" \
-       --ignore-decorators="HB_EXTERN"
+       --ignore-decorators='HB_EXTERN|HB_DEPRECATED|HB_DEPRECATED_FOR()'
 
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
-IGNORE_HFILES=`cd $(top_srcdir)/src; find . -path './hb-*/*.h' | sed 's@^.*/@@'`
-if HAVE_GOBJECT
-else
+IGNORE_HFILES=`cd $(top_srcdir)/src; find . -path './*/*.h' | sed 's@^.*/@@'`
 IGNORE_HFILES+=hb-gobject.h hb-gobject-enums.h hb-gobject-structs.h
-endif
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--xml-mode --output-format=xml
@@ -75,15 +72,18 @@ content_files=      \
        usermanual-what-is-harfbuzz.xml \
        usermanual-install-harfbuzz.xml \
        usermanual-getting-started.xml \
+       usermanual-glyph-information.xml \
        usermanual-shaping-concepts.xml \
+       usermanual-object-model.xml \
        usermanual-buffers-language-script-and-direction.xml \
        usermanual-fonts-and-faces.xml \
-       usermanual-clusters.xml \
        usermanual-opentype-features.xml \
-       usermanual-glyph-information.xml \
+       usermanual-clusters.xml \
+       usermanual-utilities.xml \
+       usermanual-integration.xml \
        version.xml
 
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
+# SGML files where gtk-doc abbreviations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
 # e.g. expand_content_files=running.sgml
 expand_content_files=
@@ -104,7 +104,7 @@ include $(top_srcdir)/gtk-doc.make
 
 # Other files to distribute
 # e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += version.xml.in
+EXTRA_DIST += version.xml.in meson.build
 
 # Files not to distribute
 # for --rebuild-types in $(SCAN_OPTIONS), e.g. $(DOC_MODULE).types