From 60f50e34c743dbb3f5c57fe06f84837f02d4e1e8 Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Wed, 30 Jun 2021 15:19:34 +0200 Subject: [PATCH] Tax - fully express source file dependencies in build scripts --- libgnucash/tax/CMakeLists.txt | 36 ++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt index 3c89f0a8dc..6b3956c895 100644 --- a/libgnucash/tax/CMakeLists.txt +++ b/libgnucash/tax/CMakeLists.txt @@ -29,11 +29,13 @@ install(TARGETS gnc-locale-tax # Scheme -set(gncmod_tax_us_SCHEME_1 us/txf.scm us/txf-help.scm) -set(gncmod_tax_us_SCHEME_2 us/tax.scm) +set(gncmod_tax_us_SCHEME_1 us/txf-help.scm) +set(gncmod_tax_us_SCHEME_2 us/txf.scm) +set(gncmod_tax_us_SCHEME_3 us/tax.scm) -set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf.scm de_DE/txf-help.scm) -set(gncmod_tax_de_DE_SCHEME_2 de_DE/tax.scm) +set(gncmod_tax_de_DE_SCHEME_1 de_DE/txf-help.scm) +set(gncmod_tax_de_DE_SCHEME_2 de_DE/txf.scm) +set(gncmod_tax_de_DE_SCHEME_3 de_DE/tax.scm) set(GUILE_DEPENDS scm-app-utils) @@ -45,8 +47,14 @@ gnc_add_scheme_targets(scm-tax-us-1 gnc_add_scheme_targets(scm-tax-us-2 SOURCES "${gncmod_tax_us_SCHEME_2}" + OUTPUT_DIR "gnucash/locale/us/tax" + DEPENDS "scm-tax-us-1;${GUILE_DEPENDS}" + MAKE_LINKS) + +gnc_add_scheme_targets(scm-tax-us-3 + SOURCES "${gncmod_tax_us_SCHEME_3}" OUTPUT_DIR "gnucash/locale/us" - DEPENDS "scm-tax-us-1;${GUILE_DEPENDS}") + DEPENDS "scm-tax-us-2;${GUILE_DEPENDS}") gnc_add_scheme_targets(scm-tax-de_DE-1 SOURCES "${gncmod_tax_de_DE_SCHEME_1}" @@ -56,27 +64,33 @@ gnc_add_scheme_targets(scm-tax-de_DE-1 gnc_add_scheme_targets(scm-tax-de_DE-2 SOURCES "${gncmod_tax_de_DE_SCHEME_2}" + OUTPUT_DIR "gnucash/locale/de_DE/tax" + DEPENDS "${GUILE_DEPENDS}" + MAKE_LINKS) + +gnc_add_scheme_targets(scm-tax-de_DE-3 + SOURCES "${gncmod_tax_de_DE_SCHEME_3}" OUTPUT_DIR "gnucash/locale/de_DE" - DEPENDS "scm-tax-de_DE-1;${GUILE_DEPENDS}") + DEPENDS "scm-tax-de_DE-2;${GUILE_DEPENDS}") # Module interfaces deprecated in 4.x, will be removed for 5.x gnc_add_scheme_deprecated_module ( OLD_MODULE "gnucash tax de_DE" NEW_MODULE "gnucash locale de_DE tax" - DEPENDS "scm-tax-de_DE-2") + DEPENDS "scm-tax-de_DE-3") gnc_add_scheme_deprecated_module ( OLD_MODULE "gnucash tax us" NEW_MODULE "gnucash locale us tax" - DEPENDS "scm-tax-us-2") + DEPENDS "scm-tax-us-3") -add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-de_DE-1 scm-tax-de_DE-2 ) +add_custom_target(scm-locale-tax ALL DEPENDS scm-tax-us-1 scm-tax-us-2 scm-tax-us-3 scm-tax-de_DE-1 scm-tax-de_DE-2 scm-tax-de_DE-3) set(de_DE_tax_EXTRA_DIST "de_DE/taxtxf - LIES MICH.txt" "de_DE/txf-USt-Bericht.html" "de_DE/txf-USt-VA Anleitung 2011.pdf") set_local_dist(tax_DIST_local CMakeLists.txt ${locale_tax_SOURCES} - ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2} - ${gncmod_tax_de_DE_SCHEME_1} ${gncmod_tax_de_DE_SCHEME_2} + ${gncmod_tax_us_SCHEME_1} ${gncmod_tax_us_SCHEME_2} ${gncmod_tax_us_SCHEME_3} + ${gncmod_tax_de_DE_SCHEME_1} ${gncmod_tax_de_DE_SCHEME_2} ${gncmod_tax_de_DE_SCHEME_3} ${de_DE_tax_EXTRA_DIST}) set(tax_DIST ${tax_DIST_local} ${locale_tax_DIST} ${test_locale_tax_DIST} PARENT_SCOPE)