More docs fixes

[platform/upstream/glib.git] / docs / reference / glib / Makefile.am

diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index b2b82bf..27fdf0b 100644 (file)
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -1,4 +1,6 @@
 ## Process this file with automake to produce Makefile.in
+include $(top_srcdir)/Makefile.decl
+
 AUTOMAKE_OPTIONS = 1.6
 
 # The name of the module.
@@ -7,11 +9,14 @@ DOC_MODULE=glib
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE=glib-docs.sgml
 
+# The directory containing the source code. Relative to $(srcdir)
+DOC_SOURCE_DIR=../../../glib ../../../gmodule
+
 # Extra options to supply to gtkdoc-scan
-SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED"
+SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR"
 
-# The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../..
+# Extra options to supply to gtkdoc-mkdb
+MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g
 
 # Used for dependencies
 HFILE_GLOB=$(top_srcdir)/glib/*.h $(top_srcdir)/gmodule/*.h
@@ -19,9 +24,7 @@ CFILE_GLOB=$(top_srcdir)/glib/*.c $(top_srcdir)/gmodule/*.c
 
 # Headers to ignore
 IGNORE_HFILES=                 \
-       build                   \
-       gobject                 \
-       config.h                \
+       gdatasetprivate.h       \
        glibintl.h              \
        gbsearcharray.h         \
        gmoduleconf.h           \
@@ -29,13 +32,21 @@ IGNORE_HFILES=                      \
        gunicomp.h              \
        gunidecomp.h            \
        gunichartables.h        \
-       glibconfig-sysdefs.h    \
+       glib_trace.h            \
+       libcharset.h            \
        gdebug.h                \
        gprintfint.h            \
-       gnulib
-
-# Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--sgml-mode --output-format=xml --ignore-files=trio
+       gmirroringtable.h       \
+       gscripttable.h          \
+       glib-mirroring-tab      \
+       gnulib                  \
+       pcre                    \
+       update-pcre             \
+       gbuffer.h               \
+       gvariant-internal.h     \
+       gvariant-serialiser.h   \
+       gvariant-core.h         \
+       gvarianttypeinfo.h
 
 # Images to copy into HTML directory
 HTML_IMAGES =                                  \
@@ -50,8 +61,12 @@ content_files =                              \
        changes.sgml                    \
        compiling.sgml                  \
        resources.sgml                  \
+       regex-syntax.sgml               \
        version.xml                     \
-       glib-gettextize.xml
+       glib-gettextize.xml             \
+       gtester.xml                     \
+       gtester-report.xml              \
+       gvariant-varargs.xml
 
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS=
@@ -70,20 +85,36 @@ EXTRA_DIST +=                               \
 
 ########################################################################
 
-man_MANS = glib-gettextize.1 
+man_MANS =                     \
+       glib-gettextize.1       \
+       gtester.1               \
+       gtester-report.1
 
 if ENABLE_MAN
 
-%.1 : %.xml 
+.xml.1:
        @XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
+dist-local-check-mans-enabled:
+       if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
+
+else
+
+$(man_MANS):
+       echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
+       echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild > $@
+
+dist-local-check-mans-enabled:
+       echo "*** --enable-man must be used in order to make dist"
+       false
+
 endif
 
-BUILT_EXTRA_DIST = $(man_MANS)
+MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
+
+EXTRA_DIST += $(man_MANS)
 
-dist-hook-local: $(BUILT_EXTRA_DIST)
-       files='$(BUILT_EXTRA_DIST)';                            \
-       for f in $$files; do                                    \
-         if test -f $$f; then d=.; else d=$(srcdir); fi;       \
-         cp $$d/$$f $(distdir) || exit 1; done
+dist-hook-local: dist-local-check-mans-enabled glib-docs-clean all-local
 
+glib-docs-clean: clean
+       cd $(srcdir) && rm -rf xml html