[app-utils] fix dependency chain

This commit is contained in:
Christopher Lam 2020-12-24 10:43:07 +08:00
parent 0510ecfe85
commit 455ae59a56

View File

@ -169,13 +169,23 @@ install(FILES ${app_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnuca
# And now handle scheme files # And now handle scheme files
set (app_utils_SCHEME_1 set (app_utils_SCHEME_1
business-options.scm
c-interface.scm c-interface.scm
date-utilities.scm date-utilities.scm
options.scm
fin.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 set (app_utils_SCHEME_2
app-utils.scm app-utils.scm
) )
@ -190,12 +200,25 @@ gnc_add_scheme_targets(scm-app-utils-1
OUTPUT_DIR "gnucash/app-utils" OUTPUT_DIR "gnucash/app-utils"
DEPENDS "${GUILE_DEPENDS}" DEPENDS "${GUILE_DEPENDS}"
MAKE_LINKS) 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" OUTPUT_DIR "gnucash/app-utils"
DEPENDS "scm-app-utils-1" DEPENDS "scm-app-utils-1"
MAKE_LINKS) 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 gnc_add_scheme_targets(scm-app-utils-2
SOURCES "${app_utils_SCHEME_2}" SOURCES "${app_utils_SCHEME_2}"
OUTPUT_DIR "gnucash" 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) add_custom_target(scm-app-utils ALL DEPENDS scm-app-utils-2 scm-app-utils-1)
set_local_dist(app_utils_DIST_local 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_ALL_SOURCES}
app-utils.i CMakeLists.txt gnc-help-utils.c) ${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 set(app_utils_DIST
${app_utils_DIST_local} ${app_utils_DIST_local}
${test_app_utils_DIST} ${test_app_utils_DIST}