diff --git a/.gitignore b/.gitignore index 0c499a69fd..3d5e3eabcd 100644 --- a/.gitignore +++ b/.gitignore @@ -51,8 +51,6 @@ intltool-merge.in intltool-update intltool-update.in lib/guile-www/www -lib/libqof/backend/file/qsf-dir.h -lib/libqof/qof/qofla-dir.h libtool ltmain.sh macros/intltool.m4 @@ -194,10 +192,7 @@ src/import-export/qif-import/qif-import src/import-export/qif-import/test/test-link src/import-export/test/test-import-parse src/import-export/test/test-link -src/libqof/backend/file/qsf-dir.h -src/libqof/qof/qofla-dir.h -src/libqof/qof/test-qofmath -src/libqof/qof/test/test-qof +src/engine/test/test-qof src/optional/gtkmm/test/test-gtkmm src/optional/python-bindings/.py-links src/optional/python-bindings/gnucash/ diff --git a/CMakeLists.txt b/CMakeLists.txt index e9d973f784..b8ace797ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -672,7 +672,7 @@ configure_file( add_custom_target(uninstall COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake) -SET_TARGET_PROPERTIES(gnc-qof gnc-core-utils gnc-module gnc-backend-sql gnc-backend-xml-utils +SET_TARGET_PROPERTIES(gnc-core-utils gnc-module gnc-backend-sql gnc-backend-xml-utils gnc-gnome PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib IF (XCODE_VERSION) diff --git a/HACKING b/HACKING index ecefe413fa..24b8ed64bb 100644 --- a/HACKING +++ b/HACKING @@ -79,7 +79,7 @@ This is known to not work very well. Instead, `--prefix` your build into /opt/g Getting Trace Messages From GnuCash ----------------------------------- -See the doxygen comments in lib/libqof/qof/qoflog.h (and .c) +See the doxygen comments in src/engine/qoflog.h (and .c) Starting GnuCash in GDB ----------------------- diff --git a/configure.ac b/configure.ac index f1e5c023d9..3478c827a5 100644 --- a/configure.ac +++ b/configure.ac @@ -657,17 +657,6 @@ AC_CHECK_LIB(z, gzopen, [:], [ ]) LIBS="$oLIBS" -### -------------------------------------------------------------------------- -### Internal code part which is called "qof" - -LIBQOF_LIBRARY_VERSION=1:4:0 -AC_SUBST(LIBQOF_LIBRARY_VERSION) - -QOF_CFLAGS='-I${top_builddir}/src/libqof/qof -I${top_srcdir}/src/libqof/qof' -QOF_LIBS='${top_builddir}/src/libqof/qof/libgnc-qof.la' -AC_SUBST(QOF_CFLAGS) -AC_SUBST(QOF_LIBS) - ### ---------------------- ### LIBDBI @@ -1740,9 +1729,6 @@ AC_CONFIG_FILES( src/import-export/aqb/Makefile src/import-export/aqb/gschemas/Makefile src/import-export/aqb/test/Makefile - src/libqof/Makefile - src/libqof/qof/Makefile - src/libqof/qof/test/Makefile src/optional/Makefile src/optional/gtkmm/Makefile src/optional/gtkmm/test/Makefile diff --git a/make-gnucash-potfiles.in b/make-gnucash-potfiles.in index 576c0bb60b..a3d58ac5b8 100644 --- a/make-gnucash-potfiles.in +++ b/make-gnucash-potfiles.in @@ -79,5 +79,5 @@ foreach my $file (@possible_files) { # These are also added, even though they are outside of src/ print "src/gnome/gnucash.appdata.xml.in\n"; print "src/gnome/gnucash.desktop.in.in\n"; -print "src/libqof/qof/qofbookslots.h\n"; +print "src/engine/qofbookslots.h\n"; print "doc/tip_of_the_day.list.in\n"; diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index 77bd40c239..2ab86f7397 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -132,7 +132,7 @@ FUNCTION(MAKE_GNUCASH_POTFILES) # These are also added, even though they are outside of src/ FILE(APPEND ${POTFILES_IN_PATH} "src/gnome/gnucash.appdata.xml.in src/gnome/gnucash.desktop.in.in -src/libqof/qof/qofbookslots.h +src/engine/qofbookslots.h doc/tip_of_the_day.list.in ") diff --git a/po/POTFILES.in b/po/POTFILES.in index 135a8ee49d..b5d9eeceaf 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -134,12 +134,15 @@ src/engine/engine.scm src/engine/engine-utilities.scm src/engine/glib-helpers.c src/engine/gncAddress.c +src/engine/gnc-aqbanking-templates.cpp src/engine/gncBillTerm.c src/engine/gnc-budget.c src/engine/gncBusGuile.c src/engine/gncBusiness.c src/engine/gnc-commodity.c src/engine/gncCustomer.c +src/engine/gnc-date.cpp +src/engine/gnc-datetime.cpp src/engine/gncEmployee.c src/engine/gnc-engine.c src/engine/gncEntry.c @@ -147,20 +150,42 @@ src/engine/gnc-event.c src/engine/gnc-features.c src/engine/gnc-hooks.c src/engine/gncIDSearch.c +src/engine/gnc-int128.cpp src/engine/gncInvoice.c src/engine/gncJob.c src/engine/gnc-lot.c src/engine/gncmod-engine.c +src/engine/gnc-numeric.cpp src/engine/gnc-numeric.scm src/engine/gncOrder.c src/engine/gncOwner.c src/engine/gnc-pricedb.c +src/engine/gnc-rational.cpp src/engine/gnc-session.c src/engine/gncTaxTable.c +src/engine/gnc-timezone.cpp src/engine/gnc-uri-utils.c src/engine/gncVendor.c +src/engine/guid.cpp +src/engine/kvp-frame.cpp src/engine/kvp-scm.cpp +src/engine/kvp-value.cpp src/engine/policy.c +src/engine/qof-backend.cpp +src/engine/qofbook.cpp +src/engine/qofchoice.cpp +src/engine/qofclass.cpp +src/engine/qofevent.cpp +src/engine/qofid.cpp +src/engine/qofinstance.cpp +src/engine/qoflog.cpp +src/engine/qofobject.cpp +src/engine/qofquerycore.cpp +src/engine/qofquery.cpp +src/engine/qofsession.cpp +src/engine/qof-string-cache.cpp +src/engine/qofutil.cpp +src/engine/qof-win32.cpp src/engine/Query.c src/engine/Recurrence.c src/engine/SchedXaction.c @@ -477,31 +502,6 @@ src/import-export/qif-imp/qif-objects.scm src/import-export/qif-imp/qif-parse.scm src/import-export/qif-imp/qif-to-gnc.scm src/import-export/qif-imp/qif-utils.scm -src/libqof/qof/gnc-aqbanking-templates.cpp -src/libqof/qof/gnc-date.cpp -src/libqof/qof/gnc-datetime.cpp -src/libqof/qof/gnc-int128.cpp -src/libqof/qof/gnc-numeric.cpp -src/libqof/qof/gnc-rational.cpp -src/libqof/qof/gnc-timezone.cpp -src/libqof/qof/guid.cpp -src/libqof/qof/kvp_frame.cpp -src/libqof/qof/kvp-value.cpp -src/libqof/qof/qof-backend.cpp -src/libqof/qof/qofbook.cpp -src/libqof/qof/qofchoice.cpp -src/libqof/qof/qofclass.cpp -src/libqof/qof/qofevent.cpp -src/libqof/qof/qofid.cpp -src/libqof/qof/qofinstance.cpp -src/libqof/qof/qoflog.cpp -src/libqof/qof/qofobject.cpp -src/libqof/qof/qofquerycore.cpp -src/libqof/qof/qofquery.cpp -src/libqof/qof/qofsession.cpp -src/libqof/qof/qof-string-cache.cpp -src/libqof/qof/qofutil.cpp -src/libqof/qof/qof-win32.cpp src/plugins/bi_import/dialog-bi-import.c src/plugins/bi_import/dialog-bi-import-gui.c src/plugins/bi_import/dialog-bi-import-helper.c @@ -678,5 +678,5 @@ src/tax/us/txf.scm src/tax/us/us.scm src/gnome/gnucash.appdata.xml.in src/gnome/gnucash.desktop.in.in -src/libqof/qof/qofbookslots.h +src/engine/qofbookslots.h doc/tip_of_the_day.list.in diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4573fc78da..55fbe34c10 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -141,7 +141,6 @@ SET(SCHEME_INSTALLED_SOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/gnucash/scm) SET(SCHEME_INSTALLED_CACHE_DIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}) # The subdirectories -ADD_SUBDIRECTORY (libqof) ADD_SUBDIRECTORY (core-utils) ADD_SUBDIRECTORY (gnc-module) ADD_SUBDIRECTORY (engine) @@ -187,5 +186,5 @@ SET_LOCAL_DIST(src_DIST_local CMakeLists.txt Makefile.am ${src_EXTRA_DIST}) SET(src_DIST ${src_DIST_local} ${app_utils_DIST} ${backend_DIST} ${bin_DIST} ${cmake_modules_DIST} ${core_utils_DIST} ${debug_DIST} ${doc_DIST} ${engine_DIST} ${gnc_module_DIST} ${gnome_DIST} ${gnome_search_DIST} - ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${libqof_DIST} ${optional_DIST} ${plugins_DIST} ${pixmaps_DIST} ${python_DIST} + ${gnome_utils_DIST} ${html_DIST} ${import_export_DIST} ${optional_DIST} ${plugins_DIST} ${pixmaps_DIST} ${python_DIST} ${quotes_DIST} ${register_DIST} ${report_DIST} ${scm_DIST} ${tax_DIST} ${test_core_DIST} PARENT_SCOPE) diff --git a/src/Makefile.am b/src/Makefile.am index 280839a8c1..7d72bcd2d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,13 +1,18 @@ # These directories do not contain any gtk dependencies +# Note the unusual ordering of some test directories. This is +# because test-core depends on engine and the test directories +# in turn depend on test-core. NONGUI_SUBDIRS = \ - libqof \ - test-core \ debug \ doc \ pixmaps \ core-utils \ gnc-module \ engine \ + test-core \ + core-utils/test \ + gnc-module/test \ + engine/test \ backend \ scm \ quotes diff --git a/src/app-utils/CMakeLists.txt b/src/app-utils/CMakeLists.txt index f27cbf4a1f..b15f510722 100644 --- a/src/app-utils/CMakeLists.txt +++ b/src/app-utils/CMakeLists.txt @@ -83,7 +83,7 @@ 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 gncmod-engine gnc-module ${GTK3_LDFLAGS} ${LIBXML2_LDFLAGS} ${LIBXSLT_LDFLAGS}) SET(app_utils_ALL_INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}/calculation ${LIBXML2_INCLUDE_DIRS} - ${LIBXSLT_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS}) + ${LIBXSLT_INCLUDE_DIRS} ${GTK3_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/engine) IF (WIN32) LIST(APPEND app_utils_ALL_SOURCES gnc-help-utils.c) @@ -171,7 +171,7 @@ SET(app_utils_SCHEME_3 SET(GUILE_MODULES src/engine) SET(GUILE_LOAD_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/scm) -SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/libqof/qof) +SET(GUILE_LIBRARY_DIRS src/app-utils src/core-utils src/engine src/gnc-module) SET(GUILE_DEPENDS gncmod-app-utils scm-core-utils scm-engine scm-scm) GNC_ADD_SCHEME_TARGETS(scm-gettext diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am index 10d6836848..f9efdf4e76 100644 --- a/src/app-utils/Makefile.am +++ b/src/app-utils/Makefile.am @@ -28,7 +28,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/app-utils/calculation \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/backend/xml \ ${GUILE_CFLAGS} \ ${PYTHON_CPPFLAGS} \ @@ -100,7 +99,6 @@ libgncmod_app_utils_la_LIBADD = \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GTK_LIBS} \ ${GUILE_LIBS} \ ${GLIB_LIBS} \ @@ -213,7 +211,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/scm \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ diff --git a/src/app-utils/gnc-gsettings.c b/src/app-utils/gnc-gsettings.c index 00f2f53b05..99b4debca4 100644 --- a/src/app-utils/gnc-gsettings.c +++ b/src/app-utils/gnc-gsettings.c @@ -30,7 +30,7 @@ #include "gnc-path.h" #include "guile-mappings.h" #include -#include "libqof/qof/qof.h" +#include "qof.h" #include "gnc-prefs-p.h" #include diff --git a/src/app-utils/test/CMakeLists.txt b/src/app-utils/test/CMakeLists.txt index d1a1b7d610..b179a979d6 100644 --- a/src/app-utils/test/CMakeLists.txt +++ b/src/app-utils/test/CMakeLists.txt @@ -1,15 +1,15 @@ SET(APP_UTILS_TEST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/app-utils - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${CMAKE_SOURCE_DIR}/src/test-core + ${CMAKE_SOURCE_DIR}/src/engine # for qof.h ${CMAKE_SOURCE_DIR}/src/engine/test-core ${CMAKE_BINARY_DIR}/src # for config.h ${GLIB2_INCLUDE_DIRS} ${GUILE_INCLUDE_DIRS} ) -SET(APP_UTILS_TEST_LIBS gncmod-app-utils gncmod-test-engine gnc-qof test-core ${GUILE_LDFLAGS}) +SET(APP_UTILS_TEST_LIBS gncmod-app-utils gncmod-test-engine test-core ${GUILE_LDFLAGS}) SET(test_app_utils_SOURCES test-app-utils.c test-option-util.cpp test-gnc-ui-util.c) diff --git a/src/app-utils/test/Makefile.am b/src/app-utils/test/Makefile.am index df77543f3d..af52d0c766 100644 --- a/src/app-utils/test/Makefile.am +++ b/src/app-utils/test/Makefile.am @@ -23,7 +23,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/scm \ --guile-load-dir ${top_builddir}/src/app-utils \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ @@ -39,7 +38,6 @@ TESTS_ENVIRONMENT = \ $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GNC_TEST_DEPS}) LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ @@ -61,7 +59,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/core-utils \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} \ ${BOOST_CPPFLAGS} diff --git a/src/app-utils/test/test-option-util.cpp b/src/app-utils/test/test-option-util.cpp index 480d024480..fd560fe55a 100644 --- a/src/app-utils/test/test-option-util.cpp +++ b/src/app-utils/test/test-option-util.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor Fax: +1-617-542-2652 * * Boston, MA 02110-1301, USA gnu@gnu.org * ********************************************************************/ -#include +#include #include extern "C" { diff --git a/src/backend/dbi/CMakeLists.txt b/src/backend/dbi/CMakeLists.txt index 61a5649bc6..e7432a2d3e 100644 --- a/src/backend/dbi/CMakeLists.txt +++ b/src/backend/dbi/CMakeLists.txt @@ -34,7 +34,7 @@ SET(WINSOCK_LIB "") IF(MINGW64) SET(WINSOCK_LIB "-lws2_32") ENDIF(MINGW64) -TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine gnc-qof ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB}) +TARGET_LINK_LIBRARIES(gncmod-backend-dbi gnc-backend-sql gncmod-engine ${GTK2_LDFLAGS} ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY} ${WINSOCK_LIB}) TARGET_COMPILE_DEFINITIONS(gncmod-backend-dbi PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.dbi\") diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am index 67f85d63b6..86ecc90751 100644 --- a/src/backend/dbi/Makefile.am +++ b/src/backend/dbi/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/lib/libc \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src \ ${GLIB_CFLAGS} \ ${BOOST_CPPFLAGS} \ @@ -39,7 +38,6 @@ libgncmod_backend_dbi_la_LIBADD = \ ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${BOOST_LDFLAGS} -lboost_regex \ ${LIBDBI_LIBS} diff --git a/src/backend/dbi/test/CMakeLists.txt b/src/backend/dbi/test/CMakeLists.txt index 5be867b303..637519b75b 100644 --- a/src/backend/dbi/test/CMakeLists.txt +++ b/src/backend/dbi/test/CMakeLists.txt @@ -4,14 +4,13 @@ SET(BACKEND_DBI_TEST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/core-utils ${CMAKE_SOURCE_DIR}/src/backend/dbi/test ${CMAKE_SOURCE_DIR}/src/backend/sql - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/engine/test-core ${CMAKE_SOURCE_DIR}/src/test-core ${LIBDBI_INCLUDE_PATH} ${GLIB2_INCLUDE_DIRS} ) -SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine gnc-qof test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY}) +SET(BACKEND_DBI_TEST_LIBS gnc-backend-sql gncmod-engine gncmod-test-engine test-core ${Boost_REGEX_LIBRARY} ${LIBDBI_LIBRARY}) SET(test_dbi_backend_SOURCES test-backend-dbi.cpp diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am index 6a7bd140b3..15e48fcffc 100644 --- a/src/backend/dbi/test/Makefile.am +++ b/src/backend/dbi/test/Makefile.am @@ -10,7 +10,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/test-core \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/engine/test-core \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/backend/sql \ -DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \ -DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \ @@ -23,7 +22,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \ ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \ ${top_builddir}/lib/libc/libc-missing.la @@ -31,7 +29,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \ GNC_TEST_DEPS = \ --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ diff --git a/src/backend/dbi/test/test-backend-dbi-basic.cpp b/src/backend/dbi/test/test-backend-dbi-basic.cpp index 1a2eeb557c..179ac82bf4 100644 --- a/src/backend/dbi/test/test-backend-dbi-basic.cpp +++ b/src/backend/dbi/test/test-backend-dbi-basic.cpp @@ -24,7 +24,7 @@ * * \********************************************************************/ -#include +#include extern "C" { diff --git a/src/backend/dbi/test/test-dbi-stuff.cpp b/src/backend/dbi/test/test-dbi-stuff.cpp index 0d0f56ad6c..ac59f9dcba 100644 --- a/src/backend/dbi/test/test-dbi-stuff.cpp +++ b/src/backend/dbi/test/test-dbi-stuff.cpp @@ -38,7 +38,7 @@ extern "C" #include } -#include +#include #include "../gnc-backend-dbi.hpp" G_GNUC_UNUSED static QofLogModule log_module = "test-dbi"; diff --git a/src/backend/sql/CMakeLists.txt b/src/backend/sql/CMakeLists.txt index 771d2b1976..89d06d9c8b 100644 --- a/src/backend/sql/CMakeLists.txt +++ b/src/backend/sql/CMakeLists.txt @@ -69,7 +69,7 @@ ADD_LIBRARY (gnc-backend-sql ${backend_sql_noinst_HEADERS} ) -TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine gnc-qof) +TARGET_LINK_LIBRARIES(gnc-backend-sql gncmod-engine) TARGET_COMPILE_DEFINITIONS (gnc-backend-sql PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.sql\") diff --git a/src/backend/sql/Makefile.am b/src/backend/sql/Makefile.am index 795a018d20..07c26d8db8 100644 --- a/src/backend/sql/Makefile.am +++ b/src/backend/sql/Makefile.am @@ -14,7 +14,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/core-utils\ -I${top_srcdir}/lib/libc\ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} \ ${WARN_CFLAGS} \ @@ -78,8 +77,7 @@ noinst_HEADERS = \ libgnc_backend_sql_la_LIBADD = \ ${GLIB_LIBS} \ ${GUILE_LIBS} \ - ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la + ${top_builddir}/src/engine/libgncmod-engine.la AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\" diff --git a/src/backend/sql/gnc-slots-sql.cpp b/src/backend/sql/gnc-slots-sql.cpp index 395167e553..c563e95635 100644 --- a/src/backend/sql/gnc-slots-sql.cpp +++ b/src/backend/sql/gnc-slots-sql.cpp @@ -49,7 +49,7 @@ extern "C" #include "gnc-sql-column-table-entry.hpp" #include "gnc-slots-sql.h" -#include +#include static QofLogModule log_module = G_LOG_DOMAIN; diff --git a/src/backend/sql/test/CMakeLists.txt b/src/backend/sql/test/CMakeLists.txt index e30d06dc44..545487c87c 100644 --- a/src/backend/sql/test/CMakeLists.txt +++ b/src/backend/sql/test/CMakeLists.txt @@ -2,7 +2,6 @@ SET(BACKEND_SQL_TEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src/backend/sql - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof. ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/test-core ${GLIB2_INCLUDE_DIRS} @@ -10,7 +9,7 @@ SET(BACKEND_SQL_TEST_INCLUDE_DIRS SET(test_backend_sql_SOURCES test-sqlbe.cpp utest-gnc-backend-sql.cpp) -SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine gnc-qof test-core) +SET(BACKEND_SQL_TEST_LIBS gnc-backend-sql gncmod-engine test-core) SET_DIST_LIST(test_backend_sql_DIST ${test_backend_sql_SOURCES} CMakeLists.txt Makefile.am test-column-types.cpp) @@ -23,4 +22,4 @@ GNC_ADD_TEST(test-column-types test-column-types.cpp GNC_ADD_TEST(test-sqlbe "${test_backend_sql_SOURCES}" BACKEND_SQL_TEST_INCLUDE_DIRS BACKEND_SQL_TEST_LIBS ) -TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe) \ No newline at end of file +TARGET_COMPILE_DEFINITIONS(test-sqlbe PRIVATE TESTPROG=test_sqlbe) diff --git a/src/backend/sql/test/Makefile.am b/src/backend/sql/test/Makefile.am index d07c554f7a..8ec28adeb0 100644 --- a/src/backend/sql/test/Makefile.am +++ b/src/backend/sql/test/Makefile.am @@ -15,7 +15,6 @@ TESTS = ${check_PROGRAMS} GNC_TEST_DEPS = \ --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ @@ -32,7 +31,6 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/lib/libc/libc-missing.la AM_CPPFLAGS = \ @@ -44,7 +42,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/engine/test-core \ -I${top_srcdir}/src/backend/sql \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} @@ -58,7 +55,7 @@ test_sqlbe_SOURCES = \ test_sqlbe_LDADD = \ $(top_builddir)/$(MODULEPATH)/libgnc-backend-sql.la \ - $(top_builddir)/src/libqof/qof/libgnc-qof.la \ + $(top_builddir)/src/engine/libgncmod-engine.la \ $(top_builddir)/src/test-core/libtest-core.la \ $(top_builddir)/src/core-utils/libgnc-core-utils.la \ $(GLIB_LIBS) @@ -68,7 +65,7 @@ test_sqlbe_CFLAGS = \ $(DEFAULT_INCLUDES) \ -I$(top_srcdir)/$(MODULEPATH)/ \ -I$(top_srcdir)/src/backend/dbi/ \ - -I$(top_srcdir)/src/libqof/qof/ \ + -I$(top_srcdir)/src/engine/ \ -I$(top_srcdir)/src/test-core/ \ $(GLIB_CFLAGS) diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am index 9362f4d3e8..eb58ca3c3f 100644 --- a/src/backend/xml/Makefile.am +++ b/src/backend/xml/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/lib/libc\ - -I${top_srcdir}/src/libqof/qof \ -I$(top_srcdir)/src \ ${LIBXML2_CFLAGS} \ ${GLIB_CFLAGS} \ @@ -92,8 +91,7 @@ libgnc_backend_xml_utils_la_LIBADD = \ ${LIBXML2_LIBS} \ ${ZLIB_LIBS} \ ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la + ${top_builddir}/src/core-utils/libgnc-core-utils.la libgncmod_backend_xml_la_LDFLAGS = -module -avoid-version libgncmod_backend_xml_la_LIBADD = \ @@ -102,8 +100,7 @@ libgncmod_backend_xml_la_LIBADD = \ ${ZLIB_LIBS} \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - libgnc-backend-xml-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la + libgnc-backend-xml-utils.la AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\" diff --git a/src/backend/xml/io-gncxml-v1.cpp b/src/backend/xml/io-gncxml-v1.cpp index bec03b9b80..14b1b32fb8 100644 --- a/src/backend/xml/io-gncxml-v1.cpp +++ b/src/backend/xml/io-gncxml-v1.cpp @@ -53,7 +53,7 @@ extern "C" #include "sixtp-parsers.h" #include "sixtp-utils.h" -#include +#include /* from Transaction-xml-parser-v1.c */ static sixtp* gnc_transaction_parser_new (void); diff --git a/src/backend/xml/sixtp-dom-generators.cpp b/src/backend/xml/sixtp-dom-generators.cpp index d659da5dfa..87e28b0791 100644 --- a/src/backend/xml/sixtp-dom-generators.cpp +++ b/src/backend/xml/sixtp-dom-generators.cpp @@ -34,7 +34,7 @@ extern "C" #include "sixtp-dom-generators.h" #include "sixtp-utils.h" -#include +#include static QofLogModule log_module = GNC_MOD_IO; diff --git a/src/backend/xml/sixtp-dom-parsers.cpp b/src/backend/xml/sixtp-dom-parsers.cpp index 0b15296852..94e3322247 100644 --- a/src/backend/xml/sixtp-dom-parsers.cpp +++ b/src/backend/xml/sixtp-dom-parsers.cpp @@ -33,7 +33,7 @@ extern "C" #include "sixtp-utils.h" #include "sixtp-dom-parsers.h" -#include +#include static QofLogModule log_module = GNC_MOD_IO; diff --git a/src/backend/xml/test/CMakeLists.txt b/src/backend/xml/test/CMakeLists.txt index c051da7867..62ccb7153c 100644 --- a/src/backend/xml/test/CMakeLists.txt +++ b/src/backend/xml/test/CMakeLists.txt @@ -6,7 +6,6 @@ SET(XML_TEST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/backend/xml/test ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/engine/test-core - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src/test-core # for unittest-support.h ${GLIB2_INCLUDE_DIRS} @@ -15,7 +14,7 @@ SET(XML_TEST_INCLUDE_DIRS ) -SET(XML_TEST_LIBS gncmod-engine gnc-qof gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz) +SET(XML_TEST_LIBS gncmod-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lz) FUNCTION(ADD_XML_TEST _TARGET _SOURCE_FILES) GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" XML_TEST_INCLUDE_DIRS XML_TEST_LIBS ${ARGN}) diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am index 428f4ed2d1..7bebc33eaf 100644 --- a/src/backend/xml/test/Makefile.am +++ b/src/backend/xml/test/Makefile.am @@ -211,7 +211,6 @@ GNC_TEST_DEPS = \ --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ @@ -250,7 +249,6 @@ check_PROGRAMS = \ noinst_HEADERS = test-file-stuff.h LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/test-core/libtest-core.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ @@ -270,7 +268,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/engine/test-core \ -I${top_srcdir}/src/backend/xml \ - -I${top_srcdir}/src/libqof/qof \ -DU_SHOW_CPLUSPLUS_API=0 \ ${LIBXML2_CFLAGS} \ ${GLIB_CFLAGS} \ diff --git a/src/backend/xml/test/test-file-stuff.cpp b/src/backend/xml/test/test-file-stuff.cpp index 8e99a07946..e0f2f741d1 100644 --- a/src/backend/xml/test/test-file-stuff.cpp +++ b/src/backend/xml/test/test-file-stuff.cpp @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA * 02110-1301, USA. */ -#include +#include extern "C" { diff --git a/src/backend/xml/test/test-kvp-frames.cpp b/src/backend/xml/test/test-kvp-frames.cpp index 2a483d12f7..1b8e39fcce 100644 --- a/src/backend/xml/test/test-kvp-frames.cpp +++ b/src/backend/xml/test/test-kvp-frames.cpp @@ -1,4 +1,4 @@ -#include +#include extern "C" { diff --git a/src/bin/CMakeLists.txt b/src/bin/CMakeLists.txt index bd661ce4e9..33332c2de5 100644 --- a/src/bin/CMakeLists.txt +++ b/src/bin/CMakeLists.txt @@ -24,7 +24,7 @@ TARGET_COMPILE_DEFINITIONS(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\") TARGET_LINK_LIBRARIES (gnucash gncmod-ledger-core gncmod-report-gnome gnc-gnome gncmod-gnome-utils gncmod-app-utils - gncmod-engine gnc-module gnc-core-utils gnc-qof gncmod-report-system + gncmod-engine gnc-module gnc-core-utils gncmod-report-system ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS} ) diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 11f207063f..e6e254cb26 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -18,7 +18,6 @@ AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \ -I${top_builddir}/src \ -I${top_builddir}/src/core-utils \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/report/report-system \ ${GUILE_CFLAGS} \ ${GTK_MAC_CFLAGS} @@ -55,7 +54,6 @@ gnucash_LDADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/report/report-system/libgncmod-report-system.la \ ${GUILE_LIBS} \ ${GLIB_LIBS} \ diff --git a/src/bin/overrides/gnucash-build-env.in b/src/bin/overrides/gnucash-build-env.in index 58f6112636..ec2e5dfd9a 100644 --- a/src/bin/overrides/gnucash-build-env.in +++ b/src/bin/overrides/gnucash-build-env.in @@ -66,7 +66,6 @@ eval `${top_srcdir}/src/gnc-test-env.pl \ --guile-load-dir ${top_builddir}/src/report/stylesheets \ --guile-load-dir ${top_builddir}/src/import-export/qif-import \ --library-dir ${top_builddir}/src/test-core \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/calculation \ --library-dir ${top_builddir}/src/app-utils \ diff --git a/src/cmake_modules/GncAddSwigCommand.cmake b/src/cmake_modules/GncAddSwigCommand.cmake index bfbe846c62..cffd61195f 100644 --- a/src/cmake_modules/GncAddSwigCommand.cmake +++ b/src/cmake_modules/GncAddSwigCommand.cmake @@ -9,7 +9,7 @@ MACRO (GNC_ADD_SWIG_COMMAND _target _output _input) ADD_CUSTOM_COMMAND ( OUTPUT ${_output} DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN} -COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/src/libqof/qof -I${CMAKE_SOURCE_DIR}/src -o ${_output} ${_input} +COMMAND ${SWIG_EXECUTABLE} -guile ${SWIG_ARGS} -Linkage module -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src -o ${_output} ${_input} ) ADD_CUSTOM_TARGET(${_target} DEPENDS ${_output}) @@ -22,7 +22,7 @@ MACRO (GNC_ADD_SWIG_PYTHON_COMMAND _target _output _input) ADD_CUSTOM_COMMAND(OUTPUT ${_output} COMMAND ${SWIG_EXECUTABLE} -python -Wall -Werror ${SWIG_ARGS} - -I${CMAKE_SOURCE_DIR}/src/libqof/qof -I${CMAKE_SOURCE_DIR}/src + -I${CMAKE_SOURCE_DIR}/src -I${CMAKE_SOURCE_DIR}/src/engine -I${CMAKE_SOURCE_DIR}/src/app-utils -o ${_output} ${_input} DEPENDS ${_input} ${CMAKE_SOURCE_DIR}/src/base-typemaps.i ${ARGN} diff --git a/src/core-utils/CMakeLists.txt b/src/core-utils/CMakeLists.txt index cd7072ade6..eefe503cf3 100644 --- a/src/core-utils/CMakeLists.txt +++ b/src/core-utils/CMakeLists.txt @@ -117,11 +117,12 @@ SET(core_utils_noinst_HEADERS ) SET(core_utils_ALL_SOURCES ${core_utils_SOURCES} ${core_utils_noinst_HEADERS}) -SET(core_utils_ALL_LIBRARIES gnc-qof ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GTK_MAC_LDFLAGS}) +SET(core_utils_ALL_LIBRARIES ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GTK_MAC_LDFLAGS}) SET(core_utils_ALL_INCLUDES + ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/src/libqof/qof ${CMAKE_CURRENT_SOURCE_DIR} + ${GLIB2_INCLUDE_DIRS} ${GUILE_INCLUDE_DIRS} ${GTK_MAC_INCLUDE_DIRS}) diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index 86c2b429b1..c827c4abcc 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -1,4 +1,6 @@ -SUBDIRS = . test +# No SUBDIR variable here... +# The 'test' subdir is added via src/Makefile to handle +# it's dependency on src/engine lib_LTLIBRARIES = libgnc-core-utils.la @@ -19,8 +21,7 @@ libgnc_core_utils_la_LIBADD = \ ${GUILE_LIBS} \ ${GLIB_LIBS} \ ${BINRELOC_LIBS} \ - ${GTK_MAC_LIBS} \ - ${QOF_LIBS} + ${GTK_MAC_LIBS} noinst_HEADERS = \ @@ -56,8 +57,6 @@ AM_CPPFLAGS = \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} \ ${GTK_MAC_CFLAGS} \ - ${QOF_CFLAGS} \ - -I${top_srcdir}/src/libqof/qof \ -I${top_builddir}/src \ -I${top_srcdir}/src @@ -84,9 +83,7 @@ libgnc_core_utils_python_la_LIBADD = \ libgnc_core_utils_python_la_CPPFLAGS = \ ${GLIB_CFLAGS} \ ${GTK_MAC_CFLAGS} \ - ${QOF_CFLAGS} \ ${PYTHON_CPPFLAGS} \ - -I${top_srcdir}/src/libqof/qof \ -I${top_builddir}/src \ -I${top_srcdir}/src @@ -108,8 +105,7 @@ endif if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ - --library-dir ${top_builddir}/src/core-utils \ - --library-dir ${top_builddir}/src/libqof/qof + --library-dir ${top_builddir}/src/core-utils %.go : %.scm .scm-links $(lib_LTLIBRARIES) GNC_UNINSTALLED=yes \ diff --git a/src/core-utils/gnc-filepath-utils.c b/src/core-utils/gnc-filepath-utils.c index 041e940db3..477cfb0d5e 100644 --- a/src/core-utils/gnc-filepath-utils.c +++ b/src/core-utils/gnc-filepath-utils.c @@ -50,17 +50,12 @@ #include "gnc-path.h" #include "gnc-filepath-utils.h" -#include "libqof/qof/qof.h" #ifdef _MSC_VER #include #define PATH_MAX MAXPATHLEN #endif -/* This static indicates the debugging module that this .o belongs to. */ -static QofLogModule log_module = G_LOG_DOMAIN; - - /** * Scrubs a filename by changing "strange" chars (e.g. those that are not * valid in a win32 file name) to "_". @@ -220,7 +215,7 @@ gnc_path_find_localized_html_file_internal (const gchar * file_name) for (i = 0; dirs[i]; i++) { full_path = g_build_filename (dirs[i], file_name, (gchar *)NULL); - DEBUG ("Checking for existence of %s", full_path); + g_debug ("Checking for existence of %s", full_path); full_path = check_path_return_if_valid (full_path); if (full_path != NULL) return full_path; diff --git a/src/core-utils/gnc-gkeyfile-utils.c b/src/core-utils/gnc-gkeyfile-utils.c index f58a8eb99b..5767a9ef10 100644 --- a/src/core-utils/gnc-gkeyfile-utils.c +++ b/src/core-utils/gnc-gkeyfile-utils.c @@ -61,10 +61,6 @@ #endif #include "gnc-gkeyfile-utils.h" -#include "qof.h" - -/* This static indicates the debugging module that this .o belongs to. */ -static QofLogModule log_module = G_LOG_DOMAIN; GKeyFile * gnc_key_file_load_from_file (const gchar *filename, @@ -118,7 +114,7 @@ gnc_key_file_save_to_file (const gchar *filename, g_return_val_if_fail(*error == NULL, FALSE); contents = g_key_file_to_data(key_file, NULL, NULL); - DEBUG("Keyfile data:\n%s", contents); + g_debug ("Keyfile data:\n%s", contents); length = strlen(contents); fd = g_open(filename, O_WRONLY | O_CREAT | O_TRUNC, 0666); if (fd == -1) diff --git a/src/core-utils/gnc-guile-utils.c b/src/core-utils/gnc-guile-utils.c index e9c2ab9341..bbb71eac6b 100644 --- a/src/core-utils/gnc-guile-utils.c +++ b/src/core-utils/gnc-guile-utils.c @@ -23,13 +23,9 @@ #include "swig-runtime.h" #include -#include "qof.h" #include "gnc-guile-utils.h" #include "guile-mappings.h" -/* This static indicates the debugging module this .o belongs to. */ -static QofLogModule log_module = G_LOG_DOMAIN; - /********************************************************************\ * gnc_scm_to_utf8_string * @@ -54,7 +50,7 @@ gchar *gnc_scm_to_utf8_string(SCM scm_string) } /* Unable to extract string from the symbol...*/ - PERR("bad value\n"); + g_error ("bad value\n"); return NULL; } @@ -86,7 +82,7 @@ gchar *gnc_scm_to_locale_string(SCM scm_string) } /* Unable to extract string from the symbol...*/ - PERR("bad value\n"); + g_error ("bad value\n"); return NULL; } @@ -117,7 +113,7 @@ gnc_scm_symbol_to_locale_string(SCM symbol_value) } /* Unable to extract string from the symbol...*/ - PERR("bad value\n"); + g_error ("bad value\n"); return NULL; } @@ -146,12 +142,12 @@ gnc_scm_call_1_to_string(SCM func, SCM arg) } else { - PERR("bad value\n"); + g_error ("bad value\n"); } } else { - PERR("not a procedure\n"); + g_error ("not a procedure\n"); } return NULL; @@ -180,7 +176,7 @@ gnc_scm_call_1_symbol_to_string(SCM func, SCM arg) } else { - PERR("not a procedure\n"); + g_error ("not a procedure\n"); } return NULL; @@ -209,12 +205,12 @@ gnc_scm_call_1_to_procedure(SCM func, SCM arg) return value; else { - PERR("bad value\n"); + g_error ("bad value\n"); } } else { - PERR("not a procedure\n"); + g_error ("not a procedure\n"); } return SCM_UNDEFINED; @@ -243,12 +239,12 @@ gnc_scm_call_1_to_list(SCM func, SCM arg) return value; else { - PERR("bad value\n"); + g_error ("bad value\n"); } } else { - PERR("not a procedure\n"); + g_error ("not a procedure\n"); } return SCM_UNDEFINED; @@ -277,12 +273,12 @@ gnc_scm_call_1_to_vector(SCM func, SCM arg) return value; else { - PERR("bad value\n"); + g_error ("bad value\n"); } } else { - PERR("not a procedure\n"); + g_error ("not a procedure\n"); } return SCM_UNDEFINED; diff --git a/src/core-utils/gnc-prefs.c b/src/core-utils/gnc-prefs.c index 84aeb51f99..27d3be96ef 100644 --- a/src/core-utils/gnc-prefs.c +++ b/src/core-utils/gnc-prefs.c @@ -22,11 +22,11 @@ */ #include +#include #include "config.h" #include "gnc-prefs.h" #include "gnc-prefs-p.h" #include "gnc-version.h" -#include "libqof/qof/qof.h" static gchar *namespace_regexp = NULL; static gboolean is_debugging = FALSE; @@ -37,9 +37,6 @@ static gint file_retention_days = 30; // This is also the default in the pre PrefsBackend *prefsbackend = NULL; -/* This static indicates the debugging module that this .o belongs to. */ -static QofLogModule log_module = G_LOG_DOMAIN; - const gchar * gnc_prefs_get_namespace_regexp(void) { @@ -130,18 +127,11 @@ gulong gnc_prefs_register_cb (const char *group, gpointer func, gpointer user_data) { - ENTER("group %s; pref_name %s, prefsbackend->register_cb %p", group, pref_name, - prefsbackend ? prefsbackend->register_cb : NULL); if (prefsbackend && prefsbackend->register_cb) - { - LEAVE(""); return (prefsbackend->register_cb) (group, pref_name, func, user_data); - } else - { - LEAVE("no backend loaded, or the backend doesn't define register_cb, returning 0"); + g_warning ("no backend loaded, or the backend doesn't define register_cb, returning 0"); return 0; - } } diff --git a/src/core-utils/test/CMakeLists.txt b/src/core-utils/test/CMakeLists.txt index cbb07e4568..ed51fbe30c 100644 --- a/src/core-utils/test/CMakeLists.txt +++ b/src/core-utils/test/CMakeLists.txt @@ -4,10 +4,9 @@ SET(CORE_UTILS_TEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src/core-utils ${CMAKE_SOURCE_DIR}/src/test-core - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${GLIB2_INCLUDE_DIRS} ) -SET(CORE_UTILS_TEST_LIBS gnc-core-utils gnc-qof test-core) +SET(CORE_UTILS_TEST_LIBS gnc-core-utils test-core) MACRO(ADD_CORE_UTILS_TEST _TARGET _SOURCE_FILES) GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" CORE_UTILS_TEST_INCLUDE_DIRS CORE_UTILS_TEST_LIBS) diff --git a/src/core-utils/test/Makefile.am b/src/core-utils/test/Makefile.am index 75d6067024..a097569391 100644 --- a/src/core-utils/test/Makefile.am +++ b/src/core-utils/test/Makefile.am @@ -1,17 +1,18 @@ include $(top_srcdir)/test-templates/Makefile.decl MODULEPATH = src/core-utils +# We add src/engine here, just to load qof.h, which +# is pulled in via test-core AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/src \ -I${top_srcdir}/src/test-core \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/core-utils \ + -I${top_srcdir}/src/engine \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ../libgnc-core-utils.la \ ${top_builddir}/src/test-core/libtest-core.la \ ${GLIB_LIBS} @@ -25,7 +26,6 @@ TESTS = \ test-gnc-glib-utils GNC_TEST_DEPS = \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils TESTS_ENVIRONMENT = \ @@ -39,7 +39,6 @@ test_gnc_glib_utils_SOURCES = \ test-gnc-glib-utils.c test_gnc_glib_utils_LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/test-core/libtest-core.la \ $(GLIB_LIBS) diff --git a/src/core-utils/test/test-resolve-file-path.c b/src/core-utils/test/test-resolve-file-path.c index 707f52210a..b79d1360d3 100644 --- a/src/core-utils/test/test-resolve-file-path.c +++ b/src/core-utils/test/test-resolve-file-path.c @@ -26,7 +26,6 @@ #include #include -#include "qof.h" #include "test-stuff.h" #include "gnc-filepath-utils.h" @@ -59,8 +58,6 @@ main(int argc, char **argv) { int i; - qof_init(); - for (i = 0; strs[i].input != NULL; i++) { char *daout; diff --git a/src/doc/doxygen.cfg.in b/src/doc/doxygen.cfg.in index 647de2fa60..b2772a3e36 100644 --- a/src/doc/doxygen.cfg.in +++ b/src/doc/doxygen.cfg.in @@ -653,7 +653,7 @@ WARN_LOGFILE = doxygen.log # with spaces. INPUT = @-top_srcdir-@/src \ - @-top_srcdir-@/src/libqof/ + @-top_srcdir-@/src/engine/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/src/engine/CMakeLists.txt b/src/engine/CMakeLists.txt index 9029f3283c..b325b02c5c 100644 --- a/src/engine/CMakeLists.txt +++ b/src/engine/CMakeLists.txt @@ -10,11 +10,21 @@ SET(engine_noinst_HEADERS SX-book.h SX-ttinfo.h TransactionP.h + gnc-backend-prov.hpp + gnc-date-p.h gnc-hooks-scm.h + gnc-int128.hpp gnc-lot.h gnc-lot-p.h gnc-pricedb-p.h policy-p.h + qofbook-p.h + qofclass-p.h + qofevent-p.h + qofobject-p.h + qofquery-p.h + qofquerycore-p.h + qofsession.hpp ) SET (engine_HEADERS @@ -37,17 +47,48 @@ SET (engine_HEADERS engine-helpers.h engine-helpers-guile.h glib-helpers.h + gnc-aqbanking-templates.h gnc-budget.h gnc-commodity.h + gnc-date.h + gnc-datetime.hpp gnc-engine.h gnc-event.h gnc-features.h gnc-hooks.h + gnc-numeric.h + gnc-numeric.hpp gnc-pricedb.h + gnc-rational.hpp + gnc-rational-rounding.hpp gnc-session.h + gnc-timezone.hpp gnc-uri-utils.h + guid.h + kvp-frame.hpp kvp-scm.h + kvp-value.hpp policy.h + qof.h + qof-backend.hpp + qofbackend.h + qofbook.h + qofbookslots.h + qofchoice.h + qofclass.h + qofevent.h + qofid-p.h + qofid.h + qofinstance-p.h + qofinstance.h + qoflog.h + qofobject.h + qofquery.h + qofquerycore.h + qofsession.h + qofutil.h + qof-gobject.h + qof-string-cache.h gncAddress.h gncAddressP.h gncBillTerm.h @@ -109,20 +150,28 @@ SET (engine_SOURCES Transaction.c cap-gains.c cashobjects.c + gnc-aqbanking-templates.cpp gnc-budget.c gnc-commodity.c + gnc-date.cpp + gnc-datetime.cpp gnc-engine.c gnc-event.c gnc-features.c gnc-hooks.c + gnc-int128.cpp gnc-lot.c + gnc-numeric.cpp gnc-pricedb.c + gnc-rational.cpp gnc-session.c + gnc-timezone.cpp gnc-uri-utils.c gncmod-engine.c kvp-scm.cpp engine-helpers.c glib-helpers.c + guid.cpp policy.c gncAddress.c gncBillTerm.c @@ -138,6 +187,22 @@ SET (engine_SOURCES gncOwner.c gncTaxTable.c gncVendor.c + kvp-frame.cpp + kvp-value.cpp + qof-backend.cpp + qofbook.cpp + qofchoice.cpp + qofclass.cpp + qofevent.cpp + qofid.cpp + qofinstance.cpp + qoflog.cpp + qofobject.cpp + qofquery.cpp + qofquerycore.cpp + qofsession.cpp + qofutil.cpp + qof-string-cache.cpp ) # Add dependency on config.h @@ -158,13 +223,20 @@ ADD_LIBRARY (gncmod-engine ${engine_noinst_HEADERS} ) -TARGET_LINK_LIBRARIES(gncmod-engine gnc-core-utils gnc-module gnc-qof ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-engine gnc-core-utils gnc-module ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS} ${GUILE_LDFLAGS}) TARGET_COMPILE_DEFINITIONS (gncmod-engine PRIVATE -DG_LOG_DOMAIN=\"gnc.engine\") TARGET_INCLUDE_DIRECTORIES (gncmod-engine PRIVATE ${CMAKE_CURRENT_BINARY_DIR} # for iso-4217-currencies.c - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/src # for config.h + ${CMAKE_SOURCE_DIR}/src # for platform.h + ${GLIB2_INCLUDE_DIRS} + ${LIBINTL_INCLUDE_PATH} + ${REGEX_INCLUDE_PATH} + ${CMAKE_SOURCE_DIR}/lib/libc # for strptime.h ) INSTALL(TARGETS gncmod-engine @@ -174,6 +246,16 @@ INSTALL(TARGETS gncmod-engine INSTALL(FILES ${engine_HEADERS} DESTINATION include/gnucash) +SET(qof_test_HEADERS +kvp-frame.hpp +qofbook.h +qofinstance.h +qofobject.h +qofsession.h +) + +INSTALL(FILES ${qof_test_HEADERS} DESTINATION libexec/gnucash/src/engine/test) + # Scheme SET (engine_SCHEME_0 @@ -194,6 +276,11 @@ IF (NOT WIN32) LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi-link) ENDIF(WITH_SQL) ELSE (NOT WIN32) + ADD_DEFINITIONS (-DOS_WIN32) + SET (engine_SOURCES ${engine_SOURCES} + qof-win32.cpp + ../../lib/libc/strptime.c + ) SET(BACKEND_DEPENDS gncmod-backend-xml) IF (WITH_SQL) LIST(APPEND BACKEND_DEPENDS gncmod-backend-dbi) diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index f533b76560..c0ba0b59b0 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -1,4 +1,7 @@ -SUBDIRS = . test-core test +# Note the test subdirectory is added in src/Makefile.am rather +# than here. This is because we need it to build after src/test-core +# but that directory requires src/engine to be built already... +SUBDIRS = . test-core pkglib_LTLIBRARIES = libgncmod-engine.la @@ -8,7 +11,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_builddir}/src \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} \ $(BOOST_CPPFLAGS) @@ -30,19 +32,29 @@ libgncmod_engine_la_SOURCES = \ Transaction.c \ cap-gains.c \ cashobjects.c \ + gnc-aqbanking-templates.cpp \ gnc-budget.c \ gnc-commodity.c \ + gnc-date.cpp \ + gnc-datetime.cpp \ gnc-engine.c \ gnc-event.c \ gnc-features.c \ gnc-hooks.c \ + gnc-int128.cpp \ gnc-lot.c \ + gnc-numeric.cpp \ gnc-pricedb.c \ + gnc-rational.cpp \ gnc-session.c \ + gnc-timezone.cpp \ gnc-uri-utils.c \ gncmod-engine.c \ + guid.cpp \ swig-engine.c \ + kvp-frame.cpp \ kvp-scm.cpp \ + kvp-value.cpp \ engine-helpers.c \ glib-helpers.c \ policy.c \ @@ -59,7 +71,27 @@ libgncmod_engine_la_SOURCES = \ gncOwner.c \ gncTaxTable.c \ gncIDSearch.c \ - gncVendor.c + gncVendor.c \ + qof-backend.cpp \ + qofbook.cpp \ + qofchoice.cpp \ + qofclass.cpp \ + qofevent.cpp \ + qofid.cpp \ + qofinstance.cpp \ + qoflog.cpp \ + qofobject.cpp \ + qofquery.cpp \ + qofquerycore.cpp \ + qofsession.cpp \ + qof-string-cache.cpp \ + qofutil.cpp + +if OS_WIN32 +libgncmod_engine_la_SOURCES += qof-win32.cpp +else +WIN32_EXTRA_DIST = qof-win32.cpp +endif EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c @@ -84,16 +116,28 @@ gncinclude_HEADERS = \ engine-helpers.h \ engine-helpers-guile.h \ glib-helpers.h \ + gnc-aqbanking-templates.h \ gnc-budget.h \ gnc-commodity.h \ + gnc-date-p.h \ + gnc-date.h \ + gnc-datetime.hpp \ gnc-engine.h \ gnc-event.h \ gnc-features.h \ gnc-hooks.h \ + gnc-numeric.h \ + gnc-numeric.hpp \ gnc-pricedb.h \ + gnc-rational.hpp \ + gnc-rational-rounding.hpp \ gnc-session.h \ + gnc-timezone.hpp \ gnc-uri-utils.h \ + guid.h \ + kvp-frame.hpp \ kvp-scm.h \ + kvp-value.hpp \ policy.h \ gncAddress.h \ gncAddressP.h \ @@ -119,7 +163,28 @@ gncinclude_HEADERS = \ gncTaxTableP.h \ gncIDSearch.h \ gncVendor.h \ - gncVendorP.h + gncVendorP.h \ + qof.h \ + qof-backend.hpp \ + qofbackend.h \ + qofbook.h \ + qofbookslots.h \ + qofchoice.h \ + qofclass.h \ + qofevent.h \ + qofid-p.h \ + qofid.h \ + qofinstance-p.h \ + qofinstance.h \ + qoflog.h \ + qofobject.h \ + qofquery.h \ + qofquerycore.h \ + qofsession.h \ + qofsession.hpp \ + qof-string-cache.h \ + qofutil.h \ + qof-gobject.h noinst_HEADERS = \ AccountP.h \ @@ -128,11 +193,18 @@ noinst_HEADERS = \ SX-book.h \ SX-ttinfo.h \ TransactionP.h \ + gnc-backend-prov.hpp \ gnc-hooks-scm.h \ gnc-lot.h \ gnc-lot-p.h \ gnc-pricedb-p.h \ - policy-p.h + policy-p.h \ + qofclass-p.h \ + qofevent-p.h \ + gnc-int128.hpp \ + qofobject-p.h \ + qofquery-p.h \ + qofquerycore-p.h libgncmod_engine_la_LDFLAGS = -avoid-version if PLATFORM_WIN32 @@ -146,10 +218,10 @@ endif libgncmod_engine_la_LIBADD = \ ../gnc-module/libgnc-module.la \ ../core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GUILE_LIBS} \ ${REGEX_LIBS} \ ${GLIB_LIBS} \ + ${BOOST_LDFLAGS} -lboost_regex \ ${top_builddir}/lib/libc/libc-missing.la gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash @@ -176,7 +248,8 @@ EXTRA_DIST = \ business-core.i \ ${gncscmmod_DATA} \ ${gncscm_DATA} \ - CMakeLists.txt + CMakeLists.txt \ + ${WIN32_EXTRA_DIST} if GNUCASH_SEPARATE_BUILDDIR #For executing test cases @@ -204,8 +277,7 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/gnc-module \ - --library-dir ${top_builddir}/src/core-utils \ - --library-dir ${top_builddir}/src/libqof/qof + --library-dir ${top_builddir}/src/core-utils %.go : %.scm .scm-links $(pkglib_LTLIBRARIES) GNC_UNINSTALLED=yes \ @@ -224,18 +296,10 @@ noinst_DATA = .scm-links if BUILDING_FROM_VCS -# The generated file depends on various libqof headers. Out of -# laziness I only include a few here - more might be needed -# subsequently. -QOFHEADERS = \ - $(top_srcdir)/src/libqof/qof/qofbook.h \ - $(top_srcdir)/src/libqof/qof/qofbookslots.h - swig-engine.c: engine.i $(top_srcdir)/src/base-typemaps.i \ - $(QOFHEADERS) \ $(gncinclude_HEADERS) $(noinst_HEADERS) $(SWIG) -guile $(SWIG_ARGS) -Linkage module \ - -I${top_srcdir}/src/libqof/qof -I${top_srcdir}/src -o $@ $< + -I${top_srcdir}/src -o $@ $< if ! OS_WIN32 if ! SWIG_DIST_FAIL if ! `grep "define scm_from_utf8_string" $@ > /dev/null 2>&1`; then \ diff --git a/src/engine/business-core.i b/src/engine/business-core.i index f1582bccb9..5aee7a50c8 100644 --- a/src/engine/business-core.i +++ b/src/engine/business-core.i @@ -129,7 +129,7 @@ GLIST_HELPER_INOUT(OwnerList, SWIGTYPE_p__gncOwner); #endif /* Import query bindings for the below invoice query functions (but * don't generate bindings for them). */ -%import +%import #define URL_TYPE_CUSTOMER GNC_ID_CUSTOMER #define URL_TYPE_VENDOR GNC_ID_VENDOR diff --git a/src/libqof/qof/gnc-aqbanking-templates.cpp b/src/engine/gnc-aqbanking-templates.cpp similarity index 99% rename from src/libqof/qof/gnc-aqbanking-templates.cpp rename to src/engine/gnc-aqbanking-templates.cpp index 54f9b6f91b..eb8d6e7390 100644 --- a/src/libqof/qof/gnc-aqbanking-templates.cpp +++ b/src/engine/gnc-aqbanking-templates.cpp @@ -33,7 +33,7 @@ extern "C" #include "qofinstance-p.h" } -#include "kvp_frame.hpp" +#include "kvp-frame.hpp" #include "gnc-rational.hpp" namespace { diff --git a/src/libqof/qof/gnc-aqbanking-templates.h b/src/engine/gnc-aqbanking-templates.h similarity index 100% rename from src/libqof/qof/gnc-aqbanking-templates.h rename to src/engine/gnc-aqbanking-templates.h diff --git a/src/libqof/qof/gnc-backend-prov.hpp b/src/engine/gnc-backend-prov.hpp similarity index 100% rename from src/libqof/qof/gnc-backend-prov.hpp rename to src/engine/gnc-backend-prov.hpp diff --git a/src/libqof/qof/gnc-date-p.h b/src/engine/gnc-date-p.h similarity index 100% rename from src/libqof/qof/gnc-date-p.h rename to src/engine/gnc-date-p.h diff --git a/src/libqof/qof/gnc-date.cpp b/src/engine/gnc-date.cpp similarity index 100% rename from src/libqof/qof/gnc-date.cpp rename to src/engine/gnc-date.cpp diff --git a/src/libqof/qof/gnc-date.h b/src/engine/gnc-date.h similarity index 100% rename from src/libqof/qof/gnc-date.h rename to src/engine/gnc-date.h diff --git a/src/libqof/qof/gnc-datetime.cpp b/src/engine/gnc-datetime.cpp similarity index 100% rename from src/libqof/qof/gnc-datetime.cpp rename to src/engine/gnc-datetime.cpp diff --git a/src/libqof/qof/gnc-datetime.hpp b/src/engine/gnc-datetime.hpp similarity index 100% rename from src/libqof/qof/gnc-datetime.hpp rename to src/engine/gnc-datetime.hpp diff --git a/src/engine/gnc-features.c b/src/engine/gnc-features.c index 9189862333..9f97eae6ca 100644 --- a/src/engine/gnc-features.c +++ b/src/engine/gnc-features.c @@ -29,7 +29,7 @@ #include #include -#include "libqof/qof/qof.h" +#include "qof.h" #include "gnc-features.h" typedef struct diff --git a/src/engine/gnc-features.h b/src/engine/gnc-features.h index 88c860dcdb..39f1c03233 100644 --- a/src/engine/gnc-features.h +++ b/src/engine/gnc-features.h @@ -36,7 +36,7 @@ #ifndef GNC_FEATURES_H #define GNC_FEATURES_H -#include "libqof/qof/qof.h" +#include "qof.h" /** @name Defined features @{ diff --git a/src/libqof/qof/gnc-int128.cpp b/src/engine/gnc-int128.cpp similarity index 100% rename from src/libqof/qof/gnc-int128.cpp rename to src/engine/gnc-int128.cpp diff --git a/src/libqof/qof/gnc-int128.hpp b/src/engine/gnc-int128.hpp similarity index 100% rename from src/libqof/qof/gnc-int128.hpp rename to src/engine/gnc-int128.hpp diff --git a/src/libqof/qof/gnc-numeric.cpp b/src/engine/gnc-numeric.cpp similarity index 100% rename from src/libqof/qof/gnc-numeric.cpp rename to src/engine/gnc-numeric.cpp diff --git a/src/libqof/qof/gnc-numeric.h b/src/engine/gnc-numeric.h similarity index 100% rename from src/libqof/qof/gnc-numeric.h rename to src/engine/gnc-numeric.h diff --git a/src/libqof/qof/gnc-numeric.hpp b/src/engine/gnc-numeric.hpp similarity index 100% rename from src/libqof/qof/gnc-numeric.hpp rename to src/engine/gnc-numeric.hpp diff --git a/src/libqof/qof/gnc-rational-rounding.hpp b/src/engine/gnc-rational-rounding.hpp similarity index 100% rename from src/libqof/qof/gnc-rational-rounding.hpp rename to src/engine/gnc-rational-rounding.hpp diff --git a/src/libqof/qof/gnc-rational.cpp b/src/engine/gnc-rational.cpp similarity index 100% rename from src/libqof/qof/gnc-rational.cpp rename to src/engine/gnc-rational.cpp diff --git a/src/libqof/qof/gnc-rational.hpp b/src/engine/gnc-rational.hpp similarity index 100% rename from src/libqof/qof/gnc-rational.hpp rename to src/engine/gnc-rational.hpp diff --git a/src/libqof/qof/gnc-timezone.cpp b/src/engine/gnc-timezone.cpp similarity index 100% rename from src/libqof/qof/gnc-timezone.cpp rename to src/engine/gnc-timezone.cpp diff --git a/src/libqof/qof/gnc-timezone.hpp b/src/engine/gnc-timezone.hpp similarity index 100% rename from src/libqof/qof/gnc-timezone.hpp rename to src/engine/gnc-timezone.hpp diff --git a/src/libqof/qof/guid.cpp b/src/engine/guid.cpp similarity index 100% rename from src/libqof/qof/guid.cpp rename to src/engine/guid.cpp diff --git a/src/libqof/qof/guid.h b/src/engine/guid.h similarity index 100% rename from src/libqof/qof/guid.h rename to src/engine/guid.h diff --git a/src/libqof/qof/guid.hpp b/src/engine/guid.hpp similarity index 100% rename from src/libqof/qof/guid.hpp rename to src/engine/guid.hpp diff --git a/src/libqof/qof/kvp_frame.cpp b/src/engine/kvp-frame.cpp similarity index 99% rename from src/libqof/qof/kvp_frame.cpp rename to src/engine/kvp-frame.cpp index 5a5b6bec53..79c2db3de5 100644 --- a/src/libqof/qof/kvp_frame.cpp +++ b/src/engine/kvp-frame.cpp @@ -33,7 +33,7 @@ extern "C" } #include "kvp-value.hpp" -#include "kvp_frame.hpp" +#include "kvp-frame.hpp" #include #include #include diff --git a/src/libqof/qof/kvp_frame.hpp b/src/engine/kvp-frame.hpp similarity index 100% rename from src/libqof/qof/kvp_frame.hpp rename to src/engine/kvp-frame.hpp diff --git a/src/engine/kvp-scm.cpp b/src/engine/kvp-scm.cpp index 9f693192be..e8b1223460 100644 --- a/src/engine/kvp-scm.cpp +++ b/src/engine/kvp-scm.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include extern "C" diff --git a/src/libqof/qof/kvp-value.cpp b/src/engine/kvp-value.cpp similarity index 99% rename from src/libqof/qof/kvp-value.cpp rename to src/engine/kvp-value.cpp index a6712848a1..277cca034c 100644 --- a/src/libqof/qof/kvp-value.cpp +++ b/src/engine/kvp-value.cpp @@ -22,7 +22,7 @@ \********************************************************************/ #include "kvp-value.hpp" -#include "kvp_frame.hpp" +#include "kvp-frame.hpp" #include #include diff --git a/src/libqof/qof/kvp-value.hpp b/src/engine/kvp-value.hpp similarity index 100% rename from src/libqof/qof/kvp-value.hpp rename to src/engine/kvp-value.hpp diff --git a/src/libqof/qof/qof-backend.cpp b/src/engine/qof-backend.cpp similarity index 100% rename from src/libqof/qof/qof-backend.cpp rename to src/engine/qof-backend.cpp diff --git a/src/libqof/qof/qof-backend.hpp b/src/engine/qof-backend.hpp similarity index 100% rename from src/libqof/qof/qof-backend.hpp rename to src/engine/qof-backend.hpp diff --git a/src/libqof/qof/qof-gobject.h b/src/engine/qof-gobject.h similarity index 100% rename from src/libqof/qof/qof-gobject.h rename to src/engine/qof-gobject.h diff --git a/src/libqof/qof/qof-string-cache.cpp b/src/engine/qof-string-cache.cpp similarity index 100% rename from src/libqof/qof/qof-string-cache.cpp rename to src/engine/qof-string-cache.cpp diff --git a/src/libqof/qof/qof-string-cache.h b/src/engine/qof-string-cache.h similarity index 100% rename from src/libqof/qof/qof-string-cache.h rename to src/engine/qof-string-cache.h diff --git a/src/libqof/qof/qof-win32.cpp b/src/engine/qof-win32.cpp similarity index 100% rename from src/libqof/qof/qof-win32.cpp rename to src/engine/qof-win32.cpp diff --git a/src/libqof/qof/qof.h b/src/engine/qof.h similarity index 100% rename from src/libqof/qof/qof.h rename to src/engine/qof.h diff --git a/src/libqof/qof/qofbackend.h b/src/engine/qofbackend.h similarity index 100% rename from src/libqof/qof/qofbackend.h rename to src/engine/qofbackend.h diff --git a/src/libqof/qof/qofbook-p.h b/src/engine/qofbook-p.h similarity index 100% rename from src/libqof/qof/qofbook-p.h rename to src/engine/qofbook-p.h diff --git a/src/libqof/qof/qofbook.cpp b/src/engine/qofbook.cpp similarity index 99% rename from src/libqof/qof/qofbook.cpp rename to src/engine/qofbook.cpp index 09707d8516..1b2dfd6035 100644 --- a/src/libqof/qof/qofbook.cpp +++ b/src/engine/qofbook.cpp @@ -57,7 +57,7 @@ extern "C" #include "qofid-p.h" #include "qofobject-p.h" #include "qofbookslots.h" -#include "kvp_frame.hpp" +#include "kvp-frame.hpp" static QofLogModule log_module = QOF_MOD_ENGINE; #define AB_KEY "hbci" diff --git a/src/libqof/qof/qofbook.h b/src/engine/qofbook.h similarity index 100% rename from src/libqof/qof/qofbook.h rename to src/engine/qofbook.h diff --git a/src/libqof/qof/qofbookslots.h b/src/engine/qofbookslots.h similarity index 100% rename from src/libqof/qof/qofbookslots.h rename to src/engine/qofbookslots.h diff --git a/src/libqof/qof/qofchoice.cpp b/src/engine/qofchoice.cpp similarity index 100% rename from src/libqof/qof/qofchoice.cpp rename to src/engine/qofchoice.cpp diff --git a/src/libqof/qof/qofchoice.h b/src/engine/qofchoice.h similarity index 100% rename from src/libqof/qof/qofchoice.h rename to src/engine/qofchoice.h diff --git a/src/libqof/qof/qofclass-p.h b/src/engine/qofclass-p.h similarity index 100% rename from src/libqof/qof/qofclass-p.h rename to src/engine/qofclass-p.h diff --git a/src/libqof/qof/qofclass.cpp b/src/engine/qofclass.cpp similarity index 100% rename from src/libqof/qof/qofclass.cpp rename to src/engine/qofclass.cpp diff --git a/src/libqof/qof/qofclass.h b/src/engine/qofclass.h similarity index 100% rename from src/libqof/qof/qofclass.h rename to src/engine/qofclass.h diff --git a/src/libqof/qof/qofevent-p.h b/src/engine/qofevent-p.h similarity index 100% rename from src/libqof/qof/qofevent-p.h rename to src/engine/qofevent-p.h diff --git a/src/libqof/qof/qofevent.cpp b/src/engine/qofevent.cpp similarity index 100% rename from src/libqof/qof/qofevent.cpp rename to src/engine/qofevent.cpp diff --git a/src/libqof/qof/qofevent.h b/src/engine/qofevent.h similarity index 100% rename from src/libqof/qof/qofevent.h rename to src/engine/qofevent.h diff --git a/src/libqof/qof/qofid-p.h b/src/engine/qofid-p.h similarity index 100% rename from src/libqof/qof/qofid-p.h rename to src/engine/qofid-p.h diff --git a/src/libqof/qof/qofid.cpp b/src/engine/qofid.cpp similarity index 100% rename from src/libqof/qof/qofid.cpp rename to src/engine/qofid.cpp diff --git a/src/libqof/qof/qofid.h b/src/engine/qofid.h similarity index 100% rename from src/libqof/qof/qofid.h rename to src/engine/qofid.h diff --git a/src/libqof/qof/qofinstance-p.h b/src/engine/qofinstance-p.h similarity index 100% rename from src/libqof/qof/qofinstance-p.h rename to src/engine/qofinstance-p.h diff --git a/src/libqof/qof/qofinstance.cpp b/src/engine/qofinstance.cpp similarity index 99% rename from src/libqof/qof/qofinstance.cpp rename to src/engine/qofinstance.cpp index d58335c6bb..512225d0f8 100644 --- a/src/libqof/qof/qofinstance.cpp +++ b/src/engine/qofinstance.cpp @@ -39,7 +39,7 @@ extern "C" #include "qof.h" #include "qofbook-p.h" #include "qofid-p.h" -#include "kvp_frame.hpp" +#include "kvp-frame.hpp" #include "qofinstance-p.h" #include "qof-backend.hpp" diff --git a/src/libqof/qof/qofinstance.h b/src/engine/qofinstance.h similarity index 100% rename from src/libqof/qof/qofinstance.h rename to src/engine/qofinstance.h diff --git a/src/libqof/qof/qoflog.cpp b/src/engine/qoflog.cpp similarity index 100% rename from src/libqof/qof/qoflog.cpp rename to src/engine/qoflog.cpp diff --git a/src/libqof/qof/qoflog.h b/src/engine/qoflog.h similarity index 100% rename from src/libqof/qof/qoflog.h rename to src/engine/qoflog.h diff --git a/src/libqof/qof/qofobject-p.h b/src/engine/qofobject-p.h similarity index 100% rename from src/libqof/qof/qofobject-p.h rename to src/engine/qofobject-p.h diff --git a/src/libqof/qof/qofobject.cpp b/src/engine/qofobject.cpp similarity index 100% rename from src/libqof/qof/qofobject.cpp rename to src/engine/qofobject.cpp diff --git a/src/libqof/qof/qofobject.h b/src/engine/qofobject.h similarity index 100% rename from src/libqof/qof/qofobject.h rename to src/engine/qofobject.h diff --git a/src/libqof/qof/qofquery-p.h b/src/engine/qofquery-p.h similarity index 100% rename from src/libqof/qof/qofquery-p.h rename to src/engine/qofquery-p.h diff --git a/src/libqof/qof/qofquery.cpp b/src/engine/qofquery.cpp similarity index 100% rename from src/libqof/qof/qofquery.cpp rename to src/engine/qofquery.cpp diff --git a/src/libqof/qof/qofquery.h b/src/engine/qofquery.h similarity index 100% rename from src/libqof/qof/qofquery.h rename to src/engine/qofquery.h diff --git a/src/libqof/qof/qofquerycore-p.h b/src/engine/qofquerycore-p.h similarity index 100% rename from src/libqof/qof/qofquerycore-p.h rename to src/engine/qofquerycore-p.h diff --git a/src/libqof/qof/qofquerycore.cpp b/src/engine/qofquerycore.cpp similarity index 100% rename from src/libqof/qof/qofquerycore.cpp rename to src/engine/qofquerycore.cpp diff --git a/src/libqof/qof/qofquerycore.h b/src/engine/qofquerycore.h similarity index 100% rename from src/libqof/qof/qofquerycore.h rename to src/engine/qofquerycore.h diff --git a/src/libqof/qof/qofsession.cpp b/src/engine/qofsession.cpp similarity index 100% rename from src/libqof/qof/qofsession.cpp rename to src/engine/qofsession.cpp diff --git a/src/libqof/qof/qofsession.h b/src/engine/qofsession.h similarity index 100% rename from src/libqof/qof/qofsession.h rename to src/engine/qofsession.h diff --git a/src/libqof/qof/qofsession.hpp b/src/engine/qofsession.hpp similarity index 100% rename from src/libqof/qof/qofsession.hpp rename to src/engine/qofsession.hpp diff --git a/src/libqof/qof/qofutil.cpp b/src/engine/qofutil.cpp similarity index 100% rename from src/libqof/qof/qofutil.cpp rename to src/engine/qofutil.cpp diff --git a/src/libqof/qof/qofutil.h b/src/engine/qofutil.h similarity index 100% rename from src/libqof/qof/qofutil.h rename to src/engine/qofutil.h diff --git a/src/engine/test-core/CMakeLists.txt b/src/engine/test-core/CMakeLists.txt index 75049b0d06..c376bd4019 100644 --- a/src/engine/test-core/CMakeLists.txt +++ b/src/engine/test-core/CMakeLists.txt @@ -10,7 +10,6 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-test-engine PRIVATE ${CMAKE_PREFIX_PATH}/include ${GMODULE_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src/gnc-module - ${CMAKE_SOURCE_DIR}/src/libqof/qof ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/engine diff --git a/src/engine/test-core/Makefile.am b/src/engine/test-core/Makefile.am index 98a41fb44e..6513014cd4 100644 --- a/src/engine/test-core/Makefile.am +++ b/src/engine/test-core/Makefile.am @@ -3,7 +3,6 @@ noinst_LTLIBRARIES=libgncmod-test-engine.la LDADD = \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ../libgncmod-engine.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.cpp @@ -11,7 +10,6 @@ libgncmod_test_engine_la_LDFLAGS = -module libgncmod_test_engine_la_LIBADD = \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ../libgncmod-engine.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} noinst_HEADERS=test-engine-stuff.h test-engine-strings.h @@ -21,7 +19,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/test-core \ -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} \ ${BOOST_CPPFLAGS} diff --git a/src/engine/test-core/test-engine-stuff.cpp b/src/engine/test-core/test-engine-stuff.cpp index 9578978fc1..b95c14de2a 100644 --- a/src/engine/test-core/test-engine-stuff.cpp +++ b/src/engine/test-core/test-engine-stuff.cpp @@ -36,7 +36,7 @@ \********************************************************************/ #include -#include +#include extern "C" { diff --git a/src/engine/test/CMakeLists.txt b/src/engine/test/CMakeLists.txt index 19dafe7a58..c8cb436c37 100644 --- a/src/engine/test/CMakeLists.txt +++ b/src/engine/test/CMakeLists.txt @@ -4,13 +4,12 @@ SET(ENGINE_TEST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/backend/xml ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/engine/test-core - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src/test-core # for unittest-support.h ${GLIB2_INCLUDE_DIRS} ) -SET(ENGINE_TEST_LIBS gncmod-engine gnc-qof gncmod-test-engine test-core ${LIBXML2_LDFLAGS}) +SET(ENGINE_TEST_LIBS gncmod-engine gncmod-test-engine test-core ${LIBXML2_LDFLAGS} -lm) MACRO(ADD_ENGINE_TEST _TARGET _SOURCE_FILES) GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" ENGINE_TEST_INCLUDE_DIRS ENGINE_TEST_LIBS) @@ -21,7 +20,7 @@ CONFIGURE_FILE(test-create-account.in test-create-account @ONLY) # Not via macro because of unique link requirements ADD_EXECUTABLE(test-link EXCLUDE_FROM_ALL test-link.c) -TARGET_LINK_LIBRARIES(test-link gnc-qof gnc-core-utils) +TARGET_LINK_LIBRARIES(test-link gnc-core-utils) ADD_TEST(NAME test-link COMMAND test-link) ADD_DEPENDENCIES(check test-link) @@ -33,8 +32,18 @@ ADD_ENGINE_TEST(test-date test-date.cpp) ADD_ENGINE_TEST(test-object test-object.c) ADD_ENGINE_TEST(test-commodities test-commodities.cpp) +SET(test_qof_SOURCES + test-gnc-date.c + test-qof.c + test-qofbook.c + test-qofinstance.cpp + test-qofobject.c + test-qof-string-cache.c +) + SET(test_engine_SOURCES test-engine.c + test-engine-kvp-properties.c test-gnc-uri-utils.c utest-Account.cpp utest-Budget.c @@ -42,14 +51,19 @@ SET(test_engine_SOURCES utest-Invoice.c utest-Split.cpp utest-Transaction.cpp - test-engine-kvp-properties.c utest-gnc-pricedb.c ) # This test does not run on Win32 IF (NOT WIN32) - ADD_ENGINE_TEST(test-engine "${test_engine_SOURCES}") + SET(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c) + ADD_ENGINE_TEST(test-qof "${SOURCES}") + TARGET_COMPILE_DEFINITIONS(test-qof PRIVATE TESTPROG=test_qof) + + SET(SOURCES ${test_engine_SOURCES} ${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c) + ADD_ENGINE_TEST(test-engine "${SOURCES}") TARGET_COMPILE_OPTIONS(test-engine PRIVATE -Wno-write-strings) + TARGET_COMPILE_DEFINITIONS(test-engine PRIVATE TESTPROG=test_engine) ENDIF() ADD_ENGINE_TEST(test-account-object test-account-object.cpp) @@ -68,6 +82,108 @@ ADD_ENGINE_TEST(test-employee test-employee.c) ADD_ENGINE_TEST(test-job test-job.c) ADD_ENGINE_TEST(test-vendor test-vendor.c) +SET(test_numeric_SOURCES + ${CMAKE_SOURCE_DIR}/src/engine/gnc-numeric.cpp + ${CMAKE_SOURCE_DIR}/src/engine/gnc-rational.cpp + ${CMAKE_SOURCE_DIR}/src/engine/gnc-int128.cpp + ${CMAKE_SOURCE_DIR}/src/engine/test/test-numeric.cpp +) +ADD_ENGINE_TEST(test-numeric "${test_numeric_SOURCES}") + +SET(MODULEPATH ${CMAKE_SOURCE_DIR}/src/engine) +SET(gtest_old_engine_LIBS + gncmod-engine + ${GLIB2_LDFLAGS} + ${Boost_LIBRARIES} + ${GTEST_LIB}) + +SET(gtest_qof_LIBS + ${GLIB2_LDFLAGS} + ${GOBJECT_LDFLAGS} + ${GMODULE_LDFLAGS} + ${GTHREAD_LDFLAGS} + ${Boost_LIBRARIES} + ${GTEST_LIB}) + +SET(gtest_engine_INCLUDES + ${MODULEPATH} + ${CMAKE_BINARY_DIR}/src # for config.h + ${CMAKE_SOURCE_DIR}/src # for platform.h + ${GLIB2_INCLUDE_DIRS} + ${GTEST_INCLUDE_DIR}) + +SET(test_gnc_guid_SOURCES + ${MODULEPATH}/guid.cpp + test-gnc-guid.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-gnc-guid "${test_gnc_guid_SOURCES}" + gtest_engine_INCLUDES gtest_old_engine_LIBS) + +SET(test_kvp_value_SOURCES + ${MODULEPATH}/kvp-value.cpp + test-kvp-value.cpp + test-kvp-frame.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-kvp-value "${test_kvp_value_SOURCES}" + gtest_engine_INCLUDES gtest_old_engine_LIBS) + +SET(test_qofsession_SOURCES + ${MODULEPATH}/qofsession.cpp + test-qofsession.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-qofsession "${test_qofsession_SOURCES}" + gtest_engine_INCLUDES gtest_old_engine_LIBS) + +SET(test_gnc_int128_SOURCES + ${MODULEPATH}/gnc-int128.cpp + gtest-gnc-int128.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-gnc-int128 "${test_gnc_int128_SOURCES}" + gtest_engine_INCLUDES gtest_qof_LIBS) + +SET(test_gnc_rational_SOURCES + ${MODULEPATH}/gnc-rational.cpp + ${MODULEPATH}/gnc-numeric.cpp + ${MODULEPATH}/gnc-int128.cpp + ${MODULEPATH}/gnc-datetime.cpp + ${MODULEPATH}/gnc-timezone.cpp + ${MODULEPATH}/gnc-date.cpp + ${MODULEPATH}/qoflog.cpp + gtest-gnc-rational.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-gnc-rational "${test_gnc_rational_SOURCES}" + gtest_engine_INCLUDES gtest_qof_LIBS) + +SET(test_gnc_numeric_SOURCES + ${MODULEPATH}/gnc-rational.cpp + ${MODULEPATH}/gnc-int128.cpp + ${MODULEPATH}/gnc-numeric.cpp + ${MODULEPATH}/gnc-datetime.cpp + ${MODULEPATH}/gnc-timezone.cpp + ${MODULEPATH}/gnc-date.cpp + ${MODULEPATH}/qoflog.cpp + gtest-gnc-numeric.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-gnc-numeric "${test_gnc_numeric_SOURCES}" + gtest_engine_INCLUDES gtest_qof_LIBS) + +SET(test_gnc_timezone_SOURCES + ${MODULEPATH}/gnc-timezone.cpp + gtest-gnc-timezone.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-gnc-timezone "${test_gnc_timezone_SOURCES}" + gtest_engine_INCLUDES gtest_old_engine_LIBS) + +SET(test_gnc_datetime_SOURCES + ${MODULEPATH}/gnc-datetime.cpp + ${MODULEPATH}/gnc-timezone.cpp + ${MODULEPATH}/gnc-date.cpp + ${MODULEPATH}/qoflog.cpp + gtest-gnc-datetime.cpp + ${GTEST_SRC}) +GNC_ADD_TEST(test-gnc-datetime "${test_gnc_datetime_SOURCES}" + gtest_engine_INCLUDES gtest_qof_LIBS) + ############################ # This is a C test that needs GUILE environment variables set. # It does not pass on Win32. @@ -100,6 +216,11 @@ GNC_ADD_SCHEME_TARGETS(scm-test-engine SET(test_engine_SOURCES_DIST dummy.cpp + gtest-gnc-int128.cpp + gtest-gnc-rational.cpp + gtest-gnc-numeric.cpp + gtest-gnc-timezone.cpp + gtest-gnc-datetime.cpp gtest-import-map.cpp test-account-object.cpp test-address.c @@ -108,16 +229,27 @@ SET(test_engine_SOURCES_DIST test-customer.c test-date.cpp test-employee.c - test-engine-kvp-properties.c + test-engine-kvp-properties.c test-engine.c - test-gnc-uri-utils.c + test-gnc-date.c + test-gnc-guid.cpp + test-gnc-uri-utils.c test-group-vs-book.cpp test-guid.cpp test-job.c + test-kvp-value.cpp + test-kvp-frame.cpp test-link.c test-load-engine.c test-lots.cpp + test-numeric.cpp test-object.c + test-qof.c + test-qofbook.c + test-qofinstance.cpp + test-qofobject.c + test-qofsession.cpp + test-qof-string-cache.c test-query.cpp test-querynew.c test-recurrence.c @@ -132,7 +264,7 @@ SET(test_engine_SOURCES_DIST utest-Invoice.c utest-Split.cpp utest-Transaction.cpp - utest-gnc-pricedb.c + utest-gnc-pricedb.c ) SET(test_engine_SCHEME_DIST diff --git a/src/engine/test/Makefile.am b/src/engine/test/Makefile.am index a363e53d4a..1af7131890 100644 --- a/src/engine/test/Makefile.am +++ b/src/engine/test/Makefile.am @@ -9,14 +9,12 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/test-core \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/engine/test-core \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/core-utils \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} \ ${BOOST_CPPFLAGS} LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/test-core/libtest-core.la \ ../libgncmod-engine.la \ @@ -36,6 +34,7 @@ TEST_GROUP_1 = \ test-date \ test-object \ test-commodities \ + test-qof \ test-engine TEST_GROUP_2 = \ @@ -73,7 +72,6 @@ GNC_TEST_DEPS = \ --guile-load-dir ${top_builddir}/src/core-utils \ --guile-load-dir ${top_builddir}/src/scm \ --guile-load-dir ${top_builddir}/src/engine/test \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ @@ -113,7 +111,6 @@ TESTS = ${TEST_GROUP_1} test-create-account ${TEST_GROUP_2} ${SCM_TESTS} test_link_SOURCES = test-link.c test_link_LDADD = ../libgncmod-engine.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la if WITH_GOOGLE_PROFILER @@ -146,6 +143,23 @@ noinst_PROGRAMS = ${TEST_PROGS} ${CHECK_PROGS} noinst_DATA: .scm-links +test_qof_SOURCES = \ + test-gnc-date.c \ + test-qof.c \ + test-qofbook.c \ + test-qofinstance.cpp \ + test-qofobject.c \ + test-qof-string-cache.c + +test_qof_LDADD = \ + $(LDADD) +test_qof_CFLAGS = \ + ${DEFAULT_INCLUDES} \ + -I${top_srcdir}/${MODULEPATH}/ \ + -DTESTPROG=test_qof \ + ${GLIB_CFLAGS} \ + ${AM_CFLAGS} + test_engine_SOURCES = \ test-engine.c \ test-gnc-uri-utils.c \ @@ -155,11 +169,12 @@ test_engine_SOURCES = \ utest-Invoice.c \ test-engine-kvp-properties.c \ utest-gnc-pricedb.c \ - dummy.cpp + utest-Transaction.cpp \ + dummy.cpp \ + utest-Split.cpp \ + ${top_srcdir}/${MODULEPATH}/gnc-numeric.cpp test_engine_LDADD = \ - libutest-Split.la \ - libutest-Trans.la \ $(LDADD) test_engine_CFLAGS = \ ${DEFAULT_INCLUDES} \ @@ -167,27 +182,11 @@ test_engine_CFLAGS = \ -DTESTPROG=test_engine \ ${GLIB_CFLAGS} \ ${AM_CFLAGS} - -noinst_LTLIBRARIES = \ - libutest-Split.la \ - libutest-Trans.la - -libutest_Split_la_SOURCES = \ - utest-Split.cpp \ - ${top_srcdir}/src/libqof/qof/gnc-numeric.cpp -libutest_Split_la_CXXFLAGS = -Wno-write-strings $(AM_CXXFLAGS) - -libutest_Split_la_LIBADD = $(LDADD) - -libutest_Trans_la_SOURCES = \ - utest-Transaction.cpp - -libutest_Trans_la_LIBADD = $(LDADD) +test_engine_CXXFLAGS = -Wno-write-strings $(AM_CXXFLAGS) test_import_map_SOURCES = \ gtest-import-map.cpp test_import_map_LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${GLIB_LIBS} \ ${GTEST_LIBS} @@ -200,7 +199,6 @@ endif test_import_map_CPPFLAGS = \ -I${GTEST_HEADERS} \ -I${top_srcdir}/${MODULEPATH} \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/core-utils \ ${GLIB_CFLAGS} diff --git a/src/libqof/qof/test/gtest-gnc-datetime.cpp b/src/engine/test/gtest-gnc-datetime.cpp similarity index 100% rename from src/libqof/qof/test/gtest-gnc-datetime.cpp rename to src/engine/test/gtest-gnc-datetime.cpp diff --git a/src/libqof/qof/test/gtest-gnc-int128.cpp b/src/engine/test/gtest-gnc-int128.cpp similarity index 100% rename from src/libqof/qof/test/gtest-gnc-int128.cpp rename to src/engine/test/gtest-gnc-int128.cpp diff --git a/src/libqof/qof/test/gtest-gnc-numeric.cpp b/src/engine/test/gtest-gnc-numeric.cpp similarity index 100% rename from src/libqof/qof/test/gtest-gnc-numeric.cpp rename to src/engine/test/gtest-gnc-numeric.cpp diff --git a/src/libqof/qof/test/gtest-gnc-rational.cpp b/src/engine/test/gtest-gnc-rational.cpp similarity index 100% rename from src/libqof/qof/test/gtest-gnc-rational.cpp rename to src/engine/test/gtest-gnc-rational.cpp diff --git a/src/libqof/qof/test/gtest-gnc-timezone.cpp b/src/engine/test/gtest-gnc-timezone.cpp similarity index 100% rename from src/libqof/qof/test/gtest-gnc-timezone.cpp rename to src/engine/test/gtest-gnc-timezone.cpp diff --git a/src/engine/test/gtest-import-map.cpp b/src/engine/test/gtest-import-map.cpp index b0a9b50950..47746d6d4c 100644 --- a/src/engine/test/gtest-import-map.cpp +++ b/src/engine/test/gtest-import-map.cpp @@ -28,7 +28,7 @@ extern "C" #include } -#include +#include #include class ImapTest : public testing::Test diff --git a/src/libqof/qof/test/test-gnc-date.c b/src/engine/test/test-gnc-date.c similarity index 99% rename from src/libqof/qof/test/test-gnc-date.c rename to src/engine/test/test-gnc-date.c index e15fffcfc8..fb9334157c 100644 --- a/src/libqof/qof/test/test-gnc-date.c +++ b/src/engine/test/test-gnc-date.c @@ -27,7 +27,7 @@ extern "C" #endif #include -#include "../../../platform.h" +#include "../../platform.h" #include #include #include diff --git a/src/libqof/qof/test/test-gnc-guid-old.cpp b/src/engine/test/test-gnc-guid-old.cpp similarity index 100% rename from src/libqof/qof/test/test-gnc-guid-old.cpp rename to src/engine/test/test-gnc-guid-old.cpp diff --git a/src/libqof/qof/test/test-gnc-guid.cpp b/src/engine/test/test-gnc-guid.cpp similarity index 100% rename from src/libqof/qof/test/test-gnc-guid.cpp rename to src/engine/test/test-gnc-guid.cpp diff --git a/src/libqof/qof/test/test-kvp-frame.cpp b/src/engine/test/test-kvp-frame.cpp similarity index 99% rename from src/libqof/qof/test/test-kvp-frame.cpp rename to src/engine/test/test-kvp-frame.cpp index 92c68b8969..3df1c75a38 100644 --- a/src/libqof/qof/test/test-kvp-frame.cpp +++ b/src/engine/test/test-kvp-frame.cpp @@ -24,7 +24,7 @@ #include #include "../kvp-value.hpp" -#include "../kvp_frame.hpp" +#include "../kvp-frame.hpp" #include #include diff --git a/src/libqof/qof/test/test-kvp-value.cpp b/src/engine/test/test-kvp-value.cpp similarity index 99% rename from src/libqof/qof/test/test-kvp-value.cpp rename to src/engine/test/test-kvp-value.cpp index e8568d2264..f564fe3d1f 100644 --- a/src/libqof/qof/test/test-kvp-value.cpp +++ b/src/engine/test/test-kvp-value.cpp @@ -25,7 +25,7 @@ #include #include "../kvp-value.hpp" #include "../guid.h" -#include "../kvp_frame.hpp" +#include "../kvp-frame.hpp" #include "../gnc-date.h" #include #include diff --git a/src/libqof/qof/test/test-numeric.cpp b/src/engine/test/test-numeric.cpp similarity index 100% rename from src/libqof/qof/test/test-numeric.cpp rename to src/engine/test/test-numeric.cpp diff --git a/src/libqof/qof/test/test-qof-string-cache.c b/src/engine/test/test-qof-string-cache.c similarity index 100% rename from src/libqof/qof/test/test-qof-string-cache.c rename to src/engine/test/test-qof-string-cache.c diff --git a/src/libqof/qof/test/test-qof.c b/src/engine/test/test-qof.c similarity index 100% rename from src/libqof/qof/test/test-qof.c rename to src/engine/test/test-qof.c diff --git a/src/libqof/qof/test/test-qofbackend.c b/src/engine/test/test-qofbackend.c similarity index 100% rename from src/libqof/qof/test/test-qofbackend.c rename to src/engine/test/test-qofbackend.c diff --git a/src/libqof/qof/test/test-qofbook.c b/src/engine/test/test-qofbook.c similarity index 100% rename from src/libqof/qof/test/test-qofbook.c rename to src/engine/test/test-qofbook.c diff --git a/src/libqof/qof/test/test-qofinstance.cpp b/src/engine/test/test-qofinstance.cpp similarity index 99% rename from src/libqof/qof/test/test-qofinstance.cpp rename to src/engine/test/test-qofinstance.cpp index 2758c109aa..7ed7d2d400 100644 --- a/src/libqof/qof/test/test-qofinstance.cpp +++ b/src/engine/test/test-qofinstance.cpp @@ -29,7 +29,7 @@ extern "C" #include "../qof.h" } #include "../qof-backend.hpp" -#include "../kvp_frame.hpp" +#include "../kvp-frame.hpp" static const gchar *suitename = "/qof/qofinstance"; extern "C" void test_suite_qofinstance ( void ); static gchar* error_message; @@ -49,10 +49,10 @@ static struct } commit_test; -class MockBackend : public QofBackend +class QofInstMockBackend : public QofBackend { public: - MockBackend() : m_qof_error{ERR_BACKEND_NO_ERR} { + QofInstMockBackend() : m_qof_error{ERR_BACKEND_NO_ERR} { commit_test.m_be = this; } void session_begin(QofSession* sess, const char* book_name, @@ -503,7 +503,7 @@ test_instance_begin_edit( Fixture *fixture, gconstpointer pData ) gboolean result; /* setup */ - auto be = new MockBackend; + auto be = new QofInstMockBackend; g_assert( be ); book = qof_book_new(); g_assert( book ); @@ -598,7 +598,7 @@ test_instance_commit_edit_part2( Fixture *fixture, gconstpointer pData ) gboolean result; /* setup */ - auto be = new MockBackend; + auto be = new QofInstMockBackend; g_assert( be ); book = qof_book_new(); g_assert( book ); diff --git a/src/libqof/qof/test/test-qofobject.c b/src/engine/test/test-qofobject.c similarity index 100% rename from src/libqof/qof/test/test-qofobject.c rename to src/engine/test/test-qofobject.c diff --git a/src/libqof/qof/test/test-qofsession-old.cpp b/src/engine/test/test-qofsession-old.cpp similarity index 100% rename from src/libqof/qof/test/test-qofsession-old.cpp rename to src/engine/test/test-qofsession-old.cpp diff --git a/src/libqof/qof/test/test-qofsession.cpp b/src/engine/test/test-qofsession.cpp similarity index 92% rename from src/libqof/qof/test/test-qofsession.cpp rename to src/engine/test/test-qofsession.cpp index 863316d864..8e64370aef 100644 --- a/src/libqof/qof/test/test-qofsession.cpp +++ b/src/engine/test/test-qofsession.cpp @@ -36,13 +36,13 @@ static bool load_error {true}; static bool hook_called {false}; static bool data_loaded {false}; -class MockBackend : public QofBackend +class QofSessionMockBackend : public QofBackend { public: - MockBackend() = default; - MockBackend(const MockBackend&) = delete; - MockBackend(const MockBackend&&) = delete; - virtual ~MockBackend() = default; + QofSessionMockBackend() = default; + QofSessionMockBackend(const QofSessionMockBackend&) = delete; + QofSessionMockBackend(const QofSessionMockBackend&&) = delete; + virtual ~QofSessionMockBackend() = default; void session_begin(QofSession*, const char*, bool, bool, bool) {} void session_end() {} void load(QofBook*, QofBackendLoadType); @@ -56,30 +56,30 @@ void example_hook (QofSession & session) hook_called = true; } -void MockBackend::load (QofBook *, QofBackendLoadType) +void QofSessionMockBackend::load (QofBook *, QofBackendLoadType) { if (load_error) set_error(ERR_BACKEND_NO_BACKEND); data_loaded = true; } -void MockBackend::safe_sync (QofBook *) +void QofSessionMockBackend::safe_sync (QofBook *) { safe_sync_called = true; } -void MockBackend::sync (QofBook *) +void QofSessionMockBackend::sync (QofBook *) { sync_called = true; } -void MockBackend::export_coa(QofBook * book) +void QofSessionMockBackend::export_coa(QofBook * book) { exported_book = book; } QofBackend * test_backend_factory () { - return new MockBackend; + return new QofSessionMockBackend; } struct MockProvider : public QofBackendProvider diff --git a/src/engine/test/utest-Account.cpp b/src/engine/test/utest-Account.cpp index b49966933f..df075bb7e0 100644 --- a/src/engine/test/utest-Account.cpp +++ b/src/engine/test/utest-Account.cpp @@ -42,7 +42,7 @@ static const gchar *suitename = "/engine/Account"; void test_suite_account (void); } -#include +#include typedef struct { diff --git a/src/engine/test/utest-Split.cpp b/src/engine/test/utest-Split.cpp index a0e9ceb961..42bf871743 100644 --- a/src/engine/test/utest-Split.cpp +++ b/src/engine/test/utest-Split.cpp @@ -45,7 +45,7 @@ static const gchar *suitename = "/engine/Split"; void test_suite_split ( void ); } -#include +#include typedef struct { diff --git a/src/engine/test/utest-Transaction.cpp b/src/engine/test/utest-Transaction.cpp index 9b5f56d56b..4624593fc4 100644 --- a/src/engine/test/utest-Transaction.cpp +++ b/src/engine/test/utest-Transaction.cpp @@ -45,7 +45,7 @@ void test_suite_transaction ( void ); } #include -#include +#include /* Copied from Transaction.c. Changing these values will break * existing databases, which is a good reason to fail a test. @@ -81,10 +81,10 @@ typedef struct Account *gains_acc; } GainsFixture; -class MockBackend : public QofBackend +class TransMockBackend : public QofBackend { public: - MockBackend() : QofBackend(), m_last_call{"Constructor"}, + TransMockBackend() : QofBackend(), m_last_call{"Constructor"}, m_result_err{ERR_BACKEND_NO_ERR} {} void session_begin(QofSession*, const char*, bool, bool, bool) override { m_last_call = "session_begin"; @@ -117,7 +117,7 @@ static void setup (Fixture *fixture, gconstpointer pData) { QofBook *book = qof_book_new (); - MockBackend *mbe = new MockBackend; + TransMockBackend *mbe = new TransMockBackend; Transaction *txn; Timespec entered = gnc_dmy2timespec (20, 4, 2012); Timespec posted = gnc_dmy2timespec (21, 4, 2012); @@ -208,7 +208,7 @@ static void teardown (Fixture *fixture, gconstpointer pData) { QofBook *book = qof_instance_get_book (QOF_INSTANCE (fixture->txn)); - auto mbe = static_cast(qof_book_get_backend (book)); + auto mbe = static_cast(qof_book_get_backend (book)); test_destroy (fixture->txn); test_destroy (fixture->acc1); @@ -1692,7 +1692,7 @@ test_xaccTransRollbackEdit (Fixture *fixture, gconstpointer pData) KvpFrame *base_frame = NULL; auto sig_account = test_signal_new (QOF_INSTANCE (fixture->acc1), GNC_EVENT_ITEM_CHANGED, NULL); - auto mbe = static_cast(qof_book_get_backend (book)); + auto mbe = static_cast(qof_book_get_backend (book)); auto split_00 = static_cast(txn->splits->data); auto split_01 = static_cast(txn->splits->next->data); auto split_02 = xaccMallocSplit (book); @@ -1754,7 +1754,7 @@ test_xaccTransRollbackEdit (Fixture *fixture, gconstpointer pData) static void test_xaccTransRollbackEdit_BackendErrors (Fixture *fixture, gconstpointer pData) { - auto mbe = static_cast(qof_book_get_backend (qof_instance_get_book (fixture->txn))); + auto mbe = static_cast(qof_book_get_backend (qof_instance_get_book (fixture->txn))); auto loglevel = static_cast(G_LOG_LEVEL_CRITICAL | G_LOG_FLAG_FATAL); auto msg = "[xaccTransRollbackEdit()] Rollback Failed. Ouch!"; auto check = test_error_struct_new ("gnc.engine", loglevel, msg); diff --git a/src/gnc-module/CMakeLists.txt b/src/gnc-module/CMakeLists.txt index d1ded1539b..ce06e3e779 100644 --- a/src/gnc-module/CMakeLists.txt +++ b/src/gnc-module/CMakeLists.txt @@ -2,7 +2,7 @@ ADD_SUBDIRECTORY(test) IF (BUILDING_FROM_VCS) - # Command to generate the swig-engine.c wrapper file + # Command to generate the swig-gnc-module.c wrapper file SET (SWIG_GNC_MODULE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-gnc-module.c) GNC_ADD_SWIG_COMMAND (swig-gnc-module-c ${SWIG_GNC_MODULE_C} ${CMAKE_CURRENT_SOURCE_DIR}/gnc-module.i) ELSE() @@ -25,13 +25,16 @@ ADD_LIBRARY (gnc-module ${SWIG_GNC_MODULE_C} ) -TARGET_LINK_LIBRARIES(gnc-module gnc-qof ${GUILE_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS}) +TARGET_LINK_LIBRARIES(gnc-module ${GUILE_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS}) TARGET_COMPILE_DEFINITIONS (gnc-module PRIVATE -DG_LOG_DOMAIN=\"gnc.module\") TARGET_INCLUDE_DIRECTORIES (gnc-module PRIVATE ${GUILE_INCLUDE_DIRS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_BINARY_DIR}/src # for config.h + ${GLIB2_INCLUDE_DIRS} ) INSTALL(TARGETS gnc-module @@ -63,4 +66,4 @@ GNC_ADD_SCHEME_TARGETS(scm-gnc-module SET_LOCAL_DIST(gnc_module_DIST_local CMakeLists.txt Makefile.am ${gnc_module_SOURCES} ${gnc_module_HEADERS} gnc-module.i gnc-module.scm README) -SET(gnc_module_DIST ${gnc_module_DIST_local} ${test_gnc_module_DIST} PARENT_SCOPE) \ No newline at end of file +SET(gnc_module_DIST ${gnc_module_DIST_local} ${test_gnc_module_DIST} PARENT_SCOPE) diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am index 2a413f6ca3..cecaed5d63 100644 --- a/src/gnc-module/Makefile.am +++ b/src/gnc-module/Makefile.am @@ -1,10 +1,11 @@ -SUBDIRS = . test +# No SUBDIR variable here... +# The 'test' subdir is added via src/Makefile to handle +# it's dependency on src/engine AM_CPPFLAGS = \ -I${top_srcdir}/lib/libc \ -I${top_srcdir}/src \ -I${top_srcdir}/src/core-utils \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} @@ -15,7 +16,6 @@ libgnc_module_la_SOURCES = gnc-module.c swig-gnc-module.c libgnc_module_la_LIBADD = \ ../core-utils/libgnc-core-utils.la \ ${top_builddir}/lib/libc/libc-missing.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} \ ${GUILE_LIBS} @@ -69,8 +69,7 @@ endif if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ --library-dir ${top_builddir}/src/gnc-module \ - --library-dir ${top_builddir}/src/core-utils \ - --library-dir ${top_builddir}/src/libqof/qof + --library-dir ${top_builddir}/src/core-utils %.go : %.scm .scm-links $(lib_LTLIBRARIES) GNC_UNINSTALLED=yes \ diff --git a/src/gnc-module/gnc-module.c b/src/gnc-module/gnc-module.c index 7165e7b1e4..a2221cd9c5 100644 --- a/src/gnc-module/gnc-module.c +++ b/src/gnc-module/gnc-module.c @@ -35,10 +35,6 @@ #endif #include "gnc-module.h" -#include "libqof/qof/qof.h" - -/* This static indicates the debugging module that this .o belongs to. */ -static QofLogModule log_module = "gnc.gui"; static GHashTable * loaded_modules = NULL; static GList * module_info = NULL; @@ -455,7 +451,7 @@ gnc_module_load_common(const char * module_name, gint iface, gboolean optional) GModule * gmodule; GNCModuleInfo * modinfo; - ENTER("module_name: %s", module_name); + g_debug ("module_name: %s", module_name); if (!loaded_modules) { @@ -477,25 +473,22 @@ gnc_module_load_common(const char * module_name, gint iface, gboolean optional) if (info->init_func(info->load_count)) { info->load_count++; - LEAVE("module %s already loaded", module_name); + g_debug ("module %s already loaded", module_name); return info; } else { g_warning ("module init failed: %s", module_name); - LEAVE(""); return NULL; } } else { g_warning ("module has no init func: %s", module_name); - LEAVE(""); return NULL; } /* NOTREACHED */ g_error("internal error"); - LEAVE(""); return NULL; } @@ -512,7 +505,6 @@ gnc_module_load_common(const char * module_name, gint iface, gboolean optional) g_warning ("Could not locate module %s interface v.%d", module_name, iface); } - LEAVE(""); return NULL; } @@ -544,11 +536,9 @@ gnc_module_load_common(const char * module_name, gint iface, gboolean optional) g_free(info->filename); g_free(info); /* g_module_close(module); */ - LEAVE(""); return NULL; } - LEAVE(""); return info; } else @@ -557,13 +547,11 @@ gnc_module_load_common(const char * module_name, gint iface, gboolean optional) modinfo->module_filepath); //lt_dlclose(handle); } - LEAVE(""); return info; } g_warning ("Failed to open module %s: %s\n", module_name, g_module_error()); - LEAVE(""); return NULL; } diff --git a/src/gnc-module/test/CMakeLists.txt b/src/gnc-module/test/CMakeLists.txt index 9053cfcbfe..522f433bd6 100644 --- a/src/gnc-module/test/CMakeLists.txt +++ b/src/gnc-module/test/CMakeLists.txt @@ -8,12 +8,11 @@ SET(GNC_MODULE_TEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src/gnc-module ${CMAKE_SOURCE_DIR}/src/test-core - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${GLIB2_INCLUDE_DIRS} ${GUILE_INCLUDE_DIRS} ) -SET(GNC_MODULE_TEST_LIBS gnc-module gnc-qof test-core) +SET(GNC_MODULE_TEST_LIBS gnc-module test-core) MACRO(ADD_GNC_MODULE_TEST _TARGET _SOURCE_FILES) GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" GNC_MODULE_TEST_INCLUDE_DIRS GNC_MODULE_TEST_LIBS) @@ -112,4 +111,4 @@ SET(test_gnc_module_EXTRA_DIST SET_LOCAL_DIST(test_gnc_module_DIST_local CMakeLists.txt Makefile.am README ${test_gnc_module_SOURCE_DIST} ${test_gnc_module_EXTRA_DIST}) SET(test_gnc_module_DIST ${test_gnc_module_DIST_local} ${misc_mods_DIST} - ${mod_bar_DIST} ${mod_baz_DIST} ${mod_foo_DIST} PARENT_SCOPE) \ No newline at end of file + ${mod_bar_DIST} ${mod_baz_DIST} ${mod_foo_DIST} PARENT_SCOPE) diff --git a/src/gnc-module/test/Makefile.am b/src/gnc-module/test/Makefile.am index 53edbff07c..d8497626b0 100644 --- a/src/gnc-module/test/Makefile.am +++ b/src/gnc-module/test/Makefile.am @@ -2,14 +2,13 @@ SUBDIRS = mod-foo mod-bar mod-baz misc-mods LDADD = \ ${top_builddir}/src/test-core/libtest-core.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS} AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/test-core \ + -I${top_srcdir}/src/engine \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} @@ -38,7 +37,6 @@ GNC_TEST_DEPS = \ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-foo \ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-baz \ --guile-load-dir ${top_srcdir}/src/gnc-module/test/mod-bar \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/test-core \ --library-dir ${top_builddir}/src/gnc-module \ diff --git a/src/gnc/CMakeLists.txt b/src/gnc/CMakeLists.txt index 156d57859b..6ba10f5b07 100644 --- a/src/gnc/CMakeLists.txt +++ b/src/gnc/CMakeLists.txt @@ -83,7 +83,6 @@ INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH}) INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH}) INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h -INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/gnc-module) # for gnc-glib-utils.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/core-utils) # for gnc-glib-utils.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/engine) # for gnc-glib-utils.h @@ -115,7 +114,7 @@ IF (WITH_AQBANKING) # TARGET_LINK_LIBRARIES (cutecash ${AQBANKING_LIBRARIES} ${GWENHYWFAR_LIBRARIES}) ENDIF (WITH_AQBANKING) TARGET_LINK_LIBRARIES (cutecash libgncmod-gtkmm) -TARGET_LINK_LIBRARIES (cutecash gncmod-engine gnc-module gnc-core-utils gnc-qof) +TARGET_LINK_LIBRARIES (cutecash gncmod-engine gnc-module gnc-core-utils) TARGET_LINK_LIBRARIES (cutecash ${GUILE_LIBRARY} ${GUILE_LIBRARIES}) TARGET_LINK_LIBRARIES (cutecash ${GLIBMM_LIBRARIES}) diff --git a/src/gnc/Doxyfile b/src/gnc/Doxyfile index 0061e5d1eb..c10806e35f 100644 --- a/src/gnc/Doxyfile +++ b/src/gnc/Doxyfile @@ -90,7 +90,6 @@ WARN_LOGFILE = # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = . \ - ../libqof/qof \ ../core-utils \ ../gnc-module \ ../engine \ diff --git a/src/gnc/QofEventWrapper.hpp b/src/gnc/QofEventWrapper.hpp index 10379faad9..f21154dbdc 100644 --- a/src/gnc/QofEventWrapper.hpp +++ b/src/gnc/QofEventWrapper.hpp @@ -25,7 +25,7 @@ // gnucash includes #include "config.h" // required by qof/qofutil.h -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/gnc/Session.hpp b/src/gnc/Session.hpp index 6e1650cd52..2d476288ff 100644 --- a/src/gnc/Session.hpp +++ b/src/gnc/Session.hpp @@ -26,7 +26,7 @@ // gnucash includes #include "config.h" // required by qof/qofutil.h #include -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/gnc/dashboard.hpp b/src/gnc/dashboard.hpp index a4a88a7785..233a57169b 100644 --- a/src/gnc/dashboard.hpp +++ b/src/gnc/dashboard.hpp @@ -23,7 +23,7 @@ #define DASHBOARD_HPP #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { diff --git a/src/gnc/fpo/ViewletModel.hpp b/src/gnc/fpo/ViewletModel.hpp index 59b550cb78..7701715228 100644 --- a/src/gnc/fpo/ViewletModel.hpp +++ b/src/gnc/fpo/ViewletModel.hpp @@ -5,7 +5,7 @@ #include #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { diff --git a/src/gnc/fpo/ViewletView.hpp b/src/gnc/fpo/ViewletView.hpp index 173f6facca..6fd4f913c9 100644 --- a/src/gnc/fpo/ViewletView.hpp +++ b/src/gnc/fpo/ViewletView.hpp @@ -2,7 +2,7 @@ #define VIEWLETVIEW_HPP #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { diff --git a/src/gnc/main.cpp b/src/gnc/main.cpp index dc0bce4f4e..7aab5fd3da 100644 --- a/src/gnc/main.cpp +++ b/src/gnc/main.cpp @@ -29,7 +29,7 @@ #include #include #include -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "gnc-module/gnc-module.h" diff --git a/src/gnome-search/CMakeLists.txt b/src/gnome-search/CMakeLists.txt index ffd53dd60d..c823388386 100644 --- a/src/gnome-search/CMakeLists.txt +++ b/src/gnome-search/CMakeLists.txt @@ -46,7 +46,7 @@ ADD_LIBRARY (gncmod-gnome-search ${gnome_search_noinst_HEADERS} ) -TARGET_LINK_LIBRARIES(gncmod-gnome-search gnc-qof gncmod-gnome-utils ${GTK3_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-gnome-search gncmod-gnome-utils ${GTK3_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\") diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am index 79e4bbc1fe..8056c048e8 100644 --- a/src/gnome-search/Makefile.am +++ b/src/gnome-search/Makefile.am @@ -7,7 +7,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} @@ -51,7 +50,7 @@ libgncmod_gnome_search_la_LIBADD = \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${GUILE_LIBS} \ ${GLIB_LIBS} \ ${REGEX_LIBS} diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index b8becc99fe..c94e88b19b 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -14,13 +14,11 @@ AM_CPPFLAGS = \ -I${top_builddir}/src \ -I${top_builddir}/src/core-utils \ -I${top_srcdir}/lib/libc \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GTK_CFLAGS} \ ${GNOME_KEYRING_CFLAGS} \ ${LIBSECRET_CFLAGS} \ ${GUILE_CFLAGS} \ - ${QOF_CFLAGS} \ ${LIBGDA_CFLAGS} \ ${LIBXML2_CFLAGS} \ ${GTK_MAC_CFLAGS} @@ -201,7 +199,6 @@ libgncmod_gnome_utils_la_LIBADD = \ ${top_builddir}/src/backend/xml/libgnc-backend-xml-utils.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ $(top_builddir)/lib/libc/libc-missing.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GTK_LIBS} \ ${GNOME_KEYRING_LIBS} \ ${LIBSECRET_LIBS} \ @@ -280,7 +277,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/app-utils \ diff --git a/src/gnome-utils/test/CMakeLists.txt b/src/gnome-utils/test/CMakeLists.txt index 42611bca03..4244d10d3c 100644 --- a/src/gnome-utils/test/CMakeLists.txt +++ b/src/gnome-utils/test/CMakeLists.txt @@ -16,7 +16,6 @@ SET(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src/gnome-utils ${CMAKE_SOURCE_DIR}/src/engine - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h ${GTK3_INCLUDE_DIRS} ) SET(GNOME_UTILS_GUI_TEST_LIBS diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am index 34c0856ff6..d7a34c3383 100644 --- a/src/gnome-utils/test/Makefile.am +++ b/src/gnome-utils/test/Makefile.am @@ -18,7 +18,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/app-utils \ --guile-load-dir ${top_builddir}/src/gnome-utils \ --library-dir ${top_builddir}/src/gnome-utils \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ @@ -45,7 +44,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/test-core \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GTK_CFLAGS} \ ${GUILE_CFLAGS} diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index 48bb9533e3..1aa5de1ee3 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -15,12 +15,10 @@ libgnc_gnome_la_LIBADD = \ ${top_builddir}/src/html/libgncmod-html.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${LIBXML2_LIBS} \ ${GUILE_LIBS} \ ${GTK_LIBS} \ - ${GLIB_LIBS} \ - ${QOF_LIBS} + ${GLIB_LIBS} libgnc_gnome_la_SOURCES = \ swig-gnome.c \ @@ -186,7 +184,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/report/report-system \ -I${top_srcdir}/src/report/report-gnome \ -I${top_srcdir}/lib/libc \ - -I${top_srcdir}/src/libqof/qof \ ${LIBXML2_CFLAGS} \ ${GUILE_CFLAGS} \ ${GTK_CFLAGS} \ diff --git a/src/html/CMakeLists.txt b/src/html/CMakeLists.txt index f2aec95f41..eecbc96aa1 100644 --- a/src/html/CMakeLists.txt +++ b/src/html/CMakeLists.txt @@ -39,7 +39,7 @@ ADD_LIBRARY (gncmod-html ${html_HEADERS} ) -TARGET_LINK_LIBRARIES(gncmod-html gnc-qof gnc-module gncmod-gnome-utils ${WEBKIT_LDFLAGS} ${GUILE_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-html gncmod-engine gnc-module gncmod-gnome-utils ${WEBKIT_LDFLAGS} ${GUILE_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\") diff --git a/src/html/Makefile.am b/src/html/Makefile.am index 98a7695052..2826b43eef 100644 --- a/src/html/Makefile.am +++ b/src/html/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_builddir}/src \ -I${top_srcdir}/lib/libc \ - ${QOF_CFLAGS} \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} \ ${GTK_CFLAGS} \ @@ -50,7 +49,6 @@ libgncmod_html_la_LIBADD = \ ${GTK_LIBS} \ ${GLIB_LIBS} \ ${DB_LIBS} \ - ${QOF_LIBS} \ ${GUILE_LIBS} \ ${REGEX_LIBS} diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am index 1adfdf6d6c..b276d0a2b3 100644 --- a/src/import-export/Makefile.am +++ b/src/import-export/Makefile.am @@ -44,7 +44,6 @@ libgncmod_generic_import_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${REGEX_LIBS} \ ${GLIB_LIBS} @@ -59,7 +58,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/gnome-utils \ - -I${top_srcdir}/src/libqof/qof \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} diff --git a/src/import-export/aqb/CMakeLists.txt b/src/import-export/aqb/CMakeLists.txt index 30fffecfd2..1355444270 100644 --- a/src/import-export/aqb/CMakeLists.txt +++ b/src/import-export/aqb/CMakeLists.txt @@ -57,7 +57,7 @@ IF(WITH_AQBANKING) TARGET_LINK_LIBRARIES(gncmod-aqbanking gnc-gnome gncmod-gnome-utils gncmod-generic-import gncmod-register-core gncmod-register-gnome gncmod-ledger-core gncmod-engine - gnc-qof ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS} + ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS} ${GWENHYWFAR_LDFLAGS} ${GWENGUI_GTK2_LDFLAGS} ${GNOME_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${AQB_LIBSTDCXX}) diff --git a/src/import-export/aqb/Makefile.am b/src/import-export/aqb/Makefile.am index e006c268ad..7ee956a821 100644 --- a/src/import-export/aqb/Makefile.am +++ b/src/import-export/aqb/Makefile.am @@ -41,7 +41,6 @@ libgncmod_aqbanking_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GTK_LIBS} \ ${GLIB_LIBS} \ ${GWENGUI_GTK2_LIBS} \ @@ -59,7 +58,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} \ ${AQBANKING_CFLAGS} diff --git a/src/import-export/aqb/test/CMakeLists.txt b/src/import-export/aqb/test/CMakeLists.txt index cf2be91e2f..2fd2379d47 100644 --- a/src/import-export/aqb/test/CMakeLists.txt +++ b/src/import-export/aqb/test/CMakeLists.txt @@ -14,7 +14,6 @@ set(test_aqb_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/core-utils ${CMAKE_SOURCE_DIR}/src/gnc-module - ${CMAKE_SOURCE_DIR}/src/libqof/qof ${GLIB2_INCLUDE_DIRS} ${GTK_INCLUDE_DIRS} ${AQBANKING_INCLUDE_DIRS} @@ -24,7 +23,7 @@ set(test_aqb_LIBS gncmod-aqbanking gncmod-generic-import gnc-gnome gncmod-gnome-utils gncmod-ledger-core gncmod-report-gnome gncmod-app-utils gncmod-backend-xml-utils gncmod-engine gnc-core-utils gnc-module - gnc-qof ${GLIB2_LDFLAGS} + ${GLIB2_LDFLAGS} ) SET_DIST_LIST(test_aqb_DIST ${test_aqb_SOURCES} file-book.gnucash diff --git a/src/import-export/aqb/test/Makefile.am b/src/import-export/aqb/test/Makefile.am index b08eef5853..be4a096ede 100644 --- a/src/import-export/aqb/test/Makefile.am +++ b/src/import-export/aqb/test/Makefile.am @@ -40,7 +40,6 @@ test_aqb_LDADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} test_aqb_CFLAGS = \ @@ -58,7 +57,6 @@ test_aqb_CFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} \ ${AQBANKING_CFLAGS} diff --git a/src/import-export/csv-exp/Makefile.am b/src/import-export/csv-exp/Makefile.am index 86c142a338..b3177da1b5 100644 --- a/src/import-export/csv-exp/Makefile.am +++ b/src/import-export/csv-exp/Makefile.am @@ -26,7 +26,6 @@ libgncmod_csv_export_la_LIBADD = \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/lib/libc/libc-missing.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GTK_LIBS} \ ${GLIB_LIBS} @@ -42,7 +41,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/register/register-core \ -I${top_srcdir}/src/register/register-gnome \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/lib/libc \ -I${top_srcdir}/lib \ ${GUILE_CFLAGS} \ diff --git a/src/import-export/csv-imp/Makefile.am b/src/import-export/csv-imp/Makefile.am index 74d01601a6..d57ccbdaf9 100644 --- a/src/import-export/csv-imp/Makefile.am +++ b/src/import-export/csv-imp/Makefile.am @@ -44,7 +44,6 @@ libgncmod_csv_import_la_LIBADD = \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/lib/goffice/libgnc-goffice.la \ ${top_builddir}/lib/libc/libc-missing.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} \ ${GTK_LIBS} \ ${ICU4C_I18N_LIBS} \ @@ -61,7 +60,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/lib/libc \ -I${top_srcdir}/lib/goffice \ -I${top_srcdir}/lib \ diff --git a/src/import-export/csv-imp/test/CMakeLists.txt b/src/import-export/csv-imp/test/CMakeLists.txt index 5fd8cea0ff..66bd44071b 100644 --- a/src/import-export/csv-imp/test/CMakeLists.txt +++ b/src/import-export/csv-imp/test/CMakeLists.txt @@ -4,11 +4,10 @@ SET(CSV_IMP_TEST_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/test-core - ${CMAKE_SOURCE_DIR}/src/libqof/qof ${CMAKE_SOURCE_DIR}/lib ${GLIB2_INCLUDE_DIRS} ) -SET(CSV_IMP_TEST_LIBS gncmod-csv-import gncmod-engine gnc-qof test-core) +SET(CSV_IMP_TEST_LIBS gncmod-csv-import gncmod-engine test-core) # This test does not run in Win32 IF (NOT WIN32) diff --git a/src/import-export/csv-imp/test/Makefile.am b/src/import-export/csv-imp/test/Makefile.am index f0055f4f79..8ae7d61507 100644 --- a/src/import-export/csv-imp/test/Makefile.am +++ b/src/import-export/csv-imp/test/Makefile.am @@ -48,7 +48,6 @@ IMP_TEST_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/src/gnc-module \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/lib/libc \ -I${top_srcdir}/lib \ ${GTK_CFLAGS} \ @@ -77,7 +76,6 @@ IMP_TEST_LDFLAGS = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} \ $(BOOST_LDFLAGS) @@ -105,8 +103,7 @@ GNC_TEST_DEPS = \ --library-dir ${top_builddir}/src/backend/xml \ --library-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/core-utils \ ---library-dir ${top_builddir}/src/gnc-module \ ---library-dir ${top_builddir}/src/libqof/qof +--library-dir ${top_builddir}/src/gnc-module TESTS_ENVIRONMENT = \ SRCDIR=${srcdir} \ diff --git a/src/import-export/log-replay/CMakeLists.txt b/src/import-export/log-replay/CMakeLists.txt index 412d99d28b..b7ad96d974 100644 --- a/src/import-export/log-replay/CMakeLists.txt +++ b/src/import-export/log-replay/CMakeLists.txt @@ -16,7 +16,7 @@ SET(log_replay_noinst_HEADERS ADD_LIBRARY(gncmod-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS}) TARGET_LINK_LIBRARIES(gncmod-log-replay gncmod-gnome-utils gncmod-app-utils gncmod-engine - gnc-core-utils gnc-module gnc-qof ${GTK3_LDFLAGS}) + gnc-core-utils gnc-module ${GTK3_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\") diff --git a/src/import-export/log-replay/Makefile.am b/src/import-export/log-replay/Makefile.am index 0be39fc546..048b7ebfad 100644 --- a/src/import-export/log-replay/Makefile.am +++ b/src/import-export/log-replay/Makefile.am @@ -19,10 +19,8 @@ libgncmod_log_replay_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GTK_LIBS} \ - ${GLIB_LIBS} \ - ${QOF_LIBS} + ${GLIB_LIBS} AM_CPPFLAGS = \ -I${top_srcdir}/src \ @@ -33,7 +31,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} diff --git a/src/import-export/ofx/CMakeLists.txt b/src/import-export/ofx/CMakeLists.txt index e35ba49879..7a88499d5e 100644 --- a/src/import-export/ofx/CMakeLists.txt +++ b/src/import-export/ofx/CMakeLists.txt @@ -23,7 +23,7 @@ IF (WITH_OFX) ADD_LIBRARY(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS}) TARGET_LINK_LIBRARIES(gncmod-ofx gncmod-generic-import gncmod-engine gncmod-app-utils gnc-core-utils - gncmod-gnome-utils gnc-qof ${LIBOFX_LDFLAGS}) + gncmod-gnome-utils ${LIBOFX_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\") diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am index 59fad5c5f0..8a6533ed43 100644 --- a/src/import-export/ofx/Makefile.am +++ b/src/import-export/ofx/Makefile.am @@ -22,7 +22,6 @@ libgncmod_ofx_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} \ ${LIBOFX_LIBS} @@ -35,7 +34,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} \ ${LIBOFX_CFLAGS} diff --git a/src/import-export/ofx/test/Makefile.am b/src/import-export/ofx/test/Makefile.am index 54cc321c1f..0306c97056 100644 --- a/src/import-export/ofx/test/Makefile.am +++ b/src/import-export/ofx/test/Makefile.am @@ -5,9 +5,9 @@ check_PROGRAMS=test-link test_link_SOURCES=test-link.c test_link_LDADD=\ - $(top_builddir)/src/libqof/qof/libgnc-qof.la \ - $(top_builddir)/src/app-utils/libgncmod-app-utils.la \ + $(top_builddir)/src/engine/libgncmod-engine.la \ + $(top_builddir)/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ../libgncmod-ofx.la + ../libgncmod-ofx.la EXTRA_DIST = CMakeLists.txt diff --git a/src/import-export/qif-imp/Makefile.am b/src/import-export/qif-imp/Makefile.am index 790b39d541..96b29c0be9 100644 --- a/src/import-export/qif-imp/Makefile.am +++ b/src/import-export/qif-imp/Makefile.am @@ -23,7 +23,6 @@ libgncmod_qif_import_la_LIBADD = \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GUILE_LIBS} \ ${GLIB_LIBS} @@ -59,7 +58,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} \ ${GTK_CFLAGS} @@ -106,7 +104,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/gnome \ diff --git a/src/import-export/qif-imp/test/Makefile.am b/src/import-export/qif-imp/test/Makefile.am index 38db8066a6..202b6cb7af 100644 --- a/src/import-export/qif-imp/test/Makefile.am +++ b/src/import-export/qif-imp/test/Makefile.am @@ -7,7 +7,6 @@ test_link_SOURCES = \ test_link_LDADD=../libgncmod-qif-import.la \ ${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnome/libgnc-gnome.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ diff --git a/src/import-export/qif/CMakeLists.txt b/src/import-export/qif/CMakeLists.txt index 0178673da8..7a2047a7c3 100644 --- a/src/import-export/qif/CMakeLists.txt +++ b/src/import-export/qif/CMakeLists.txt @@ -25,7 +25,7 @@ SET(qif_noinst_HEADERS ADD_LIBRARY(gncmod-qif ${qif_noinst_HEADERS} ${qif_SOURCES}) -TARGET_LINK_LIBRARIES(gncmod-qif gncmod-generic-import gncmod-engine gnc-qof ${GLIB2_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-qif gncmod-generic-import gncmod-engine ${GLIB2_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-qif PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif\") @@ -36,4 +36,4 @@ INSTALL(TARGETS gncmod-qif # No headers to install. SET_LOCAL_DIST(qif_DIST_local CMakeLists.txt Makefile.am ${qif_SOURCES} ${qif_noinst_HEADERS}) -SET(qif_DIST ${qif_DIST_local} ${test_qif_DIST} PARENT_SCOPE) \ No newline at end of file +SET(qif_DIST ${qif_DIST_local} ${test_qif_DIST} PARENT_SCOPE) diff --git a/src/import-export/qif/Makefile.am b/src/import-export/qif/Makefile.am index cff9cdefdf..88c7280093 100644 --- a/src/import-export/qif/Makefile.am +++ b/src/import-export/qif/Makefile.am @@ -22,7 +22,6 @@ noinst_HEADERS = \ libgncmod_qif_la_LIBADD = \ ${top_builddir}/src/import-export/libgncmod-generic-import.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${REGEX_LIBS} \ ${GLIB_LIBS} @@ -32,7 +31,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GUILE_CFLAGS} diff --git a/src/import-export/qif/test/CMakeLists.txt b/src/import-export/qif/test/CMakeLists.txt index b5c2d4846e..eb4d2b4aa1 100644 --- a/src/import-export/qif/test/CMakeLists.txt +++ b/src/import-export/qif/test/CMakeLists.txt @@ -2,7 +2,7 @@ SET(QIF_TEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src/import-export/qif - ${CMAKE_SOURCE_DIR}/src/libqof/qof + ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/test-core ${GLIB2_INCLUDE_DIRS} ) diff --git a/src/import-export/qif/test/Makefile.am b/src/import-export/qif/test/Makefile.am index 71104256f2..befbc4afca 100644 --- a/src/import-export/qif/test/Makefile.am +++ b/src/import-export/qif/test/Makefile.am @@ -6,7 +6,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/import-export \ -I${top_srcdir}/src/import-export/qif \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} @@ -15,7 +14,6 @@ LDADD = \ ${top_builddir}/src/test-core/libtest-core.la \ ../../libgncmod-generic-import.la \ ../libgncmod-qif.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} TESTS = \ diff --git a/src/import-export/test/CMakeLists.txt b/src/import-export/test/CMakeLists.txt index a81cdf3c92..12a9ade78c 100644 --- a/src/import-export/test/CMakeLists.txt +++ b/src/import-export/test/CMakeLists.txt @@ -4,14 +4,14 @@ SET(GENERIC_IMPORT_TEST_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/src # for config.h ${CMAKE_SOURCE_DIR}/src/gnc-module ${CMAKE_SOURCE_DIR}/src/import-export - ${CMAKE_SOURCE_DIR}/src/libqof/qof ${CMAKE_SOURCE_DIR}/src/test-core + ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/engine/test-core ${GLIB2_INCLUDE_DIRS} ${GUILE_INCLUDE_DIRS} ) -SET(GENERIC_IMPORT_TEST_LIBS gncmod-generic-import gncmod-test-engine gnc-qof test-core) +SET(GENERIC_IMPORT_TEST_LIBS gncmod-generic-import gncmod-test-engine test-core) GNC_ADD_TEST_WITH_GUILE(test-import-parse test-import-parse.c GENERIC_IMPORT_TEST_INCLUDE_DIRS GENERIC_IMPORT_TEST_LIBS diff --git a/src/import-export/test/Makefile.am b/src/import-export/test/Makefile.am index 1d322958ec..196731e547 100644 --- a/src/import-export/test/Makefile.am +++ b/src/import-export/test/Makefile.am @@ -7,14 +7,12 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/import-export \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/engine/test-core \ ${GTK_CFLAGS} \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/test-core/libtest-core.la \ @@ -40,7 +38,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/app-utils \ --guile-load-dir ${top_builddir}/src/gnome-utils \ \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/gnome-utils \ @@ -65,7 +62,6 @@ noinst_PROGRAMS = $(TEST_PROGS) $(check_PROGRAMS) test_import_pending_matches_SOURCES = test-import-pending-matches.c test_import_pending_matches_LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ../libgncmod-generic-import.la \ ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \ diff --git a/src/libqof/CMakeLists.txt b/src/libqof/CMakeLists.txt deleted file mode 100644 index fdb77483e8..0000000000 --- a/src/libqof/CMakeLists.txt +++ /dev/null @@ -1,6 +0,0 @@ -# CMakeLists.txt for src/libqof - -ADD_SUBDIRECTORY(qof) - -SET_LOCAL_DIST(libqof_DIST_local CMakeLists.txt Makefile.am) -SET(libqof_DIST ${libqof_DIST_local} ${qof_DIST} PARENT_SCOPE) diff --git a/src/libqof/Makefile.am b/src/libqof/Makefile.am deleted file mode 100644 index 3a351536f1..0000000000 --- a/src/libqof/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = . qof - -EXTRA_DIST = CMakeLists.txt diff --git a/src/libqof/qof/CMakeLists.txt b/src/libqof/qof/CMakeLists.txt deleted file mode 100644 index 0ef2525241..0000000000 --- a/src/libqof/qof/CMakeLists.txt +++ /dev/null @@ -1,129 +0,0 @@ -# CMakeLists.txt for src/libqof - -ADD_SUBDIRECTORY(test) - -SET (gnc_qof_HEADERS - gnc-aqbanking-templates.h - gnc-date-p.h - gnc-date.h - gnc-datetime.hpp - gnc-timezone.hpp - gnc-numeric.h - gnc-numeric.hpp - gnc-rational.hpp - gnc-rational-rounding.hpp - guid.h - kvp_frame.hpp - kvp-value.hpp - qof.h - qof-backend.hpp - qofbackend.h - qofbook.h - qofbookslots.h - qofchoice.h - qofclass.h - qofevent.h - qofid-p.h - qofid.h - qofinstance-p.h - qofinstance.h - qoflog.h - qofobject.h - qofquery.h - qofquerycore.h - qofsession.h - qofutil.h - qof-gobject.h - qof-string-cache.h -) -SET (gnc_qof_noinst_HEADERS - gnc-backend-prov.hpp - qofbook-p.h - qofclass-p.h - gnc-date-p.h - qofevent-p.h - gnc-int128.hpp - qofobject-p.h - qofquery-p.h - qofquerycore-p.h - qofsession.hpp -) - -SET (gnc_qof_SOURCES - gnc-aqbanking-templates.cpp - gnc-date.cpp - gnc-datetime.cpp - gnc-int128.cpp - gnc-numeric.cpp - gnc-rational.cpp - gnc-datetime.cpp - gnc-timezone.cpp - guid.cpp - kvp_frame.cpp - kvp-value.cpp - qof-backend.cpp - qofbook.cpp - qofchoice.cpp - qofclass.cpp - qofevent.cpp - qofid.cpp - qofinstance.cpp - qoflog.cpp - qofobject.cpp - qofquery.cpp - qofquerycore.cpp - qofsession.cpp - qofutil.cpp - qof-string-cache.cpp -) - -IF (WIN32) - ADD_DEFINITIONS (-DOS_WIN32) - SET (gnc_qof_SOURCES ${gnc_qof_SOURCES} - qof-win32.cpp - ../../../lib/libc/strptime.c - ) -ENDIF (WIN32) - -# Add dependency on config.h -SET_SOURCE_FILES_PROPERTIES (${gnc_qof_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H}) - - -ADD_LIBRARY(gnc-qof - ${gnc_qof_SOURCES} - ${gnc_qof_HEADERS} - ${gnc_qof_noinst_HEADERS} -) - -TARGET_LINK_LIBRARIES(gnc-qof ${Boost_DATE_TIME_LIBRARIES} ${Boost_REGEX_LIBRARIES} ${REGEX_LDFLAGS} ${GMODULE_LDFLAGS} ${GLIB2_LDFLAGS} ${GOBJECT_LDFLAGS}) - -TARGET_COMPILE_DEFINITIONS (gnc-qof PRIVATE -DG_LOG_DOMAIN=\"qof\") - -TARGET_INCLUDE_DIRECTORIES (gnc-qof PUBLIC - ${CMAKE_BINARY_DIR}/src # for config.h - ${CMAKE_SOURCE_DIR}/src # for platform.h - ${CMAKE_CURRENT_SOURCE_DIR}/qof - ${GLIB2_INCLUDE_DIRS} - ${LIBINTL_INCLUDE_PATH} - ${REGEX_INCLUDE_PATH} - ${CMAKE_SOURCE_DIR}/lib/libc # for strptime.h -) - -INSTALL(TARGETS gnc-qof - LIBRARY DESTINATION lib - ARCHIVE DESTINATION lib - RUNTIME DESTINATION bin) -INSTALL(FILES ${gnc_qof_HEADERS} DESTINATION include/gnucash) - -SET(qof_test_HEADERS - kvp_frame.hpp - qofbook.h - qofinstance.h - qofobject.h - qofsession.h -) - -INSTALL(FILES ${qof_test_HEADERS} DESTINATION libexec/gnucash/src/libqof/qof/test) -SET_LOCAL_DIST(qof_DIST_local CMakeLists.txt Makefile.am ${gnc_qof_EXTRA_DIST} - ${gnc_qof_HEADERS} ${gnc_qof_noinst_HEADERS} ${gnc_qof_SOURCES} qof-win32.cpp) -SET(qof_DIST ${qof_DIST_local} ${test_qof_DIST} PARENT_SCOPE) diff --git a/src/libqof/qof/Makefile.am b/src/libqof/qof/Makefile.am deleted file mode 100644 index 418fe93a7a..0000000000 --- a/src/libqof/qof/Makefile.am +++ /dev/null @@ -1,107 +0,0 @@ -include $(top_srcdir)/test-templates/Makefile.decl -SUBDIRS = . test -TEST_SUBDIRS = test - -lib_LTLIBRARIES = libgnc-qof.la - -libgnc_qof_la_LDFLAGS= \ - -version-info \ - $(LIBQOF_LIBRARY_VERSION) - -libgnc_qof_common_libs = \ - $(GLIB_LIBS) \ - $(REGEX_LIBS) \ - ${BOOST_LDFLAGS} -lboost_regex \ - $(top_builddir)/lib/libc/libc-missing.la - -libgnc_qof_la_LIBADD = $(libgnc_qof_common_libs) - -AM_CPPFLAGS = \ - -I$(top_srcdir)/lib/libc \ - -I$(top_srcdir)/src \ - $(GLIB_CFLAGS) \ - $(BOOST_CPPFLAGS) - -libgnc_qof_la_SOURCES = \ - gnc-aqbanking-templates.cpp \ - gnc-date.cpp \ - gnc-int128.cpp \ - gnc-numeric.cpp \ - gnc-rational.cpp \ - gnc-timezone.cpp \ - gnc-datetime.cpp \ - guid.cpp \ - kvp_frame.cpp \ - kvp-value.cpp \ - qof-backend.cpp \ - qofbook.cpp \ - qofchoice.cpp \ - qofclass.cpp \ - qofevent.cpp \ - qofid.cpp \ - qofinstance.cpp \ - qoflog.cpp \ - qofobject.cpp \ - qofquery.cpp \ - qofquerycore.cpp \ - qofsession.cpp \ - qof-string-cache.cpp \ - qofutil.cpp - -qofincludedir = ${pkgincludedir} - -qofinclude_HEADERS = \ - gnc-aqbanking-templates.h \ - gnc-date-p.h \ - gnc-date.h \ - gnc-numeric.h \ - gnc-numeric.hpp \ - gnc-rational.hpp \ - gnc-rational-rounding.hpp \ - gnc-timezone.hpp \ - gnc-datetime.hpp \ - guid.h \ - kvp_frame.hpp \ - kvp-value.hpp \ - qof.h \ - qof-backend.hpp \ - qofbackend.h \ - qofbook.h \ - qofbookslots.h \ - qofchoice.h \ - qofclass.h \ - qofevent.h \ - qofid-p.h \ - qofid.h \ - qofinstance-p.h \ - qofinstance.h \ - qoflog.h \ - qofobject.h \ - qofquery.h \ - qofquerycore.h \ - qofsession.h \ - qofsession.hpp \ - qof-string-cache.h \ - qofutil.h \ - qof-gobject.h - -noinst_HEADERS = \ - gnc-backend-prov.hpp \ - qofbook-p.h \ - qofclass-p.h \ - qofevent-p.h \ - gnc-int128.hpp \ - qofobject-p.h \ - qofquery-p.h \ - qofquerycore-p.h - -EXTRA_DIST += \ - CMakeLists.txt - -if OS_WIN32 -libgnc_qof_la_SOURCES += qof-win32.cpp -else -EXTRA_DIST += qof-win32.cpp -endif - -AM_CPPFLAGS += -DG_LOG_DOMAIN=\"qof\" diff --git a/src/libqof/qof/test/CMakeLists.txt b/src/libqof/qof/test/CMakeLists.txt deleted file mode 100644 index 356b532069..0000000000 --- a/src/libqof/qof/test/CMakeLists.txt +++ /dev/null @@ -1,145 +0,0 @@ -SET(TEST_QOF_INCLUDE_DIRS - ${CMAKE_BINARY_DIR}/src # for config.h - ${CMAKE_SOURCE_DIR}/src/test-core # for unittest-support.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof # for qof.h - ${GLIB2_INCLUDE_DIRS} -) - -SET(TEST_QOF_LIBS - gnc-qof test-core ${GLIB2_LDFLAGS} -lm -) - -SET(test_qof_SOURCES - test-gnc-date.c - test-qof.c - test-qofbook.c - test-qofinstance.cpp - test-qofobject.c - test-qof-string-cache.c -) - -SET(TEST_ENGINE_INCLUDE_DIRS - ${TEST_QOF_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/src/engine - ${CMAKE_SOURCE_DIR}/src/engine/test-core - ${CMAKE_BINARY_DIR}/src # for config.h - ) - -SET(TEST_ENGINE_LIBS - ${TEST_QOF_LIBS} - gncmod-test-engine - ) - -SET(test_numeric_SOURCES - ${CMAKE_SOURCE_DIR}/src/engine/cashobjects.c - ${CMAKE_SOURCE_DIR}/src/engine/test-core/test-engine-stuff.cpp - ${CMAKE_SOURCE_DIR}/src/libqof/qof/gnc-numeric.cpp - ${CMAKE_SOURCE_DIR}/src/libqof/qof/gnc-rational.cpp - ${CMAKE_SOURCE_DIR}/src/libqof/qof/gnc-int128.cpp - ${CMAKE_SOURCE_DIR}/src/libqof/qof/test/test-numeric.cpp -) - - -GNC_ADD_TEST(test-numeric "${test_numeric_SOURCES}" TEST_ENGINE_INCLUDE_DIRS TEST_ENGINE_LIBS) - -# This test does not on Win32. Worse, it causes a dialog box to -# pop up due to an assertion. This interferes with running the tests -# unattended. -IF (NOT WIN32) - SET(SOURCES ${test_qof_SOURCES} ${CMAKE_SOURCE_DIR}/src/test-core/unittest-support.c) - GNC_ADD_TEST(test-qof "${SOURCES}" - TEST_QOF_INCLUDE_DIRS TEST_QOF_LIBS) - TARGET_COMPILE_DEFINITIONS(test-qof PRIVATE TESTPROG=test_qof) - SET(MODULEPATH ${CMAKE_SOURCE_DIR}/src/libqof/qof) - SET(gtest_old_qof_LIBS gnc-qof ${GLIB2_LDFLAGS} ${Boost_LIBRARIES} ${GTEST_LIB}) - SET(gtest_qof_LIBS - ${GLIB2_LDFLAGS} - ${GOBJECT_LDFLAGS} - ${GMODULE_LDFLAGS} - ${GTHREAD_LDFLAGS} - ${Boost_LIBRARIES} - ${GTEST_LIB}) - SET(gtest_qof_INCLUDES - ${MODULEPATH} - ${CMAKE_BINARY_DIR}/src # for config.h - ${CMAKE_SOURCE_DIR}/src # for platform.h - ${GLIB2_INCLUDE_DIRS} - ${GTEST_INCLUDE_DIR}) - - SET(test_gnc_guid_SOURCES - ${MODULEPATH}/guid.cpp - test-gnc-guid.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-gnc-guid "${test_gnc_guid_SOURCES}" - gtest_qof_INCLUDES gtest_old_qof_LIBS) - - SET(test_kvp_value_SOURCES - ${MODULEPATH}/kvp-value.cpp - test-kvp-value.cpp - test-kvp-frame.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-kvp-value "${test_kvp_value_SOURCES}" - gtest_qof_INCLUDES gtest_old_qof_LIBS) - - SET(test_qofsession_SOURCES - ${MODULEPATH}/qofsession.cpp - test-qofsession.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-qofsession "${test_qofsession_SOURCES}" - gtest_qof_INCLUDES gtest_old_qof_LIBS) - - SET(test_gnc_int128_SOURCES - ${MODULEPATH}/gnc-int128.cpp - gtest-gnc-int128.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-gnc-int128 "${test_gnc_int128_SOURCES}" - gtest_qof_INCLUDES gtest_qof_LIBS) - - SET(test_gnc_rational_SOURCES - ${MODULEPATH}/gnc-rational.cpp - ${MODULEPATH}/gnc-numeric.cpp - ${MODULEPATH}/gnc-int128.cpp - ${MODULEPATH}/gnc-datetime.cpp - ${MODULEPATH}/gnc-timezone.cpp - ${MODULEPATH}/gnc-date.cpp - ${MODULEPATH}/qoflog.cpp - gtest-gnc-rational.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-gnc-rational "${test_gnc_rational_SOURCES}" - gtest_qof_INCLUDES gtest_qof_LIBS) - - SET(test_gnc_numeric_SOURCES - ${MODULEPATH}/gnc-rational.cpp - ${MODULEPATH}/gnc-int128.cpp - ${MODULEPATH}/gnc-numeric.cpp - ${MODULEPATH}/gnc-datetime.cpp - ${MODULEPATH}/gnc-timezone.cpp - ${MODULEPATH}/gnc-date.cpp - ${MODULEPATH}/qoflog.cpp - gtest-gnc-numeric.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-gnc-numeric "${test_gnc_numeric_SOURCES}" - gtest_qof_INCLUDES gtest_qof_LIBS) - - SET(test_gnc_timezone_SOURCES - ${MODULEPATH}/gnc-timezone.cpp - gtest-gnc-timezone.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-gnc-timezone "${test_gnc_timezone_SOURCES}" - gtest_qof_INCLUDES gtest_old_qof_LIBS) - - SET(test_gnc_datetime_SOURCES - ${MODULEPATH}/gnc-datetime.cpp - ${MODULEPATH}/gnc-timezone.cpp - ${MODULEPATH}/gnc-date.cpp - ${MODULEPATH}/qoflog.cpp - gtest-gnc-datetime.cpp - ${GTEST_SRC}) - GNC_ADD_TEST(test-gnc-datetime "${test_gnc_datetime_SOURCES}" - gtest_qof_INCLUDES gtest_qof_LIBS) -ENDIF() - -SET_DIST_LIST(test_qof_DIST CMakeLists.txt Makefile.am ${test_qof_SOURCES} - test-numeric.cpp test-gnc-guid.cpp test-kvp-value.cpp test-kvp-frame.cpp - test-qofsession.cpp gtest-gnc-int128.cpp gtest-gnc-rational.cpp - gtest-gnc-numeric.cpp gtest-gnc-timezone.cpp gtest-gnc-datetime.cpp) diff --git a/src/libqof/qof/test/Makefile.am b/src/libqof/qof/test/Makefile.am deleted file mode 100644 index 304fc6fb6c..0000000000 --- a/src/libqof/qof/test/Makefile.am +++ /dev/null @@ -1,252 +0,0 @@ -# A template Makefile.am for GLib g_test-based test directories. -# Copyright 2011 John Ralls - -include $(top_srcdir)/test-templates/Makefile.decl - - -#You will only need one of these: It points to the module directory -#after $(top_srcdir) or $(top_builddir): -MODULEPATH = src/libqof/qof - -test_qof_SOURCES = \ - test-gnc-date.c \ - test-qof.c \ - test-qofbook.c \ - test-qofinstance.cpp \ - test-qofobject.c \ - test-qof-string-cache.c \ - ${top_srcdir}/src/test-core/unittest-support.c - -test_qof_HEADERS = \ - $(top_srcdir)/${MODULEPATH}/qofbook.h \ - $(top_srcdir)/${MODULEPATH}/qofinstance.h \ - $(top_srcdir)/${MODULEPATH}/kvp_frame.hpp \ - $(top_srcdir)/${MODULEPATH}/qofobject.h \ - $(top_srcdir)/${MODULEPATH}/qofsession.h \ - $(top_srcdir)/src/test-core/unittest-support.h - -test_numeric_SOURCES = \ - ${top_srcdir}/src/engine/cashobjects.c \ - ${top_srcdir}/src/test-core/test-stuff.c \ - ${top_srcdir}/src/engine/test-core/test-engine-stuff.cpp \ - ${top_srcdir}/${MODULEPATH}/gnc-numeric.cpp \ - ${top_srcdir}/${MODULEPATH}/gnc-rational.cpp \ - ${top_srcdir}/${MODULEPATH}/gnc-int128.cpp \ - ${top_srcdir}/${MODULEPATH}/test/test-numeric.cpp - -test_numeric_CPPFLAGS = \ - -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/test-core \ - -I${top_srcdir}/src/engine/test-core \ - -I${top_srcdir}/src \ - -I${top_srcdir}/${MODULEPATH} \ - ${BOOST_CPPFLAGS} \ - ${GLIB_CFLAGS} - -test_numeric_LDADD = \ - ${top_builddir}/src/engine/libgncmod-engine.la \ - ${top_builddir}/${MODULEPATH}/libgnc-qof.la \ - ${BOOST_LDFLAGS} -lboost_regex \ - ${GLIB_LIBS} - -check_PROGRAMS = \ - test-numeric \ - test-qof - -TESTS = ${check_PROGRAMS} - -test_gnc_guid_SOURCES = \ - $(top_srcdir)/$(MODULEPATH)/guid.cpp \ - test-gnc-guid.cpp -test_gnc_guid_LDADD = \ - $(top_builddir)/$(MODULEPATH)/libgnc-qof.la \ - $(GLIB_LIBS) \ - $(GTEST_LIBS) \ - $(BOOST_LDFLAGS) -if !GOOGLE_TEST_LIBS -nodist_test_gnc_guid_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif - -test_gnc_guid_CPPFLAGS = \ - -I$(GTEST_HEADERS) \ - -I$(top_srcdir)/$(MODULEPATH) \ - $(GLIB_CFLAGS) \ - $(BOOST_CPPFLAGS) - -check_PROGRAMS += test-gnc-guid - -test_kvp_value_SOURCES = \ - $(top_srcdir)/$(MODULEPATH)/kvp-value.cpp \ - test-kvp-value.cpp \ - test-kvp-frame.cpp -test_kvp_value_LDADD = \ - $(top_builddir)/$(MODULEPATH)/libgnc-qof.la \ - $(GLIB_LIBS) \ - $(GTEST_LIBS) \ - $(BOOST_LDFLAGS) - -if !GOOGLE_TEST_LIBS -nodist_test_kvp_value_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif - -test_kvp_value_CPPFLAGS = \ - -I$(GTEST_HEADERS) \ - -I$(top_srcdir)/$(MODULEPATH) \ - $(GLIB_CFLAGS) \ - $(BOOST_CPPFLAGS) - -check_PROGRAMS += test-kvp-value - -test_qofsession_SOURCES = \ - $(top_srcdir)/$(MODULEPATH)/qofsession.cpp \ - test-qofsession.cpp -test_qofsession_LDADD = \ - $(top_builddir)/$(MODULEPATH)/libgnc-qof.la \ - $(GLIB_LIBS) \ - $(GTEST_LIBS) \ - $(BOOST_LDFLAGS) -lboost_regex - -if !GOOGLE_TEST_LIBS -nodist_test_qofsession_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif - -test_qofsession_CPPFLAGS = \ - -I$(GTEST_HEADERS) \ - -I$(top_srcdir)/$(MODULEPATH) \ - $(GLIB_CFLAGS) \ - $(BOOST_CPPFLAGS) - -check_PROGRAMS += test-qofsession - -test_gnc_int128_SOURCES = \ - $(top_srcdir)/${MODULEPATH}/gnc-int128.cpp \ - gtest-gnc-int128.cpp -test_gnc_int128_CPPFLAGS = -I${GTEST_HEADERS} - -test_gnc_int128_LDADD = ${GTEST_LIBS} -if !GOOGLE_TEST_LIBS -nodist_test_gnc_int128_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif -check_PROGRAMS += test-gnc-int128 - -test_gnc_rational_SOURCES = \ - $(top_srcdir)/${MODULEPATH}/gnc-rational.cpp \ - $(top_srcdir)/${MODULEPATH}/gnc-numeric.cpp \ - $(top_srcdir)/${MODULEPATH}/gnc-int128.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-datetime.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-timezone.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-date.cpp \ - $(top_srcdir)/${MODULEPATH}/qoflog.cpp \ - gtest-gnc-rational.cpp - -test_gnc_rational_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/libqof/qof \ - -I${GTEST_HEADERS} \ - ${BOOST_CPPFLAGS} \ - ${GLIB_CFLAGS} - -test_gnc_rational_LDADD = \ - ${GTEST_LIBS} \ - ${BOOST_LDFLAGS} -lboost_regex \ - ${GLIB_LIBS} - -if !GOOGLE_TEST_LIBS -nodist_test_gnc_rational_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif -check_PROGRAMS += test-gnc-rational -check_PROGRAMS += test-gnc-int128 - -test_gnc_numeric_SOURCES = \ - $(top_srcdir)/${MODULEPATH}/gnc-rational.cpp \ - $(top_srcdir)/${MODULEPATH}/gnc-int128.cpp \ - $(top_srcdir)/${MODULEPATH}/gnc-numeric.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-datetime.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-timezone.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-date.cpp \ - $(top_srcdir)/${MODULEPATH}/qoflog.cpp \ - gtest-gnc-numeric.cpp -test_gnc_numeric_CPPFLAGS = \ - -I${top_srcdir}/src \ - -I${top_srcdir}/src/libqof/qof \ - -I${GTEST_HEADERS} \ - ${BOOST_CPPFLAGS} \ - ${GLIB_CFLAGS} - -test_gnc_numeric_LDADD = \ - ${GTEST_LIBS} \ - ${BOOST_LDFLAGS} -lboost_regex \ - ${GLIB_LIBS} -if !GOOGLE_TEST_LIBS -nodist_test_gnc_numeric_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif -check_PROGRAMS += test-gnc-numeric - -test_gnc_timezone_SOURCES = \ - $(top_srcdir)/${MODULEPATH}/gnc-timezone.cpp \ - gtest-gnc-timezone.cpp - -test_gnc_timezone_CPPFLAGS = \ - -I${GTEST_HEADERS} \ - -I$(top_srcdir)/$(MODULEPATH) \ - -I${top_srcdir}/src \ - $(GLIB_CFLAGS) \ - $(BOOST_CPPFLAGS) - -test_gnc_timezone_LDADD = \ - ${top_builddir}/${MODULEPATH}/libgnc-qof.la \ - $(GLIB_LIBS) \ - $(GTEST_LIBS) -if !GOOGLE_TEST_LIBS -nodist_test_gnc_timezone_SOURCES = \ - ${GTEST_SRC}/src/gtest_main.cc -endif -check_PROGRAMS += test-gnc-timezone - -test_gnc_datetime_SOURCES = \ - $(top_srcdir)/$(MODULEPATH)/gnc-datetime.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-timezone.cpp \ - $(top_srcdir)/$(MODULEPATH)/gnc-date.cpp \ - $(top_srcdir)/${MODULEPATH}/qoflog.cpp \ - gtest-gnc-datetime.cpp -test_gnc_datetime_CPPFLAGS =\ - -I$(GTEST_HEADERS) \ - -I$(top_srcdir)/$(MODULEPATH) \ - -I$(top_srcdir)/src \ - $(GLIB_CFLAGS) \ - $(BOOST_CPPFLAGS) - -test_gnc_datetime_LDADD = \ - $(GLIB_LIBS) \ - $(GTEST_LIBS) \ - ${BOOST_LDFLAGS} -lboost_regex -lboost_date_time -if !GOOGLE_TEST_LIBS -nodist_test_gnc_datetime_SOURCES = \ - $(GTEST_SRC)/src/gtest_main.cc -endif -check_PROGRAMS += test-gnc-datetime - - -test_qofdir = ${GNC_LIBEXECDIR}/${MODULEPATH}/test - -#The tests might require more libraries, but try to keep them -#as independent as possible. -test_qof_LDADD = \ - ${top_builddir}/${MODULEPATH}/libgnc-qof.la \ - $(GLIB_LIBS) - -test_qof_CPPFLAGS = \ - ${DEFAULT_INCLUDES} \ - -I$(top_srcdir)/${MODULEPATH} \ - -I$(top_srcdir)/src/test-core \ - -DTESTPROG=test_qof \ - -I$(top_srcdir)/lib/libc \ - ${GLIB_CFLAGS} - -EXTRA_DIST += CMakeLists.txt diff --git a/src/optional/gtkmm/CMakeLists.txt b/src/optional/gtkmm/CMakeLists.txt index b3a3958bcb..ad777a050e 100644 --- a/src/optional/gtkmm/CMakeLists.txt +++ b/src/optional/gtkmm/CMakeLists.txt @@ -12,7 +12,6 @@ INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH}) INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS}) INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h -INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/libqof/qof) # for qof.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/gnc-module) # for gnc-glib-utils.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/core-utils) # for gnc-glib-utils.h INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src/engine) # for gnc-glib-utils.h diff --git a/src/optional/gtkmm/Makefile.am b/src/optional/gtkmm/Makefile.am index f0757a342a..7b4be860e9 100644 --- a/src/optional/gtkmm/Makefile.am +++ b/src/optional/gtkmm/Makefile.am @@ -40,13 +40,11 @@ libgncmod_gtkmm_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GTKMM_LIBS} \ ${GLIB_LIBS} AM_CPPFLAGS = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/libqof/qof \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/core-utils \ -I${top_srcdir}/src/engine \ diff --git a/src/optional/gtkmm/gncmm/Account.hpp b/src/optional/gtkmm/gncmm/Account.hpp index efd53f1461..576188291c 100644 --- a/src/optional/gtkmm/gncmm/Account.hpp +++ b/src/optional/gtkmm/gncmm/Account.hpp @@ -24,7 +24,7 @@ #define GNC_ACCOUNT_HPP // gnucash includes -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/optional/gtkmm/gncmm/Book.hpp b/src/optional/gtkmm/gncmm/Book.hpp index 41ad8b73f3..2795166b00 100644 --- a/src/optional/gtkmm/gncmm/Book.hpp +++ b/src/optional/gtkmm/gncmm/Book.hpp @@ -24,7 +24,7 @@ #define GNC_BOOK_HPP // gnucash includes -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/optional/gtkmm/gncmm/Commodity.hpp b/src/optional/gtkmm/gncmm/Commodity.hpp index e944eba0c8..f2e9f9f4e5 100644 --- a/src/optional/gtkmm/gncmm/Commodity.hpp +++ b/src/optional/gtkmm/gncmm/Commodity.hpp @@ -25,7 +25,7 @@ // gnucash includes #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/optional/gtkmm/gncmm/GncInstance.hpp b/src/optional/gtkmm/gncmm/GncInstance.hpp index 641c029e64..14a8369785 100644 --- a/src/optional/gtkmm/gncmm/GncInstance.hpp +++ b/src/optional/gtkmm/gncmm/GncInstance.hpp @@ -25,7 +25,7 @@ // gnucash includes #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/optional/gtkmm/gncmm/Numeric.hpp b/src/optional/gtkmm/gncmm/Numeric.hpp index b6214503ec..74e80419d4 100644 --- a/src/optional/gtkmm/gncmm/Numeric.hpp +++ b/src/optional/gtkmm/gncmm/Numeric.hpp @@ -25,7 +25,7 @@ // gnucash includes #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/optional/gtkmm/gncmm/Split.hpp b/src/optional/gtkmm/gncmm/Split.hpp index 2fc40a56e2..0465bc5b62 100644 --- a/src/optional/gtkmm/gncmm/Split.hpp +++ b/src/optional/gtkmm/gncmm/Split.hpp @@ -25,7 +25,7 @@ // gnucash includes #include "config.h" -#include "libqof/qof/guid.hpp" +#include "engine/guid.hpp" extern "C" { #include "qof.h" diff --git a/src/optional/gtkmm/test/Makefile.am b/src/optional/gtkmm/test/Makefile.am index 631b518ead..c36d0a04ec 100644 --- a/src/optional/gtkmm/test/Makefile.am +++ b/src/optional/gtkmm/test/Makefile.am @@ -30,7 +30,7 @@ test_gtkmm_HEADERS = \ #The tests might require more libraries, but try to keep them #as independent as possible. test_gtkmm_LDADD = ${top_builddir}/${MODULEPATH}/libgncmod-gtkmm.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${GTKMM_LIBS} \ ${GLIB_LIBS} diff --git a/src/optional/python-bindings/CMakeLists.txt b/src/optional/python-bindings/CMakeLists.txt index 93682fb2c8..8aed964dbd 100644 --- a/src/optional/python-bindings/CMakeLists.txt +++ b/src/optional/python-bindings/CMakeLists.txt @@ -5,21 +5,21 @@ IF (BUILDING_FROM_VCS) SET(SWIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i ${CMAKE_CURRENT_SOURCE_DIR}/timespec.i) SET(GNUCASH_CORE_C_INCLUDES ${CMAKE_BINARY_DIR}/src/config.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/qofsession.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/qofbook.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/qofbackend.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/qoflog.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/qofutil.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/qofid.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/guid.h + ${CMAKE_SOURCE_DIR}/src/engine/qofsession.h + ${CMAKE_SOURCE_DIR}/src/engine/qofbook.h + ${CMAKE_SOURCE_DIR}/src/engine/qofbackend.h + ${CMAKE_SOURCE_DIR}/src/engine/qoflog.h + ${CMAKE_SOURCE_DIR}/src/engine/qofutil.h + ${CMAKE_SOURCE_DIR}/src/engine/qofid.h + ${CMAKE_SOURCE_DIR}/src/engine/guid.h ${CMAKE_SOURCE_DIR}/src/gnc-module/gnc-module.h ${CMAKE_SOURCE_DIR}/src/engine/gnc-engine.h - ${CMAKE_SOURCE_DIR}/src/engine/Transaction.h + ${CMAKE_SOURCE_DIR}/src/engine/Transaction.h ${CMAKE_SOURCE_DIR}/src/engine/Split.h ${CMAKE_SOURCE_DIR}/src/engine/Account.h ${CMAKE_SOURCE_DIR}/src/engine/gnc-commodity.h ${CMAKE_SOURCE_DIR}/src/engine/gnc-lot.h - ${CMAKE_SOURCE_DIR}/src/libqof/qof/gnc-numeric.h + ${CMAKE_SOURCE_DIR}/src/engine/gnc-numeric.h ${CMAKE_SOURCE_DIR}/src/engine/gncCustomer.h ${CMAKE_SOURCE_DIR}/src/engine/gncEmployee.h ${CMAKE_SOURCE_DIR}/src/engine/gncVendor.h @@ -50,7 +50,6 @@ ENDIF() IF(WITH_PYTHON) SET(gnucash_core_c_INCLUDE_DIRS - ${CMAKE_SOURCE_DIR}/src/libqof/qof ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/gnome-utils @@ -66,12 +65,12 @@ 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-qof gnc-module gncmod-engine gncmod-app-utils ${GLIB_LIBS} ${PYTHON_LIBRARIES}) + TARGET_LINK_LIBRARIES(gnucash_core_c gncmod-app-utils gncmod-engine gnc-module ${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) ADD_EXECUTABLE(sqlite3test EXCLUDE_FROM_ALL sqlite3test.c ${SWIG_GNUCASH_CORE_C}) - TARGET_LINK_LIBRARIES(sqlite3test gnc-qof gnc-module gncmod-engine gncmod-app-utils ${GLIB_LIBS} ${PYTHON_LIBRARIES}) + TARGET_LINK_LIBRARIES(sqlite3test gncmod-app-utils gncmod-engine gnc-module ${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) diff --git a/src/optional/python-bindings/Makefile.am b/src/optional/python-bindings/Makefile.am index 7f9bf9c888..6d0ac7d701 100644 --- a/src/optional/python-bindings/Makefile.am +++ b/src/optional/python-bindings/Makefile.am @@ -17,7 +17,6 @@ _gnucash_core_c_la_SOURCES = \ _gnucash_core_c_la_CPPFLAGS = \ $(PYTHON_CPPFLAGS) \ $(GLIB_CFLAGS) \ - -I${top_srcdir}/src/libqof/qof \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/engine \ -I${top_srcdir}/src/gnome-utils \ @@ -34,20 +33,19 @@ _gnucash_core_c_la_LDFLAGS = -avoid-version -module _gnucash_core_c_la_LIBADD = \ ${GLIB_LIBS} \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la if BUILDING_FROM_VCS _gnucash_core_c_includes= \ ${top_builddir}/config.h \ - ${top_srcdir}/src/libqof/qof/qofsession.h \ - ${top_srcdir}/src/libqof/qof/qofbook.h \ - ${top_srcdir}/src/libqof/qof/qofbackend.h \ - ${top_srcdir}/src/libqof/qof/qoflog.h \ - ${top_srcdir}/src/libqof/qof/qofutil.h \ - ${top_srcdir}/src/libqof/qof/qofid.h \ - ${top_srcdir}/src/libqof/qof/guid.h \ + ${top_srcdir}/src/engine/qofsession.h \ + ${top_srcdir}/src/engine/qofbook.h \ + ${top_srcdir}/src/engine/qofbackend.h \ + ${top_srcdir}/src/engine/qoflog.h \ + ${top_srcdir}/src/engine/qofutil.h \ + ${top_srcdir}/src/engine/qofid.h \ + ${top_srcdir}/src/engine/guid.h \ ${top_srcdir}/src/gnc-module/gnc-module.h \ ${top_srcdir}/src/engine/gnc-engine.h \ ${top_srcdir}/src/engine/Transaction.h \ @@ -55,7 +53,7 @@ _gnucash_core_c_includes= \ ${top_srcdir}/src/engine/Account.h \ ${top_srcdir}/src/engine/gnc-commodity.h \ ${top_srcdir}/src/engine/gnc-lot.h \ - ${top_srcdir}/src/libqof/qof/gnc-numeric.h \ + ${top_srcdir}/src/engine/gnc-numeric.h \ ${top_srcdir}/src/engine/gncCustomer.h \ ${top_srcdir}/src/engine/gncEmployee.h \ ${top_srcdir}/src/engine/gncVendor.h \ @@ -74,8 +72,7 @@ _gnucash_core_c_includes= \ gnucash_core.c: $(SWIG_FILES) ${top_srcdir}/src/base-typemaps.i ${top_srcdir}/src/engine/engine-common.i $(_gnucash_core_c_includes) $(SWIG) -python -Wall -Werror \ -I$(top_srcdir)/src -I$(top_srcdir)/src/engine \ - -I$(top_srcdir)/src/app-utils -I${top_srcdir}/src/libqof/qof \ - -o $@ $< + -I$(top_srcdir)/src/app-utils -o $@ $< gnucash_core_c.py: gnucash_core.c $(SWIG_FILES) endif diff --git a/src/optional/python-bindings/tests/Makefile.am b/src/optional/python-bindings/tests/Makefile.am index 8a0d3f6729..6b638c5d43 100644 --- a/src/optional/python-bindings/tests/Makefile.am +++ b/src/optional/python-bindings/tests/Makefile.am @@ -5,7 +5,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/scm \ --guile-load-dir ${top_builddir}/src/app-utils \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ diff --git a/src/plugins/bi_import/CMakeLists.txt b/src/plugins/bi_import/CMakeLists.txt index 9662853fe5..f6b25f32c7 100644 --- a/src/plugins/bi_import/CMakeLists.txt +++ b/src/plugins/bi_import/CMakeLists.txt @@ -29,7 +29,6 @@ TARGET_LINK_LIBRARIES(gncmod-bi_import gncmod-engine gnc-core-utils gnc-module - gnc-qof gnc-gnome ) diff --git a/src/plugins/bi_import/Makefile.am b/src/plugins/bi_import/Makefile.am index c996cf6c51..b17da1acf3 100644 --- a/src/plugins/bi_import/Makefile.am +++ b/src/plugins/bi_import/Makefile.am @@ -24,9 +24,7 @@ libgncmod_bi_import_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/lib/libc/libc-missing.la \ - ${QOF_LIBS} \ ${GLIB_LIBS} AM_CPPFLAGS = \ @@ -47,7 +45,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/lib/libc \ ${GTK_CFLAGS} \ - ${QOF_CFLAGS} \ ${GLIB_CFLAGS} AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\" diff --git a/src/plugins/customer_import/CMakeLists.txt b/src/plugins/customer_import/CMakeLists.txt index 5beaaa6d89..36772b1689 100644 --- a/src/plugins/customer_import/CMakeLists.txt +++ b/src/plugins/customer_import/CMakeLists.txt @@ -21,7 +21,7 @@ SET(customer_import_noinst_HEADERS ADD_LIBRARY(gncmod-customer_import ${customer_import_SOURCES} ${customer_input_noinst_HEADERS}) TARGET_LINK_LIBRARIES(gncmod-customer_import gnc-gnome gncmod-gnome-utils gncmod-app-utils - gncmod-engine gnc-core-utils gnc-module gnc-qof ${GLIB2_LDFLAGS}) + gncmod-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS}) TARGET_INCLUDE_DIRECTORIES(gncmod-bi_import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/src/plugins/customer_import/Makefile.am b/src/plugins/customer_import/Makefile.am index 5569e54660..61311aa61c 100644 --- a/src/plugins/customer_import/Makefile.am +++ b/src/plugins/customer_import/Makefile.am @@ -22,9 +22,7 @@ libgncmod_customer_import_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/lib/libc/libc-missing.la \ - ${QOF_LIBS} \ ${GLIB_LIBS} AM_CPPFLAGS = \ @@ -44,7 +42,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/lib/libc \ ${GTK_CFLAGS} \ - ${QOF_CFLAGS} \ ${GLIB_CFLAGS} AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\" diff --git a/src/plugins/example/Makefile.am b/src/plugins/example/Makefile.am index ff20330260..8944dcbdb2 100644 --- a/src/plugins/example/Makefile.am +++ b/src/plugins/example/Makefile.am @@ -15,7 +15,6 @@ libgncmod_example_la_LIBADD = \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${GNOME_LIBS} \ ${GLADE_LIBS} \ - ${QOF_LIBS} \ ${GLIB_LIBS} \ ${AQBANKING_LIBS} @@ -32,7 +31,6 @@ AM_CFLAGS = \ -I${top_srcdir}/src/gnc-module \ ${GNOME_CFLAGS} \ ${GLADE_CFLAGS} \ - ${QOF_CFLAGS} \ ${GLIB_CFLAGS} \ ${AQBANKING_CFLAGS} diff --git a/src/register/ledger-core/Makefile.am b/src/register/ledger-core/Makefile.am index b0e256dbb3..739d3113df 100644 --- a/src/register/ledger-core/Makefile.am +++ b/src/register/ledger-core/Makefile.am @@ -45,7 +45,6 @@ libgncmod_ledger_core_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GUILE_LIBS} \ ${GTK_LIBS} \ ${GLIB_LIBS} @@ -60,7 +59,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/register/register-core \ -I${top_srcdir}/src/register/register-gnome \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} \ diff --git a/src/register/ledger-core/test/Makefile.am b/src/register/ledger-core/test/Makefile.am index 2029ee58bb..b9d57a42d1 100644 --- a/src/register/ledger-core/test/Makefile.am +++ b/src/register/ledger-core/test/Makefile.am @@ -4,7 +4,7 @@ check_PROGRAMS = test-link-module test_link_module_SOURCES=test-link-module.c test_link_module_LDADD=\ - $(top_builddir)/src/libqof/qof/libgnc-qof.la \ + $(top_builddir)/src/engine/libgncmod-engine.la \ $(top_builddir)/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/gnome/libgnc-gnome.la \ diff --git a/src/register/register-core/CMakeLists.txt b/src/register/register-core/CMakeLists.txt index c4b4aa8ae7..6ab939f4aa 100644 --- a/src/register/register-core/CMakeLists.txt +++ b/src/register/register-core/CMakeLists.txt @@ -45,7 +45,7 @@ SET_SOURCE_FILES_PROPERTIES (${register_core_SOURCES} PROPERTIES OBJECT_DEPENDS ADD_LIBRARY (gncmod-register-core ${register_core_SOURCES} ${register_core_HEADERS}) -TARGET_LINK_LIBRARIES(gncmod-register-core gncmod-gnome-utils gnc-qof gncmod-app-utils ${GMODULE_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-register-core gncmod-gnome-utils gncmod-app-utils ${GMODULE_LDFLAGS}) TARGET_COMPILE_DEFINITIONS (gncmod-register-core PRIVATE -DG_LOG_DOMAIN=\"gnc.register.core\") diff --git a/src/register/register-core/Makefile.am b/src/register/register-core/Makefile.am index b5305e67d3..dca543d24a 100644 --- a/src/register/register-core/Makefile.am +++ b/src/register/register-core/Makefile.am @@ -10,7 +10,6 @@ libgncmod_register_core_la_LIBADD = \ ${top_builddir}/src/core-utils/libgnc-core-utils.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GUILE_LIBS} \ ${GLIB_LIBS} @@ -60,7 +59,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/gnome-utils \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} diff --git a/src/register/register-core/test/Makefile.am b/src/register/register-core/test/Makefile.am index bf223e9e7e..785d760a4c 100644 --- a/src/register/register-core/test/Makefile.am +++ b/src/register/register-core/test/Makefile.am @@ -13,7 +13,6 @@ check_PROGRAMS = \ test_link_module_SOURCES=test-link-module.c test_link_module_LDADD=\ - $(top_builddir)/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ diff --git a/src/register/register-gnome/CMakeLists.txt b/src/register/register-gnome/CMakeLists.txt index 45a36c8874..2e9b2e7b35 100644 --- a/src/register/register-gnome/CMakeLists.txt +++ b/src/register/register-gnome/CMakeLists.txt @@ -44,7 +44,7 @@ SET_SOURCE_FILES_PROPERTIES (${register_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ADD_LIBRARY (gncmod-register-gnome ${register_gnome_SOURCES} ${register_gnome_noinst_HEADERS}) -TARGET_LINK_LIBRARIES(gncmod-register-gnome gncmod-register-core gnc-qof ${GTK3_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-register-gnome gncmod-register-core ${GTK3_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-register-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.register.gnome\") diff --git a/src/register/register-gnome/Makefile.am b/src/register/register-gnome/Makefile.am index 0909205472..0da1eb2c12 100644 --- a/src/register/register-gnome/Makefile.am +++ b/src/register/register-gnome/Makefile.am @@ -11,7 +11,6 @@ libgncmod_register_gnome_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GLIB_LIBS} \ ${GTK_LIBS} @@ -61,7 +60,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/register/ledger-core \ -I${top_srcdir}/src/register/register-core \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GTK_CFLAGS} \ ${GTK_XIM_FLAGS} diff --git a/src/register/register-gnome/test/Makefile.am b/src/register/register-gnome/test/Makefile.am index d615f02db3..df8c865208 100644 --- a/src/register/register-gnome/test/Makefile.am +++ b/src/register/register-gnome/test/Makefile.am @@ -13,7 +13,6 @@ check_PROGRAMS = \ test_link_module_SOURCES = test-link-module.c test_link_module_LDADD = \ - $(top_builddir)/src/libqof/qof/libgnc-qof.la \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am index a15a37a1ce..96f979049e 100644 --- a/src/report/business-reports/Makefile.am +++ b/src/report/business-reports/Makefile.am @@ -63,7 +63,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/report/business-reports \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnome-utils \ diff --git a/src/report/locale-specific/us/CMakeLists.txt b/src/report/locale-specific/us/CMakeLists.txt index 7cf180d7b9..47556cdc58 100644 --- a/src/report/locale-specific/us/CMakeLists.txt +++ b/src/report/locale-specific/us/CMakeLists.txt @@ -29,7 +29,7 @@ SET(gncmod_local_reports_us_SCHEME_2 us.scm de_DE.scm) SET(GUILE_MODULES src/app-utils src/engine src/gnome-utils src/html src/report/report-system src/tax/us) SET(GUILE_LOAD_DIRS src/app-utils src/core-utils src/engine src/gnc-module src/gnome-utils src/report/report-system src/scm src/tax/us) -SET(GUILE_LIBRARY_DIRS src/engine src/libqof/qof src/app-utils src/core-utils src/gnc-module src/gnome-utils +SET(GUILE_LIBRARY_DIRS src/engine src/app-utils src/core-utils src/gnc-module src/gnome-utils src/html src/report/report-system) SET(GUILE_DEPENDS gncmod-html scm-tax-us-1 scm-tax-us-2 scm-report-system-3) diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am index 462c462f59..826f2a9e89 100644 --- a/src/report/locale-specific/us/Makefile.am +++ b/src/report/locale-specific/us/Makefile.am @@ -70,7 +70,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/scm \ --guile-load-dir ${top_builddir}/src/tax/us \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ diff --git a/src/report/locale-specific/us/test/Makefile.am b/src/report/locale-specific/us/test/Makefile.am index 03e33bb34f..ac71b66c12 100644 --- a/src/report/locale-specific/us/test/Makefile.am +++ b/src/report/locale-specific/us/test/Makefile.am @@ -7,7 +7,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/tax/us \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ --library-dir ${top_builddir}/src/engine \ diff --git a/src/report/report-gnome/CMakeLists.txt b/src/report/report-gnome/CMakeLists.txt index f6223e8d95..4230898fb9 100644 --- a/src/report/report-gnome/CMakeLists.txt +++ b/src/report/report-gnome/CMakeLists.txt @@ -30,7 +30,7 @@ ADD_LIBRARY (gncmod-report-gnome ${SWIG_REPORT_GNOME_C} ) TARGET_LINK_LIBRARIES(gncmod-report-gnome gncmod-report-system gncmod-html gncmod-gnome-utils - gnc-qof ${GUILE_LDFLAGS} ${GTK3_LDFLAGS}) + ${GUILE_LDFLAGS} ${GTK3_LDFLAGS}) TARGET_COMPILE_DEFINITIONS (gncmod-report-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.report.gui\") diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am index 39a7bf33c4..ea546f3c3d 100644 --- a/src/report/report-gnome/Makefile.am +++ b/src/report/report-gnome/Makefile.am @@ -13,7 +13,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/html \ -I${top_srcdir}/src/report/report-system \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} @@ -45,7 +44,6 @@ libgncmod_report_gnome_la_LIBADD = \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/html/libgncmod-html.la \ ${top_builddir}/src/report/report-system/libgncmod-report-system.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${GUILE_LIBS} \ ${GLIB_LIBS} @@ -120,7 +118,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/report/utility-reports \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ diff --git a/src/report/report-gnome/test/Makefile.am b/src/report/report-gnome/test/Makefile.am index 1c0897929f..a894a75911 100644 --- a/src/report/report-gnome/test/Makefile.am +++ b/src/report/report-gnome/test/Makefile.am @@ -2,13 +2,13 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/src \ -I${top_srcdir}/src/test-core \ - -I${top_srcdir}/src/libqof/qof \ + -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/gnc-module \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \ $(top_builddir)/src/app-utils/libgncmod-app-utils.la \ @@ -41,7 +41,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ \ --library-dir ${top_builddir}/src/report/report-gnome \ --library-dir ${top_builddir}/src/report/report-system \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/gnc-module \ diff --git a/src/report/report-system/CMakeLists.txt b/src/report/report-system/CMakeLists.txt index bc97a93d49..5ca9c9271d 100644 --- a/src/report/report-system/CMakeLists.txt +++ b/src/report/report-system/CMakeLists.txt @@ -25,7 +25,7 @@ ADD_LIBRARY (gncmod-report-system TARGET_COMPILE_DEFINITIONS(gncmod-report-system PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\") -TARGET_LINK_LIBRARIES(gncmod-report-system gnc-module gncmod-app-utils gnc-qof ${GTK3_LDFLAGS} ${GUILE_LDFLAGS}) +TARGET_LINK_LIBRARIES(gncmod-report-system gnc-module gncmod-app-utils ${GTK3_LDFLAGS} ${GUILE_LDFLAGS}) TARGET_INCLUDE_DIRECTORIES (gncmod-report-system PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} PRIVATE ${GTK3_INCLUDE_DIRS} @@ -115,4 +115,4 @@ SET_LOCAL_DIST(report_system_DIST_local CMakeLists.txt Makefile.am report-system ${report_system_HEADERS} ${report_system_SOURCES} ${report_system_SCHEME} ${report_system_SCHEME_1} ${report_system_SCHEME_2} ${report_system_SCHEME_3}) -SET(report_system_DIST ${report_system_DIST_local} ${test_report_system_DIST} PARENT_SCOPE) \ No newline at end of file +SET(report_system_DIST ${report_system_DIST_local} ${test_report_system_DIST} PARENT_SCOPE) diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am index 07cd4ef1c9..c0352f500c 100644 --- a/src/report/report-system/Makefile.am +++ b/src/report/report-system/Makefile.am @@ -18,7 +18,7 @@ libgncmod_report_system_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${GUILE_LIBS} \ ${GLIB_LIBS} \ ${GTK_LIBS} @@ -42,7 +42,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnc-module \ -I${top_srcdir}/src/app-utils \ -I${top_srcdir}/src/engine \ - -I${top_srcdir}/src/libqof/qof \ ${GLIB_CFLAGS} \ ${GTK_CFLAGS} \ ${GUILE_CFLAGS} @@ -120,7 +119,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/gnome-utils \ --guile-load-dir ${top_builddir}/src/scm \ --guile-load-dir ${top_builddir}/src/report/report-system \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ diff --git a/src/report/report-system/test/Makefile.am b/src/report/report-system/test/Makefile.am index a62c741ca1..b122c7bf43 100644 --- a/src/report/report-system/test/Makefile.am +++ b/src/report/report-system/test/Makefile.am @@ -2,13 +2,13 @@ AM_CPPFLAGS = \ -I${top_srcdir} \ -I${top_srcdir}/src \ -I${top_srcdir}/src/test-core \ - -I${top_srcdir}/src/libqof/qof \ + -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/gnc-module \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} LDADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ ${GLIB_LIBS} \ ${GUILE_LIBS} @@ -47,7 +47,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/report/report-system/test \ \ --library-dir ${top_builddir}/src/report/report-system \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/gnome-utils \ diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am index 42f215cfcf..7e7356abea 100644 --- a/src/report/standard-reports/Makefile.am +++ b/src/report/standard-reports/Makefile.am @@ -71,7 +71,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/report/report-system \ --guile-load-dir ${top_builddir}/src/report/standard-reports \ --guile-load-dir ${top_builddir}/src/scm \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ diff --git a/src/report/standard-reports/test/Makefile.am b/src/report/standard-reports/test/Makefile.am index e98cb85a34..06e8c6ab0e 100644 --- a/src/report/standard-reports/test/Makefile.am +++ b/src/report/standard-reports/test/Makefile.am @@ -31,7 +31,6 @@ GNC_TEST_DEPS = \ --guile-load-dir ${top_builddir}/src/report/standard-reports/test \ \ --library-dir ${top_builddir}/src/report/report-system \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/gnome-utils \ diff --git a/src/report/stylesheets/CMakeLists.txt b/src/report/stylesheets/CMakeLists.txt index c5e2b32f2e..f2480f504b 100644 --- a/src/report/stylesheets/CMakeLists.txt +++ b/src/report/stylesheets/CMakeLists.txt @@ -12,7 +12,7 @@ SET(stylesheets_noinst_HEADERS ADD_LIBRARY(gncmod-stylesheets MODULE ${stylesheets_SOURCES} ${stylesheets_noinst_HEADERS}) TARGET_LINK_LIBRARIES(gncmod-stylesheets gncmod-report-gnome gncmod-report-system gncmod-gnome-utils gnc-module - gnc-qof ${GUILE_LDFLAGS} ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS}) + ${GUILE_LDFLAGS} ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS}) TARGET_COMPILE_DEFINITIONS(gncmod-stylesheets PRIVATE -DG_LOG_DOMAIN=\"gnc.report.core\") diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am index 0f0798883f..6596b11958 100644 --- a/src/report/stylesheets/Makefile.am +++ b/src/report/stylesheets/Makefile.am @@ -16,7 +16,7 @@ libgncmod_stylesheets_la_LIBADD = \ ${top_builddir}/src/report/report-system/libgncmod-report-system.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/gnc-module/libgnc-module.la \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${GUILE_LIBS} \ ${GTK_LIBS} \ ${GLIB_LIBS} @@ -28,7 +28,6 @@ AM_CPPFLAGS = \ -I${top_srcdir}/src/gnome \ -I${top_srcdir}/src/gnome-utils \ -I${top_srcdir}/src/report/report-gnome \ - -I${top_srcdir}/src/libqof/qof \ ${GUILE_CFLAGS} \ ${GLIB_CFLAGS} \ ${GTK_CFLAGS} @@ -78,7 +77,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/report/report-system \ --guile-load-dir ${top_builddir}/src/report/stylesheets \ --guile-load-dir ${top_builddir}/src/scm \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ diff --git a/src/report/stylesheets/test/Makefile.am b/src/report/stylesheets/test/Makefile.am index a2f8e5d0fc..73b133aaec 100644 --- a/src/report/stylesheets/test/Makefile.am +++ b/src/report/stylesheets/test/Makefile.am @@ -17,7 +17,6 @@ GNC_TEST_DEPS = --gnc-module-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/report/report-system \ --guile-load-dir ${top_builddir}/src/report/stylesheets \ \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/test-core \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am index 686d6a092b..33a03b0224 100644 --- a/src/report/utility-reports/Makefile.am +++ b/src/report/utility-reports/Makefile.am @@ -44,7 +44,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/report/utility-reports \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/engine \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ diff --git a/src/scm/Makefile.am b/src/scm/Makefile.am index fa1bdd7564..318af4d18e 100644 --- a/src/scm/Makefile.am +++ b/src/scm/Makefile.am @@ -48,7 +48,7 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/scm \ --library-dir ${top_builddir}/src/core-utils \ --library-dir ${top_builddir}/src/gnc-module \ - --library-dir ${top_builddir}/src/libqof/qof + --library-dir ${top_builddir}/src/engine %.go : %.scm .scm-links $(shell ${abs_top_srcdir}/src/gnc-test-env.pl --noexports ${GUILE_COMPILE_ENV}) \ diff --git a/src/tax/us/Makefile.am b/src/tax/us/Makefile.am index 143441acc9..082710b8da 100644 --- a/src/tax/us/Makefile.am +++ b/src/tax/us/Makefile.am @@ -52,7 +52,6 @@ GUILE_COMPILE_ENV = \ --guile-load-dir ${top_builddir}/src/engine \ --guile-load-dir ${top_builddir}/src/gnc-module \ --guile-load-dir ${top_builddir}/src/scm \ - --library-dir ${top_builddir}/src/libqof/qof \ --library-dir ${top_builddir}/src/engine \ --library-dir ${top_builddir}/src/app-utils \ --library-dir ${top_builddir}/src/core-utils \ diff --git a/src/test-core/CMakeLists.txt b/src/test-core/CMakeLists.txt index 824d633d31..1cb2ca376e 100644 --- a/src/test-core/CMakeLists.txt +++ b/src/test-core/CMakeLists.txt @@ -11,7 +11,7 @@ SET(test_core_noinst_HEADERS INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR}/src ${CMAKE_SOURCE_DIR}/src - ${CMAKE_SOURCE_DIR}/src/libqof/qof + ${CMAKE_SOURCE_DIR}/src/engine ${CMAKE_SOURCE_DIR}/src/test-core ${GLIB2_INCLUDE_DIRS} @@ -22,7 +22,7 @@ SET_DIST_LIST(test_core_DIST ${test_core_SOURCES} ${test_core_noinst_HEADERS} CM Makefile.am unittest-support.i unittest-support.scm) ADD_LIBRARY(test-core STATIC ${test_core_SOURCES} ${test_core_noinst_HEADERS}) -TARGET_LINK_LIBRARIES(test-core gncmod-engine gnc-qof ${GLIB2_LDFLAGS}) +TARGET_LINK_LIBRARIES(test-core gncmod-engine ${GLIB2_LDFLAGS}) IF (UNIX) TARGET_COMPILE_OPTIONS(test-core PRIVATE -fPIC) ENDIF() @@ -54,7 +54,7 @@ SET(test_core_SCHEME unittest-support.scm) SET(GUILE_OUTPUT_DIR gnucash) SET(GUILE_MODULES "") SET(GUILE_LOAD_DIRS "") -SET(GUILE_LIBRARY_DIRS src/test-core src/libqof) +SET(GUILE_LIBRARY_DIRS src/test-core src/engine) SET(GUILE_DEPENDS test-core-guile) @@ -78,4 +78,4 @@ ADD_LIBRARY(gmock STATIC ${lib_gmock_SOURCES}) TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR} ${GMOCK_INCLUDE_DIR} ${GMOCK_SRC_DIR}) -INSTALL(FILES unittest-support.h DESTINATION libexec/gnucash/src/libqof/qof/test) +INSTALL(FILES unittest-support.h DESTINATION libexec/gnucash/src/engine/test) diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am index 5e3edf7d2f..5a59b8ed85 100644 --- a/src/test-core/Makefile.am +++ b/src/test-core/Makefile.am @@ -8,7 +8,7 @@ libtest_core_la_SOURCES = \ unittest-support.c libtest_core_la_LIBADD = \ - ${top_builddir}/src/libqof/qof/libgnc-qof.la \ + ${top_builddir}/src/engine/libgncmod-engine.la \ ${GLIB_LIBS} noinst_HEADERS = \ @@ -17,7 +17,7 @@ noinst_HEADERS = \ libtest_core_la_CPPFLAGS = \ -I${top_srcdir}/src \ - -I${top_srcdir}/src/libqof/qof \ + -I${top_srcdir}/src/engine \ ${GLIB_CFLAGS} libtest_core_la_LDFLAGS = \ @@ -113,7 +113,7 @@ endif if GNC_HAVE_GUILE_2 GUILE_COMPILE_ENV = \ --library-dir ${top_builddir}/src/test-core \ - --library-dir ${top_builddir}/src/libqof/qof + --library-dir ${top_builddir}/src/engine %.go : %.scm .scm-links $(noinst_LTLIBRARIES) GNC_UNINSTALLED=yes \