gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/a7cfedb9 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/34cc103e (commit)
	from  https://github.com/Gnucash/gnucash/commit/709787da (commit)



commit a7cfedb9dd91a8c6087b8f9ff5ff7cdfba576559
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 25 13:44:42 2018 -0800

    Remove overview links to nonexistant articles.

diff --git a/libgnucash/doc/doxygen_main_page.c b/libgnucash/doc/doxygen_main_page.c
index 4aed8be..d4efc45 100644
--- a/libgnucash/doc/doxygen_main_page.c
+++ b/libgnucash/doc/doxygen_main_page.c
@@ -41,18 +41,14 @@ in relation to existing code.
 - \ref druidframework
 - \ref guid
 - \ref gnome2
-- \ref networkoverview
-- \ref backenderrors
 - \ref loanhandling
 - \ref kvpvalues
 - \ref lotsoverview
 - \ref multicurrency
-- \ref plugindesign
 - \ref pricedocs
 - \ref gnucashextension
 - \ref python_bindings_page
 - \ref qif
-- \ref backendapi
 - \ref budgetplan
 - \ref taxnotes
 - \ref todo
@@ -68,6 +64,17 @@ source files using Doxygen but some topics need updating.
 - \ref stylediscussion
 
 */
+/* The following section links were removed from the overview section
+ * because there are no corresponding sections anywhere in
+ * source. Aside from networkoverview, whose intent is obscure, it
+ * would be good to have them at some point.
+
+- networkoverview
+- backenderrors
+- plugindesign
+- backendapi
+*/
+
 /********************************************************************\
  * This program is free software; you can redistribute it and/or    *
  * modify it under the terms of the GNU General Public License as   *

commit 34cc103e947c5fc461ba46b8d78c966fabff8c29
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu Jan 25 13:20:28 2018 -0800

    Add doxygen target.

diff --git a/libgnucash/doc/CMakeLists.txt b/libgnucash/doc/CMakeLists.txt
index 55a8122..235f1ea 100644
--- a/libgnucash/doc/CMakeLists.txt
+++ b/libgnucash/doc/CMakeLists.txt
@@ -35,6 +35,11 @@ SET(doc_FILES
         user-prefs-howto.txt
         )
 
-SET_LOCAL_DIST(doc_DIST_local CMakeLists.txt ${doc_FILES})
+SET_LOCAL_DIST(doc_DIST_local CMakeLists.txt Makefile.am ${doc_FILES})
 SET(doc_DIST ${doc_DIST_local} ${doc_design_DIST} ${doc_xml_DIST} PARENT_SCOPE)
 
+find_program(DOXYGEN doxygen)
+if (NOT ${DOXYGEN} STREQUAL "DOXYGEN-NOTFOUND")
+  configure_file(doxygen.cfg.in doxygen.cfg)
+  add_custom_target(doc ${DOXYGEN} doxygen.cfg)
+endif()
diff --git a/libgnucash/doc/doxygen.cfg.in b/libgnucash/doc/doxygen.cfg.in
index 8663366..36c39ba 100644
--- a/libgnucash/doc/doxygen.cfg.in
+++ b/libgnucash/doc/doxygen.cfg.in
@@ -652,8 +652,11 @@ WARN_LOGFILE           = doxygen.log
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = @top_srcdir@/libgnucash \
-                         @top_srcdir@/libgnucash/engine/
+INPUT                  = ${CMAKE_SOURCE_DIR}/libgnucash \
+                         ${CMAKE_SOURCE_DIR}/gnucash \
+                         ${CMAKE_SOURCE_DIR}/common \
+                         ${CMAKE_SOURCE_DIR}/bindings \
+                         ${CMAKE_SOURCE_DIR}/libgnucash/engine/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1548,7 +1551,7 @@ SEARCH_INCLUDES        = YES
 # contain include files that are not input files but should be processed by
 # the preprocessor.
 
-INCLUDE_PATH           = @top_srcdir@/libgnucash/engine/
+INCLUDE_PATH           = ${CMAKE_SOURCE_DIR}/libgnucash/engine/
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the



Summary of changes:
 libgnucash/doc/CMakeLists.txt      |  7 ++++++-
 libgnucash/doc/doxygen.cfg.in      |  9 ++++++---
 libgnucash/doc/doxygen_main_page.c | 15 +++++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)