Rename lib/libqof -> src/libqof

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@18029 57a11ea4-9604-0410-9ed3-97b8803252fd

configure.in

@@ -1464,10 +1464,6 @@ AC_CONFIG_FILES(po/Makefile.in
           lib/guile-www/Makefile
           lib/srfi/Makefile
           lib/libc/Makefile
-          lib/libqof/Makefile
-          lib/libqof/qof/Makefile
-          lib/libqof/backend/Makefile
-          lib/libqof/backend/file/Makefile
           lib/stf/Makefile
           packaging/Makefile
           packaging/win32/Makefile
@@ -1535,6 +1531,10 @@ AC_CONFIG_FILES(po/Makefile.in
           src/import-export/hbci/glade/Makefile
           src/import-export/hbci/schemas/Makefile
           src/import-export/hbci/test/Makefile
+          src/libqof/Makefile
+          src/libqof/qof/Makefile
+          src/libqof/backend/Makefile
+          src/libqof/backend/file/Makefile
           src/optional/Makefile
           src/optional/python-bindings/Makefile
           src/optional/python-bindings/tests/Makefile

lib/Makefile.am

@@ -1,9 +1,5 @@
 SUBDIRS = libc glib28 guile-www srfi stf
-DIST_SUBDIRS = libc glib28 guile-www srfi libqof stf
-
-if USE_LIBQOF
-SUBDIRS += libqof
-endif
+DIST_SUBDIRS = libc glib28 guile-www srfi stf
 
 EXTRA_DIST = README
 

src/Makefile.am

@@ -1,4 +1,5 @@
 NONGUI_SUBDIRS = \
+  libqof \
   doc \
   pixmaps \
   core-utils \

src/app-utils/Makefile.am

@@ -27,7 +27,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/calculation \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS} \
@@ -92,10 +92,10 @@ libgncmod_app_utils_la_LIBADD = \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/calculation/libgncmod-calculation.la \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GCONF_LIBS} \
   ${GTK_LIBS} \
   ${GUILE_LIBS} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS}
 
 if BUILDING_FROM_SVN

src/app-utils/test/Makefile.am

@@ -40,8 +40,8 @@ LDADD = \
    ${top_builddir}/src/test-core/libgncmod-test.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 \
    ${GUILE_LIBS} \
-   ${QOF_LIBS} \
    ${GCONF_LIBS}
 
 check_PROGRAMS = \
@@ -63,7 +63,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/core-utils \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS}

src/backend/dbi/Makefile.am

@@ -12,7 +12,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils\
   -I${top_srcdir}/lib/libc\
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS} \
   ${WARN_CFLAGS}
@@ -25,10 +25,11 @@ noinst_HEADERS = \
 
 libgncmod_backend_dbi_la_LDFLAGS = -module -avoid-version
 libgncmod_backend_dbi_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} \
+   ${GLIB_LIBS} \
+   ${GCONF_LIBS} \
    ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
    ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${LIBDBI_LIBS} \
-   ${QOF_LIBS}
+   ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+   ${LIBDBI_LIBS}
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.dbi\"

src/backend/dbi/test/Makefile.am

@@ -27,7 +27,7 @@ LDADD = ${top_builddir}/src/test-core/libgncmod-test.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 \
-        ${QOF_LIBS} \
+        ${top_builddir}/src/libqof/qof/libgnc-qof.la \
         ${top_builddir}/lib/libc/libc-missing.la
 
 AM_CFLAGS = \
@@ -40,8 +40,8 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/backend/gda \
   -I${top_srcdir}/src/backend/qsf \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GCONF_CFLAGS}
 

src/backend/postgres/Makefile.am

@@ -8,14 +8,14 @@ AM_CPPFLAGS = \
   -I${srcdir}/../.. \
   -I${top_srcdir}/src/backend \
   -I${top_srcdir}/src/engine \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${PGSQL_CFLAGS} \
   ${GLIB_CFLAGS}
 
 libgnc_backend_postgres_la_LDFLAGS = -module -avoid-version
 libgnc_backend_postgres_la_LIBADD  =  ${PGSQL_LIBS} -lpq  \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GLIB_LIBS}
 
 libgnc_backend_postgres_la_SOURCES = \

src/backend/postgres/test/Makefile.am

@@ -63,7 +63,7 @@ test_escape_SOURCES = \
 
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \

src/backend/sql/Makefile.am

@@ -10,7 +10,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils\
   -I${top_srcdir}/lib/libc\
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS} \
   ${WARN_CFLAGS}
@@ -42,8 +42,9 @@ noinst_HEADERS = \
   gnc-transaction-sql.h
 
 libgnc_backend_sql_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} \
+   ${GLIB_LIBS} \
+   ${GCONF_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
-   ${QOF_LIBS}
+   ${top_builddir}/src/libqof/qof/libgnc-qof.la
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.sql\"

src/backend/sql/test/Makefile.am

@@ -41,7 +41,7 @@ LDADD = ${top_builddir}/src/test-core/libgncmod-test.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 \
-        ${QOF_LIBS} \
+        ${top_builddir}/src/libqof/qof/libgnc-qof.la \
         ${top_builddir}/lib/libc/libc-missing.la
 
 AM_CFLAGS = \
@@ -53,8 +53,8 @@ AM_CFLAGS = \
   -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} \
-  ${QOF_CFLAGS} \
   ${GUILE_INCS} \
   ${GCONF_CFLAGS}
 

src/backend/xml/Makefile.am

@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils\
   -I${top_srcdir}/lib/libc\
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GCONF_CFLAGS}
@@ -59,17 +59,23 @@ noinst_HEADERS = \
   sixtp-utils.h
 
 libgnc_backend_xml_utils_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} ${ZLIB_LIBS} \
+   ${GLIB_LIBS} \
+   ${GCONF_LIBS} \
+   ${LIBXML2_LIBS} \
+   ${ZLIB_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-   ${QOF_LIBS}
+   ${top_builddir}/src/libqof/qof/libgnc-qof.la
 
 libgncmod_backend_xml_la_LDFLAGS = -module -avoid-version
 libgncmod_backend_xml_la_LIBADD = \
-   ${GLIB_LIBS} ${GCONF_LIBS} ${LIBXML2_LIBS} ${ZLIB_LIBS} \
+   ${GLIB_LIBS} \
+   ${GCONF_LIBS} \
+   ${LIBXML2_LIBS} \
+   ${ZLIB_LIBS} \
    ${top_builddir}/src/engine/libgncmod-engine.la \
    ${top_builddir}/src/core-utils/libgnc-core-utils.la \
    libgnc-backend-xml-utils.la \
-   ${QOF_LIBS}
+   ${top_builddir}/src/libqof/qof/libgnc-qof.la
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.xml\"

src/backend/xml/test/Makefile.am

@@ -225,7 +225,7 @@ LDADD = ${top_builddir}/src/test-core/libgncmod-test.la \
         ${top_builddir}/src/core-utils/libgnc-core-utils.la \
         ./libgnc-test-file-stuff.la \
         ${LIBXML2_LIBS} \
-        ${QOF_LIBS} \
+        ${top_builddir}/src/libqof/qof/libgnc-qof.la \
         ${top_builddir}/lib/libc/libc-missing.la
 
 AM_CPPFLAGS = \
@@ -238,7 +238,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/backend/xml \
   -I${top_srcdir}/src/backend/qsf \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS} \

src/bin/Makefile.am

@@ -14,19 +14,23 @@ AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
   -I${top_srcdir}/src/gnome \
   -I${top_builddir}/src/gnome-utils \
   -I${top_srcdir}/src/gnc-module \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS}
 
 bin_PROGRAMS = gnucash-bin
 gnucash_bin_SOURCES = gnucash-bin.c
-gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
-${QOF_LIBS} \
-${top_builddir}/src/engine/libgncmod-engine.la \
-${top_builddir}/src/gnome/libgnc-gnome.la \
-${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
-${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-${top_builddir}/src/core-utils/libgnc-core-utils.la \
-${top_builddir}/src/gnc-module/libgnc-module.la
+gnucash_bin_LDADD = \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GUILE_LIBS} \
+  ${GLIB_LIBS} \
+  ${GNOME_LIBS} \
+  ${GTK_LIBS} \
+  ${top_builddir}/src/engine/libgncmod-engine.la \
+  ${top_builddir}/src/gnome/libgnc-gnome.la \
+  ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
+  ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+  ${top_builddir}/src/core-utils/libgnc-core-utils.la \
+  ${top_builddir}/src/gnc-module/libgnc-module.la
 
 gnucash: gnucash.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp

src/business/business-core/Makefile.am

@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
@@ -60,7 +60,7 @@ libgncmod_business_core_la_LDFLAGS = -avoid-version
 libgncmod_business_core_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${EFENCE_LIBS}

src/business/business-core/sql/Makefile.am

@@ -9,7 +9,7 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${LIBGDA_CFLAGS}
 
@@ -47,7 +47,7 @@ libgncmod_business_backend_sql_la_LIBADD = \
   ${top_builddir}/src/backend/sql/libgnc-backend-sql.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GLIB_LIBS} \
   ${LIBGDA_LIBS}
 

src/business/business-core/test/Makefile.am

@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/business/business-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
@@ -14,8 +14,8 @@ LDADD = \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ../libgncmod-business-core.la \
-  ${GLIB_LIBS} \
-  ${QOF_LIBS}
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GLIB_LIBS}
 
 TESTS = \
   test-load-module \

src/business/business-core/xml/Makefile.am

@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS}
 
@@ -48,6 +48,6 @@ libgncmod_business_backend_xml_la_LIBADD = \
   ${top_builddir}/src/backend/xml/libgnc-backend-xml-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 \
   ${LIBXML2_LIBS} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS}

src/business/business-gnome/Makefile.am

@@ -19,7 +19,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/register/ledger-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GTKHTML_CFLAGS} \
@@ -79,11 +79,11 @@ libgncmod_business_gnome_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 \
   ${GLADE_LIBS} \
   ${GNOME_LIBS} \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
-  ${QOF_LIBS} \
   ${EFENCE_LIBS}
 
 # For Business Reports

src/business/business-ledger/Makefile.am

@@ -27,9 +27,9 @@ libgnc_business_ledger_la_LIBADD = \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.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} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS}
 
 AM_CPPFLAGS = \
@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/register/register-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \

src/business/business-utils/Makefile.am

@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/business/business-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
   ${GNOME_CFLAGS}
@@ -24,9 +24,9 @@ libgncmod_business_utils_la_LDFLAGS = -avoid-version
 libgncmod_business_utils_la_LIBADD = \
   ${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 \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
-  ${QOF_LIBS} \
   ${EFENCE_LIBS}
 
 # Guile Modules

src/business/dialog-tax-table/Makefile.am

@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/business/business-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GTKHTML_CFLAGS} \
@@ -32,11 +32,11 @@ libgncmod_dialog_tax_table_la_LIBADD = \
   ${top_builddir}/src/app-utils/libgncmod-app-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 \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
   ${GLIB_LIBS} \
-  ${QOF_LIBS} \
   ${EFENCE_LIBS}
 
 if BUILDING_FROM_SVN

src/calculation/Makefile.am

@@ -5,8 +5,9 @@ pkglib_LTLIBRARIES = libgncmod-calculation.la
 libgncmod_calculation_la_LDFLAGS = -avoid-version
 
 libgncmod_calculation_la_LIBADD = \
-  ${GLIB_LIBS} ${GUILE_LIBS} \
-  ${QOF_LIBS}
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GLIB_LIBS} \
+  ${GUILE_LIBS}
 
 libgncmod_calculation_la_SOURCES = \
   expression_parser.c \
@@ -32,6 +33,6 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}

src/engine/Makefile.am

@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
 	-I${top_srcdir}/src/gnc-module \
-	${QOF_CFLAGS} \
+    -I${top_srcdir}/src/libqof/qof \
 	${GLIB_CFLAGS} \
 	${GUILE_INCS}
 
@@ -111,8 +111,8 @@ libgncmod_engine_la_LDFLAGS = -avoid-version
 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} \
-  ${QOF_LIBS} \
   ${REGEX_LIBS} \
   ${GLIB_LIBS} \
   ${BINRELOC_LIBS} \

src/engine/test-core/Makefile.am

@@ -3,15 +3,15 @@ check_LTLIBRARIES=libgncmod-test-engine.la
 LDADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ../libgncmod-engine.la \
-  ${GLIB_LIBS} \
-  ${QOF_LIBS}
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GLIB_LIBS}
 
 libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.c
 libgncmod_test_engine_la_LDFLAGS = -module
 libgncmod_test_engine_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ../libgncmod-engine.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GLIB_LIBS}
 
 noinst_HEADERS=test-engine-stuff.h test-engine-strings.h
@@ -21,6 +21,6 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS}

src/engine/test/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
@@ -16,8 +16,8 @@ LDADD = \
   ../libgncmod-engine.la \
   ../test-core/libgncmod-test-engine.la \
   ${top_builddir}/src/core-utils/libgnc-core-utils.la \
-  ${GLIB_LIBS} \
-  ${QOF_LIBS}
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GLIB_LIBS}
 
 # these tests are ordered kind more or less in the order
 # that they should be executed, with more basic tests coming first.
@@ -84,7 +84,8 @@ check_PROGRAMS = \
 
 
 test_link_SOURCES = test-link.c
-test_link_LDADD = ../libgncmod-engine.la ${QOF_LIBS}
+test_link_LDADD = ../libgncmod-engine.la \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la
 
 EXTRA_DIST = \
   test-create-account \

src/gnome-search/Makefile.am

@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnc-module \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GNOME_CFLAGS} \
@@ -52,12 +52,12 @@ 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 \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${GLIB_LIBS} \
-  ${REGEX_LIBS} \
-  ${QOF_LIBS}
+  ${REGEX_LIBS}
 
 gladedir = $(GNC_GLADE_DIR)
 glade_DATA = \

src/gnome-utils/Makefile.am

@@ -13,13 +13,13 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/lib/libc \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GLADE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GUILE_INCS} \
-  ${QOF_CFLAGS} \
   ${GOFFICE_CFLAGS}
 
 libgncmod_gnome_utils_la_SOURCES = \
@@ -184,6 +184,7 @@ 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 \
   ${GNOME_LIBS} \
   ${GTKHTML_LIBS} \
   ${GUILE_LIBS} \
@@ -192,7 +193,6 @@ libgncmod_gnome_utils_la_LIBADD = \
   ${GUILE_LIBS} \
   ${GLIB_LIBS} \
   ${DB_LIBS} \
-  ${QOF_LIBS} \
   ${GOFFICE_LIBS} \
   ${REGEX_LIBS} \
   ${LIBXML2_LIBS}

src/gnome-utils/test/Makefile.am

@@ -35,7 +35,11 @@ INCLUDES= \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/test-core \
-  ${GLIB_CFLAGS} ${GUILE_INCS} ${GNOME_CFLAGS} ${GLADE_CFLAGS} ${QOF_CFLAGS}
+  -I${top_srcdir}/src/libqof/qof \
+  ${GLIB_CFLAGS} \
+  ${GUILE_INCS} \
+  ${GNOME_CFLAGS} \
+  ${GLADE_CFLAGS}
 
 LDADD = \
   ${GNOME_LIBS} \

src/gnome/Makefile.am

@@ -14,11 +14,11 @@ libgnc_gnome_la_LIBADD = \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.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 \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
-  ${GLIB_LIBS} \
-  ${QOF_LIBS}
+  ${GLIB_LIBS}
 
 libgnc_gnome_la_SOURCES = \
   swig-gnome.c \
@@ -118,7 +118,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/report/report-system \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/lib/libc \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GNOME_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \

src/import-export/Makefile.am

@@ -47,9 +47,9 @@ 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 \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
-  ${QOF_LIBS} \
   ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
@@ -66,7 +66,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GDK_PIXBUF_CFLAGS} \

src/import-export/aqbanking/Makefile.am

@@ -41,9 +41,9 @@ 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 \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS} \
   ${AQBANKING_LIBS}
 
@@ -59,9 +59,9 @@ AM_CFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/gnc-module \
+  -I${top_srcdir}/src/libqof/qof \
   ${GNOME_CFLAGS} \
   ${GLADE_CFLAGS} \
-  ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${AQBANKING_CFLAGS}
 

src/import-export/binary-import/Makefile.am

@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnome \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLADE_CFLAGS} \
   ${GLIB_CFLAGS} \
@@ -32,10 +32,10 @@ libgncmod_binary_import_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 \
   ${GUILE_LIBS} \
   ${GLADE_LIBS} \
   ${GNOME_LIBS} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS}
 
 gladedir = $(GNC_GLADE_DIR)

src/import-export/csv/Makefile.am

@@ -26,7 +26,7 @@ libgncmod_csv_la_LIBADD = \
   ${top_builddir}/src/gnc-module/libgnc-module.la \
   ${top_builddir}/lib/stf/libgnc-stf.la \
   ${top_builddir}/lib/libc/libc-missing.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GOFFICE_LIBS} \
   ${GLIB_LIBS}
 
@@ -39,9 +39,9 @@ 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 \
-  ${QOF_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \

src/import-export/hbci/Makefile.am

@@ -52,9 +52,9 @@ libgncmod_hbci_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 \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS} \
   ${AQBANKING_LIBS}
 
@@ -71,7 +71,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/register/ledger-core \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \

src/import-export/log-replay/Makefile.am

@@ -19,8 +19,9 @@ 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 \
@@ -31,7 +32,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \

src/import-export/ofx/Makefile.am

@@ -20,7 +20,7 @@ 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 \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GLIB_LIBS} \
   ${LIBOFX_LIBS}
 
@@ -33,7 +33,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GNOME_CFLAGS} \
   ${GTKHTML_CFLAGS} \
   ${GLADE_CFLAGS} \

src/import-export/qif-import/Makefile.am

@@ -25,10 +25,10 @@ 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} \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
-  ${QOF_LIBS} \
   ${GLIB_LIBS}
 
 
@@ -61,7 +61,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnome \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS} \
   ${GLADE_CFLAGS} \

src/import-export/qif-import/test/Makefile.am

@@ -11,6 +11,6 @@ test_link_LDADD=../libgncmod-qif-import.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
-  ${LIBXML2_LIBS} \
-  ${QOF_LIBS}
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${LIBXML2_LIBS}
 

src/import-export/qif/Makefile.am

@@ -22,7 +22,7 @@ noinst_HEADERS = \
 libgncmod_qif_la_LIBADD = \
   ${top_builddir}/src/import-export/libgncmod-generic-import.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${REGEX_LIBS} \
   ${GLIB_LIBS}
 
@@ -32,9 +32,8 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GUILE_INCS}
 
-
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif\"

src/import-export/qif/test/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/src/import-export/qif \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
@@ -15,7 +15,7 @@ LDADD = \
   ${top_builddir}/src/test-core/libgncmod-test.la \
   ../../libgncmod-generic-import.la \
   ../libgncmod-qif.la \
-  ${QOF_LIBS} \
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
   ${GLIB_LIBS}
 
 TESTS = \

src/import-export/test/Makefile.am

@@ -5,7 +5,7 @@ AM_CPPFLAGS = \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${GUILE_INCS} \
   ${GLIB_CFLAGS}
 
@@ -15,7 +15,8 @@ LDADD = \
   ../libgncmod-generic-import.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
-  ${GLIB_LIBS} ${QOF_LIBS}
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GLIB_LIBS}
 
 TESTS = \
   test-link \

src/libqof/backend/file/Makefile.am

@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
   -I.. -I../.. \
   -I$(top_srcdir)/lib/libc \
   -DLOCALE_DIR=\""$(datadir)/locale"\" \
-  ${QOF_CFLAGS} \
+  -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS}
 
@@ -17,11 +17,11 @@ libgncqof_backend_qsf_la_SOURCES = \
 
 libgncqof_backend_qsf_la_LDFLAGS = -module -avoid-version
 libgncqof_backend_qsf_la_LIBADD = \
- ${QOF_LIBS} \
- ${GLIB_LIBS} \
- ${REGEX_LIBS} \
- ${LIBXML2_LIBS} \
- $(top_builddir)/lib/libc/libc-missing.la
+  ${top_builddir}/src/libqof/qof/libgnc-qof.la \
+  ${GLIB_LIBS} \
+  ${REGEX_LIBS} \
+  ${LIBXML2_LIBS} \
+  $(top_builddir)/lib/libc/libc-missing.la
 
 qsfschemadir = $(QOF_XML_DIR)
 qsfschema_DATA = \