[evolution-data-server/wip/mcrha/libical-glib] Correct build of introspection and documentation

[Milan Crha <mcrha src gnome org>]

commit 2018aa19869a4f886b128d413330be33282ef792
Author: Milan Crha <mcrha redhat com>
Date:   Wed Jan 9 12:20:01 2019 +0100

    Correct build of introspection and documentation

 cmake/modules/GObjectIntrospection.cmake                           | 7 ++++++-
 .../evolution-data-server/evolution-data-server-docs.sgml.in       | 3 ---
 src/CMakeLists.txt                                                 | 6 +++---
 src/addressbook/CMakeLists.txt                                     | 4 ++--
 4 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/cmake/modules/GObjectIntrospection.cmake b/cmake/modules/GObjectIntrospection.cmake
index 5b3c84555..52c60a2bf 100644
--- a/cmake/modules/GObjectIntrospection.cmake
+++ b/cmake/modules/GObjectIntrospection.cmake
@@ -38,7 +38,12 @@ endmacro(_gir_list_prefix)
 macro(_gir_list_prefix_libs _outvar _listvar _prefix)
        set(${_outvar})
        foreach(_item IN LISTS ${_listvar})
-               list(APPEND ${_outvar} ${_prefix}${_item}-${API_VERSION})
+               if(TARGET ${_item})
+                       get_target_property(_output_name ${_item} OUTPUT_NAME)
+                       list(APPEND ${_outvar} ${_prefix}${_output_name})
+               else(TARGET ${_item})
+                       message(FATAL_ERROR "'${_item}' not found as a target, possibly typo or reorder 
target definitions")
+               endif(TARGET ${_item})
        endforeach()
 endmacro(_gir_list_prefix_libs)
 
diff --git a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in 
b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
index a5ba6f283..4fe357725 100644
--- a/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
+++ b/docs/reference/evolution-data-server/evolution-data-server-docs.sgml.in
@@ -200,7 +200,6 @@
     <chapter>
       <title>Calendar Backend Classes</title>
       <xi:include href="xml/e-cal-backend.xml"/>
-      <xi:include href="xml/e-cal-backend-cache.xml"/>
       <xi:include href="xml/e-cal-backend-factory.xml"/>
       <xi:include href="xml/e-cal-backend-sexp.xml"/>
       <xi:include href="xml/e-cal-backend-store.xml"/>
@@ -324,8 +323,6 @@
       <title>Client Deprecated Classes</title>
       <xi:include href="xml/e-book.xml"/>
       <xi:include href="xml/e-book-view.xml"/>
-      <xi:include href="xml/e-cal.xml"/>
-      <xi:include href="xml/e-cal-view.xml"/>
       <xi:include href="xml/e-book-types.xml"/>
     </chapter>
     <chapter>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5bb6e9dc7..50ab1cdc9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,8 +1,8 @@
-add_subdirectory(addressbook)
-add_subdirectory(calendar)
 add_subdirectory(camel)
-add_subdirectory(libebackend)
 add_subdirectory(libedataserver)
+add_subdirectory(libebackend)
+add_subdirectory(addressbook)
+add_subdirectory(calendar)
 add_subdirectory(modules)
 add_subdirectory(private)
 add_subdirectory(services)
diff --git a/src/addressbook/CMakeLists.txt b/src/addressbook/CMakeLists.txt
index 85d56e647..815e915e1 100644
--- a/src/addressbook/CMakeLists.txt
+++ b/src/addressbook/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_subdirectory(backends)
-add_subdirectory(libebook)
-add_subdirectory(libebook-contacts)
 add_subdirectory(libedata-book)
+add_subdirectory(libebook-contacts)
+add_subdirectory(libebook)