From 466781acef58bd4ea8aa32b373dee1ec2d17b0e6 Mon Sep 17 00:00:00 2001 From: Neil Williams Date: Sun, 13 Nov 2005 13:22:34 +0000 Subject: [PATCH] move QOF files to lib/libqof/ git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@11917 57a11ea4-9604-0410-9ed3-97b8803252fd --- ChangeLog | 93 +++++++++++++++ configure.in | 22 ++-- lib/Makefile.am | 13 ++- lib/libqof/Makefile.am | 2 + lib/libqof/backend/Makefile.am | 2 + lib/libqof/backend/file/Makefile.am | 43 +++++++ .../file}/pilot-qsf-GnuCashInvoice.xml | 0 .../libqof/backend/file}/qof-backend-qsf.h | 0 .../libqof/backend/file}/qsf-backend.c | 0 .../libqof/backend/file}/qsf-dir.h.in | 0 .../libqof/backend/file}/qsf-map.xsd.xml | 0 .../libqof/backend/file}/qsf-object.xsd.xml | 0 .../libqof/backend/file}/qsf-xml-map.c | 0 .../qsf => lib/libqof/backend/file}/qsf-xml.c | 0 .../qsf => lib/libqof/backend/file}/qsf-xml.h | 0 lib/libqof/qof/Makefile.am | 89 +++++++++++++++ {src/engine => lib/libqof/qof}/gnc-date.c | 0 {src/engine => lib/libqof/qof}/gnc-date.h | 0 .../libqof/qof}/gnc-engine-util.c | 0 .../libqof/qof}/gnc-engine-util.h | 0 {src/engine => lib/libqof/qof}/gnc-event-p.h | 0 {src/engine => lib/libqof/qof}/gnc-event.c | 0 {src/engine => lib/libqof/qof}/gnc-event.h | 0 {src/engine => lib/libqof/qof}/gnc-numeric.c | 0 {src/engine => lib/libqof/qof}/gnc-numeric.h | 0 {src/engine => lib/libqof/qof}/gnc-trace.c | 0 {src/engine => lib/libqof/qof}/gnc-trace.h | 0 {src/engine => lib/libqof/qof}/guid.c | 0 {src/engine => lib/libqof/qof}/guid.h | 0 {src/engine => lib/libqof/qof}/kvp-util-p.h | 0 {src/engine => lib/libqof/qof}/kvp-util.c | 0 {src/engine => lib/libqof/qof}/kvp-util.h | 0 {src/engine => lib/libqof/qof}/kvp_frame.c | 0 {src/engine => lib/libqof/qof}/kvp_frame.h | 0 {src/engine => lib/libqof/qof}/md5.c | 0 {src/engine => lib/libqof/qof}/md5.h | 0 {src/engine => lib/libqof/qof}/qof-be-utils.h | 0 {src/engine => lib/libqof/qof}/qof.h | 0 .../libqof/qof}/qof_book_merge.c | 0 .../libqof/qof}/qof_book_merge.h | 0 {src/engine => lib/libqof/qof}/qofbackend-p.h | 0 {src/engine => lib/libqof/qof}/qofbackend.c | 0 {src/engine => lib/libqof/qof}/qofbackend.h | 0 {src/engine => lib/libqof/qof}/qofbook-p.h | 0 {src/engine => lib/libqof/qof}/qofbook.c | 0 {src/engine => lib/libqof/qof}/qofbook.h | 0 {src/engine => lib/libqof/qof}/qofchoice.c | 0 {src/engine => lib/libqof/qof}/qofchoice.h | 0 {src/engine => lib/libqof/qof}/qofclass-p.h | 0 {src/engine => lib/libqof/qof}/qofclass.c | 0 {src/engine => lib/libqof/qof}/qofclass.h | 0 {src/engine => lib/libqof/qof}/qofgobj.c | 0 {src/engine => lib/libqof/qof}/qofgobj.h | 0 {src/engine => lib/libqof/qof}/qofid-p.h | 0 {src/engine => lib/libqof/qof}/qofid.c | 0 {src/engine => lib/libqof/qof}/qofid.h | 0 .../engine => lib/libqof/qof}/qofinstance-p.h | 0 {src/engine => lib/libqof/qof}/qofinstance.c | 0 {src/engine => lib/libqof/qof}/qofinstance.h | 0 {src/engine => lib/libqof/qof}/qofla-dir.h.in | 0 {src/engine => lib/libqof/qof}/qofmath128.c | 0 {src/engine => lib/libqof/qof}/qofmath128.h | 0 {src/engine => lib/libqof/qof}/qofobject-p.h | 0 {src/engine => lib/libqof/qof}/qofobject.c | 0 {src/engine => lib/libqof/qof}/qofobject.h | 0 .../libqof/qof}/qofquery-deserial.c | 0 .../libqof/qof}/qofquery-deserial.h | 0 {src/engine => lib/libqof/qof}/qofquery-p.h | 0 .../libqof/qof}/qofquery-serialize.c | 0 .../libqof/qof}/qofquery-serialize.h | 0 {src/engine => lib/libqof/qof}/qofquery.c | 0 {src/engine => lib/libqof/qof}/qofquery.h | 0 .../libqof/qof}/qofquerycore-p.h | 0 {src/engine => lib/libqof/qof}/qofquerycore.c | 0 {src/engine => lib/libqof/qof}/qofquerycore.h | 0 {src/engine => lib/libqof/qof}/qofsession-p.h | 0 {src/engine => lib/libqof/qof}/qofsession.c | 0 {src/engine => lib/libqof/qof}/qofsession.h | 0 {src/engine => lib/libqof/qof}/qofsql.c | 0 {src/engine => lib/libqof/qof}/qofsql.h | 0 src/backend/Makefile.am | 7 +- src/backend/postgres/test/Makefile.am | 38 ++++++- src/backend/postgres/test/test-load-backend.c | 4 +- src/backend/qsf/Makefile.am | 43 ------- src/engine/Makefile.am | 106 +----------------- src/gnome-utils/test/Makefile.am | 1 + src/import-export/qif-import/test/Makefile.am | 1 + 87 files changed, 298 insertions(+), 166 deletions(-) create mode 100644 lib/libqof/Makefile.am create mode 100644 lib/libqof/backend/Makefile.am create mode 100644 lib/libqof/backend/file/Makefile.am rename {src/backend/qsf => lib/libqof/backend/file}/pilot-qsf-GnuCashInvoice.xml (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qof-backend-qsf.h (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-backend.c (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-dir.h.in (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-map.xsd.xml (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-object.xsd.xml (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-xml-map.c (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-xml.c (100%) rename {src/backend/qsf => lib/libqof/backend/file}/qsf-xml.h (100%) create mode 100644 lib/libqof/qof/Makefile.am rename {src/engine => lib/libqof/qof}/gnc-date.c (100%) rename {src/engine => lib/libqof/qof}/gnc-date.h (100%) rename {src/engine => lib/libqof/qof}/gnc-engine-util.c (100%) rename {src/engine => lib/libqof/qof}/gnc-engine-util.h (100%) rename {src/engine => lib/libqof/qof}/gnc-event-p.h (100%) rename {src/engine => lib/libqof/qof}/gnc-event.c (100%) rename {src/engine => lib/libqof/qof}/gnc-event.h (100%) rename {src/engine => lib/libqof/qof}/gnc-numeric.c (100%) rename {src/engine => lib/libqof/qof}/gnc-numeric.h (100%) rename {src/engine => lib/libqof/qof}/gnc-trace.c (100%) rename {src/engine => lib/libqof/qof}/gnc-trace.h (100%) rename {src/engine => lib/libqof/qof}/guid.c (100%) rename {src/engine => lib/libqof/qof}/guid.h (100%) rename {src/engine => lib/libqof/qof}/kvp-util-p.h (100%) rename {src/engine => lib/libqof/qof}/kvp-util.c (100%) rename {src/engine => lib/libqof/qof}/kvp-util.h (100%) rename {src/engine => lib/libqof/qof}/kvp_frame.c (100%) rename {src/engine => lib/libqof/qof}/kvp_frame.h (100%) rename {src/engine => lib/libqof/qof}/md5.c (100%) rename {src/engine => lib/libqof/qof}/md5.h (100%) rename {src/engine => lib/libqof/qof}/qof-be-utils.h (100%) rename {src/engine => lib/libqof/qof}/qof.h (100%) rename {src/engine => lib/libqof/qof}/qof_book_merge.c (100%) rename {src/engine => lib/libqof/qof}/qof_book_merge.h (100%) rename {src/engine => lib/libqof/qof}/qofbackend-p.h (100%) rename {src/engine => lib/libqof/qof}/qofbackend.c (100%) rename {src/engine => lib/libqof/qof}/qofbackend.h (100%) rename {src/engine => lib/libqof/qof}/qofbook-p.h (100%) rename {src/engine => lib/libqof/qof}/qofbook.c (100%) rename {src/engine => lib/libqof/qof}/qofbook.h (100%) rename {src/engine => lib/libqof/qof}/qofchoice.c (100%) rename {src/engine => lib/libqof/qof}/qofchoice.h (100%) rename {src/engine => lib/libqof/qof}/qofclass-p.h (100%) rename {src/engine => lib/libqof/qof}/qofclass.c (100%) rename {src/engine => lib/libqof/qof}/qofclass.h (100%) rename {src/engine => lib/libqof/qof}/qofgobj.c (100%) rename {src/engine => lib/libqof/qof}/qofgobj.h (100%) rename {src/engine => lib/libqof/qof}/qofid-p.h (100%) rename {src/engine => lib/libqof/qof}/qofid.c (100%) rename {src/engine => lib/libqof/qof}/qofid.h (100%) rename {src/engine => lib/libqof/qof}/qofinstance-p.h (100%) rename {src/engine => lib/libqof/qof}/qofinstance.c (100%) rename {src/engine => lib/libqof/qof}/qofinstance.h (100%) rename {src/engine => lib/libqof/qof}/qofla-dir.h.in (100%) rename {src/engine => lib/libqof/qof}/qofmath128.c (100%) rename {src/engine => lib/libqof/qof}/qofmath128.h (100%) rename {src/engine => lib/libqof/qof}/qofobject-p.h (100%) rename {src/engine => lib/libqof/qof}/qofobject.c (100%) rename {src/engine => lib/libqof/qof}/qofobject.h (100%) rename {src/engine => lib/libqof/qof}/qofquery-deserial.c (100%) rename {src/engine => lib/libqof/qof}/qofquery-deserial.h (100%) rename {src/engine => lib/libqof/qof}/qofquery-p.h (100%) rename {src/engine => lib/libqof/qof}/qofquery-serialize.c (100%) rename {src/engine => lib/libqof/qof}/qofquery-serialize.h (100%) rename {src/engine => lib/libqof/qof}/qofquery.c (100%) rename {src/engine => lib/libqof/qof}/qofquery.h (100%) rename {src/engine => lib/libqof/qof}/qofquerycore-p.h (100%) rename {src/engine => lib/libqof/qof}/qofquerycore.c (100%) rename {src/engine => lib/libqof/qof}/qofquerycore.h (100%) rename {src/engine => lib/libqof/qof}/qofsession-p.h (100%) rename {src/engine => lib/libqof/qof}/qofsession.c (100%) rename {src/engine => lib/libqof/qof}/qofsession.h (100%) rename {src/engine => lib/libqof/qof}/qofsql.c (100%) rename {src/engine => lib/libqof/qof}/qofsql.h (100%) delete mode 100644 src/backend/qsf/Makefile.am diff --git a/ChangeLog b/ChangeLog index 8e2a7a7a0b..d6228c2576 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,96 @@ +2005-11-13 Neil Williams + + * configure.in : New locations of QOF files and + postgres fix to clean up CFLAGS + * lib/Makefile.am : New directory. + * src/engine/Makefile.am : Remove QOF build + * src/backend/Makefile.am : Remove QSF directory. + * src/backend/postgres/test/Makefile.am : Build tests + without linking against the GModule to retain portability. + * src/import-export/qif-import/test/Makefile.am : Adjusted + linkage due to library changes. + * src/gnome-utils/test/Makefile.am : Adjusted linkage + due to library changes. + + Moving QSF to lib/libqof/backend/file + * src/backend/qsf/qsf-backend.c + * src/backend/qsf/pilot-qsf-GnuCashInvoice.xml + * src/backend/qsf/qsf-dir.h.in + * src/backend/qsf/qsf-map.xsd.xml + * src/backend/qsf/qsf-xml-map.c + * src/backend/qsf/qof-backend-qsf.h + * src/backend/qsf/qsf-xml.c + * src/backend/qsf/Makefile.am + * src/backend/qsf/qsf-object.xsd.xml + * src/backend/qsf/qsf-xml.h : + + Moving QOF to lib/libqof/qof/ + * src/engine/qofbook-p.h + * src/engine/gnc-trace.c + * src/engine/qofquery-deserial.h + * src/engine/gnc-trace.h + * src/engine/gnc-date.c + * src/engine/qofquerycore-p.h + * src/engine/gnc-date.h + * src/engine/qofquery-serialize.c + * src/engine/qofid.c + * src/engine/qofquery-serialize.h + * src/engine/qofid.h + * src/engine/gnc-engine-util.c + * src/engine/gnc-event.c + * src/engine/qofgobj.c + * src/engine/gnc-engine-util.h + * src/engine/gnc-event.h + * src/engine/qofgobj.h + * src/engine/qofbook.c + * src/engine/qofchoice.c + * src/engine/qofbook.h + * src/engine/qofchoice.h + * src/engine/kvp_frame.c + * src/engine/qofquery.c + * src/engine/kvp_frame.h + * src/engine/qofquery.h + * src/engine/qofquerycore.c + * src/engine/qofquerycore.h + * src/engine/qofsession.c + * src/engine/qofsession-p.h + * src/engine/qofsession.h + * src/engine/qofid-p.h + * src/engine/qofsql.c + * src/engine/gnc-numeric.c + * src/engine/qofsql.h + * src/engine/gnc-numeric.h + * src/engine/kvp-util-p.h + * src/engine/qofclass-p.h + * src/engine/qof_book_merge.c + * src/engine/qof_book_merge.h + * src/engine/gnc-event-p.h + * src/engine/qofla-dir.h.in + * src/engine/qof.h + * src/engine/qofinstance.c + * src/engine/qofinstance.h + * src/engine/qofmath128.c + * src/engine/qofmath128.h + * src/engine/qofobject-p.h + * src/engine/Makefile.am + * src/engine/qofbackend.c + * src/engine/qofbackend-p.h + * src/engine/qofbackend.h + * src/engine/qofinstance-p.h + * src/engine/qofquery-p.h + * src/engine/md5.c + * src/engine/md5.h + * src/engine/kvp-util.c + * src/engine/qofclass.c + * src/engine/qof-be-utils.h + * src/engine/qofobject.c + * src/engine/kvp-util.h + * src/engine/qofclass.h + * src/engine/qofobject.h + * src/engine/guid.c + * src/engine/guid.h + * src/engine/qofquery-deserial.c : + 2005-11-12 Christian Stimming * src/*/*.glade: String improvements: Fix typos, remove diff --git a/configure.in b/configure.in index efecf16d67..212e8c4526 100644 --- a/configure.in +++ b/configure.in @@ -415,11 +415,13 @@ else fi if test x$QOF_XML_DIR = x; then AC_MSG_RESULT([no, will use internal QOF code]) - QOF_CFLAGS="-I\${top_srcdir}/src/engine" - QOF_LIBS="\${top_srcdir}/src/engine/libqof.la" - QOF_LIB_DIR="${libdir}" + QOF_LIB_DIR=`eval echo $libdir | sed "s%^NONE%$prefix%"` + QOF_LIB_DIR=`eval echo $QOF_LIB_DIR | sed "s%^NONE%$prefix%"` + QOF_CFLAGS="-I\${top_srcdir}/lib/libqof/qof" + QOF_LIBS="\${top_srcdir}/lib/libqof/qof/libqof.la" +# QOF_LIB_DIR=`eval echo ${libdir}` QOF_PREFIX="internal" - QOF_XML_DIR="$QSF_SCHEMA_DIR" + QOF_XML_DIR=`eval echo ${datadir}/xml/qsf` LIBQOF_LIBRARY_VERSION=1:1:0 LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:0:0 AC_SUBST(LIBQOF_LIBRARY_VERSION) @@ -437,6 +439,7 @@ AC_SUBST(QOF_LIBS) AS_SCRUB_INCLUDE(QOF_PREFIX) AC_SUBST(QOF_PREFIX) AC_SUBST(QOF_LIB_DIR) +AC_SUBST(QOF_XML_DIR) ### -------------------------------------------------------------------------- ### for GOG/goffice... @@ -545,7 +548,6 @@ fi GNC_ACCOUNTS_DIR='${GNC_SHAREDIR}/accounts' GNC_GLADE_DIR='${GNC_SHAREDIR}/glade' -QSF_SCHEMA_DIR='${GNC_SHAREDIR}/xml/qsf' GNC_UI_DIR='${GNC_SHAREDIR}/ui' GNC_GWRAP_LIBDIR='${GNC_SHAREDIR}/guile-modules/g-wrapped' GNC_MODULE_DIR='${pkglibdir}' @@ -555,7 +557,6 @@ AC_SUBST(GNC_ACCOUNTS_DIR) AC_SUBST(GNC_CONFIGDIR) AC_SUBST(GNC_DOC_INSTALL_DIR) AC_SUBST(GNC_GLADE_DIR) -AC_SUBST(QSF_SCHEMA_DIR) AC_SUBST(GNC_UI_DIR) AC_SUBST(GNC_GWRAP_LIBDIR) AC_SUBST(GNC_INCLUDE_DIR) @@ -609,8 +610,9 @@ AC_ARG_ENABLE( sql, fi AS_SCRUB_INCLUDE(PGSQL_CFLAGS) - +# XXX Fixme: CPPFLAGS are saved but CFLAGS are altered later on and not restored. saved_CPPFLAGS="${CPPFLAGS}" + saved_CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS} ${PGSQL_CFLAGS}" AC_CHECK_HEADERS(pgsql/libpq-fe.h postgresql/libpq-fe.h libpq-fe.h) if test "x$ac_cv_header_pgsql_libpq_fe_h$ac_cv_header_postgresql_libpq_fe_h$ac_cv_header_libpq_fe_h" = xnonono; then @@ -661,6 +663,7 @@ AC_ARG_ENABLE( sql, LIBS="$saved_LIBS" fi CPPFLAGS="$saved_CPPFLAGS" + CFLAGS="$saved_CFLAGS" fi ] ) @@ -1284,6 +1287,10 @@ AC_CONFIG_FILES(po/Makefile.in lib/goffice/pixmaps/Makefile lib/goffice/cut-n-paste/Makefile lib/goffice/cut-n-paste/pcre/Makefile + lib/libqof/Makefile + lib/libqof/qof/Makefile + lib/libqof/backend/Makefile + lib/libqof/backend/file/Makefile rpm/Makefile src/Makefile src/app-utils/Makefile @@ -1294,7 +1301,6 @@ AC_CONFIG_FILES(po/Makefile.in src/backend/file/test/Makefile src/backend/file/test/test-files/Makefile src/backend/file/test/test-files/xml2/Makefile - src/backend/qsf/Makefile src/backend/postgres/Makefile src/backend/postgres/test/Makefile src/backend/rpc/Makefile diff --git a/lib/Makefile.am b/lib/Makefile.am index c671787764..e255dffb60 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,7 +1,16 @@ -if USE_LIBGOFFICE SUBDIRS = libc glib26 guile-www srfi + +if USE_LIBGOFFICE +SUBDIRS += else -SUBDIRS = libc glib26 guile-www srfi goffice +SUBDIRS += goffice +endif + +if USE_LIBQOF +SUBDIRS += libqof +else +SUBDIRS += endif EXTRA_DIST = README guppi-legend.patch + diff --git a/lib/libqof/Makefile.am b/lib/libqof/Makefile.am new file mode 100644 index 0000000000..452104632e --- /dev/null +++ b/lib/libqof/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = . qof backend + diff --git a/lib/libqof/backend/Makefile.am b/lib/libqof/backend/Makefile.am new file mode 100644 index 0000000000..94a922329b --- /dev/null +++ b/lib/libqof/backend/Makefile.am @@ -0,0 +1,2 @@ +SUBDIRS = file + diff --git a/lib/libqof/backend/file/Makefile.am b/lib/libqof/backend/file/Makefile.am new file mode 100644 index 0000000000..ae08ca9bdd --- /dev/null +++ b/lib/libqof/backend/file/Makefile.am @@ -0,0 +1,43 @@ +SUBDIRS = . + +lib_LTLIBRARIES = libqof-backend-qsf.la + +AM_CFLAGS = \ + -I.. -I../.. \ + -DLOCALE_DIR=\""$(datadir)/locale"\" \ + ${QOF_CFLAGS} \ + ${LIBXML2_CFLAGS} \ + ${GLIB_CFLAGS} + +libqof_backend_qsf_la_SOURCES = \ + qsf-backend.c \ + qsf-xml-map.c \ + qsf-xml.c + +LIBADD = \ + ${QOF_LIBS} \ + ${GLIB_LIBS} \ + ${LIBXML2_LIBS} + +qsfschemadir = $(QOF_XML_DIR) +qsfschema_DATA = \ + qsf-object.xsd.xml \ + qsf-map.xsd.xml \ + pilot-qsf-GnuCashInvoice.xml + +EXTRA_DIST = \ + $(qsfschema_DATA) \ + qsf-dir.h.in \ + qof-backend-qsf.h \ + qsf-xml.h + +qsf-dir.h: qsf-dir.h.in + rm -f $@.tmp + sed < $< > $@.tmp \ + -e 's:@-QSF_SCHEMA_DIR-@:${QOF_XML_DIR}:g' + mv $@.tmp $@ + +BUILT_SOURCES = qsf-dir.h + +CONFIG_CLEAN_FILES = qsf-dir.h + diff --git a/src/backend/qsf/pilot-qsf-GnuCashInvoice.xml b/lib/libqof/backend/file/pilot-qsf-GnuCashInvoice.xml similarity index 100% rename from src/backend/qsf/pilot-qsf-GnuCashInvoice.xml rename to lib/libqof/backend/file/pilot-qsf-GnuCashInvoice.xml diff --git a/src/backend/qsf/qof-backend-qsf.h b/lib/libqof/backend/file/qof-backend-qsf.h similarity index 100% rename from src/backend/qsf/qof-backend-qsf.h rename to lib/libqof/backend/file/qof-backend-qsf.h diff --git a/src/backend/qsf/qsf-backend.c b/lib/libqof/backend/file/qsf-backend.c similarity index 100% rename from src/backend/qsf/qsf-backend.c rename to lib/libqof/backend/file/qsf-backend.c diff --git a/src/backend/qsf/qsf-dir.h.in b/lib/libqof/backend/file/qsf-dir.h.in similarity index 100% rename from src/backend/qsf/qsf-dir.h.in rename to lib/libqof/backend/file/qsf-dir.h.in diff --git a/src/backend/qsf/qsf-map.xsd.xml b/lib/libqof/backend/file/qsf-map.xsd.xml similarity index 100% rename from src/backend/qsf/qsf-map.xsd.xml rename to lib/libqof/backend/file/qsf-map.xsd.xml diff --git a/src/backend/qsf/qsf-object.xsd.xml b/lib/libqof/backend/file/qsf-object.xsd.xml similarity index 100% rename from src/backend/qsf/qsf-object.xsd.xml rename to lib/libqof/backend/file/qsf-object.xsd.xml diff --git a/src/backend/qsf/qsf-xml-map.c b/lib/libqof/backend/file/qsf-xml-map.c similarity index 100% rename from src/backend/qsf/qsf-xml-map.c rename to lib/libqof/backend/file/qsf-xml-map.c diff --git a/src/backend/qsf/qsf-xml.c b/lib/libqof/backend/file/qsf-xml.c similarity index 100% rename from src/backend/qsf/qsf-xml.c rename to lib/libqof/backend/file/qsf-xml.c diff --git a/src/backend/qsf/qsf-xml.h b/lib/libqof/backend/file/qsf-xml.h similarity index 100% rename from src/backend/qsf/qsf-xml.h rename to lib/libqof/backend/file/qsf-xml.h diff --git a/lib/libqof/qof/Makefile.am b/lib/libqof/qof/Makefile.am new file mode 100644 index 0000000000..5d0130d325 --- /dev/null +++ b/lib/libqof/qof/Makefile.am @@ -0,0 +1,89 @@ +lib_LTLIBRARIES = libqof.la + +libqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION) + +AM_CFLAGS = \ + -I. \ + ${GLIB_CFLAGS} + +libqof_la_SOURCES = \ + gnc-date.c \ + gnc-engine-util.c \ + gnc-numeric.c \ + gnc-event.c \ + gnc-trace.c \ + guid.c \ + kvp_frame.c \ + kvp-util.c \ + md5.c \ + qofbackend.c \ + qofclass.c \ + qofchoice.c \ + qofid.c \ + qofinstance.c \ + qofquery.c \ + qofbook.c \ + qofobject.c \ + qofquerycore.c \ + qofsession.c \ + qof_book_merge.c + +qofincludedir = ${pkgincludedir} + +qofinclude_HEADERS = \ + gnc-date.h \ + gnc-engine-util.h \ + gnc-numeric.h \ + gnc-event.h \ + gnc-trace.h \ + guid.h \ + kvp_frame.h \ + kvp-util.h \ + kvp-util-p.h \ + qof.h \ + qof-be-utils.h \ + qofbackend.h \ + qofbackend-p.h \ + qofclass.h \ + qofchoice.h \ + qofgobj.h \ + qofid.h \ + qofid-p.h \ + qofinstance-p.h \ + qofinstance.h \ + qofquery.h \ + qofbook.h \ + qofobject.h \ + qofquerycore.h \ + qofsession.h \ + qofla-dir.h \ + qof_book_merge.h + +noinst_HEADERS = \ + gnc-event-p.h \ + md5.h \ + qofclass-p.h \ + qofmath128.h \ + qofquery-p.h \ + qofquery-deserial.h \ + qofquery-serialize.h \ + qofbook-p.h \ + qofobject-p.h \ + qofquerycore-p.h \ + qofsession-p.h + +QOFLIBdir = $(libdir) + +EXTRA_DIST = \ + qofla-dir.h.in \ + qofmath128.c + +qofla-dir.h: qofla-dir.h.in + rm -f $@.tmp + sed < $< > $@.tmp \ + -e 's:@-libdir-@:${QOFLIBdir}:g' + mv $@.tmp $@ + +BUILT_SOURCES = qofla-dir.h + + diff --git a/src/engine/gnc-date.c b/lib/libqof/qof/gnc-date.c similarity index 100% rename from src/engine/gnc-date.c rename to lib/libqof/qof/gnc-date.c diff --git a/src/engine/gnc-date.h b/lib/libqof/qof/gnc-date.h similarity index 100% rename from src/engine/gnc-date.h rename to lib/libqof/qof/gnc-date.h diff --git a/src/engine/gnc-engine-util.c b/lib/libqof/qof/gnc-engine-util.c similarity index 100% rename from src/engine/gnc-engine-util.c rename to lib/libqof/qof/gnc-engine-util.c diff --git a/src/engine/gnc-engine-util.h b/lib/libqof/qof/gnc-engine-util.h similarity index 100% rename from src/engine/gnc-engine-util.h rename to lib/libqof/qof/gnc-engine-util.h diff --git a/src/engine/gnc-event-p.h b/lib/libqof/qof/gnc-event-p.h similarity index 100% rename from src/engine/gnc-event-p.h rename to lib/libqof/qof/gnc-event-p.h diff --git a/src/engine/gnc-event.c b/lib/libqof/qof/gnc-event.c similarity index 100% rename from src/engine/gnc-event.c rename to lib/libqof/qof/gnc-event.c diff --git a/src/engine/gnc-event.h b/lib/libqof/qof/gnc-event.h similarity index 100% rename from src/engine/gnc-event.h rename to lib/libqof/qof/gnc-event.h diff --git a/src/engine/gnc-numeric.c b/lib/libqof/qof/gnc-numeric.c similarity index 100% rename from src/engine/gnc-numeric.c rename to lib/libqof/qof/gnc-numeric.c diff --git a/src/engine/gnc-numeric.h b/lib/libqof/qof/gnc-numeric.h similarity index 100% rename from src/engine/gnc-numeric.h rename to lib/libqof/qof/gnc-numeric.h diff --git a/src/engine/gnc-trace.c b/lib/libqof/qof/gnc-trace.c similarity index 100% rename from src/engine/gnc-trace.c rename to lib/libqof/qof/gnc-trace.c diff --git a/src/engine/gnc-trace.h b/lib/libqof/qof/gnc-trace.h similarity index 100% rename from src/engine/gnc-trace.h rename to lib/libqof/qof/gnc-trace.h diff --git a/src/engine/guid.c b/lib/libqof/qof/guid.c similarity index 100% rename from src/engine/guid.c rename to lib/libqof/qof/guid.c diff --git a/src/engine/guid.h b/lib/libqof/qof/guid.h similarity index 100% rename from src/engine/guid.h rename to lib/libqof/qof/guid.h diff --git a/src/engine/kvp-util-p.h b/lib/libqof/qof/kvp-util-p.h similarity index 100% rename from src/engine/kvp-util-p.h rename to lib/libqof/qof/kvp-util-p.h diff --git a/src/engine/kvp-util.c b/lib/libqof/qof/kvp-util.c similarity index 100% rename from src/engine/kvp-util.c rename to lib/libqof/qof/kvp-util.c diff --git a/src/engine/kvp-util.h b/lib/libqof/qof/kvp-util.h similarity index 100% rename from src/engine/kvp-util.h rename to lib/libqof/qof/kvp-util.h diff --git a/src/engine/kvp_frame.c b/lib/libqof/qof/kvp_frame.c similarity index 100% rename from src/engine/kvp_frame.c rename to lib/libqof/qof/kvp_frame.c diff --git a/src/engine/kvp_frame.h b/lib/libqof/qof/kvp_frame.h similarity index 100% rename from src/engine/kvp_frame.h rename to lib/libqof/qof/kvp_frame.h diff --git a/src/engine/md5.c b/lib/libqof/qof/md5.c similarity index 100% rename from src/engine/md5.c rename to lib/libqof/qof/md5.c diff --git a/src/engine/md5.h b/lib/libqof/qof/md5.h similarity index 100% rename from src/engine/md5.h rename to lib/libqof/qof/md5.h diff --git a/src/engine/qof-be-utils.h b/lib/libqof/qof/qof-be-utils.h similarity index 100% rename from src/engine/qof-be-utils.h rename to lib/libqof/qof/qof-be-utils.h diff --git a/src/engine/qof.h b/lib/libqof/qof/qof.h similarity index 100% rename from src/engine/qof.h rename to lib/libqof/qof/qof.h diff --git a/src/engine/qof_book_merge.c b/lib/libqof/qof/qof_book_merge.c similarity index 100% rename from src/engine/qof_book_merge.c rename to lib/libqof/qof/qof_book_merge.c diff --git a/src/engine/qof_book_merge.h b/lib/libqof/qof/qof_book_merge.h similarity index 100% rename from src/engine/qof_book_merge.h rename to lib/libqof/qof/qof_book_merge.h diff --git a/src/engine/qofbackend-p.h b/lib/libqof/qof/qofbackend-p.h similarity index 100% rename from src/engine/qofbackend-p.h rename to lib/libqof/qof/qofbackend-p.h diff --git a/src/engine/qofbackend.c b/lib/libqof/qof/qofbackend.c similarity index 100% rename from src/engine/qofbackend.c rename to lib/libqof/qof/qofbackend.c diff --git a/src/engine/qofbackend.h b/lib/libqof/qof/qofbackend.h similarity index 100% rename from src/engine/qofbackend.h rename to lib/libqof/qof/qofbackend.h diff --git a/src/engine/qofbook-p.h b/lib/libqof/qof/qofbook-p.h similarity index 100% rename from src/engine/qofbook-p.h rename to lib/libqof/qof/qofbook-p.h diff --git a/src/engine/qofbook.c b/lib/libqof/qof/qofbook.c similarity index 100% rename from src/engine/qofbook.c rename to lib/libqof/qof/qofbook.c diff --git a/src/engine/qofbook.h b/lib/libqof/qof/qofbook.h similarity index 100% rename from src/engine/qofbook.h rename to lib/libqof/qof/qofbook.h diff --git a/src/engine/qofchoice.c b/lib/libqof/qof/qofchoice.c similarity index 100% rename from src/engine/qofchoice.c rename to lib/libqof/qof/qofchoice.c diff --git a/src/engine/qofchoice.h b/lib/libqof/qof/qofchoice.h similarity index 100% rename from src/engine/qofchoice.h rename to lib/libqof/qof/qofchoice.h diff --git a/src/engine/qofclass-p.h b/lib/libqof/qof/qofclass-p.h similarity index 100% rename from src/engine/qofclass-p.h rename to lib/libqof/qof/qofclass-p.h diff --git a/src/engine/qofclass.c b/lib/libqof/qof/qofclass.c similarity index 100% rename from src/engine/qofclass.c rename to lib/libqof/qof/qofclass.c diff --git a/src/engine/qofclass.h b/lib/libqof/qof/qofclass.h similarity index 100% rename from src/engine/qofclass.h rename to lib/libqof/qof/qofclass.h diff --git a/src/engine/qofgobj.c b/lib/libqof/qof/qofgobj.c similarity index 100% rename from src/engine/qofgobj.c rename to lib/libqof/qof/qofgobj.c diff --git a/src/engine/qofgobj.h b/lib/libqof/qof/qofgobj.h similarity index 100% rename from src/engine/qofgobj.h rename to lib/libqof/qof/qofgobj.h diff --git a/src/engine/qofid-p.h b/lib/libqof/qof/qofid-p.h similarity index 100% rename from src/engine/qofid-p.h rename to lib/libqof/qof/qofid-p.h diff --git a/src/engine/qofid.c b/lib/libqof/qof/qofid.c similarity index 100% rename from src/engine/qofid.c rename to lib/libqof/qof/qofid.c diff --git a/src/engine/qofid.h b/lib/libqof/qof/qofid.h similarity index 100% rename from src/engine/qofid.h rename to lib/libqof/qof/qofid.h diff --git a/src/engine/qofinstance-p.h b/lib/libqof/qof/qofinstance-p.h similarity index 100% rename from src/engine/qofinstance-p.h rename to lib/libqof/qof/qofinstance-p.h diff --git a/src/engine/qofinstance.c b/lib/libqof/qof/qofinstance.c similarity index 100% rename from src/engine/qofinstance.c rename to lib/libqof/qof/qofinstance.c diff --git a/src/engine/qofinstance.h b/lib/libqof/qof/qofinstance.h similarity index 100% rename from src/engine/qofinstance.h rename to lib/libqof/qof/qofinstance.h diff --git a/src/engine/qofla-dir.h.in b/lib/libqof/qof/qofla-dir.h.in similarity index 100% rename from src/engine/qofla-dir.h.in rename to lib/libqof/qof/qofla-dir.h.in diff --git a/src/engine/qofmath128.c b/lib/libqof/qof/qofmath128.c similarity index 100% rename from src/engine/qofmath128.c rename to lib/libqof/qof/qofmath128.c diff --git a/src/engine/qofmath128.h b/lib/libqof/qof/qofmath128.h similarity index 100% rename from src/engine/qofmath128.h rename to lib/libqof/qof/qofmath128.h diff --git a/src/engine/qofobject-p.h b/lib/libqof/qof/qofobject-p.h similarity index 100% rename from src/engine/qofobject-p.h rename to lib/libqof/qof/qofobject-p.h diff --git a/src/engine/qofobject.c b/lib/libqof/qof/qofobject.c similarity index 100% rename from src/engine/qofobject.c rename to lib/libqof/qof/qofobject.c diff --git a/src/engine/qofobject.h b/lib/libqof/qof/qofobject.h similarity index 100% rename from src/engine/qofobject.h rename to lib/libqof/qof/qofobject.h diff --git a/src/engine/qofquery-deserial.c b/lib/libqof/qof/qofquery-deserial.c similarity index 100% rename from src/engine/qofquery-deserial.c rename to lib/libqof/qof/qofquery-deserial.c diff --git a/src/engine/qofquery-deserial.h b/lib/libqof/qof/qofquery-deserial.h similarity index 100% rename from src/engine/qofquery-deserial.h rename to lib/libqof/qof/qofquery-deserial.h diff --git a/src/engine/qofquery-p.h b/lib/libqof/qof/qofquery-p.h similarity index 100% rename from src/engine/qofquery-p.h rename to lib/libqof/qof/qofquery-p.h diff --git a/src/engine/qofquery-serialize.c b/lib/libqof/qof/qofquery-serialize.c similarity index 100% rename from src/engine/qofquery-serialize.c rename to lib/libqof/qof/qofquery-serialize.c diff --git a/src/engine/qofquery-serialize.h b/lib/libqof/qof/qofquery-serialize.h similarity index 100% rename from src/engine/qofquery-serialize.h rename to lib/libqof/qof/qofquery-serialize.h diff --git a/src/engine/qofquery.c b/lib/libqof/qof/qofquery.c similarity index 100% rename from src/engine/qofquery.c rename to lib/libqof/qof/qofquery.c diff --git a/src/engine/qofquery.h b/lib/libqof/qof/qofquery.h similarity index 100% rename from src/engine/qofquery.h rename to lib/libqof/qof/qofquery.h diff --git a/src/engine/qofquerycore-p.h b/lib/libqof/qof/qofquerycore-p.h similarity index 100% rename from src/engine/qofquerycore-p.h rename to lib/libqof/qof/qofquerycore-p.h diff --git a/src/engine/qofquerycore.c b/lib/libqof/qof/qofquerycore.c similarity index 100% rename from src/engine/qofquerycore.c rename to lib/libqof/qof/qofquerycore.c diff --git a/src/engine/qofquerycore.h b/lib/libqof/qof/qofquerycore.h similarity index 100% rename from src/engine/qofquerycore.h rename to lib/libqof/qof/qofquerycore.h diff --git a/src/engine/qofsession-p.h b/lib/libqof/qof/qofsession-p.h similarity index 100% rename from src/engine/qofsession-p.h rename to lib/libqof/qof/qofsession-p.h diff --git a/src/engine/qofsession.c b/lib/libqof/qof/qofsession.c similarity index 100% rename from src/engine/qofsession.c rename to lib/libqof/qof/qofsession.c diff --git a/src/engine/qofsession.h b/lib/libqof/qof/qofsession.h similarity index 100% rename from src/engine/qofsession.h rename to lib/libqof/qof/qofsession.h diff --git a/src/engine/qofsql.c b/lib/libqof/qof/qofsql.c similarity index 100% rename from src/engine/qofsql.c rename to lib/libqof/qof/qofsql.c diff --git a/src/engine/qofsql.h b/lib/libqof/qof/qofsql.h similarity index 100% rename from src/engine/qofsql.h rename to lib/libqof/qof/qofsql.h diff --git a/src/backend/Makefile.am b/src/backend/Makefile.am index d8ea78b805..13ab0726d0 100644 --- a/src/backend/Makefile.am +++ b/src/backend/Makefile.am @@ -1,10 +1,5 @@ -if USE_LIBQOF -SUBDIRS = qsf file ${SQL_DIR} ${RPC_DIR} -DIST_SUBDIRS = qsf file net postgres rpc -else SUBDIRS = file ${SQL_DIR} ${RPC_DIR} -DIST_SUBDIRS = qsf file net postgres rpc -endif +DIST_SUBDIRS = file net postgres rpc noinst_HEADERS = gnc-backend-api.h diff --git a/src/backend/postgres/test/Makefile.am b/src/backend/postgres/test/Makefile.am index 0f64df908d..2f3d525ac9 100644 --- a/src/backend/postgres/test/Makefile.am +++ b/src/backend/postgres/test/Makefile.am @@ -29,8 +29,42 @@ LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \ ${top_builddir}/src/engine/libgw-engine.la \ ${top_builddir}/src/engine/libgw-kvp.la \ ${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \ - ${top_builddir}/src/backend/postgres/libgnc-backend-postgres.la \ - -lltdl + -lltdl \ + -lpq + +test_db_SOURCES = \ + ${top_srcdir}/src/backend/postgres/PostgresBackend.c \ + ${top_srcdir}/src/backend/postgres/account.c \ + ${top_srcdir}/src/backend/postgres/book.c \ + ${top_srcdir}/src/backend/postgres/builder.c \ + ${top_srcdir}/src/backend/postgres/checkpoint.c \ + ${top_srcdir}/src/backend/postgres/escape.c \ + ${top_srcdir}/src/backend/postgres/events.c \ + ${top_srcdir}/src/backend/postgres/gncquery.c \ + ${top_srcdir}/src/backend/postgres/kvp-sql.c \ + ${top_srcdir}/src/backend/postgres/price.c \ + ${top_srcdir}/src/backend/postgres/txn.c \ + ${top_srcdir}/src/backend/postgres/txnmass.c \ + ${top_srcdir}/src/backend/postgres/upgrade.c \ + ${top_srcdir}/src/backend/postgres/putil.c \ + test-db.c + +test_escape_SOURCES = \ + ${top_srcdir}/src/backend/postgres/PostgresBackend.c \ + ${top_srcdir}/src/backend/postgres/account.c \ + ${top_srcdir}/src/backend/postgres/book.c \ + ${top_srcdir}/src/backend/postgres/builder.c \ + ${top_srcdir}/src/backend/postgres/checkpoint.c \ + ${top_srcdir}/src/backend/postgres/escape.c \ + ${top_srcdir}/src/backend/postgres/events.c \ + ${top_srcdir}/src/backend/postgres/gncquery.c \ + ${top_srcdir}/src/backend/postgres/kvp-sql.c \ + ${top_srcdir}/src/backend/postgres/price.c \ + ${top_srcdir}/src/backend/postgres/txn.c \ + ${top_srcdir}/src/backend/postgres/txnmass.c \ + ${top_srcdir}/src/backend/postgres/upgrade.c \ + ${top_srcdir}/src/backend/postgres/putil.c \ + test-escape.c AM_CFLAGS = \ -I${top_srcdir}/src \ diff --git a/src/backend/postgres/test/test-load-backend.c b/src/backend/postgres/test/test-load-backend.c index 073b9cc91b..917a0f3099 100644 --- a/src/backend/postgres/test/test-load-backend.c +++ b/src/backend/postgres/test/test-load-backend.c @@ -35,8 +35,10 @@ int main (int argc, char ** argv) { qof_init(); cashobjects_register(); + /* the test needs to run locally in case make install + * has not yet been run. Use GNC_LIBDIR usually. */ do_test( - qof_load_backend_library (QOF_LIB_DIR, PG_LIB_NAME, PG_LIB_INIT), + qof_load_backend_library ("../", PG_LIB_NAME, PG_LIB_INIT), " loading gnc-backend-postgres GModule failed"); print_test_results(); qof_close(); diff --git a/src/backend/qsf/Makefile.am b/src/backend/qsf/Makefile.am deleted file mode 100644 index 3da8a95ec3..0000000000 --- a/src/backend/qsf/Makefile.am +++ /dev/null @@ -1,43 +0,0 @@ -SUBDIRS = . - -lib_LTLIBRARIES = libqof-backend-qsf.la - -AM_CFLAGS = \ - -I.. -I../.. \ - -I${top_srcdir}/src/backend \ - -I${top_srcdir}/src/engine \ - -DLOCALE_DIR=\""$(datadir)/locale"\" \ - -I${top_srcdir}/src/gnc-module \ - ${LIBXML2_CFLAGS} \ - ${GLIB_CFLAGS} - -libqof_backend_qsf_la_SOURCES = \ - qsf-backend.c \ - qsf-xml-map.c \ - qsf-xml.c - -LIBADD = \ - ${GLIB_LIBS} \ - ${LIBXML2_LIBS} - -qsfschemadir = $(QSF_SCHEMA_DIR) -qsfschema_DATA = \ - qsf-object.xsd.xml \ - qsf-map.xsd.xml \ - pilot-qsf-GnuCashInvoice.xml - -EXTRA_DIST = \ - $(qsfschema_DATA) \ - qsf-dir.h.in \ - qof-backend-qsf.h \ - qsf-xml.h - -qsf-dir.h: qsf-dir.h.in - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:@-QSF_SCHEMA_DIR-@:${QSF_SCHEMA_DIR}:g' - mv $@.tmp $@ - -BUILT_SOURCES = qsf-dir.h - -CONFIG_CLEAN_FILES = qsf-dir.h diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index 520179e048..0ce360cbdd 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -12,103 +12,6 @@ AM_CFLAGS = \ ${QOF_CFLAGS} \ ${GNUCASH_ENGINE_CFLAGS} -qof_library = \ - gnc-date.c \ - gnc-engine-util.c \ - gnc-numeric.c \ - gnc-event.c \ - gnc-trace.c \ - guid.c \ - kvp_frame.c \ - kvp-util.c \ - md5.c \ - qofbackend.c \ - qofclass.c \ - qofchoice.c \ - qofid.c \ - qofinstance.c \ - qofquery.c \ - qofbook.c \ - qofobject.c \ - qofquerycore.c \ - qofsession.c \ - qof_book_merge.c - -qof_headers = \ - gnc-date.h \ - gnc-engine-util.h \ - gnc-numeric.h \ - gnc-event.h \ - gnc-trace.h \ - guid.h \ - kvp_frame.h \ - kvp-util.h \ - kvp-util-p.h \ - qof.h \ - qof-be-utils.h \ - qofbackend.h \ - qofbackend-p.h \ - qofclass.h \ - qofchoice.h \ - qofid.h \ - qofid-p.h \ - qofinstance-p.h \ - qofinstance.h \ - qofquery.h \ - qofbook.h \ - qofobject.h \ - qofquerycore.h \ - qofsession.h \ - qof_book_merge.h - -qof_noinst_headers = \ - gnc-event-p.h \ - md5.h \ - qofclass-p.h \ - qofmath128.h \ - qofquery-p.h \ - qofbook-p.h \ - qofobject-p.h \ - qofquerycore-p.h \ - qofsession-p.h \ - qofsql.h - -if USE_LIBQOF - -lib_LTLIBRARIES = libqof.la - -libqof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION) - -libqof_la_SOURCES = ${qof_library} - -qofincludedir = ${pkgincludedir} - -qofinclude_HEADERS = ${qof_headers} - -nodist_qofinclude_HEADERS = qofla-dir.h - -QOFLIBdir = $(libdir) - -qofla-dir.h: qofla-dir.h.in - rm -f $@.tmp - sed < $< > $@.tmp \ - -e 's:@-libdir-@:${QOFLIBdir}:g' - mv $@.tmp $@ - -qof_builds = qofla-dir.h - -else - -libqof_la_SOURCES = - -qofincludedir = ${pkgincludedir} - -qofinclude_HEADERS = - -qof_builds = - -endif - libgncmod_engine_la_SOURCES = \ Account.c \ FreqSpec.c \ @@ -196,8 +99,7 @@ noinst_HEADERS = \ gnc-pricedb-p.h \ gw-engine.h \ gw-kvp.h \ - policy-p.h \ - ${qof_noinst_headers} + policy-p.h noinst_SCRIPTS = iso-currencies-to-c @@ -239,12 +141,9 @@ EXTRA_DIST = \ extensions.txt \ iso-4217-currencies.scm \ iso-currencies-to-c \ - qofla-dir.h.in \ gncla-dir.h.in \ kvp_doc.txt \ SX-book-p.h \ - ${qof_library} \ - ${qof_headers} \ ${gncmod_DATA} \ ${gncscm_DATA} \ ${gwmod_DATA} @@ -288,13 +187,12 @@ gw-kvp.scm gw-kvp.c gw-kvp.h: \ (gw:generate-wrapset \"gw-kvp\")" BUILT_SOURCES = \ - ${qof_builds} \ iso-4217-currencies.c \ gw-engine.scm gw-engine.c gw-engine.h \ gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \ - gw-engine.html gw-kvp.html qofla-dir.h gncla-dir.h + gw-engine.html gw-kvp.html gncla-dir.h gncla-dir.h: gncla-dir.h.in rm -f $@.tmp diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am index c5e869306b..37d16df9b3 100644 --- a/src/gnome-utils/test/Makefile.am +++ b/src/gnome-utils/test/Makefile.am @@ -45,6 +45,7 @@ INCLUDES= \ test_gnc_recurrence_SOURCES=test-gnc-recurrence.c test_gnc_recurrence_LDADD = ${GNOME_LIBS} \ + ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la test_gnc_dialog_LDADD = ${GNOME_LIBS} \ diff --git a/src/import-export/qif-import/test/Makefile.am b/src/import-export/qif-import/test/Makefile.am index afba32346f..8d322befa9 100644 --- a/src/import-export/qif-import/test/Makefile.am +++ b/src/import-export/qif-import/test/Makefile.am @@ -7,6 +7,7 @@ test_link_SOURCES = \ test_link_LDADD=../libgncmod-qif-import.la \ ${top_builddir}/src/gnome/libgncgnome.la \ + ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \ ${LIBXML2_LIBS}