From bbeb9a2b62ec1174aa2075d9053f37713747e1bd Mon Sep 17 00:00:00 2001 From: Geert Janssens Date: Fri, 24 Apr 2020 22:16:24 +0200 Subject: [PATCH] Drop all gnc-module dependencies and includes from compilation units that no longer use it This also drops the python wrapper for gnc-module. As for the guile wrappers, python should use other means of loading our shared libraries. This commit required a few tweaks to the dependency chain as some units inherited dependency information from gnc-module's public dependency interface. --- bindings/guile/test/test-scm-query.cpp | 1 - bindings/python/CMakeLists.txt | 7 ++----- bindings/python/gnucash_core.i | 2 -- bindings/python/sqlite3test.c | 1 - gnucash/gnome-utils/CMakeLists.txt | 2 +- gnucash/gnome-utils/assistant-xml-encoding.c | 1 - gnucash/gnome-utils/test/CMakeLists.txt | 14 +++----------- gnucash/gnome/CMakeLists.txt | 1 - gnucash/gnome/dialog-tax-info.c | 1 - gnucash/html/CMakeLists.txt | 2 +- gnucash/import-export/aqb/CMakeLists.txt | 2 +- gnucash/import-export/bi-import/CMakeLists.txt | 1 - gnucash/import-export/csv-exp/CMakeLists.txt | 11 +++++++++-- gnucash/import-export/csv-imp/CMakeLists.txt | 3 +-- .../import-export/customer-import/CMakeLists.txt | 9 +++++++-- gnucash/import-export/log-replay/CMakeLists.txt | 8 ++++++-- gnucash/import-export/ofx/CMakeLists.txt | 2 +- gnucash/import-export/qif-imp/CMakeLists.txt | 1 - .../import-export/qif-imp/test/CMakeLists.txt | 1 - gnucash/report/CMakeLists.txt | 2 -- gnucash/report/reports/CMakeLists.txt | 1 - .../report/reports/standard/test/CMakeLists.txt | 1 - gnucash/report/stylesheets/CMakeLists.txt | 1 - gnucash/report/test/CMakeLists.txt | 1 - libgnucash/app-utils/CMakeLists.txt | 16 ++++++++-------- libgnucash/app-utils/gnc-ui-util.c | 1 - .../xml/test/test-load-example-account.cpp | 1 - .../backend/xml/test/test-xml-commodity.cpp | 1 - libgnucash/engine/CMakeLists.txt | 1 - libgnucash/engine/test-core/CMakeLists.txt | 1 - libgnucash/engine/test/test-business.c | 1 - libgnucash/tax/CMakeLists.txt | 11 ++++++++--- util/src-count/count.sh | 2 +- 33 files changed, 49 insertions(+), 62 deletions(-) diff --git a/bindings/guile/test/test-scm-query.cpp b/bindings/guile/test/test-scm-query.cpp index d4b3bc8cf9..8ded449928 100644 --- a/bindings/guile/test/test-scm-query.cpp +++ b/bindings/guile/test/test-scm-query.cpp @@ -26,7 +26,6 @@ extern "C" #include #include "gnc-engine-guile.h" -#include "gnc-module.h" #include "test-engine-stuff.h" #include "test-stuff.h" #include "Query.h" diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index b41f5a215b..8c5884e3a9 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -13,7 +13,6 @@ set(GNUCASH_CORE_C_INCLUDES ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofutil.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofid.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/guid.h - ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module/gnc-module.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/gnc-engine.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/Transaction.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/Split.h @@ -65,10 +64,8 @@ if(WITH_PYTHON) ${CMAKE_SOURCE_DIR}/libgnucash/engine ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils ${CMAKE_SOURCE_DIR}/libgnucash/app-utils - ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module ${CMAKE_SOURCE_DIR}/gnucash/gnome ${CMAKE_SOURCE_DIR}/libgnucash/core-utils - ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module ${GLIB_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS} ) @@ -76,7 +73,7 @@ if(WITH_PYTHON) add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C}) target_include_directories(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS}) - target_link_libraries(gnucash_core_c gnc-app-utils gnc-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES}) + target_link_libraries(gnucash_core_c gnc-app-utils gnc-engine ${GLIB_LIBS} ${PYTHON_LIBRARIES}) set_target_properties(gnucash_core_c PROPERTIES PREFIX "_") target_compile_options(gnucash_core_c PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations) if (HAVE_STRINGOP_TRUNCATION) @@ -84,7 +81,7 @@ if(WITH_PYTHON) endif() add_executable(sqlite3test EXCLUDE_FROM_ALL sqlite3test.c ${SWIG_GNUCASH_CORE_C}) - target_link_libraries(sqlite3test gnc-app-utils gnc-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES}) + target_link_libraries(sqlite3test gnc-app-utils gnc-engine ${GLIB_LIBS} ${PYTHON_LIBRARIES}) target_include_directories(sqlite3test PRIVATE ${gnucash_core_c_INCLUDE_DIRS}) target_compile_options(sqlite3test PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations) if (HAVE_STRINGOP_TRUNCATION) diff --git a/bindings/python/gnucash_core.i b/bindings/python/gnucash_core.i index a00ed4e792..bbaf15d1f5 100644 --- a/bindings/python/gnucash_core.i +++ b/bindings/python/gnucash_core.i @@ -56,7 +56,6 @@ #include "guid.h" #include "qofquery.h" #include "qofquerycore.h" -#include "gnc-module.h" #include "gnc-engine.h" #include "Transaction.h" #include "Split.h" @@ -221,7 +220,6 @@ gnc_environment_setup(); qof_log_init(); qof_init(); qof_query_init(); -gnc_module_system_init(); char * no_args[1] = { NULL }; gnc_engine_init(0, no_args); gnc_prefs_init(); diff --git a/bindings/python/sqlite3test.c b/bindings/python/sqlite3test.c index 08f22b332d..40b2720fe9 100644 --- a/bindings/python/sqlite3test.c +++ b/bindings/python/sqlite3test.c @@ -26,7 +26,6 @@ int main() const char* testurl = "sqlite3://" TESTFILE; qof_log_init(); qof_init(); - gnc_module_system_init(); char * no_args[1] = { NULL }; gnc_engine_init(0, no_args); diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt index 8db0ce7d9a..ac2d7783fd 100644 --- a/gnucash/gnome-utils/CMakeLists.txt +++ b/gnucash/gnome-utils/CMakeLists.txt @@ -252,7 +252,7 @@ install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu # Scheme -set(GUILE_DEPENDS gnc-gnome-utils scm-gnc-module scm-engine scm-app-utils) +set(GUILE_DEPENDS gnc-gnome-utils scm-engine scm-app-utils) gnc_add_scheme_targets(scm-gnome-utils-1 SOURCES gnome-utils.scm diff --git a/gnucash/gnome-utils/assistant-xml-encoding.c b/gnucash/gnome-utils/assistant-xml-encoding.c index c2287efe47..4acc2af951 100644 --- a/gnucash/gnome-utils/assistant-xml-encoding.c +++ b/gnucash/gnome-utils/assistant-xml-encoding.c @@ -33,7 +33,6 @@ #include "gnc-backend-xml.h" #include "gnc-component-manager.h" #include "gnc-uri-utils.h" -#include "gnc-module.h" #include "gnc-ui.h" /* The following are copied from src/backend/xml/io-gncxml2-v2.h as a temporary diff --git a/gnucash/gnome-utils/test/CMakeLists.txt b/gnucash/gnome-utils/test/CMakeLists.txt index b01f120aeb..b037b854de 100644 --- a/gnucash/gnome-utils/test/CMakeLists.txt +++ b/gnucash/gnome-utils/test/CMakeLists.txt @@ -1,20 +1,13 @@ -set(GNOME_UTILS_TEST_INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module - ${GLIB2_INCLUDE_DIRS} - ${GUILE_INCLUDE_DIRS} -) -set(GNOME_UTILS_TEST_LIBS gnc-module test-core) - - set(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS - ${GNOME_UTILS_TEST_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/common ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils ${CMAKE_SOURCE_DIR}/libgnucash/engine + ${GLIB2_INCLUDE_DIRS} + ${GUILE_INCLUDE_DIRS} ) set(GNOME_UTILS_GUI_TEST_LIBS - ${GNOME_UTILS_TEST_LIBS} + test-core gnc-gnome-utils ) #This is a GUI test @@ -23,7 +16,6 @@ set(GNOME_UTILS_GUI_TEST_LIBS # GNOME_UTILS_GUI_TEST_LIBS # set(GUILE_DEPENDS - scm-gnc-module scm-gnome-utils test-core gnc-test-engine diff --git a/gnucash/gnome/CMakeLists.txt b/gnucash/gnome/CMakeLists.txt index 4b0366e4b7..01cdc055c9 100644 --- a/gnucash/gnome/CMakeLists.txt +++ b/gnucash/gnome/CMakeLists.txt @@ -246,7 +246,6 @@ set(GUILE_DEPENDS scm-engine scm-core-utils scm-gnome-utils - scm-gnc-module scm-report scm-reports ) diff --git a/gnucash/gnome/dialog-tax-info.c b/gnucash/gnome/dialog-tax-info.c index 787ba6e2a7..6c68c3dafb 100644 --- a/gnucash/gnome/dialog-tax-info.c +++ b/gnucash/gnome/dialog-tax-info.c @@ -31,7 +31,6 @@ #include #include "guile-mappings.h" #include "gnc-guile-utils.h" -#include "gnc-module.h" #include "Account.h" #include "gnc-ui-util.h" diff --git a/gnucash/html/CMakeLists.txt b/gnucash/html/CMakeLists.txt index a743ef58d8..1706592460 100644 --- a/gnucash/html/CMakeLists.txt +++ b/gnucash/html/CMakeLists.txt @@ -51,7 +51,7 @@ add_library (gnc-html ${html_HEADERS} ) -target_link_libraries(gnc-html gnc-engine gnc-module gnc-gnome-utils +target_link_libraries(gnc-html gnc-engine gnc-gnome-utils PkgConfig::GTK3 PkgConfig::WEBKIT ${GUILE_LDFLAGS}) target_compile_definitions(gnc-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\") diff --git a/gnucash/import-export/aqb/CMakeLists.txt b/gnucash/import-export/aqb/CMakeLists.txt index fa867e75e4..e29c531d03 100644 --- a/gnucash/import-export/aqb/CMakeLists.txt +++ b/gnucash/import-export/aqb/CMakeLists.txt @@ -55,7 +55,7 @@ if(WITH_AQBANKING) endif() target_link_libraries(gncmod-aqbanking gnc-gnome gnc-gnome-utils - gnc-generic-import gnc-register-core + gnc-generic-import gnc-register-core gnc-module gnc-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3 ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS} ${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS} diff --git a/gnucash/import-export/bi-import/CMakeLists.txt b/gnucash/import-export/bi-import/CMakeLists.txt index 61a6119c0c..53b0c2ed52 100644 --- a/gnucash/import-export/bi-import/CMakeLists.txt +++ b/gnucash/import-export/bi-import/CMakeLists.txt @@ -23,7 +23,6 @@ target_link_libraries(gnc-bi-import gnc-app-utils gnc-engine gnc-core-utils - gnc-module gnc-gnome ) diff --git a/gnucash/import-export/csv-exp/CMakeLists.txt b/gnucash/import-export/csv-exp/CMakeLists.txt index 3ef5160b1b..be95550015 100644 --- a/gnucash/import-export/csv-exp/CMakeLists.txt +++ b/gnucash/import-export/csv-exp/CMakeLists.txt @@ -17,8 +17,15 @@ set(csv_export_noinst_HEADERS add_library(gnc-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES}) -target_link_libraries(gnc-csv-export gnc-register-gnome gnc-register-core gnc-ledger-core gnc-engine - gnc-module gnc-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils) +target_link_libraries(gnc-csv-export + gnc-register-gnome + gnc-register-core + gnc-ledger-core + gnc-engine + gnc-gnome-utils + gnc-gnome + gnc-app-utils + gnc-core-utils) target_include_directories(gnc-csv-export PUBLIC diff --git a/gnucash/import-export/csv-imp/CMakeLists.txt b/gnucash/import-export/csv-imp/CMakeLists.txt index 7d2879ee11..e7bb7ecb28 100644 --- a/gnucash/import-export/csv-imp/CMakeLists.txt +++ b/gnucash/import-export/csv-imp/CMakeLists.txt @@ -69,8 +69,7 @@ target_link_libraries( gnc-gnome-utils gnc-app-utils gnc-engine - gnc-core-utils - gnc-module) + gnc-core-utils) target_compile_definitions(gnc-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\") diff --git a/gnucash/import-export/customer-import/CMakeLists.txt b/gnucash/import-export/customer-import/CMakeLists.txt index b0f7073ea7..cdc3ec2e78 100644 --- a/gnucash/import-export/customer-import/CMakeLists.txt +++ b/gnucash/import-export/customer-import/CMakeLists.txt @@ -16,8 +16,13 @@ set(customer_import_noinst_HEADERS add_library(gnc-customer-import ${customer_import_SOURCES} ${customer_import_noinst_HEADERS}) -target_link_libraries(gnc-customer-import gnc-gnome gnc-gnome-utils gnc-app-utils - gnc-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS}) +target_link_libraries(gnc-customer-import + gnc-gnome + gnc-gnome-utils + gnc-app-utils + gnc-engine + gnc-core-utils + ${GLIB2_LDFLAGS}) target_include_directories(gnc-customer-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/gnucash/import-export/log-replay/CMakeLists.txt b/gnucash/import-export/log-replay/CMakeLists.txt index bcf5872ccf..742c3dc7b5 100644 --- a/gnucash/import-export/log-replay/CMakeLists.txt +++ b/gnucash/import-export/log-replay/CMakeLists.txt @@ -14,8 +14,12 @@ set(log_replay_noinst_HEADERS add_library(gnc-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS}) -target_link_libraries(gnc-log-replay gnc-gnome-utils gnc-app-utils gnc-engine - gnc-core-utils gnc-module PkgConfig::GTK3) +target_link_libraries(gnc-log-replay + gnc-gnome-utils + gnc-app-utils + gnc-engine + gnc-core-utils + PkgConfig::GTK3) target_compile_definitions(gnc-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\") diff --git a/gnucash/import-export/ofx/CMakeLists.txt b/gnucash/import-export/ofx/CMakeLists.txt index 27de14df90..2f6f30a867 100644 --- a/gnucash/import-export/ofx/CMakeLists.txt +++ b/gnucash/import-export/ofx/CMakeLists.txt @@ -21,7 +21,7 @@ if (WITH_OFX) add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS}) target_link_libraries(gncmod-ofx gnc-generic-import gnc-engine gnc-app-utils gnc-core-utils - gnc-gnome-utils ${LIBOFX_LDFLAGS}) + gnc-gnome-utils gnc-module ${LIBOFX_LDFLAGS}) target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\") diff --git a/gnucash/import-export/qif-imp/CMakeLists.txt b/gnucash/import-export/qif-imp/CMakeLists.txt index 86b35899a8..b3ca2363a3 100644 --- a/gnucash/import-export/qif-imp/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/CMakeLists.txt @@ -69,7 +69,6 @@ set(GUILE_DEPENDS gnc-qif-import gnc-gnome scm-core-utils - scm-gnc-module scm-app-utils scm-engine scm-gnome-utils diff --git a/gnucash/import-export/qif-imp/test/CMakeLists.txt b/gnucash/import-export/qif-imp/test/CMakeLists.txt index cbf33eeb1b..9936f7f727 100644 --- a/gnucash/import-export/qif-imp/test/CMakeLists.txt +++ b/gnucash/import-export/qif-imp/test/CMakeLists.txt @@ -10,7 +10,6 @@ set(scm_qifimp_test_with_srfi64_SOURCES ) set (GUILE_DEPENDS - scm-gnc-module scm-app-utils scm-engine scm-test-engine diff --git a/gnucash/report/CMakeLists.txt b/gnucash/report/CMakeLists.txt index 2e3c9daf5d..a1fe3aae64 100644 --- a/gnucash/report/CMakeLists.txt +++ b/gnucash/report/CMakeLists.txt @@ -26,7 +26,6 @@ add_library (gnc-report target_compile_definitions(gnc-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\") target_link_libraries(gnc-report - gnc-module gnc-app-utils gnucash-guile PkgConfig::GTK3 @@ -92,7 +91,6 @@ set(GUILE_DEPENDS gnc-report scm-app-utils scm-engine - scm-gnc-module guile-json ) diff --git a/gnucash/report/reports/CMakeLists.txt b/gnucash/report/reports/CMakeLists.txt index 22b1fcc26d..44281d387f 100644 --- a/gnucash/report/reports/CMakeLists.txt +++ b/gnucash/report/reports/CMakeLists.txt @@ -87,7 +87,6 @@ set(scm_rpts_GUILE_DEPENDS scm-engine scm-gnome-utils scm-app-utils - scm-gnc-module scm-report ) diff --git a/gnucash/report/reports/standard/test/CMakeLists.txt b/gnucash/report/reports/standard/test/CMakeLists.txt index 4f6601376d..9793973fb1 100644 --- a/gnucash/report/reports/standard/test/CMakeLists.txt +++ b/gnucash/report/reports/standard/test/CMakeLists.txt @@ -28,7 +28,6 @@ set(scm_test_with_textual_ports_SOURCES ) set(GUILE_DEPENDS - scm-gnc-module scm-app-utils scm-engine scm-test-engine diff --git a/gnucash/report/stylesheets/CMakeLists.txt b/gnucash/report/stylesheets/CMakeLists.txt index 1dae163cc2..65377d0a11 100644 --- a/gnucash/report/stylesheets/CMakeLists.txt +++ b/gnucash/report/stylesheets/CMakeLists.txt @@ -7,7 +7,6 @@ set(stylesheets_SCHEME ) set(GUILE_DEPENDS - scm-gnc-module scm-core-utils scm-core-utils scm-engine diff --git a/gnucash/report/test/CMakeLists.txt b/gnucash/report/test/CMakeLists.txt index 467fcaaeff..ebabb972e1 100644 --- a/gnucash/report/test/CMakeLists.txt +++ b/gnucash/report/test/CMakeLists.txt @@ -15,7 +15,6 @@ set (scm_test_report_with_srfi64_SOURCES ) set(GUILE_DEPENDS - scm-gnc-module scm-app-utils scm-core-utils scm-core-utils diff --git a/libgnucash/app-utils/CMakeLists.txt b/libgnucash/app-utils/CMakeLists.txt index 225c14de71..4eb513167a 100644 --- a/libgnucash/app-utils/CMakeLists.txt +++ b/libgnucash/app-utils/CMakeLists.txt @@ -73,7 +73,6 @@ set_source_files_properties (${app_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CO set(app_utils_ALL_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS}) set(app_utils_ALL_LIBRARIES gnc-engine - gnc-module gnc-locale-tax gnucash-guile ${GIO_LDFLAGS} @@ -98,8 +97,11 @@ add_library (gnc-app-utils ${app_utils_ALL_SOURCES} ${SWIG_APP_UTILS_GUILE_C}) target_link_libraries(gnc-app-utils ${app_utils_ALL_LIBRARIES}) target_include_directories (gnc-app-utils - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${app_utils_ALL_INCLUDES} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${GLIB2_INCLUDE_DIRS} + PRIVATE + ${app_utils_ALL_INCLUDES} ) target_compile_definitions (gnc-app-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.app-utils\") @@ -168,11 +170,9 @@ set (app_utils_SCHEME_2 ) set(GUILE_DEPENDS - gnc-app-utils - scm-core-utils - scm-engine - scm-gnc-module - ) + gnc-app-utils + scm-core-utils + scm-engine) gnc_add_scheme_targets(scm-app-utils-1 SOURCES "${app_utils_SCHEME_1}" diff --git a/libgnucash/app-utils/gnc-ui-util.c b/libgnucash/app-utils/gnc-ui-util.c index 9dacea87df..5cc8d65b49 100644 --- a/libgnucash/app-utils/gnc-ui-util.c +++ b/libgnucash/app-utils/gnc-ui-util.c @@ -47,7 +47,6 @@ #include "qof.h" #include "guile-mappings.h" #include "gnc-prefs.h" -#include "gnc-module.h" #include "Account.h" #include "Transaction.h" #include "gnc-engine.h" diff --git a/libgnucash/backend/xml/test/test-load-example-account.cpp b/libgnucash/backend/xml/test/test-load-example-account.cpp index 352b79084e..af0c437771 100644 --- a/libgnucash/backend/xml/test/test-load-example-account.cpp +++ b/libgnucash/backend/xml/test/test-load-example-account.cpp @@ -32,7 +32,6 @@ extern "C" #include #include -#include "gnc-module.h" #include "gnc-engine.h" #include "test-engine-stuff.h" } diff --git a/libgnucash/backend/xml/test/test-xml-commodity.cpp b/libgnucash/backend/xml/test/test-xml-commodity.cpp index 71a3060524..6ff7e76565 100644 --- a/libgnucash/backend/xml/test/test-xml-commodity.cpp +++ b/libgnucash/backend/xml/test/test-xml-commodity.cpp @@ -26,7 +26,6 @@ extern "C" #include #include -#include "gnc-module.h" #include "qof.h" #include "test-engine-stuff.h" diff --git a/libgnucash/engine/CMakeLists.txt b/libgnucash/engine/CMakeLists.txt index beca640bbf..e03a5f01db 100644 --- a/libgnucash/engine/CMakeLists.txt +++ b/libgnucash/engine/CMakeLists.txt @@ -216,7 +216,6 @@ add_dependencies (gnc-engine iso-4217-c) target_link_libraries(gnc-engine gnc-core-utils - gnc-module ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${ICU4C_I18N_LDFLAGS} diff --git a/libgnucash/engine/test-core/CMakeLists.txt b/libgnucash/engine/test-core/CMakeLists.txt index 675707b155..117003435c 100644 --- a/libgnucash/engine/test-core/CMakeLists.txt +++ b/libgnucash/engine/test-core/CMakeLists.txt @@ -8,7 +8,6 @@ add_library(gnc-test-engine STATIC ${libgnc_test_engine_SOURCES}) target_include_directories(gnc-test-engine PRIVATE ${GMODULE_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module ${CMAKE_BINARY_DIR}/common # for config.h ${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/libgnucash/engine diff --git a/libgnucash/engine/test/test-business.c b/libgnucash/engine/test/test-business.c index d2cd08d21a..ac73add85e 100644 --- a/libgnucash/engine/test/test-business.c +++ b/libgnucash/engine/test/test-business.c @@ -27,7 +27,6 @@ #include #include "qof.h" -#include "gnc-module.h" #include "gncBusiness.h" #include "test-stuff.h" diff --git a/libgnucash/tax/CMakeLists.txt b/libgnucash/tax/CMakeLists.txt index 1afdc6349b..3c89f0a8dc 100644 --- a/libgnucash/tax/CMakeLists.txt +++ b/libgnucash/tax/CMakeLists.txt @@ -6,11 +6,16 @@ set(locale_tax_SOURCES gnc-locale-tax.c gnc-locale-tax.h) set_source_files_properties (${locale_tax_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H}) add_library(gnc-locale-tax ${locale_tax_SOURCES}) -target_link_libraries(gnc-locale-tax gnc-module ${GLIB2_LDFLAGS} ${GUILE_LDFLAGS}) +target_link_libraries(gnc-locale-tax + ${GLIB2_LDFLAGS} + ${GUILE_LDFLAGS}) target_include_directories(gnc-locale-tax PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - PRIVATE ${CMAKE_BINARY_DIR}/common ${GUILE_INCLUDE_DIRS}) + PRIVATE + ${CMAKE_BINARY_DIR}/common + ${GUILE_INCLUDE_DIRS} + ${GLIB2_INCLUDE_DIRS}) if (APPLE) set_target_properties (gnc-locale-tax PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") @@ -30,7 +35,7 @@ set(gncmod_tax_us_SCHEME_2 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(GUILE_DEPENDS scm-app-utils scm-gnc-module) +set(GUILE_DEPENDS scm-app-utils) gnc_add_scheme_targets(scm-tax-us-1 SOURCES "${gncmod_tax_us_SCHEME_1}" diff --git a/util/src-count/count.sh b/util/src-count/count.sh index 5d67fadfba..a6a18922c4 100644 --- a/util/src-count/count.sh +++ b/util/src-count/count.sh @@ -136,4 +136,4 @@ wc $(find .. \( -path '*.svn' -prune \) -o \ -name '*.dtd' \) -a \ -print | sort ) | wc -cd - \ No newline at end of file +cd -