From 455ae59a5611f726bd90b92bf9e2f0680f650d04 Mon Sep 17 00:00:00 2001
From: Christopher Lam <christopher.lck@gmail.com>
Date: Thu, 24 Dec 2020 10:43:07 +0800
Subject: [PATCH] [app-utils] fix dependency chain

---
 libgnucash/app-utils/CMakeLists.txt | 42 ++++++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt
index 39c12d694c..1b713a8d86 100644
--- a/libgnucash/app-utils/CMakeLists.txt
+++ b/libgnucash/app-utils/CMakeLists.txt
@@ -169,13 +169,23 @@ install(FILES ${app_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnuca
 # And now handle scheme files
 
 set (app_utils_SCHEME_1
-    business-options.scm
     c-interface.scm
     date-utilities.scm
-    options.scm
     fin.scm
 )
 
+set (app_utils_SCHEME_1a
+    options.scm
+)
+
+set (app_utils_SCHEME_1b
+    business-options.scm
+)
+
+set (app_utils_SCHEME_1c
+    business-prefs.scm
+)
+
 set (app_utils_SCHEME_2
     app-utils.scm
 )
@@ -190,12 +200,25 @@ gnc_add_scheme_targets(scm-app-utils-1
     OUTPUT_DIR "gnucash/app-utils"
     DEPENDS "${GUILE_DEPENDS}"
     MAKE_LINKS)
-  gnc_add_scheme_targets(scm-bus-prefs
-    SOURCES "business-prefs.scm"
+
+gnc_add_scheme_targets(scm-app-utils-1a
+    SOURCES "${app_utils_SCHEME_1a}"
     OUTPUT_DIR "gnucash/app-utils"
     DEPENDS "scm-app-utils-1"
     MAKE_LINKS)
 
+gnc_add_scheme_targets(scm-app-utils-1b
+    SOURCES "${app_utils_SCHEME_1b}"
+    OUTPUT_DIR "gnucash/app-utils"
+    DEPENDS "scm-app-utils-1a"
+    MAKE_LINKS)
+
+gnc_add_scheme_targets(scm-bus-prefs
+    SOURCES "${app_utils_SCHEME_1c}"
+    OUTPUT_DIR "gnucash/app-utils"
+    DEPENDS "scm-app-utils-1b"
+    MAKE_LINKS)
+
 gnc_add_scheme_targets(scm-app-utils-2
     SOURCES "${app_utils_SCHEME_2}"
     OUTPUT_DIR "gnucash"
@@ -213,8 +236,15 @@ gnc_add_scheme_deprecated_module (
 add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1)
 
 set_local_dist(app_utils_DIST_local
-        ${app_utils_ALL_SOURCES} ${app_utils_SCHEME_1} ${app_utils_SCHEME_2} ${app_utils_SCHEME_3}
-        app-utils.i CMakeLists.txt gnc-help-utils.c)
+    ${app_utils_ALL_SOURCES}
+    ${app_utils_SCHEME_1}
+    ${app_utils_SCHEME_1a}
+    ${app_utils_SCHEME_1b}
+    ${app_utils_SCHEME_1c}
+    ${app_utils_SCHEME_2}
+    ${app_utils_SCHEME_3}
+    app-utils.i CMakeLists.txt gnc-help-utils.c)
+
 set(app_utils_DIST
     ${app_utils_DIST_local}
     ${test_app_utils_DIST}