IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drop all gnc-module dependencies and includes from compilation units that no longer use it

Browse Source 
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.
This commit is contained in:
Geert Janssens 2020-04-24 22:16:24 +02:00
parent abf29aa196
commit bbeb9a2b62
33 changed files with 49 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bindings/guile/test/test-scm-query.cpp
View File

@ -26,7 +26,6 @@ extern "C"
#include <glib.h> #include <glib.h>
#include "gnc-engine-guile.h" #include "gnc-engine-guile.h"
#include "gnc-module.h"
#include "test-engine-stuff.h" #include "test-engine-stuff.h"
#include "test-stuff.h" #include "test-stuff.h"
#include "Query.h" #include "Query.h"

7
bindings/python/CMakeLists.txt
View File

@ -13,7 +13,6 @@ set(GNUCASH_CORE_C_INCLUDES
${CMAKE_SOURCE_DIR}/libgnucash/engine/qofutil.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofutil.h
${CMAKE_SOURCE_DIR}/libgnucash/engine/qofid.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/qofid.h
${CMAKE_SOURCE_DIR}/libgnucash/engine/guid.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/gnc-engine.h
${CMAKE_SOURCE_DIR}/libgnucash/engine/Transaction.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/Transaction.h
${CMAKE_SOURCE_DIR}/libgnucash/engine/Split.h ${CMAKE_SOURCE_DIR}/libgnucash/engine/Split.h
@ -65,10 +64,8 @@ if(WITH_PYTHON)
${CMAKE_SOURCE_DIR}/libgnucash/engine ${CMAKE_SOURCE_DIR}/libgnucash/engine
${CMAKE_SOURCE_DIR}/gnucash/gnome-utils ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
${CMAKE_SOURCE_DIR}/libgnucash/app-utils ${CMAKE_SOURCE_DIR}/libgnucash/app-utils
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${CMAKE_SOURCE_DIR}/gnucash/gnome ${CMAKE_SOURCE_DIR}/gnucash/gnome
${CMAKE_SOURCE_DIR}/libgnucash/core-utils ${CMAKE_SOURCE_DIR}/libgnucash/core-utils
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${GLIB_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS} ${PYTHON_INCLUDE_DIRS}
) )
@ -76,7 +73,7 @@ if(WITH_PYTHON)
add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C}) add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
target_include_directories(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS}) 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 "_") 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) target_compile_options(gnucash_core_c PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
if (HAVE_STRINGOP_TRUNCATION) if (HAVE_STRINGOP_TRUNCATION)
@ -84,7 +81,7 @@ if(WITH_PYTHON)
endif() endif()
add_executable(sqlite3test EXCLUDE_FROM_ALL sqlite3test.c ${SWIG_GNUCASH_CORE_C}) 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_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) target_compile_options(sqlite3test PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
if (HAVE_STRINGOP_TRUNCATION) if (HAVE_STRINGOP_TRUNCATION)

2
bindings/python/gnucash_core.i
View File

@ -56,7 +56,6 @@
#include "guid.h" #include "guid.h"
#include "qofquery.h" #include "qofquery.h"
#include "qofquerycore.h" #include "qofquerycore.h"
#include "gnc-module.h"
#include "gnc-engine.h" #include "gnc-engine.h"
#include "Transaction.h" #include "Transaction.h"
#include "Split.h" #include "Split.h"
@ -221,7 +220,6 @@ gnc_environment_setup();
qof_log_init(); qof_log_init();
qof_init(); qof_init();
qof_query_init(); qof_query_init();
gnc_module_system_init();
char * no_args[1] = { NULL }; char * no_args[1] = { NULL };
gnc_engine_init(0, no_args); gnc_engine_init(0, no_args);
gnc_prefs_init(); gnc_prefs_init();

1
bindings/python/sqlite3test.c
View File

@ -26,7 +26,6 @@ int main()
const char* testurl = "sqlite3://" TESTFILE; const char* testurl = "sqlite3://" TESTFILE;
qof_log_init(); qof_log_init();
qof_init(); qof_init();
gnc_module_system_init();
char * no_args[1] = { NULL }; char * no_args[1] = { NULL };
gnc_engine_init(0, no_args); gnc_engine_init(0, no_args);

2
gnucash/gnome-utils/CMakeLists.txt
View File

@ -252,7 +252,7 @@ install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnu
# Scheme # 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 gnc_add_scheme_targets(scm-gnome-utils-1
SOURCES gnome-utils.scm SOURCES gnome-utils.scm

1
gnucash/gnome-utils/assistant-xml-encoding.c
View File

@ -33,7 +33,6 @@
#include "gnc-backend-xml.h" #include "gnc-backend-xml.h"
#include "gnc-component-manager.h" #include "gnc-component-manager.h"
#include "gnc-uri-utils.h" #include "gnc-uri-utils.h"
#include "gnc-module.h"
#include "gnc-ui.h" #include "gnc-ui.h"
/* The following are copied from src/backend/xml/io-gncxml2-v2.h as a temporary /* The following are copied from src/backend/xml/io-gncxml2-v2.h as a temporary

14
gnucash/gnome-utils/test/CMakeLists.txt
View File

@ -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 set(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
${GNOME_UTILS_TEST_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}/common ${CMAKE_BINARY_DIR}/common
${CMAKE_SOURCE_DIR}/gnucash/gnome-utils ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
${CMAKE_SOURCE_DIR}/libgnucash/engine ${CMAKE_SOURCE_DIR}/libgnucash/engine
${GLIB2_INCLUDE_DIRS}
${GUILE_INCLUDE_DIRS}
) )
set(GNOME_UTILS_GUI_TEST_LIBS set(GNOME_UTILS_GUI_TEST_LIBS
${GNOME_UTILS_TEST_LIBS} test-core
gnc-gnome-utils gnc-gnome-utils
) )
#This is a GUI test #This is a GUI test
@ -23,7 +16,6 @@ set(GNOME_UTILS_GUI_TEST_LIBS
# GNOME_UTILS_GUI_TEST_LIBS # GNOME_UTILS_GUI_TEST_LIBS
# #
set(GUILE_DEPENDS set(GUILE_DEPENDS
scm-gnc-module
scm-gnome-utils scm-gnome-utils
test-core test-core
gnc-test-engine gnc-test-engine

1
gnucash/gnome/CMakeLists.txt
View File

@ -246,7 +246,6 @@ set(GUILE_DEPENDS
scm-engine scm-engine
scm-core-utils scm-core-utils
scm-gnome-utils scm-gnome-utils
scm-gnc-module
scm-report scm-report
scm-reports scm-reports
) )

1
gnucash/gnome/dialog-tax-info.c
View File

@ -31,7 +31,6 @@
#include <libguile.h> #include <libguile.h>
#include "guile-mappings.h" #include "guile-mappings.h"
#include "gnc-guile-utils.h" #include "gnc-guile-utils.h"
#include "gnc-module.h"
#include "Account.h" #include "Account.h"
#include "gnc-ui-util.h" #include "gnc-ui-util.h"

2
gnucash/html/CMakeLists.txt
View File

@ -51,7 +51,7 @@ add_library (gnc-html
${html_HEADERS} ${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}) PkgConfig::GTK3 PkgConfig::WEBKIT ${GUILE_LDFLAGS})
target_compile_definitions(gnc-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\") target_compile_definitions(gnc-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")

2
gnucash/import-export/aqb/CMakeLists.txt
View File

@ -55,7 +55,7 @@ if(WITH_AQBANKING)
endif() endif()
target_link_libraries(gncmod-aqbanking gnc-gnome gnc-gnome-utils 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 gnc-register-gnome gnc-ledger-core gnc-engine gwengui-gtk3
${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS} ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS} ${GWENHYWFAR_LDFLAGS} ${GWEN_GTK3_LDFLAGS}

1
gnucash/import-export/bi-import/CMakeLists.txt
View File

@ -23,7 +23,6 @@ target_link_libraries(gnc-bi-import
gnc-app-utils gnc-app-utils
gnc-engine gnc-engine
gnc-core-utils gnc-core-utils
gnc-module
gnc-gnome gnc-gnome
) )

11
gnucash/import-export/csv-exp/CMakeLists.txt
View File

@ -17,8 +17,15 @@ set(csv_export_noinst_HEADERS
add_library(gnc-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES}) 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 target_link_libraries(gnc-csv-export
gnc-module gnc-gnome-utils gnc-gnome gnc-app-utils gnc-core-utils) 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 target_include_directories(gnc-csv-export
PUBLIC PUBLIC

3
gnucash/import-export/csv-imp/CMakeLists.txt
View File

@ -69,8 +69,7 @@ target_link_libraries(
gnc-gnome-utils gnc-gnome-utils
gnc-app-utils gnc-app-utils
gnc-engine gnc-engine
gnc-core-utils gnc-core-utils)
gnc-module)
target_compile_definitions(gnc-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\") target_compile_definitions(gnc-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")

9
gnucash/import-export/customer-import/CMakeLists.txt
View File

@ -16,8 +16,13 @@ set(customer_import_noinst_HEADERS
add_library(gnc-customer-import ${customer_import_SOURCES} ${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 target_link_libraries(gnc-customer-import
gnc-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS}) gnc-gnome
gnc-gnome-utils
gnc-app-utils
gnc-engine
gnc-core-utils
${GLIB2_LDFLAGS})
target_include_directories(gnc-customer-import target_include_directories(gnc-customer-import
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}

8
gnucash/import-export/log-replay/CMakeLists.txt
View File

@ -14,8 +14,12 @@ set(log_replay_noinst_HEADERS
add_library(gnc-log-replay ${log_replay_SOURCES} ${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 target_link_libraries(gnc-log-replay
gnc-core-utils gnc-module PkgConfig::GTK3) 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\") target_compile_definitions(gnc-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")

2
gnucash/import-export/ofx/CMakeLists.txt
View File

@ -21,7 +21,7 @@ if (WITH_OFX)
add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS}) 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 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\") target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")

1
gnucash/import-export/qif-imp/CMakeLists.txt
View File

@ -69,7 +69,6 @@ set(GUILE_DEPENDS
gnc-qif-import gnc-qif-import
gnc-gnome gnc-gnome
scm-core-utils scm-core-utils
scm-gnc-module
scm-app-utils scm-app-utils
scm-engine scm-engine
scm-gnome-utils scm-gnome-utils

1
gnucash/import-export/qif-imp/test/CMakeLists.txt
View File

@ -10,7 +10,6 @@ set(scm_qifimp_test_with_srfi64_SOURCES
) )
set (GUILE_DEPENDS set (GUILE_DEPENDS
scm-gnc-module
scm-app-utils scm-app-utils
scm-engine scm-engine
scm-test-engine scm-test-engine

2
gnucash/report/CMakeLists.txt
View File

@ -26,7 +26,6 @@ add_library (gnc-report
target_compile_definitions(gnc-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\") target_compile_definitions(gnc-report PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\")
target_link_libraries(gnc-report target_link_libraries(gnc-report
gnc-module
gnc-app-utils gnc-app-utils
gnucash-guile gnucash-guile
PkgConfig::GTK3 PkgConfig::GTK3
@ -92,7 +91,6 @@ set(GUILE_DEPENDS
gnc-report gnc-report
scm-app-utils scm-app-utils
scm-engine scm-engine
scm-gnc-module
guile-json guile-json
) )

1
gnucash/report/reports/CMakeLists.txt
View File

@ -87,7 +87,6 @@ set(scm_rpts_GUILE_DEPENDS
scm-engine scm-engine
scm-gnome-utils scm-gnome-utils
scm-app-utils scm-app-utils
scm-gnc-module
scm-report scm-report
) )

1
gnucash/report/reports/standard/test/CMakeLists.txt
View File

@ -28,7 +28,6 @@ set(scm_test_with_textual_ports_SOURCES
) )
set(GUILE_DEPENDS set(GUILE_DEPENDS
scm-gnc-module
scm-app-utils scm-app-utils
scm-engine scm-engine
scm-test-engine scm-test-engine

1
gnucash/report/stylesheets/CMakeLists.txt
View File

@ -7,7 +7,6 @@ set(stylesheets_SCHEME
) )
set(GUILE_DEPENDS set(GUILE_DEPENDS
scm-gnc-module
scm-core-utils scm-core-utils
scm-core-utils scm-core-utils
scm-engine scm-engine

1
gnucash/report/test/CMakeLists.txt
View File

@ -15,7 +15,6 @@ set (scm_test_report_with_srfi64_SOURCES
) )
set(GUILE_DEPENDS set(GUILE_DEPENDS
scm-gnc-module
scm-app-utils scm-app-utils
scm-core-utils scm-core-utils
scm-core-utils scm-core-utils

16
libgnucash/app-utils/CMakeLists.txt
View File

@ -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_SOURCES ${app_utils_SOURCES} ${app_utils_HEADERS} ${app_utils_noinst_HEADERS})
set(app_utils_ALL_LIBRARIES set(app_utils_ALL_LIBRARIES
gnc-engine gnc-engine
gnc-module
gnc-locale-tax gnc-locale-tax
gnucash-guile gnucash-guile
${GIO_LDFLAGS} ${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_link_libraries(gnc-app-utils ${app_utils_ALL_LIBRARIES})
target_include_directories (gnc-app-utils target_include_directories (gnc-app-utils
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PUBLIC
PRIVATE ${app_utils_ALL_INCLUDES} ${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\") 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 set(GUILE_DEPENDS
gnc-app-utils gnc-app-utils
scm-core-utils scm-core-utils
scm-engine scm-engine)
scm-gnc-module
)
gnc_add_scheme_targets(scm-app-utils-1 gnc_add_scheme_targets(scm-app-utils-1
SOURCES "${app_utils_SCHEME_1}" SOURCES "${app_utils_SCHEME_1}"

1
libgnucash/app-utils/gnc-ui-util.c
View File

@ -47,7 +47,6 @@
#include "qof.h" #include "qof.h"
#include "guile-mappings.h" #include "guile-mappings.h"
#include "gnc-prefs.h" #include "gnc-prefs.h"
#include "gnc-module.h"
#include "Account.h" #include "Account.h"
#include "Transaction.h" #include "Transaction.h"
#include "gnc-engine.h" #include "gnc-engine.h"

1
libgnucash/backend/xml/test/test-load-example-account.cpp
View File

@ -32,7 +32,6 @@ extern "C"
#include <unistd.h> #include <unistd.h>
#include <dirent.h> #include <dirent.h>
#include "gnc-module.h"
#include "gnc-engine.h" #include "gnc-engine.h"
#include "test-engine-stuff.h" #include "test-engine-stuff.h"
} }

1
libgnucash/backend/xml/test/test-xml-commodity.cpp
View File

@ -26,7 +26,6 @@ extern "C"
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include "gnc-module.h"
#include "qof.h" #include "qof.h"
#include "test-engine-stuff.h" #include "test-engine-stuff.h"

1
libgnucash/engine/CMakeLists.txt
View File

@ -216,7 +216,6 @@ add_dependencies (gnc-engine iso-4217-c)
target_link_libraries(gnc-engine target_link_libraries(gnc-engine
gnc-core-utils gnc-core-utils
gnc-module
${Boost_DATE_TIME_LIBRARIES} ${Boost_DATE_TIME_LIBRARIES}
${Boost_REGEX_LIBRARIES} ${Boost_REGEX_LIBRARIES}
${ICU4C_I18N_LDFLAGS} ${ICU4C_I18N_LDFLAGS}

1
libgnucash/engine/test-core/CMakeLists.txt
View File

@ -8,7 +8,6 @@ add_library(gnc-test-engine STATIC ${libgnc_test_engine_SOURCES})
target_include_directories(gnc-test-engine PRIVATE target_include_directories(gnc-test-engine PRIVATE
${GMODULE_INCLUDE_DIRS} ${GMODULE_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
${CMAKE_BINARY_DIR}/common # for config.h ${CMAKE_BINARY_DIR}/common # for config.h
${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/common
${CMAKE_SOURCE_DIR}/libgnucash/engine ${CMAKE_SOURCE_DIR}/libgnucash/engine

1
libgnucash/engine/test/test-business.c
View File

@ -27,7 +27,6 @@
#include <glib.h> #include <glib.h>
#include "qof.h" #include "qof.h"
#include "gnc-module.h"
#include "gncBusiness.h" #include "gncBusiness.h"
#include "test-stuff.h" #include "test-stuff.h"

11
libgnucash/tax/CMakeLists.txt
View File

@ -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}) set_source_files_properties (${locale_tax_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
add_library(gnc-locale-tax ${locale_tax_SOURCES}) 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 target_include_directories(gnc-locale-tax
PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} 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) if (APPLE)
set_target_properties (gnc-locale-tax PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}") 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_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_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 gnc_add_scheme_targets(scm-tax-us-1
SOURCES "${gncmod_tax_us_SCHEME_1}" SOURCES "${gncmod_tax_us_SCHEME_1}"

2
util/src-count/count.sh
View File

@ -136,4 +136,4 @@ wc $(find .. \( -path '*.svn' -prune \) -o \
-name '*.dtd' \) -a \ -name '*.dtd' \) -a \
-print | sort ) | wc -print | sort ) | wc
cd - cd -