r18029 - gnucash/trunk - Rename lib/libqof -> src/libqof
Phil Longstaff
plongstaff at code.gnucash.org
Mon Apr 6 20:48:53 EDT 2009
Author: plongstaff
Date: 2009-04-06 20:48:53 -0400 (Mon, 06 Apr 2009)
New Revision: 18029
Trac: http://svn.gnucash.org/trac/changeset/18029
Added:
gnucash/trunk/src/libqof/
Removed:
gnucash/trunk/lib/libqof/
Modified:
gnucash/trunk/configure.in
gnucash/trunk/lib/Makefile.am
gnucash/trunk/src/Makefile.am
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/app-utils/test/Makefile.am
gnucash/trunk/src/backend/dbi/Makefile.am
gnucash/trunk/src/backend/dbi/test/Makefile.am
gnucash/trunk/src/backend/postgres/Makefile.am
gnucash/trunk/src/backend/postgres/test/Makefile.am
gnucash/trunk/src/backend/sql/Makefile.am
gnucash/trunk/src/backend/sql/test/Makefile.am
gnucash/trunk/src/backend/xml/Makefile.am
gnucash/trunk/src/backend/xml/test/Makefile.am
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/business/business-core/Makefile.am
gnucash/trunk/src/business/business-core/sql/Makefile.am
gnucash/trunk/src/business/business-core/test/Makefile.am
gnucash/trunk/src/business/business-core/xml/Makefile.am
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/business-ledger/Makefile.am
gnucash/trunk/src/business/business-utils/Makefile.am
gnucash/trunk/src/business/dialog-tax-table/Makefile.am
gnucash/trunk/src/calculation/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/engine/test-core/Makefile.am
gnucash/trunk/src/engine/test/Makefile.am
gnucash/trunk/src/gnome-search/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome-utils/test/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/import-export/aqbanking/Makefile.am
gnucash/trunk/src/import-export/binary-import/Makefile.am
gnucash/trunk/src/import-export/csv/Makefile.am
gnucash/trunk/src/import-export/hbci/Makefile.am
gnucash/trunk/src/import-export/log-replay/Makefile.am
gnucash/trunk/src/import-export/ofx/Makefile.am
gnucash/trunk/src/import-export/qif-import/Makefile.am
gnucash/trunk/src/import-export/qif-import/test/Makefile.am
gnucash/trunk/src/import-export/qif/Makefile.am
gnucash/trunk/src/import-export/qif/test/Makefile.am
gnucash/trunk/src/import-export/test/Makefile.am
gnucash/trunk/src/libqof/backend/file/Makefile.am
gnucash/trunk/src/optional/python-bindings/Makefile.am
gnucash/trunk/src/register/ledger-core/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/register/register-gnome/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/stylesheets/Makefile.am
Log:
Rename lib/libqof -> src/libqof
Modified: gnucash/trunk/configure.in
===================================================================
--- gnucash/trunk/configure.in 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/configure.in 2009-04-07 00:48:53 UTC (rev 18029)
@@ -1464,10 +1464,6 @@
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 @@
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
Modified: gnucash/trunk/lib/Makefile.am
===================================================================
--- gnucash/trunk/lib/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/lib/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -1,9 +1,5 @@
SUBDIRS = libc glib28 guile-www srfi stf
-DIST_SUBDIRS = libc glib28 guile-www srfi libqof stf
+DIST_SUBDIRS = libc glib28 guile-www srfi stf
-if USE_LIBQOF
-SUBDIRS += libqof
-endif
-
EXTRA_DIST = README
Modified: gnucash/trunk/src/Makefile.am
===================================================================
--- gnucash/trunk/src/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -1,4 +1,5 @@
NONGUI_SUBDIRS = \
+ libqof \
doc \
pixmaps \
core-utils \
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/app-utils/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -27,7 +27,7 @@
-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 @@
${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
Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/app-utils/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -40,8 +40,8 @@
${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 @@
-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}
Modified: gnucash/trunk/src/backend/dbi/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/dbi/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -12,7 +12,7 @@
-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 @@
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\"
Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -27,7 +27,7 @@
${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 @@
-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}
Modified: gnucash/trunk/src/backend/postgres/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/postgres/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/postgres/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -8,14 +8,14 @@
-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 = \
Modified: gnucash/trunk/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/postgres/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/postgres/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -63,7 +63,7 @@
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 \
Modified: gnucash/trunk/src/backend/sql/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/sql/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -10,7 +10,7 @@
-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 @@
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\"
Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -41,7 +41,7 @@
${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 @@
-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}
Modified: gnucash/trunk/src/backend/xml/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/xml/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -11,7 +11,7 @@
-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 @@
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\"
Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -225,7 +225,7 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/bin/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -14,19 +14,23 @@
-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
Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-core/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -7,7 +7,7 @@
-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_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}
Modified: gnucash/trunk/src/business/business-core/sql/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/sql/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-core/sql/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -9,7 +9,7 @@
-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 @@
${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}
Modified: gnucash/trunk/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-core/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -5,7 +5,7 @@
-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 @@
${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 \
Modified: gnucash/trunk/src/business/business-core/xml/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/xml/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-core/xml/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -9,7 +9,7 @@
-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 @@
${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}
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -19,7 +19,7 @@
-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 @@
${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
Modified: gnucash/trunk/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-ledger/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-ledger/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -27,9 +27,9 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-utils/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/business-utils/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -7,7 +7,7 @@
-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_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
Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -8,7 +8,7 @@
-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 @@
${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
Modified: gnucash/trunk/src/calculation/Makefile.am
===================================================================
--- gnucash/trunk/src/calculation/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/calculation/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -5,8 +5,9 @@
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 @@
-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}
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/engine/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -8,7 +8,7 @@
-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_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} \
Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/engine/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -6,7 +6,7 @@
-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 @@
../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 @@
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 \
Modified: gnucash/trunk/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test-core/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/engine/test-core/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -3,15 +3,15 @@
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 @@
-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}
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/gnome/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -14,11 +14,11 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/gnome-search/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -7,7 +7,7 @@
-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 @@
${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 = \
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -13,13 +13,13 @@
-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 @@
${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 @@
${GUILE_LIBS} \
${GLIB_LIBS} \
${DB_LIBS} \
- ${QOF_LIBS} \
${GOFFICE_LIBS} \
${REGEX_LIBS} \
${LIBXML2_LIBS}
Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -35,7 +35,11 @@
-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} \
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -47,9 +47,9 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/import-export/aqbanking/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/aqbanking/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -41,9 +41,9 @@
${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 @@
-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}
Modified: gnucash/trunk/src/import-export/binary-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/binary-import/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/binary-import/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -9,7 +9,7 @@
-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 @@
${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)
Modified: gnucash/trunk/src/import-export/csv/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/csv/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -26,7 +26,7 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/hbci/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -52,9 +52,9 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -19,8 +19,9 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -20,7 +20,7 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/qif/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -22,7 +22,7 @@
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 @@
-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\"
Modified: gnucash/trunk/src/import-export/qif/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/qif/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -6,7 +6,7 @@
-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 @@
${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 = \
Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -25,10 +25,10 @@
${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 @@
-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} \
Modified: gnucash/trunk/src/import-export/qif-import/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/qif-import/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -11,6 +11,6 @@
${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}
Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/import-export/test/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -5,7 +5,7 @@
-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 @@
../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 \
Property changes on: gnucash/trunk/src/libqof
___________________________________________________________________
Added: svn:ignore
+ Makefile
Makefile.in
semantic.cache
TAGS
Added: svn:mergeinfo
+
Modified: gnucash/trunk/src/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/backend/file/Makefile.am 2009-04-06 23:09:52 UTC (rev 18026)
+++ gnucash/trunk/src/libqof/backend/file/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -6,7 +6,7 @@
-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_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 = \
Modified: gnucash/trunk/src/optional/python-bindings/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/python-bindings/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/optional/python-bindings/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -16,9 +16,9 @@
_gnucash_core_c_la_CPPFLAGS = \
$(PYTHON_CPPFLAGS) \
- $(QOF_CFLAGS) \
$(GLIB_CFLAGS) \
$(GUILE_INCS) \
+ -I${top_srcdir}/src/libqof/qof \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/engine \
-I$(top_srcdir)/src/business/business-core
@@ -29,9 +29,9 @@
_gnucash_core_c_la_LDFLAGS = -avoid-version -module
_gnucash_core_c_la_LIBADD = \
- ${QOF_LIBS} \
${GLIB_LIBS} \
${GUILE_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/business/business-core/libgncmod-business-core.la
@@ -41,7 +41,8 @@
swig $(SWIG_PYTHON_OPT) -Wall -Werror \
-I$(top_srcdir)/src -I$(top_srcdir)/src/engine \
-I$(top_srcdir)/src/business/business-core \
- $(QOF_CFLAGS) -o $@ $<
+ -I${top_srcdir}/src/libqof/qof \
+ -o $@ $<
gnucash_core_c.py: gnucash_core.c $(SWIG_SOURCES)
endif
Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -33,11 +33,11 @@
${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} \
${GCONF_LIBS} \
${GUILE_LIBS} \
${GTK_LIBS} \
- ${QOF_LIBS} \
${GLIB_LIBS}
AM_CPPFLAGS = \
@@ -49,7 +49,7 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
- ${QOF_CFLAGS} \
+ -I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -9,8 +9,9 @@
${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} \
- ${QOF_LIBS} ${GLIB_LIBS}
+ ${GLIB_LIBS}
libgncmod_register_core_la_SOURCES = \
gncmod-register-core.c \
@@ -57,7 +58,7 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/gnome-utils \
- ${QOF_CFLAGS} \
+ -I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
Modified: gnucash/trunk/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/register/register-gnome/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -11,8 +11,8 @@
${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} \
- ${QOF_LIBS} \
${GNOME_LIBS}
libgncmod_register_gnome_la_SOURCES = \
@@ -59,7 +59,7 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/register/ledger-core \
-I${top_srcdir}/src/register/register-core \
- ${QOF_CFLAGS} \
+ -I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -12,7 +12,7 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/report/report-system \
- ${QOF_CFLAGS} \
+ -I${top_srcdir}/src/libqof/qof \
${GLADE_CFLAGS} \
${GUILE_INCS} \
${GTKHTML_CFLAGS} \
@@ -45,10 +45,10 @@
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/report/report-system/libgncmod-report-system.la \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GLADE_LIBS} \
${GUILE_LIBS} \
${GNOME_LIBS} \
- ${QOF_LIBS} \
${GLIB_LIBS}
if BUILDING_FROM_SVN
Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am 2009-04-06 23:44:14 UTC (rev 18028)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am 2009-04-07 00:48:53 UTC (rev 18029)
@@ -16,7 +16,7 @@
${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 \
- ${QOF_LIBS} \
+ ${top_builddir}/src/libqof/qof/libgnc-qof.la \
${GUILE_LIBS} \
${GLIB_LIBS}
@@ -27,7 +27,7 @@
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/report/report-gnome \
- ${QOF_CFLAGS} \
+ -I${top_srcdir}/src/libqof/qof \
${GUILE_INCS} \
${GLIB_CFLAGS} \
${GNOME_CFLAGS}
More information about the gnucash-changes
mailing list