[json-glib/json-glib-1-2: 1/9] Move the reference build down one level

[Emmanuele Bassi <ebassi src gnome org>]

commit 66746cfa3de8cdb272c30da5c762735265e3b040
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Tue Mar 14 10:58:33 2017 +0000

    Move the reference build down one level
    
    There's no point in having the API reference in its own sub-directory:
    it's the only documentation we have.

 Makefile.am                                   |    6 +-
 configure.ac                                  |    2 -
 doc/Makefile.am                               |   78 ++++++++++++++++++++++--
 doc/{reference => }/json-glib-docs.xml        |    0
 doc/{reference => }/json-glib-format.xml      |    0
 doc/{reference => }/json-glib-overrides.txt   |    0
 doc/{reference => }/json-glib-sections.txt    |    0
 doc/{reference => }/json-glib-validate.xml    |    0
 doc/{reference => }/meson.build               |    0
 doc/reference/Makefile.am                     |   78 -------------------------
 doc/reference/version.xml.in                  |    1 -
 doc/{reference => }/xml/gtkdocentities.ent.in |    0
 doc/{reference => }/xml/meson.build           |    0
 meson.build                                   |    2 +-
 14 files changed, 75 insertions(+), 92 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d932b4f..328b384 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,9 +3,9 @@ ACLOCAL_AMFLAGS = -I build/autotools
 EXTRA_DIST = \
        meson.build \
        meson_options.txt \
-       doc/reference/meson.build \
-       doc/reference/xml/meson.build \
-       doc/reference/xml/gtkdocentities.ent.in \
+       doc/meson.build \
+       doc/xml/meson.build \
+       doc/xml/gtkdocentities.ent.in \
        json-glib/meson.build \
        json-glib/tests/meson.build \
        json-glib/tests/gen-installed-test.py \
diff --git a/configure.ac b/configure.ac
index 8023a53..11983c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -392,8 +392,6 @@ AC_CONFIG_FILES([
         json-glib/tests/Makefile
 
         doc/Makefile
-        doc/reference/Makefile
-        doc/reference/version.xml
 
         po/Makefile.in
 ])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index fd91f01..0a021ce 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,11 +1,75 @@
-SUBDIRS = reference
+DOC_MODULE = json-glib
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
+DOC_SOURCE_DIR = $(top_srcdir)/json-glib $(top_builddir)/json-glib
 
-test-report:
-       @true
+SCANGOBJ_OPTIONS =
+SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED" --rebuild-types
+MKDB_OPTIONS = --output-format=xml --name-space=json
+MKTMPL_OPTIONS =
+FIXXREF_OPTIONS = \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio
 
-test:
-       @true
+HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
+CFILE_GLOB = $(top_srcdir)/json-glib/*.c
 
-check-local: test
+IGNORE_HFILES = \
+       config.h                \
+       json-scanner.h          \
+       json-types-private.h    \
+       json-gobject-private.h  \
+       json-private.h          \
+       json-marshal.h          \
+       json-glib.h             \
+       json-enum-types.h       \
+       json-debug.h
 
-.PHONY: test-report test check-local
+EXTRA_HFILES =
+
+HTML_IMAGES =
+
+content_files = \
+       json-glib-format.xml \
+       json-glib-validate.xml
+
+expand_content_files =
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
+
+include $(top_srcdir)/gtk-doc.make
+
+man_MANS =
+
+if ENABLE_GTK_DOC
+TESTS_ENVIRONMENT = \
+       DOC_MODULE=$(DOC_MODULE) \
+       DOC_MAIN_SGML_FILE=$(DOC_MAIN_SGML_FILE) \
+       SRCDIR=$(abs_srcdir) \
+       BUILDDIR=$(abs_builddir)
+
+TESTS = $(GTKDOC_CHECK)
+endif
+
+if ENABLE_MAN
+man_MANS += \
+       json-glib-format.1 \
+       json-glib-validate.1
+
+XSLTPROC_FLAGS = \
+       --nonet \
+       --stringparam man.output.quietly 1 \
+       --stringparam funcsynopsis.style ansi \
+       --stringparam man.th.extra1.suppress 1 \
+       --stringparam man.authors.section.enabled 0 \
+       --stringparam man.copyright.section.enabled 0
+
+.xml.1:
+       $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) 
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+endif
+
+CLEANFILES ?=
+CLEANFILES += $(man_MANS)
+EXTRA_DIST += $(man_MANS)
diff --git a/doc/reference/json-glib-docs.xml b/doc/json-glib-docs.xml
similarity index 100%
rename from doc/reference/json-glib-docs.xml
rename to doc/json-glib-docs.xml
diff --git a/doc/reference/json-glib-format.xml b/doc/json-glib-format.xml
similarity index 100%
rename from doc/reference/json-glib-format.xml
rename to doc/json-glib-format.xml
diff --git a/doc/reference/json-glib-overrides.txt b/doc/json-glib-overrides.txt
similarity index 100%
rename from doc/reference/json-glib-overrides.txt
rename to doc/json-glib-overrides.txt
diff --git a/doc/reference/json-glib-sections.txt b/doc/json-glib-sections.txt
similarity index 100%
rename from doc/reference/json-glib-sections.txt
rename to doc/json-glib-sections.txt
diff --git a/doc/reference/json-glib-validate.xml b/doc/json-glib-validate.xml
similarity index 100%
rename from doc/reference/json-glib-validate.xml
rename to doc/json-glib-validate.xml
diff --git a/doc/reference/meson.build b/doc/meson.build
similarity index 100%
rename from doc/reference/meson.build
rename to doc/meson.build
diff --git a/doc/reference/xml/gtkdocentities.ent.in b/doc/xml/gtkdocentities.ent.in
similarity index 100%
rename from doc/reference/xml/gtkdocentities.ent.in
rename to doc/xml/gtkdocentities.ent.in
diff --git a/doc/reference/xml/meson.build b/doc/xml/meson.build
similarity index 100%
rename from doc/reference/xml/meson.build
rename to doc/xml/meson.build
diff --git a/meson.build b/meson.build
index 3192d4c..e2e8328 100644
--- a/meson.build
+++ b/meson.build
@@ -154,5 +154,5 @@ subdir('json-glib')
 subdir('po')
 
 if get_option('enable-gtk-doc')
-  subdir('doc/reference')
+  subdir('doc')
 endif