[docs] Rename main file to json-glib-docs.xml

2 files changed, 19 insertions, 17 deletions

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 5aa6ca5..45e6b1d 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -6,45 +6,45 @@
 # The name of the module, e.g. 'glib'.
 DOC_MODULE = json-glib
 
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
+# The top-level XML file. You can change this if you want to.
+DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
 # documenting the functions and macros.
 # e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../json-glib
+DOC_SOURCE_DIR = ../../json-glib
 
 # Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=--type-init-func="g_type_init()"
+SCANGOBJ_OPTIONS = --type-init-func="g_type_init()"
 
 # Extra options to supply to gtkdoc-scan.
 # e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=--deprecated-guards="JSON_DISABLE_DEPRECATED"
+SCAN_OPTIONS = --deprecated-guards="JSON_DISABLE_DEPRECATED"
 
 # Extra options to supply to gtkdoc-mkdb.
 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
+MKDB_OPTIONS = --sgml-mode --output-format=xml
 
 # Extra options to supply to gtkdoc-mktmpl
 # e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
+MKTMPL_OPTIONS =
 
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=\
+FIXXREF_OPTIONS = \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
 	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject
 
 # Used for dependencies. The docs will be rebuilt if any of these change.
 # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
-CFILE_GLOB=$(top_srcdir)/json-glib/*.c
+HFILE_GLOB = $(top_srcdir)/json-glib/*.h $(top_builddir)/json-glib/*.h
+CFILE_GLOB = $(top_srcdir)/json-glib/*.c
 
 # Header files to ignore when scanning.
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=\
+IGNORE_HFILES = \
 	json-scanner.h \
 	json-types-private.h \
 	json-private.h \
@@ -54,20 +54,20 @@ IGNORE_HFILES=\
 	stamp-json-enum-types.h \
 	stamp-json-marshal.h
 
-EXTRA_HFILES=
+EXTRA_HFILES =
 
 # Images to copy into HTML directory.
 # e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
+HTML_IMAGES =
 
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=version.xml
+content_files = version.xml
 
 # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
 # These files must be listed here *and* in content_files
 # e.g. expand_content_files=running.sgml
-expand_content_files=
+expand_content_files =
 
 # CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
 # Only needed if you are using gtkdoc-scangobj to dynamically query widget
@@ -75,9 +75,11 @@ expand_content_files=
 # e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
 # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
 
-INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
-GTKDOC_LIBS=$(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(JSON_CFLAGS)
+GTKDOC_LIBS = $(top_builddir)/json-glib/libjson-glib-1.0.la $(JSON_LIBS)
 
+# needed to avoid including $(top_srcdir)/Makefile.decls which redeclares
+# EXTRA_DIST and generates a warning when the gtk-doc.make include below
 test-report:
 	@true
 
diff --git a/doc/reference/json-glib-docs.sgml b/doc/reference/json-glib-docs.xml
index 417d3ed..417d3ed 100644
--- a/doc/reference/json-glib-docs.sgml
+++ b/doc/reference/json-glib-docs.xml