gnucash unstable: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Sun Feb 18 19:53:39 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/474c3ae0 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/605f3466 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/a5f46a5e (commit)
	from  https://github.com/Gnucash/gnucash/commit/ec0656e7 (commit)



commit 474c3ae079a547ad8f311e1d09e1e135c5a06311
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Feb 18 16:08:26 2018 -0800

    Make a target for the python-bindings test to set its dependencies.

diff --git a/bindings/python/tests/CMakeLists.txt b/bindings/python/tests/CMakeLists.txt
index fffd04f..55285a3 100644
--- a/bindings/python/tests/CMakeLists.txt
+++ b/bindings/python/tests/CMakeLists.txt
@@ -1,5 +1,7 @@
 
 IF (WITH_PYTHON)
+  add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py)
+  add_dependencies(check test-python-bindings)
   ADD_TEST(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
   SET_PROPERTY(TEST python-bindings PROPERTY ENVIRONMENT
     GNC_BUILDDIR=${CMAKE_BINARY_DIR}

commit 605f3466cb964e5d4655b91ff5ad6628f747bb06
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Feb 18 16:07:25 2018 -0800

    Rename the gnc-module test libraries to be consistent with other modules.

diff --git a/libgnucash/gnc-module/test/CMakeLists.txt b/libgnucash/gnc-module/test/CMakeLists.txt
index 82f9ae8..aa34bbf 100644
--- a/libgnucash/gnc-module/test/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/CMakeLists.txt
@@ -12,7 +12,16 @@ SET(GNC_MODULE_TEST_INCLUDE_DIRS
   ${GUILE_INCLUDE_DIRS}
 )
 
-SET(GNC_MODULE_TEST_LIBS gnc-module test-core)
+SET(GNC_MODULE_TEST_LIBS
+  gnc-module
+  test-core
+  gncmod-foo
+  gncmod-bar
+  gncmod-baz
+  gncmod-agedver
+  gncmod-futuremodsys
+  gncmod-incompatdep
+  )
 
 MACRO(ADD_GNC_MODULE_TEST _TARGET _SOURCE_FILES)
   GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS)
@@ -43,7 +52,7 @@ GNC_ADD_TEST_WITH_GUILE(test-incompatdep test-incompatdep.c
 GNC_ADD_TEST_WITH_GUILE(test-agedver test-agedver.c
   GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS
   "GNC_MODULE_PATH=${LIBDIR_BUILD}/gnucash/test"
-)
+  )
 
 SET(_LIBDIR ${LIBDIR_BUILD})
 IF (WIN32)
@@ -64,7 +73,16 @@ SET(test_gnc_module_SCHEME
   test-gnc-module-scm-multi.scm
   )
 
-SET(GUILE_DEPENDS gnc-module scm-test-core scm-mod-foo scm-mod-baz)
+SET(GUILE_DEPENDS
+  gnc-module
+  scm-test-core
+  scm-mod-foo
+  gncmod-bar
+  scm-mod-baz
+  gncmod-agedver
+  gncmod-incompatdep
+  gncmod-futuremodsys
+  )
 
 GNC_ADD_SCHEME_TARGETS(test-gnc-modules-scm
   "${test_gnc_module_SCHEME}"
@@ -76,7 +94,7 @@ GNC_ADD_SCHEME_TARGETS(test-gnc-modules-scm
 GNC_ADD_SCHEME_TESTS("${test_gnc_module_SCHEME}")
 IF(NOT WIN32)
   # This little dance is needed because gnc_module_init will assert if
-  # it finds libgncmod_futuremod.so outside of a test that expects it.
+  # it finds libgncmod-futuremod.so outside of a test that expects it.
   GET_GUILE_ENV()
   SET(_GNC_MODULE_PATH "${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${LIBDIR_BUILD}/gnucash/test")
   FOREACH(test_file ${test_gnc_module_SCHEME})
diff --git a/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
index 820237e..6c4b004 100644
--- a/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/misc-mods/CMakeLists.txt
@@ -4,16 +4,16 @@ INCLUDE_DIRECTORIES(
   ${GLIB2_INCLUDE_DIRS}
 )
 
-ADD_LIBRARY(gncmod_agedver EXCLUDE_FROM_ALL agedver.c)
-TARGET_LINK_LIBRARIES(gncmod_agedver ${GLIB2_LDFLAGS})
+ADD_LIBRARY(gncmod-agedver EXCLUDE_FROM_ALL agedver.c)
+TARGET_LINK_LIBRARIES(gncmod-agedver ${GLIB2_LDFLAGS})
 
-ADD_LIBRARY(gncmod_futuremodsys  EXCLUDE_FROM_ALL futuremodsys.c)
-TARGET_LINK_LIBRARIES(gncmod_futuremodsys ${GLIB2_LDFLAGS})
+ADD_LIBRARY(gncmod-futuremodsys  EXCLUDE_FROM_ALL futuremodsys.c)
+TARGET_LINK_LIBRARIES(gncmod-futuremodsys ${GLIB2_LDFLAGS})
 
-ADD_LIBRARY(gncmod_incompatdep  EXCLUDE_FROM_ALL incompatdep.c)
-TARGET_LINK_LIBRARIES(gncmod_incompatdep gnc-module ${GLIB2_LDFLAGS})
+ADD_LIBRARY(gncmod-incompatdep  EXCLUDE_FROM_ALL incompatdep.c)
+TARGET_LINK_LIBRARIES(gncmod-incompatdep gnc-module ${GLIB2_LDFLAGS})
 
-SET_TARGET_PROPERTIES(gncmod_agedver gncmod_futuremodsys gncmod_incompatdep PROPERTIES
+SET_TARGET_PROPERTIES(gncmod-agedver gncmod-futuremodsys gncmod-incompatdep PROPERTIES
 LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
 ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
 RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
diff --git a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
index 257f811..068fc8e 100644
--- a/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-bar/CMakeLists.txt
@@ -5,11 +5,11 @@ gnc_add_swig_guile_command (swig-bar-c
 )
 
 ADD_LIBRARY(bar EXCLUDE_FROM_ALL bar.c bar.h)
-ADD_LIBRARY(gncmodbar EXCLUDE_FROM_ALL gnc-mod-bar.c)
+ADD_LIBRARY(gncmod-bar EXCLUDE_FROM_ALL gnc-mod-bar.c)
 SET_SOURCE_FILES_PROPERTIES (gnc-mod-bar.c PROPERTY OBJECT_DEPENDS ${SWIG_BAR_C})
 
-TARGET_LINK_LIBRARIES(gncmodbar bar gnc-module)
-TARGET_INCLUDE_DIRECTORIES(gncmodbar PRIVATE
+TARGET_LINK_LIBRARIES(gncmod-bar bar gnc-module)
+TARGET_INCLUDE_DIRECTORIES(gncmod-bar PRIVATE
   ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -19,9 +19,10 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbar PRIVATE
   ${GUILE_INCLUDE_DIRS}
 )
 
-SET_TARGET_PROPERTIES(bar gncmodbar PROPERTIES
-LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
-ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
-RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+SET_TARGET_PROPERTIES(bar gncmod-bar PROPERTIES
+  LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
+  ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
+  RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
+  )
 
 SET_DIST_LIST(mod_bar_DIST CMakeLists.txt bar.c gnucash/bar.scm bar.h bar.i gnc-mod-bar.c)
diff --git a/libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c b/libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c
index 7a15b79..a5fba10 100644
--- a/libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c
+++ b/libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c
@@ -29,28 +29,28 @@
 #include "gnc-module-api.h"
 #include "swig-bar.c"
 
-GNC_MODULE_API_DECL(libgncmodbar)
+GNC_MODULE_API_DECL(libgncmod_bar)
 
-int libgncmodbar_gnc_module_system_interface = 0;
+int libgncmod_bar_gnc_module_system_interface = 0;
 
-int libgncmodbar_gnc_module_current = 0;
-int libgncmodbar_gnc_module_age = 0;
-int libgncmodbar_gnc_module_revision = 0;
+int libgncmod_bar_gnc_module_current = 0;
+int libgncmod_bar_gnc_module_age = 0;
+int libgncmod_bar_gnc_module_revision = 0;
 
 char *
-libgncmodbar_gnc_module_path(void)
+libgncmod_bar_gnc_module_path(void)
 {
     return g_strdup("gnucash/bar");
 }
 
 char *
-libgncmodbar_gnc_module_description(void)
+libgncmod_bar_gnc_module_description(void)
 {
     return g_strdup("this is a bar module");
 }
 
 int
-libgncmodbar_gnc_module_init(int refcount)
+libgncmod_bar_gnc_module_init(int refcount)
 {
     /* publish the wrapped Scheme bindings for libbar */
     scm_init_sw_bar_module();
diff --git a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
index 7702374..0d70b3c 100644
--- a/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-baz/CMakeLists.txt
@@ -11,11 +11,11 @@ TARGET_INCLUDE_DIRECTORIES(baz PRIVATE
 TARGET_LINK_LIBRARIES(baz foo)
 
 
-ADD_LIBRARY(gncmodbaz EXCLUDE_FROM_ALL gnc-mod-baz.c)
+ADD_LIBRARY(gncmod-baz EXCLUDE_FROM_ALL gnc-mod-baz.c)
 SET_SOURCE_FILES_PROPERTIES (gnc-mod-baz.c PROPERTY OBJECT_DEPENDS ${SWIG_BAZ_C})
 
-TARGET_LINK_LIBRARIES(gncmodbaz baz gnc-module)
-TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE
+TARGET_LINK_LIBRARIES(gncmod-baz baz gnc-module)
+TARGET_INCLUDE_DIRECTORIES(gncmod-baz PRIVATE
   ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -28,11 +28,11 @@ TARGET_INCLUDE_DIRECTORIES(gncmodbaz PRIVATE
 GNC_ADD_SCHEME_TARGETS(scm-mod-baz
   gnucash/baz.scm
   "gnucash"
-  gncmodbaz
+  gncmod-baz
   TRUE
   )
 
-SET_TARGET_PROPERTIES(baz gncmodbaz PROPERTIES
+SET_TARGET_PROPERTIES(baz gncmod-baz PROPERTIES
 LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
 ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
 RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
diff --git a/libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c b/libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c
index cb31744..d15442d 100644
--- a/libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c
+++ b/libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c
@@ -30,28 +30,28 @@
 #include "gnc-module-api.h"
 #include "swig-baz.c"
 
-GNC_MODULE_API_DECL(libgncmodbaz)
+GNC_MODULE_API_DECL(libgncmod_baz)
 
-int libgncmodbaz_gnc_module_system_interface = 0;
+int libgncmod_baz_gnc_module_system_interface = 0;
 
-int libgncmodbaz_gnc_module_current = 0;
-int libgncmodbaz_gnc_module_age = 0;
-int libgncmodbaz_gnc_module_revision = 0;
+int libgncmod_baz_gnc_module_current = 0;
+int libgncmod_baz_gnc_module_age = 0;
+int libgncmod_baz_gnc_module_revision = 0;
 
 char *
-libgncmodbaz_gnc_module_path(void)
+libgncmod_baz_gnc_module_path(void)
 {
     return g_strdup("gnucash/baz");
 }
 
 char *
-libgncmodbaz_gnc_module_description(void)
+libgncmod_baz_gnc_module_description(void)
 {
     return g_strdup("this is the baz module");
 }
 
 int
-libgncmodbaz_gnc_module_init(int refcount)
+libgncmod_baz_gnc_module_init(int refcount)
 {
     /* load libfoo */
     if (gnc_module_load("gnucash/foo", 0))
diff --git a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
index 4c9734e..b40ab95 100644
--- a/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
+++ b/libgnucash/gnc-module/test/mod-foo/CMakeLists.txt
@@ -5,11 +5,11 @@ gnc_add_swig_guile_command (swig-foo-c
 )
 
 ADD_LIBRARY(foo EXCLUDE_FROM_ALL foo.c foo.h)
-ADD_LIBRARY(gncmodfoo EXCLUDE_FROM_ALL gnc-mod-foo.c)
+ADD_LIBRARY(gncmod-foo EXCLUDE_FROM_ALL gnc-mod-foo.c)
 SET_SOURCE_FILES_PROPERTIES (gnc-mod-foo.c PROPERTY OBJECT_DEPENDS ${SWIG_FOO_C})
 
-TARGET_LINK_LIBRARIES(gncmodfoo foo gnc-module)
-TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE
+TARGET_LINK_LIBRARIES(gncmod-foo foo gnc-module)
+TARGET_INCLUDE_DIRECTORIES(gncmod-foo PRIVATE
   ${CMAKE_BINARY_DIR}/common
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -22,11 +22,11 @@ TARGET_INCLUDE_DIRECTORIES(gncmodfoo PRIVATE
 GNC_ADD_SCHEME_TARGETS(scm-mod-foo
   gnucash/foo.scm
   "gnucash"
-  gncmodfoo
+  gncmod-foo
   TRUE
   )
 
-SET_TARGET_PROPERTIES(foo gncmodfoo PROPERTIES
+SET_TARGET_PROPERTIES(foo gncmod-foo PROPERTIES
 LIBRARY_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
 ARCHIVE_OUTPUT_DIRECTORY ${LIBDIR_BUILD}/gnucash/test
 RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
diff --git a/libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c b/libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c
index 2bb02a0..f41cc95 100644
--- a/libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c
+++ b/libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c
@@ -29,28 +29,28 @@
 #include "gnc-module-api.h"
 #include "swig-foo.c"
 
-GNC_MODULE_API_DECL(libgncmodfoo)
+GNC_MODULE_API_DECL(libgncmod_foo)
 
-int libgncmodfoo_gnc_module_system_interface = 0;
+int libgncmod_foo_gnc_module_system_interface = 0;
 
-int libgncmodfoo_gnc_module_current = 0;
-int libgncmodfoo_gnc_module_age = 0;
-int libgncmodfoo_gnc_module_revision = 0;
+int libgncmod_foo_gnc_module_current = 0;
+int libgncmod_foo_gnc_module_age = 0;
+int libgncmod_foo_gnc_module_revision = 0;
 
 char *
-libgncmodfoo_gnc_module_path(void)
+libgncmod_foo_gnc_module_path(void)
 {
     return g_strdup("gnucash/foo");
 }
 
 char *
-libgncmodfoo_gnc_module_description(void)
+libgncmod_foo_gnc_module_description(void)
 {
     return g_strdup("this is a foo module");
 }
 
 int
-libgncmodfoo_gnc_module_init(int refcount)
+libgncmod_foo_gnc_module_init(int refcount)
 {
     /* publish the wrapped Scheme bindings for libfoo */
     scm_init_sw_foo_module();
diff --git a/libgnucash/gnc-module/test/test-load-c.c b/libgnucash/gnc-module/test/test-load-c.c
index eb53072..af35b7e 100644
--- a/libgnucash/gnc-module/test/test-load-c.c
+++ b/libgnucash/gnc-module/test/test-load-c.c
@@ -30,7 +30,7 @@ static void
 guile_main(void *closure, int argc, char ** argv)
 {
     GNCModule foo;
-    gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod_futuremodsys.so' requires newer module system\n";
+    gchar *msg = "Module '../../../libgnucash/gnc-module/test/misc-mods/.libs/libgncmod-futuremodsys.so' requires newer module system\n";
     gchar *logdomain = "gnc.module";
     guint loglevel = G_LOG_LEVEL_WARNING;
     TestErrorStruct check = { loglevel, logdomain, msg };

commit a5f46a5e45fa5c167ff6306590a030670f5d3f20
Author: John Ralls <jralls at ceridwen.us>
Date:   Sun Feb 18 15:59:00 2018 -0800

    More Scheme dependency additions.

diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 2cf3d7f..95b179c 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -248,7 +248,7 @@ INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
 
 # Scheme
 
-SET(GUILE_DEPENDS      gncmod-gnome-utils scm-gnc-module scm-scm)
+SET(GUILE_DEPENDS      gncmod-gnome-utils scm-gnc-module scm-scm scm-app-utils)
 
 GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
   gnome-utils.scm
diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt
index 5293444..0817866 100644
--- a/gnucash/gnome-utils/test/CMakeLists.txt
+++ b/gnucash/gnome-utils/test/CMakeLists.txt
@@ -29,6 +29,7 @@ SET(GNOME_UTILS_GUI_TEST_LIBS
 #
 SET(GUILE_DEPENDS
   scm-gnc-module
+  scm-gnome-utils
   test-core
   gncmod-test-engine
   gncmod-app-utils
diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt
index b6f244c..cab305c 100644
--- a/gnucash/import-export/qif-imp/CMakeLists.txt
+++ b/gnucash/import-export/qif-imp/CMakeLists.txt
@@ -54,7 +54,16 @@ SET(qif_import_SCHEME_2
   qif-import.scm
 )
 
-SET(GUILE_DEPENDS      gncmod-qif-import scm-core-utils scm-gnc-module scm-scm scm-app-utils-3)
+SET(GUILE_DEPENDS
+  gncmod-qif-import
+  gnc-gnome
+  scm-core-utils
+  scm-gnc-module
+  scm-scm
+  scm-app-utils
+  scm-engine
+  scm-gnome-utils
+  )
 
 GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
   "${qif_import_SCHEME_2}"
diff --git a/gnucash/report/business-reports/CMakeLists.txt b/gnucash/report/business-reports/CMakeLists.txt
index e9ce440..bd8946e 100644
--- a/gnucash/report/business-reports/CMakeLists.txt
+++ b/gnucash/report/business-reports/CMakeLists.txt
@@ -26,12 +26,15 @@ SET(business_reports_DATA
 
 SET(GUILE_OUTPUT_DIR   gnucash/report)
 SET(GUILE_DEPENDS
+  gncmod-html
   scm-app-utils
   scm-gettext
   scm-gnc-module
+  scm-engine
   scm-scm
   scm-business-reports-links
   scm-standard-reports
+  scm-report-system
   )
 
 GNC_ADD_SCHEME_TARGETS(scm-business-reports
diff --git a/gnucash/report/locale-specific/us/CMakeLists.txt b/gnucash/report/locale-specific/us/CMakeLists.txt
index 914b90a..df8da92 100644
--- a/gnucash/report/locale-specific/us/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/CMakeLists.txt
@@ -31,15 +31,16 @@ SET(gncmod_local_reports_us_SCHEME_2 us.scm de_DE.scm)
 
 
 SET(GUILE_DEPENDS
+  gncmod-html
   scm-core-utils
   scm-gettext
   scm-gnc-module
   scm-scm
   scm-test-core
-  gncmod-html
-  scm-tax-us-1
-  scm-tax-us-2
-  scm-report-system-3)
+  scm-tax-us
+  scm-report-system
+  scm-gnome-utils
+  )
 
 GNC_ADD_SCHEME_TARGETS(scm-report-locale-specific-1
   "${gncmod_local_reports_us_SCHEME_1}"
diff --git a/gnucash/report/locale-specific/us/test/CMakeLists.txt b/gnucash/report/locale-specific/us/test/CMakeLists.txt
index 8a5c0c3..df59385 100644
--- a/gnucash/report/locale-specific/us/test/CMakeLists.txt
+++ b/gnucash/report/locale-specific/us/test/CMakeLists.txt
@@ -6,8 +6,9 @@ GNC_ADD_TEST(test-link-module-report-locale-specific-us test-link-module.c
 )
 
 # FIXME why is this not run/running?
+# Answer: Bitrot. The test needs to be rewritten.
 #SET(GUILE_DEPENDS
-#  gncmod-app-utils
+#  scm-app-utils
 #  gnc-core-utils
 #  gnc-module
 #  gncmod-engine
diff --git a/gnucash/report/report-gnome/CMakeLists.txt b/gnucash/report/report-gnome/CMakeLists.txt
index ab2c78c..f587824 100644
--- a/gnucash/report/report-gnome/CMakeLists.txt
+++ b/gnucash/report/report-gnome/CMakeLists.txt
@@ -55,11 +55,12 @@ SET(report_gnome_SCHEME
 SET(GUILE_OUTPUT_DIR   gnucash/report)
 SET(GUILE_DEPENDS
   gncmod-report-gnome
-  gncmod-engine
+  scm-engine
   scm-gettext
   scm-gnome-utils
   scm-gnc-module
   scm-scm
+  scm-report-system
   scm-standard-reports
   scm-business-reports
   scm-utility-reports
diff --git a/gnucash/report/report-gnome/test/CMakeLists.txt b/gnucash/report/report-gnome/test/CMakeLists.txt
index 0ec6df2..a6a3689 100644
--- a/gnucash/report/report-gnome/test/CMakeLists.txt
+++ b/gnucash/report/report-gnome/test/CMakeLists.txt
@@ -11,10 +11,10 @@ GNC_ADD_TEST_WITH_GUILE(test-link-module-report-gnome test-link-module.c
 
 SET(GUILE_DEPENDS
   scm-app-utils
-  gncmod-gnome-utils
+  scm-gnome-utils
   gnc-module
-  gncmod-engine
-  gncmod-report-gnome
+  scm-engine
+  scm-report-gnome
 )
 
 GNC_ADD_SCHEME_TARGETS(scm-test-load-report-gnome-module
diff --git a/gnucash/report/report-system/CMakeLists.txt b/gnucash/report/report-system/CMakeLists.txt
index d36f2a5..bd21e6b 100644
--- a/gnucash/report/report-system/CMakeLists.txt
+++ b/gnucash/report/report-system/CMakeLists.txt
@@ -81,14 +81,14 @@ SET (report_system_SCHEME_3
 
 SET(GUILE_DEPENDS
   gncmod-html
-  gncmod-gnome-utils
+  scm-gnome-utils
   gncmod-report-system
   scm-app-utils
   scm-scm
   scm-gnc-module
   )
 
-GNC_ADD_SCHEME_TARGETS(scm-report-system
+GNC_ADD_SCHEME_TARGETS(scm-report-system-1
   "${report_system_SCHEME}"
   "gnucash/report"
   "${GUILE_DEPENDS}"
@@ -98,7 +98,7 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system
 GNC_ADD_SCHEME_TARGETS(scm-report-system-2a
   "${report_system_SCHEME_2a}"
   "gnucash/report/report-system"
-  scm-report-system
+  scm-report-system-1
   FALSE
 )
 
@@ -116,6 +116,8 @@ GNC_ADD_SCHEME_TARGETS(scm-report-system-3
   FALSE
 )
 
+add_custom_target(scm-report-system ALL DEPENDS scm-report-system-3)
+
 SET_LOCAL_DIST(report_system_DIST_local CMakeLists.txt
   report-system.i
   ${report_system_HEADERS} ${report_system_SOURCES}
diff --git a/gnucash/report/standard-reports/CMakeLists.txt b/gnucash/report/standard-reports/CMakeLists.txt
index 658dfa7..b4875ae 100644
--- a/gnucash/report/standard-reports/CMakeLists.txt
+++ b/gnucash/report/standard-reports/CMakeLists.txt
@@ -41,7 +41,6 @@ SET(GUILE_DEPENDS
   scm-scm
   scm-gnome-utils
   scm-report-system
-  scm-report-system-3
   )
 
 GNC_ADD_SCHEME_TARGETS(scm-standard-reports-1
diff --git a/gnucash/report/standard-reports/test/CMakeLists.txt b/gnucash/report/standard-reports/test/CMakeLists.txt
index ff0c5a6..8f3d82b 100644
--- a/gnucash/report/standard-reports/test/CMakeLists.txt
+++ b/gnucash/report/standard-reports/test/CMakeLists.txt
@@ -21,7 +21,7 @@ set(GUILE_DEPENDS
   scm-scm
   scm-test-report-system
   scm-standard-reports
-  scm-report-stylesheets-2
+  scm-report-stylesheets
   )
 GNC_ADD_SCHEME_TESTS("${scm_test_standard_reports_SOURCES}")
 
diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt
index a6b3ffe..4ece021 100644
--- a/gnucash/report/stylesheets/CMakeLists.txt
+++ b/gnucash/report/stylesheets/CMakeLists.txt
@@ -54,7 +54,7 @@ SET(GUILE_DEPENDS
   scm-gettext
   scm-scm
   gncmod-html
-  scm-report-system-3
+  scm-report-system
   )
 
 GNC_ADD_SCHEME_TARGETS(scm-report-stylesheets-1
diff --git a/gnucash/report/stylesheets/test/CMakeLists.txt b/gnucash/report/stylesheets/test/CMakeLists.txt
index fd2947a..0f904aa 100644
--- a/gnucash/report/stylesheets/test/CMakeLists.txt
+++ b/gnucash/report/stylesheets/test/CMakeLists.txt
@@ -4,12 +4,13 @@ SET(GUILE_DEPENDS
   scm-core-utils
   scm-gnc-module
   scm-scm
-  gncmod-engine
+  scm-engine
   gncmod-backend-xml
-  gncmod-gnome-utils
+  scm-gnome-utils
   gncmod-html
-  gncmod-report-system
-  gncmod-report-gnome
+  scm-report-system
+  scm-report-gnome
+  scm-report-stylesheets
 )
 
 GNC_ADD_SCHEME_TARGETS(scm-test-load-report-stylesheets-module
diff --git a/gnucash/report/utility-reports/CMakeLists.txt b/gnucash/report/utility-reports/CMakeLists.txt
index 2346421..2309b4a 100644
--- a/gnucash/report/utility-reports/CMakeLists.txt
+++ b/gnucash/report/utility-reports/CMakeLists.txt
@@ -9,13 +9,16 @@ SET(utility_reports_SCHEME
 
 SET(GUILE_OUTPUT_DIR     gnucash/report)
 SET(GUILE_DEPENDS
+  gncmod-html
   scm-app-utils
   scm-core-utils
   scm-gettext
   scm-gnc-module
   scm-scm
   scm-utility-reports-links
-  scm-report-system-3)
+  scm-gnome-utils
+  scm-report-system
+  )
 
 GNC_ADD_SCHEME_TARGETS(scm-utility-reports
   "${utility_reports_SCHEME}"
diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index cc15586..a34b868 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -173,7 +173,13 @@ SET(app_utils_SCHEME_3
     business-prefs.scm
 )
 
-SET(GUILE_DEPENDS      gncmod-app-utils scm-core-utils scm-engine scm-scm scm-gnc-module)
+SET(GUILE_DEPENDS
+  gncmod-app-utils
+  scm-core-utils
+  scm-engine
+  scm-scm
+  scm-gnc-module
+  )
 
 GNC_ADD_SCHEME_TARGETS(scm-gettext
   gettext.scm
diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt
index 560bc38..169f7d1 100644
--- a/libgnucash/engine/CMakeLists.txt
+++ b/libgnucash/engine/CMakeLists.txt
@@ -277,7 +277,10 @@ IF (WITH_SQL)
     LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi)
 ENDIF(WITH_SQL)
 
-SET(GUILE_DEPENDS      ${BACKEND_DEPENDS} gnc-module gncmod-engine scm-gnc-module)
+SET(GUILE_DEPENDS
+  ${BACKEND_DEPENDS}
+  gncmod-engine
+  scm-gnc-module)
 
 
 GNC_ADD_SCHEME_TARGETS(scm-engine-0
diff --git a/libgnucash/engine/test/CMakeLists.txt b/libgnucash/engine/test/CMakeLists.txt
index 6084f6d..4447951 100644
--- a/libgnucash/engine/test/CMakeLists.txt
+++ b/libgnucash/engine/test/CMakeLists.txt
@@ -218,7 +218,7 @@ SET(engine_test_SCHEME
 
 #LIST(APPEND engine_test_SCHEME  test-scm-query-import.scm) Fails
 
-SET(GUILE_DEPENDS      scm-gnc-module scm-app-utils scm-scm)
+SET(GUILE_DEPENDS      scm-gnc-module scm-app-utils scm-scm scm-engine)
 
 GNC_ADD_SCHEME_TARGETS(scm-test-engine-extras
   "test-extras.scm"
diff --git a/libgnucash/scm/CMakeLists.txt b/libgnucash/scm/CMakeLists.txt
index 7fd32ca..b0528b4 100644
--- a/libgnucash/scm/CMakeLists.txt
+++ b/libgnucash/scm/CMakeLists.txt
@@ -1,24 +1,23 @@
 SET(GUILE_DEPENDS      scm-core-utils scm-gnc-module)
-SET(scm_scm_1_SCHEME   string.scm utilities.scm)
+SET(scm_SCHEME   string.scm utilities.scm)
 
 
-GNC_ADD_SCHEME_TARGETS(scm-scm-1
-  "${scm_scm_1_SCHEME}"
+GNC_ADD_SCHEME_TARGETS(scm-scm
+  "${scm_SCHEME}"
   gnucash
   "${GUILE_DEPENDS}"
   FALSE
 )
 
 # depends on main.scm
-GNC_ADD_SCHEME_TARGETS(scm-scm-2
+GNC_ADD_SCHEME_TARGETS(price-quotes
   price-quotes.scm
   gnucash
-  scm-scm-1
+  "scm-scm;scm-gnome-utils;scm-app-utils"
   FALSE)
 
-ADD_CUSTOM_TARGET(scm-scm ALL DEPENDS scm-scm-1 scm-scm-2)
 
-SET_LOCAL_DIST(scm_DIST_local CMakeLists.txt ${scm_scm_1_SCHEME} price-quotes.scm)
+SET_LOCAL_DIST(scm_DIST_local CMakeLists.txt ${scm_SCHEME} price-quotes.scm)
 SET(scm_DIST ${scm_DIST_local} ${scm_gnumeric_DIST} PARENT_SCOPE)
 
 
diff --git a/libgnucash/tax/us/CMakeLists.txt b/libgnucash/tax/us/CMakeLists.txt
index d809679..7feb344 100644
--- a/libgnucash/tax/us/CMakeLists.txt
+++ b/libgnucash/tax/us/CMakeLists.txt
@@ -41,6 +41,8 @@ GNC_ADD_SCHEME_TARGETS(scm-tax-us-2
   FALSE
   )
 
+add_custom_target(scm-tax-us ALL DEPENDS scm-tax-us-1 scm-tax-us-2)
+
 SET_LOCAL_DIST(tax_us_DIST_local CMakeLists.txt ${tax_us_SOURCES} ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2})
 SET(tax_us_DIST ${tax_us_DIST_local} ${test_tax_us_DIST} PARENT_SCOPE)
 



Summary of changes:
 bindings/python/tests/CMakeLists.txt               |  2 ++
 gnucash/gnome-utils/CMakeLists.txt                 |  2 +-
 gnucash/gnome-utils/test/CMakeLists.txt            |  1 +
 gnucash/import-export/qif-imp/CMakeLists.txt       | 11 ++++++++-
 gnucash/report/business-reports/CMakeLists.txt     |  3 +++
 gnucash/report/locale-specific/us/CMakeLists.txt   |  9 ++++----
 .../report/locale-specific/us/test/CMakeLists.txt  |  3 ++-
 gnucash/report/report-gnome/CMakeLists.txt         |  3 ++-
 gnucash/report/report-gnome/test/CMakeLists.txt    |  6 ++---
 gnucash/report/report-system/CMakeLists.txt        |  8 ++++---
 gnucash/report/standard-reports/CMakeLists.txt     |  1 -
 .../report/standard-reports/test/CMakeLists.txt    |  2 +-
 gnucash/report/stylesheets/CMakeLists.txt          |  2 +-
 gnucash/report/stylesheets/test/CMakeLists.txt     |  9 ++++----
 gnucash/report/utility-reports/CMakeLists.txt      |  5 ++++-
 libgnucash/app-utils/CMakeLists.txt                |  8 ++++++-
 libgnucash/engine/CMakeLists.txt                   |  5 ++++-
 libgnucash/engine/test/CMakeLists.txt              |  2 +-
 libgnucash/gnc-module/test/CMakeLists.txt          | 26 ++++++++++++++++++----
 .../gnc-module/test/misc-mods/CMakeLists.txt       | 14 ++++++------
 libgnucash/gnc-module/test/mod-bar/CMakeLists.txt  | 15 +++++++------
 libgnucash/gnc-module/test/mod-bar/gnc-mod-bar.c   | 16 ++++++-------
 libgnucash/gnc-module/test/mod-baz/CMakeLists.txt  | 10 ++++-----
 libgnucash/gnc-module/test/mod-baz/gnc-mod-baz.c   | 16 ++++++-------
 libgnucash/gnc-module/test/mod-foo/CMakeLists.txt  | 10 ++++-----
 libgnucash/gnc-module/test/mod-foo/gnc-mod-foo.c   | 16 ++++++-------
 libgnucash/gnc-module/test/test-load-c.c           |  2 +-
 libgnucash/scm/CMakeLists.txt                      | 13 +++++------
 libgnucash/tax/us/CMakeLists.txt                   |  2 ++
 29 files changed, 137 insertions(+), 85 deletions(-)



More information about the gnucash-changes mailing list