[gxml] Fixed GXml Vala documentation installation for DevHelp

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit ecd56ac62705672fca2fa14012de75958bb259b0
Author: Daniel Espinosa <esodan gmail com>
Date:   Sun Sep 28 23:49:44 2014 -0500

    Fixed GXml Vala documentation installation for DevHelp

 configure.ac             |   24 ++++++++++++++++++---
 docs/valadoc/Makefile.am |   49 +++++++++++++++++++++++++++++++--------------
 2 files changed, 54 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f9c34f1..25bdc2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@
 
 # Release Version
 m4_define([project_major_version], [0])
-m4_define([project_minor_version], [5])
-m4_define([project_micro_version], [0])
+m4_define([project_minor_version], [4])
+m4_define([project_micro_version], [2])
 m4_define([project_nano_version], [0])
 
 # LT_VERSION
@@ -21,7 +21,7 @@ m4_define([project_nano_version], [0])
 #     increment current and set revision to 0
 #   If public symbols have been added since last release, increment age
 #   If public symbols have been removed since last release, set age to 0
-m4_define([project_lt_current], [5])
+m4_define([project_lt_current], [4])
 m4_define([project_lt_revision], [0])
 m4_define([project_lt_age], [0])
 
@@ -89,7 +89,11 @@ AC_SUBST([LT_AGE])
 PROJECT_MAJOR_MINOR_VERSION=project_major_minor_version
 AC_SUBST([PROJECT_MAJOR_MINOR_VERSION])
 
-API_VERSION=project_major_minor_version
+# This is used to identify a set of API compatible beatween versions 
+# - If new versions are compatible with the actual one, just leave this untouched
+# - If new version breaks API change it in order to allow paralled installations
+#   with old versions. Change name of pc files to use a new API too.
+API_VERSION=0.4
 AC_SUBST([API_VERSION])
 
 GXML_VERSION=project_base_version
@@ -155,6 +159,14 @@ if test x$enable_docs = xyes; then
 fi
 AM_CONDITIONAL([HAVE_VALADOC], [test x$have_valadoc = xyes])
 
+
+AC_ARG_ENABLE([devhelp-docs],
+              AS_HELP_STRING([--enable-devhelp-docs],[Enable DevHelp documentation generation]),
+             [enable_devhelp_docs=$enableval], [enable_devhelp_docs=no])
+AC_ARG_ENABLE([gtk-docs],
+              AS_HELP_STRING([--enable-gtk-docs],[Enable gtk-doc documentation generation]),
+             [enable_devhelp_docs=$enableval], [enable_gtk_docs=no])
+
 dnl Find yelp-build program
 enable_mallard_doc="no"
 if test x$enable_docs = xyes; then
@@ -169,6 +181,8 @@ if test x$enable_docs = xyes; then
   fi
 fi
 AM_CONDITIONAL(ENABLE_MALLARD_DOC, [test "$enable_mallard_doc" = "yes"])
+AM_CONDITIONAL([ENABLE_DEVHELP_DOCS], [test "x$enable_docs" = "xyes" -a "x$enable_devhelp_docs" = "xyes"])
+AM_CONDITIONAL([ENABLE_GTK_DOCS], [test "x$enable_docs" = "xyes" -a "x$enable_gtk_docs" = "xyes"])
 
 debug=no
 AC_ARG_ENABLE(debug,
@@ -247,5 +261,7 @@ echo " Configuration summary for GXml-$GXML_VERSION"
 echo "   Installation prefix:   $prefix"
 echo "   GObject Introspection: $found_introspection"
 echo "   Documentation:         ${enable_docs}"
+echo "       DevHelp Doc:       `if test x${enable_docs} = xyes -a x${enable_devhelp_docs} = xyes; then echo 
yes; else echo no; fi`"
+echo "       Gtk-Doc:           `if test x${enable_docs} = xyes -a x${enable_gtk_docs} = xyes; then echo 
yes; else echo no; fi`"
 echo "   Platform:              $host"
 echo ""
diff --git a/docs/valadoc/Makefile.am b/docs/valadoc/Makefile.am
index 17b0c18..adf1a0f 100644
--- a/docs/valadoc/Makefile.am
+++ b/docs/valadoc/Makefile.am
@@ -1,8 +1,9 @@
 -include $(top_srcdir)/git.mk
+CLEANFILES=
 
 VALADOC_FLAGS = \
        --force \
-       --package-name=GXml \
+       --package-name=gxml-$(API_VERSION) \
        --package-version=$(PACKAGE_VERSION) \
        $(top_srcdir)/vapi/libxml-2.0.vapi \
        --pkg glib-2.0 \
@@ -23,26 +24,44 @@ WIKI_FILES = \
 sources= \
        $(top_srcdir)/gxml/*.vala
 
+distclean_dirs=
+
+if ENABLE_DEVHELP_DOCS
 gxmldocdir=$(datadir)/devhelp/books/gxml-$(API_VERSION)
 gxmldoc_DATA = \
-       gxml/GXml/GXml.devhelp2 \
-       gxml/GXml/*.png \
-       gxml/GXml/*.html \
-       gxml/GXml/*.htm
+       gxml/gxml-$(API_VERSION)/gxml-$(API_VERSION).devhelp2 \
+       gxml/gxml-$(API_VERSION)/*.png \
+       gxml/gxml-$(API_VERSION)/*.html \
+       gxml/gxml-$(API_VERSION)/*.htm \
+       gxml/gxml-$(API_VERSION)/*.css \
+       gxml/gxml-$(API_VERSION)/*.js
 
 gxmldocimgdir=$(datadir)/devhelp/books/gxml-$(API_VERSION)/img
 gxmldocimg_DATA=\
-       gxml/GXml/img/*
+       gxml/gxml-$(API_VERSION)/img/*
+
+$(gxmldoc_DATA) $(gxmldocimg_DATA): gxml-doc
 
 gxml-doc:
-       $(VALADOC) -o gxml/ --doclet=devhelp $(VALADOC_FLAGS) $(sources)
+       $(VALADOC) -o gxml --doclet=devhelp $(VALADOC_FLAGS) $(sources)
+
+all: gxml-doc
+
+clean-local: clean-local-gxml-doc
+.PHONY: clean-local-gxml-doc
+clean-local-gxml-doc:
+       -rm -rf gxml
 
+endif
 
+if ENABLE_GTK_DOCS
 gxmlgtkdocdir=$(datadir)/gtk-doc/html/gxml
 gxmlgtkdoc_DATA= \
-       gtk-doc/gxml/html/*
+       gtk-doc/gxml/*.txt \
+       gtk-doc/gxml/html/*.bak \
+       gtk-doc/gxml/html/*.types \
+       gtk-doc/gxml/html/sgml.stamp
 
-$(gxmldoc_DATA): gxml-doc
 $(gxmlgtkdoc_DATA): gxml-gtk-doc
 
 gxml-gtk-doc:
@@ -50,14 +69,14 @@ gxml-gtk-doc:
        -X $(top_builddir)/gxml/gxml.h \
        $(VALADOC_FLAGS) $(sources)
 
-all: gxml-doc gxml-gtk-doc
+all: gxml-gtk-doc
 
-distclean_dirs = \
-       gxml \
-       gtk-doc
+clean-local: clean-local-gtk-doc
+.PHONY: clean-local-gtk-doc
+clean-local-gtk-doc:
+       -rm -rf gtk-doc
 
-clean:
-       rm -rf $(distclean_dirs)
+endif
 
 EXTRA_DIST = \
        $(WIKI_FILES)