[gxml] Making documentation generation by default



commit 437e9b474bfd8ed1691b9a7933ddbcc09fb8f954
Author: Daniel Espinosa <esodan gmail com>
Date:   Mon Nov 7 22:51:44 2016 -0600

    Making documentation generation by default

 Makefile.am              |    6 +-----
 NEWS                     |    1 +
 configure.ac             |   39 +++++++++++++++------------------------
 gxml/GomCollections.vala |    2 +-
 4 files changed, 18 insertions(+), 30 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fe0019a..35d404b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,11 +5,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 
 # Set up subdirectories to traverse
-SUBDIRS = gxml test po examples debian
-
-if ENABLE_DOCS
-SUBDIRS += docs
-endif
+SUBDIRS = gxml test po examples debian docs
 
 # Define available flags
 DISTCHECK_CONFIGURE_FLAGS = \
diff --git a/NEWS b/NEWS
index 1238c42..48ddfaf 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@
 Version 0.13.0
 ===============
 
+* Enable documentation generation by default
 * Added XPath interfaces and initial implementation based on libxml2
 * Removed old DOM1 implementation on xNode/xDocument
 * API change on DomImplementation.with_ids () for DocumentType to DomDocumentType
diff --git a/configure.ac b/configure.ac
index 6308c8b..c4cdf10 100644
--- a/configure.ac
+++ b/configure.ac
@@ -147,14 +147,9 @@ GOBJECT_INTROSPECTION_CHECK([1.32.0])
 AC_PATH_PROG(YELP_BUILD, [yelp-build], [no])
 AC_PATH_PROG([VALADOC], [valadoc], [no])
 
-AC_ARG_ENABLE([docs],
-              AS_HELP_STRING([--enable-docs],[Enable documentation generation]),
-        [enable_docs=$enableval], [enable_docs=no])
-AM_CONDITIONAL([ENABLE_DOCS], [test x$enable_docs = xyes])
-
 have_valadoc=no
-if test x$enable_docs = xyes -a "x$VALADOC" = "xno"; then
-               AC_MSG_RESULT([Required documentation but no valadoc found])
+if test "x$VALADOC" = "xno"; then
+       have_valadoc="no"
        else
        have_valadoc="yes"
 fi
@@ -166,29 +161,25 @@ PKG_CHECK_MODULES([GTKDOC], gtk-doc,[
     ],[
     found_gtk_docs=no
     ])
-if test x$enable_docs = xyes; then
-  if test x$have_valadoc = xyes; then
-    if test $found_gtk_docs=xyes; then
-      build_gtkdoc=yes
-    else
-      build_gtkdoc=no
-    fi
-  fi
+if test x$have_valadoc = xyes; then
+  if test $found_gtk_docs=xyes; then
+    build_gtkdoc=yes
+  else
+    build_gtkdoc=no
+fi
 fi
 AM_CONDITIONAL([BUILD_GTK_DOCS], [test "x$build_gtkdoc" = "xyes"])
 
 build_devhelp=no
 build_mallard_doc=no
 build_gir_doc=no
-if test x$enable_docs = xyes; then
-  if test x$have_valadoc = "xyes"; then
-    if test x$YELP_BUILD != "xno"; then
-      build_devhelp=yes
-      YELP_HELP_INIT
-      build_mallard_doc=yes;
-    else
-      build_devhelp=no;
-    fi
+if test x$have_valadoc = "xyes"; then
+  if test x$YELP_BUILD != "xno"; then
+    build_devhelp=yes
+    YELP_HELP_INIT
+    build_mallard_doc=yes;
+  else
+    build_devhelp=no;
   fi
 fi
 AM_CONDITIONAL([BUILD_DEVHELP_DOCS], [test "x$build_devhelp" = "xyes"])
diff --git a/gxml/GomCollections.vala b/gxml/GomCollections.vala
index 222afce..9935d29 100644
--- a/gxml/GomCollections.vala
+++ b/gxml/GomCollections.vala
@@ -34,7 +34,7 @@ public interface GXml.GomCollection : Object
   public abstract Queue<int> nodes_index { get; }
   /**
    * A {@link DomElement} with all child elements in collection. Only
-   *{@link GomElement} objects are supported.
+   * {@link GomElement} objects are supported.
    */
   public abstract DomElement element { get; construct set; }
   /**


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]