[Gnucash-changes] Allow GnuCash to use QOF externally
Neil Williams
codehelp at cvs.gnucash.org
Thu Oct 20 10:55:59 EDT 2005
Log Message:
-----------
Allow GnuCash to use QOF externally
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
configure.in
gnucash/src/app-utils:
Makefile.am
gnucash/src/app-utils/test:
Makefile.am
gnucash/src/backend:
Makefile.am
gnucash/src/backend/file:
Makefile.am
gnucash/src/backend/file/test:
Makefile.am
gnucash/src/backend/postgres:
Makefile.am
gnucash/src/backend/postgres/test:
Makefile.am
gnucash/src/business/business-core:
Makefile.am
gnucash/src/business/business-core/file:
Makefile.am
gnucash/src/business/business-core/test:
Makefile.am
gnucash/src/business/business-gnome:
Makefile.am
gnucash/src/business/business-ledger:
Makefile.am
gnucash/src/business/business-utils:
Makefile.am
gnucash/src/business/dialog-tax-table:
Makefile.am
gnucash/src/calculation:
Makefile.am
expression_parser.c
gnucash/src/calculation/test:
Makefile.am
gnucash/src/engine:
Makefile.am
gnucash/src/engine/test-core:
Makefile.am
gnucash/src/engine/test:
Makefile.am
gnucash/src/gnome-search:
Makefile.am
gnucash/src/gnome-utils:
Makefile.am
gnucash/src/gnome:
Makefile.am
gnucash/src/import-export:
Makefile.am
gnucash/src/import-export/binary-import:
Makefile.am
gnucash/src/import-export/log-replay:
Makefile.am
gnucash/src/import-export/qif-import:
Makefile.am
gnucash/src/import-export/qif:
Makefile.am
gnucash/src/import-export/qif/test:
Makefile.am
gnucash/src/import-export/test:
Makefile.am
gnucash/src/network-utils:
Makefile.am
gnucash/src/register/ledger-core:
Makefile.am
gnucash/src/register/register-core:
Makefile.am
gnucash/src/register/register-gnome:
Makefile.am
gnucash/src/report/report-gnome:
Makefile.am
gnucash/src/report/stylesheets:
Makefile.am
Revision Data
-------------
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Makefile.am,v
retrieving revision 1.48.2.41
retrieving revision 1.48.2.42
diff -Lsrc/gnome-utils/Makefile.am -Lsrc/gnome-utils/Makefile.am -u -r1.48.2.41 -r1.48.2.42
--- src/gnome-utils/Makefile.am
+++ src/gnome-utils/Makefile.am
@@ -26,6 +26,7 @@
${GUILE_INCS} \
${G_WRAP_COMPILE_ARGS} \
${GSF_CFLAGS} \
+ ${QOF_CFLAGS} \
${LIBGOFFICE_CFLAGS}
else
AM_CFLAGS = \
@@ -51,6 +52,7 @@
${GUILE_INCS} \
${GNOME_PRINT_CFLAGS} \
${G_WRAP_COMPILE_ARGS} \
+ ${QOF_CFLAGS} \
${GSF_CFLAGS}
endif
@@ -212,6 +214,7 @@
${GLIB_LIBS} \
${DB_LIBS} \
${GSF_LIBS} \
+ ${QOF_LIBS} \
${LIBGOFFICE_LIBS} \
${XML_LIBS}
else
@@ -234,6 +237,7 @@
${GLIB_LIBS} \
${DB_LIBS} \
${GSF_LIBS} \
+ ${QOF_LIBS} \
${XML_LIBS}
endif
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.71
retrieving revision 1.359.2.72
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.71 -r1.359.2.72
--- configure.in
+++ configure.in
@@ -397,6 +397,59 @@
])
LIBS="$oLIBS"
+dnl *************************************
+dnl QOF
+dnl *************************************
+
+AC_ARG_WITH(qof, [ --with-qof=path prefix for Query Object Framework - QOF (auto)])
+QOF_REQUIRED=0.6.0
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test pkg-config = no; then
+ AC_MSG_ERROR([Please install pkgconfig])
+ exit 1
+fi
+AC_MSG_CHECKING([for QOF, version >= $QOF_REQUIRED])
+if test "$withval" != "yes"; then
+ QOF=`$PKG_CONFIG --exists '$withval/lib/pkgconfig/qof-1.pc >= $QOF_REQUIRED'`
+ QOF_LIBS=`$PKG_CONFIG --libs $withval/lib/pkgconfig/qof-1.pc`
+ QOF_CFLAGS=`$PKG_CONFIG --cflags $withval/lib/pkgconfig/qof-1.pc`
+ QOF_VERSION=`$PKG_CONFIG --modversion $withval/lib/pkgconfig/qof-1.pc`
+ QOF_PREFIX=`$PKG_CONFIG --variable=prefix $withval/lib/pkgconfig/qof-1.pc`
+ QOF_LIB_DIR=`$PKG_CONFIG --variable=libdir $withval/lib/pkgconfig/qof-1.pc`
+ QOF_XML_DIR=`$PKG_CONFIG --variable=xmldir $withval/lib/pkgconfig/qof-1.pc`
+else
+ QOF=`$PKG_CONFIG --exists 'qof-1 >= $QOF_REQUIRED'`
+ QOF_LIBS=`$PKG_CONFIG --libs qof-1`
+ QOF_CFLAGS=`$PKG_CONFIG --cflags qof-1`
+ QOF_VERSION=`$PKG_CONFIG --modversion qof-1`
+ QOF_PREFIX=`$PKG_CONFIG --variable=prefix qof-1`
+ QOF_LIB_DIR=`$PKG_CONFIG --variable=libdir qof-1`
+ QOF_XML_DIR=`$PKG_CONFIG --variable=xmldir qof-1`
+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_PREFIX="internal"
+ QOF_XML_DIR="$QSF_SCHEMA_DIR"
+ LIBQOF_LIBRARY_VERSION=1:1:0
+ LIBQOF_BACKEND_QSF_LIBRARY_VERSION=0:0:0
+ AC_SUBST(LIBQOF_LIBRARY_VERSION)
+ AC_SUBST(LIBQOF_BACKEND_QSF_LIBRARY_VERSION)
+ AC_DEFINE(HAVE_LIBQOF,,[We will use the internal QOF code])
+ HAVE_LIBQOF="use_internal"
+else
+ AC_MSG_RESULT([yes])
+fi
+AM_CONDITIONAL(USE_LIBQOF, [test x$HAVE_LIBQOF != x])
+AM_CONDITIONAL(USE_LIBQOF, [test $HAVE_LIBQOF = "use_internal"])
+AC_SUBST(USE_LIBQOF)
+AC_SUBST(QOF_CFLAGS)
+AC_SUBST(QOF_LIBS)
+AS_SCRUB_INCLUDE(QOF_PREFIX)
+AC_SUBST(QOF_PREFIX)
+AC_SUBST(QOF_LIB_DIR)
### --------------------------------------------------------------------------
### for GOG/goffice...
@@ -1390,5 +1443,8 @@
CPPFLAGS ............. : $CPPFLAGS
CFLAGS ............... : $CFLAGS
LDFLAGS .............. : $LDFLAGS
+ QOF support ...........: $QOF_VERSION
+ QOF location ..........: $QOF_PREFIX
+ QOF library dir .......: $QOF_LIB_DIR
+ QOF backend config ....: $QOF_XML_DIR
])
-
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/Makefile.am,v
retrieving revision 1.29.4.15
retrieving revision 1.29.4.16
diff -Lsrc/app-utils/Makefile.am -Lsrc/app-utils/Makefile.am -u -r1.29.4.15 -r1.29.4.16
--- src/app-utils/Makefile.am
+++ src/app-utils/Makefile.am
@@ -13,6 +13,7 @@
${GUILE_INCS} \
${G_WRAP_COMPILE_ARGS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS}
libgncmod_app_utils_la_SOURCES = \
@@ -74,6 +75,7 @@
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/lib/glib26/libgncglib.la \
${GUILE_LIBS} \
+ ${QOF_LIBS} \
${GLIB_LIBS}
libgw_app_utils_la_SOURCES = gw-app-utils.c
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/test/Makefile.am,v
retrieving revision 1.23.4.2
retrieving revision 1.23.4.3
diff -Lsrc/app-utils/test/Makefile.am -Lsrc/app-utils/test/Makefile.am -u -r1.23.4.2 -r1.23.4.3
--- src/app-utils/test/Makefile.am
+++ src/app-utils/test/Makefile.am
@@ -42,6 +42,7 @@
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
${top_builddir}/src/core-utils/libcore-utils.la \
${GUILE_LIBS} \
+ ${QOF_LIBS} \
${GCONF_LIBS}
noinst_PROGRAMS = \
@@ -65,5 +66,5 @@
-I${top_srcdir}/src/core-utils \
${GUILE_INCS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GCONF_CFLAGS}
-
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/Makefile.am,v
retrieving revision 1.4.6.2
retrieving revision 1.4.6.3
diff -Lsrc/backend/Makefile.am -Lsrc/backend/Makefile.am -u -r1.4.6.2 -r1.4.6.3
--- src/backend/Makefile.am
+++ src/backend/Makefile.am
@@ -1,5 +1,10 @@
-SUBDIRS=qsf file ${SQL_DIR} ${RPC_DIR}
-DIST_SUBDIRS=qsf file net postgres rpc
+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
noinst_HEADERS = gnc-backend-api.h
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/Makefile.am,v
retrieving revision 1.16.4.6
retrieving revision 1.16.4.7
diff -Lsrc/backend/file/Makefile.am -Lsrc/backend/file/Makefile.am -u -r1.16.4.6 -r1.16.4.7
--- src/backend/file/Makefile.am
+++ src/backend/file/Makefile.am
@@ -11,6 +11,7 @@
-I${top_srcdir}/src/core-utils\
-I${top_srcdir}/lib/libc\
${XML_CFLAGS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
${GCONF_CFLAGS}
@@ -57,4 +58,5 @@
libgnc_backend_file_la_LDFLAGS = -module
libgnc_backend_file_la_LIBADD = \
${GLIB_LIBS} ${GCONF_LIBS} ${XML_LIBS} \
- ${top_builddir}/src/engine/libgncmod-engine.la
+ ${top_builddir}/src/engine/libgncmod-engine.la \
+ ${QOF_LIBS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/Makefile.am,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -Lsrc/backend/postgres/Makefile.am -Lsrc/backend/postgres/Makefile.am -u -r1.18.4.3 -r1.18.4.4
--- src/backend/postgres/Makefile.am
+++ src/backend/postgres/Makefile.am
@@ -6,6 +6,7 @@
libgnc_backend_postgres_la_LIBADD = ${PGSQL_LIBS} -lpq \
${top_builddir}/src/engine/libgncmod-engine.la \
+ ${QOF_LIBS} \
${GLIB_LIBS}
libgnc_backend_postgres_la_SOURCES = \
@@ -96,6 +97,7 @@
-I../.. -I${srcdir}/../.. \
-I../../engine -I${srcdir}/../../engine \
${PGSQL_CFLAGS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
$(M4_SRC): table.m4
@@ -109,4 +111,3 @@
.sql.c:
echo "\"-- DO NOT EDIT THIS FILE. IT IS AUTOGENERATED.\"" > $@
cat $< >> $@
-
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/file/test/Makefile.am,v
retrieving revision 1.28.4.5
retrieving revision 1.28.4.6
diff -Lsrc/backend/file/test/Makefile.am -Lsrc/backend/file/test/Makefile.am -u -r1.28.4.5 -r1.28.4.6
--- src/backend/file/test/Makefile.am
+++ src/backend/file/test/Makefile.am
@@ -213,6 +213,7 @@
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
./libgnc-test-file-stuff.la \
${LIBXML2_LIBS} \
+ ${QOF_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
AM_CFLAGS = \
@@ -227,6 +228,7 @@
-I${top_srcdir}/src/backend/qsf \
${XML_CFLAGS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GUILE_INCS}
EXTRA_DIST = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Makefile.am,v
retrieving revision 1.107.4.28
retrieving revision 1.107.4.29
diff -Lsrc/gnome/Makefile.am -Lsrc/gnome/Makefile.am -u -r1.107.4.28 -r1.107.4.29
--- src/gnome/Makefile.am
+++ src/gnome/Makefile.am
@@ -12,7 +12,7 @@
${top_builddir}/src/report/report-gnome/libgncmod-report-gnome.la \
${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
${top_builddir}/src/gnome-search/libgncmod-gnome-search.la \
- ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS}
+ ${GUILE_LIBS} ${GNOME_LIBS} ${GLIB_LIBS} ${QOF_LIBS}
libgw_gnc_la_SOURCES = gw-gnc.c
@@ -153,6 +153,7 @@
${GDK_PIXBUF_CFLAGS} \
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
+ ${QOF_CFLAGS} \
${GUPPI_CFLAGS}
# We build this in an earlier directory.
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/postgres/test/Makefile.am,v
retrieving revision 1.27.4.2
retrieving revision 1.27.4.3
diff -Lsrc/backend/postgres/test/Makefile.am -Lsrc/backend/postgres/test/Makefile.am -u -r1.27.4.2 -r1.27.4.3
--- src/backend/postgres/test/Makefile.am
+++ src/backend/postgres/test/Makefile.am
@@ -34,6 +34,7 @@
AM_CFLAGS = \
-I${top_srcdir}/src \
+ ${QOF_CFLAGS} \
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/engine/test-core \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/Makefile.am,v
retrieving revision 1.25.4.14
retrieving revision 1.25.4.15
diff -Lsrc/import-export/Makefile.am -Lsrc/import-export/Makefile.am -u -r1.25.4.14 -r1.25.4.15
--- src/import-export/Makefile.am
+++ src/import-export/Makefile.am
@@ -44,6 +44,7 @@
${top_builddir}/src/register/ledger-core/libgncmod-ledger-core.la \
${top_builddir}/src/core-utils/libcore-utils.la \
${GLADE_LIBS} \
+ ${QOF_LIBS} \
${GLIB_LIBS}
gladedir = ${GNC_GLADE_DIR}
@@ -65,6 +66,7 @@
${GDK_PIXBUF_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
EXTRA_DIST = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/Makefile.am,v
retrieving revision 1.18.4.3
retrieving revision 1.18.4.4
diff -Lsrc/business/business-core/Makefile.am -Lsrc/business/business-core/Makefile.am -u -r1.18.4.3 -r1.18.4.4
--- src/business/business-core/Makefile.am
+++ src/business/business-core/Makefile.am
@@ -9,6 +9,7 @@
-I${top_srcdir}/src/gnc-module \
${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_business_core_la_SOURCES = \
@@ -58,6 +59,7 @@
libgncmod_business_core_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
${EFENCE_LIBS}
# business-core-helpers.c
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/binary-import/Makefile.am,v
retrieving revision 1.15.4.6
retrieving revision 1.15.4.7
diff -Lsrc/import-export/binary-import/Makefile.am -Lsrc/import-export/binary-import/Makefile.am -u -r1.15.4.6 -r1.15.4.7
--- src/import-export/binary-import/Makefile.am
+++ src/import-export/binary-import/Makefile.am
@@ -13,6 +13,7 @@
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS}
#FIXME remove the following deps
@@ -36,6 +37,7 @@
${GUILE_LIBS} \
${GLADE_LIBS} \
${GNOME_LIBS} \
+ ${QOF_LIBS} \
${GLIB_LIBS}
gladedir = $(GNC_GLADE_DIR)
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/test/Makefile.am,v
retrieving revision 1.4.4.3
retrieving revision 1.4.4.4
diff -Lsrc/business/business-core/test/Makefile.am -Lsrc/business/business-core/test/Makefile.am -u -r1.4.4.3 -r1.4.4.4
--- src/business/business-core/test/Makefile.am
+++ src/business/business-core/test/Makefile.am
@@ -6,6 +6,7 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/business/business-core \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
LDADD = \
@@ -16,6 +17,7 @@
../libgncmod-business-core.la \
../libgw-business-core.la \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
-lltdl
TESTS = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-core/file/Makefile.am,v
retrieving revision 1.5.4.4
retrieving revision 1.5.4.5
diff -Lsrc/business/business-core/file/Makefile.am -Lsrc/business/business-core/file/Makefile.am -u -r1.5.4.4 -r1.5.4.5
--- src/business/business-core/file/Makefile.am
+++ src/business/business-core/file/Makefile.am
@@ -10,6 +10,7 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/business/business-core \
${XML_CFLAGS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_business_backend_file_la_SOURCES = \
@@ -42,5 +43,5 @@
libgncmod_business_backend_file_la_LDFLAGS = -module
libgncmod_business_backend_file_la_LIBADD = \
- ${GLIB_LIBS} ${XML_LIBS} \
+ ${GLIB_LIBS} ${XML_LIBS} ${QOF_LIBS} \
${top_builddir}/src/business/business-core/libgncmod-business-core.la
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/log-replay/Makefile.am,v
retrieving revision 1.1.4.7
retrieving revision 1.1.4.8
diff -Lsrc/import-export/log-replay/Makefile.am -Lsrc/import-export/log-replay/Makefile.am -u -r1.1.4.7 -r1.1.4.8
--- src/import-export/log-replay/Makefile.am
+++ src/import-export/log-replay/Makefile.am
@@ -16,7 +16,7 @@
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/import-export/libgncmod-generic-import.la \
- ${GLIB_LIBS}
+ ${GLIB_LIBS} ${QOF_LIBS}
AM_CFLAGS = \
-I${top_srcdir}/src \
@@ -31,6 +31,7 @@
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
uidir = $(GNC_UI_DIR)
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/Makefile.am,v
retrieving revision 1.31.4.14
retrieving revision 1.31.4.15
diff -Lsrc/business/business-gnome/Makefile.am -Lsrc/business/business-gnome/Makefile.am -u -r1.31.4.14 -r1.31.4.15
--- src/business/business-gnome/Makefile.am
+++ src/business/business-gnome/Makefile.am
@@ -24,6 +24,7 @@
${GLIB_CFLAGS} \
${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/register/ledger-core
@@ -73,6 +74,7 @@
${GNOME_LIBS} \
${G_WRAP_LINK_ARGS} \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
${EFENCE_LIBS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif-import/Makefile.am,v
retrieving revision 1.21.4.10
retrieving revision 1.21.4.11
diff -Lsrc/import-export/qif-import/Makefile.am -Lsrc/import-export/qif-import/Makefile.am -u -r1.21.4.10 -r1.21.4.11
--- src/import-export/qif-import/Makefile.am
+++ src/import-export/qif-import/Makefile.am
@@ -24,6 +24,7 @@
${GUILE_LIBS} \
${GNOME_LIBS} \
${GLADE_LIBS} \
+ ${QOF_LIBS} \
${GLIB_LIBS}
@@ -62,6 +63,7 @@
${GNOME_PRINT_CFLAGS} \
${GNOME_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
+ ${QOF_CFLAGS} \
${GTKHTML_CFLAGS}
uidir = $(GNC_UI_DIR)
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-ledger/Makefile.am,v
retrieving revision 1.6.4.4
retrieving revision 1.6.4.5
diff -Lsrc/business/business-ledger/Makefile.am -Lsrc/business/business-ledger/Makefile.am -u -r1.6.4.4 -r1.6.4.5
--- src/business/business-ledger/Makefile.am
+++ src/business/business-ledger/Makefile.am
@@ -18,6 +18,7 @@
gncEntryLedgerModel.h
libgnc_business_ledger_la_LIBADD = \
+ ${QOF_LIBS} \
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
@@ -39,5 +40,6 @@
-I${top_srcdir}/src/register/register-core \
${GUILE_INCS} \
${GLADE_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GLIB_CFLAGS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/qif/Makefile.am -Lsrc/import-export/qif/Makefile.am -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/qif/Makefile.am
+++ src/import-export/qif/Makefile.am
@@ -18,7 +18,7 @@
qif-objects-p.h \
qif-parse.h
-libgncmod_qif_la_LIBADD =
+libgncmod_qif_la_LIBADD = ${QOF_LIBS}
AM_CFLAGS = \
-I${top_srcdir}/src \
@@ -28,5 +28,6 @@
-I${top_srcdir}/src/import-export \
${GLIB_CFLAGS} \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${G_WRAP_COMPILE_ARGS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-utils/Makefile.am,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -Lsrc/business/business-utils/Makefile.am -Lsrc/business/business-utils/Makefile.am -u -r1.3.2.2 -r1.3.2.3
--- src/business/business-utils/Makefile.am
+++ src/business/business-utils/Makefile.am
@@ -9,6 +9,7 @@
${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS}
libgncmod_business_utils_la_SOURCES = \
@@ -21,6 +22,7 @@
libgncmod_business_utils_la_LIBADD = \
${GUILE_LIBS} \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
${EFENCE_LIBS}
# Guile Modules
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/qif/test/Makefile.am,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/import-export/qif/test/Makefile.am -Lsrc/import-export/qif/test/Makefile.am -u -r1.1.2.1 -r1.1.2.2
--- src/import-export/qif/test/Makefile.am
+++ src/import-export/qif/test/Makefile.am
@@ -7,6 +7,7 @@
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/src/import-export/qif \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
LDADD = \
@@ -14,6 +15,7 @@
${top_builddir}/src/test-core/libgncmod-test.la \
../../libgncmod-generic-import.la \
../libgncmod-qif.la \
+ ${QOF_LIBS} \
${GLIB_LIBS}
TESTS = \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/test/Makefile.am,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -Lsrc/import-export/test/Makefile.am -Lsrc/import-export/test/Makefile.am -u -r1.1.4.1 -r1.1.4.2
--- src/import-export/test/Makefile.am
+++ src/import-export/test/Makefile.am
@@ -6,13 +6,14 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/import-export \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
LDADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/test-core/libgncmod-test.la \
../libgncmod-generic-import.la \
- ${GLIB_LIBS}
+ ${GLIB_LIBS} ${QOF_LIBS}
TESTS = \
test-link \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/dialog-tax-table/Makefile.am,v
retrieving revision 1.5.4.6
retrieving revision 1.5.4.7
diff -Lsrc/business/dialog-tax-table/Makefile.am -Lsrc/business/dialog-tax-table/Makefile.am -u -r1.5.4.6 -r1.5.4.7
--- src/business/dialog-tax-table/Makefile.am
+++ src/business/dialog-tax-table/Makefile.am
@@ -16,6 +16,7 @@
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${G_WRAP_COMPILE_ARGS} \
${GUILE_INCS}
@@ -34,6 +35,7 @@
${GNOME_LIBS} \
${G_WRAP_LINK_ARGS} \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
${EFENCE_LIBS}
libgw_dialog_tax_table_la_SOURCES = gw-dialog-tax-table.c
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/network-utils/Makefile.am,v
retrieving revision 1.7.4.4
retrieving revision 1.7.4.5
diff -Lsrc/network-utils/Makefile.am -Lsrc/network-utils/Makefile.am -u -r1.7.4.4 -r1.7.4.5
--- src/network-utils/Makefile.am
+++ src/network-utils/Makefile.am
@@ -10,6 +10,7 @@
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/engine \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GUILE_INCS}
@@ -25,7 +26,7 @@
libgncmod_network_utils_la_LIBADD = \
${top_builddir}/src/gnc-module/libgncmodule.la \
- ${GNOME_LIBS}
+ ${GNOME_LIBS} ${QOF_LIBS}
EXTRA_DIST = \
.cvsignore
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/ledger-core/Makefile.am,v
retrieving revision 1.25.4.3
retrieving revision 1.25.4.4
diff -Lsrc/register/ledger-core/Makefile.am -Lsrc/register/ledger-core/Makefile.am -u -r1.25.4.3 -r1.25.4.4
--- src/register/ledger-core/Makefile.am
+++ src/register/ledger-core/Makefile.am
@@ -24,6 +24,7 @@
split-register-p.h
libgncmod_ledger_core_la_LIBADD = \
+ ${QOF_LIBS} \
${top_builddir}/src/core-utils/libcore-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
@@ -42,4 +43,5 @@
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-core/Makefile.am,v
retrieving revision 1.27.4.3
retrieving revision 1.27.4.4
diff -Lsrc/register/register-core/Makefile.am -Lsrc/register/register-core/Makefile.am -u -r1.27.4.3 -r1.27.4.4
--- src/register/register-core/Makefile.am
+++ src/register/register-core/Makefile.am
@@ -8,7 +8,7 @@
${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 \
- ${GLIB_LIBS}
+ ${QOF_LIBS} ${GLIB_LIBS}
libgncmod_register_core_la_SOURCES = \
gncmod-register-core.c \
@@ -50,7 +50,6 @@
table-model.h
libgw_register_core_la_SOURCES = gw-register-core.c
-libgw_register_core_la_LDFLAGS = -module
gwmoddir = ${GNC_GWRAP_LIBDIR}
gwmod_DATA = gw-register-core.scm gw-register-core-spec.scm
@@ -72,6 +71,7 @@
${GLADE_CFLAGS} \
${G_WRAP_COMPILE_ARGS} \
${GNOME_CFLAGS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/calculation/Makefile.am,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -Lsrc/calculation/Makefile.am -Lsrc/calculation/Makefile.am -u -r1.11.2.2 -r1.11.2.3
--- src/calculation/Makefile.am
+++ src/calculation/Makefile.am
@@ -2,7 +2,9 @@
pkglib_LTLIBRARIES = libgncmod-calculation.la
-libgncmod_calculation_la_LIBADD = ${GLIB_LIBS} ${GUILE_LIBS}
+libgncmod_calculation_la_LIBADD = \
+ ${GLIB_LIBS} ${GUILE_LIBS} \
+ ${QOF_LIBS}
libgncmod_calculation_la_SOURCES = \
expression_parser.c \
@@ -29,4 +31,5 @@
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
Index: expression_parser.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/calculation/expression_parser.c,v
retrieving revision 1.15.4.1
retrieving revision 1.15.4.2
diff -Lsrc/calculation/expression_parser.c -Lsrc/calculation/expression_parser.c -u -r1.15.4.1 -r1.15.4.2
--- src/calculation/expression_parser.c
+++ src/calculation/expression_parser.c
@@ -387,7 +387,7 @@
#include <glib.h>
-#include "../engine/gnc-numeric.h"
+#include "qof.h"
#define EXPRESSION_PARSER_STATICS
#include "finvar.h"
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/register/register-gnome/Makefile.am,v
retrieving revision 1.16.4.3
retrieving revision 1.16.4.4
diff -Lsrc/register/register-gnome/Makefile.am -Lsrc/register/register-gnome/Makefile.am -u -r1.16.4.3 -r1.16.4.4
--- src/register/register-gnome/Makefile.am
+++ src/register/register-gnome/Makefile.am
@@ -10,6 +10,7 @@
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
${GNOME_LIBS}
libgncmod_register_gnome_la_SOURCES = \
@@ -63,4 +64,5 @@
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
${GTK_XIM_FLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/calculation/test/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -Lsrc/calculation/test/Makefile.am -Lsrc/calculation/test/Makefile.am -u -r1.2 -r1.2.6.1
--- src/calculation/test/Makefile.am
+++ src/calculation/test/Makefile.am
@@ -3,4 +3,7 @@
noinst_PROGRAMS=test-link
test_link_SOURCES=test-link.c
-test_link_LDADD=../libgncmod-calculation.la ${GLIB_LIBS}
+test_link_LDADD= \
+ ../libgncmod-calculation.la \
+ ${GLIB_LIBS} \
+ -lgmodule-2.0
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/Makefile.am,v
retrieving revision 1.94.2.17
retrieving revision 1.94.2.18
diff -Lsrc/engine/Makefile.am -Lsrc/engine/Makefile.am -u -r1.94.2.17 -r1.94.2.18
--- src/engine/Makefile.am
+++ src/engine/Makefile.am
@@ -8,8 +8,105 @@
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/business/business-core/ \
+ ${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} \
+ 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 \
@@ -33,35 +130,15 @@
gnc-budget-period.c \
gnc-budget.c \
gnc-commodity.c \
- gnc-date.c \
- gnc-engine-util.c \
gnc-engine.c \
- gnc-event.c \
gnc-filepath-utils.c \
gnc-hooks.c \
gnc-lot.c \
- gnc-numeric.c \
gnc-pricedb.c \
gnc-session-scm.c \
- gnc-trace.c \
gncmod-engine.c \
- guid.c \
- kvp_frame.c \
- kvp-util.c \
- md5.c \
messages.c \
- policy.c \
- qofbackend.c \
- qof_book_merge.c \
- qofbook.c \
- qofchoice.c \
- qofclass.c \
- qofid.c \
- qofinstance.c \
- qofobject.c \
- qofquery.c \
- qofquerycore.c \
- qofsession.c
+ policy.c
EXTRA_libgncmod_engine_la_SOURCES = iso-4217-currencies.c
@@ -96,39 +173,16 @@
gnc-budget-period.h \
gnc-budget.h \
gnc-commodity.h \
- gnc-date.h \
- gnc-engine-util.h \
gnc-engine.h \
- gnc-event.h \
gnc-filepath-utils.h \
gnc-hooks.h \
- gnc-numeric.h \
gnc-pricedb.h \
gnc-session.h \
gnc-session-scm.h \
- gnc-trace.h \
- guid.h \
gncObject.h \
- kvp_frame.h \
kvp-scm.h \
- kvp-util.h \
messages.h \
- policy.h \
- qof.h \
- qofbackend.h \
- qof-be-utils.h \
- qofbook.h \
- qof_book_merge.h \
- qofclass.h \
- qofchoice.h \
- qofid.h \
- qofinstance.h \
- qofmath128.c \
- qofmath128.h \
- qofobject.h \
- qofquery.h \
- qofquerycore.h \
- qofsession.h
+ policy.h
noinst_HEADERS = \
AccountP.h \
@@ -145,43 +199,31 @@
gnc-budget-period-value-p.h \
gnc-budget-period-p.h \
gnc-budget-p.h \
- gnc-event-p.h \
gnc-hooks-scm.h \
gnc-lot.h \
gnc-lot-p.h \
gnc-pricedb-p.h \
- kvp-util-p.h \
- md5.h \
gw-engine.h \
gw-kvp.h \
policy-p.h \
- qofbackend-p.h \
- qofbook-p.h \
- qofclass-p.h \
- qofid-p.h \
- qofinstance-p.h \
- qofmath128.h \
- qofobject-p.h \
- qofquery-p.h \
- qofquerycore-p.h \
- qofsession-p.h \
- qofsql.h
+ ${qof_noinst_headers}
noinst_SCRIPTS = iso-currencies-to-c
libgncmod_engine_la_LIBADD = ${GNUCASH_ENGINE_BASE_LIBS} \
+ ${QOF_LIBS} \
libgw-engine.la \
libgw-kvp.la \
../gnc-module/libgncmodule.la \
../../lib/libc/libc-missing.la
libgw_kvp_la_SOURCES = gw-kvp.c kvp-scm.c
-
-libgw_kvp_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
+libgw_kvp_la_LDFLAGS = ${G_WRAP_LINK_ARGS} ${QOF_LIBS}
libgw_engine_la_SOURCES = gw-engine.c engine-helpers.c glib-helpers.c
-
-libgw_engine_la_LDFLAGS = ${G_WRAP_LINK_ARGS}
+libgw_engine_la_LDFLAGS = \
+ ${G_WRAP_LINK_ARGS} \
+ ${QOF_LIBS}
gncmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash
gncmod_DATA = engine.scm
@@ -208,22 +250,15 @@
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}
-QOFLIBdir = $(libdir)
-
-CONFIG_CLEAN_FILES = qofla-dir.h
-
-qofla-dir.h: qofla-dir.h.in
- rm -f $@.tmp
- sed < $< > $@.tmp \
- -e 's:@-libdir-@:${QOFLIBdir}:g'
- mv $@.tmp $@
-
if GNUCASH_SEPARATE_BUILDDIR
#For compiling
SCM_FILE_LINKS = gw-engine-spec.scm gw-kvp-spec.scm iso-4217-currencies.scm
@@ -235,7 +270,6 @@
rm -f gnucash g-wrapped
ln -sf . gnucash
ln -sf . g-wrapped
- ln -sf ${srcdir} qof
if GNUCASH_SEPARATE_BUILDDIR
for X in ${SCM_FILE_LINKS} ; do \
ln -sf ${srcdir}/$$X . ; \
@@ -264,10 +298,16 @@
(gw:generate-wrapset \"gw-kvp\")"
BUILT_SOURCES = \
- qofla-dir.h \
+ ${qof_builds} \
iso-4217-currencies.c \
gw-engine.scm gw-engine.c gw-engine.h \
- gw-kvp.scm gw-kvp.c gw-kvp.h
+ gw-kvp.scm gw-kvp.c gw-kvp.h gncla-dir.h
-DISTCLEANFILES = gnucash g-wrapped qof .scm-links ${SCM_FILE_LINKS} \
- gw-engine.html gw-kvp.html
+DISTCLEANFILES = gnucash g-wrapped .scm-links ${SCM_FILE_LINKS} \
+ gw-engine.html gw-kvp.html qofla-dir.h gncla-dir.h
+
+gncla-dir.h: gncla-dir.h.in
+ rm -f $@.tmp
+ sed < $< > $@.tmp \
+ -e 's:@-GNC_LIBDIR-@:${GNC_LIBDIR}:g'
+ mv $@.tmp $@
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/report-gnome/Makefile.am,v
retrieving revision 1.14.4.10
retrieving revision 1.14.4.11
diff -Lsrc/report/report-gnome/Makefile.am -Lsrc/report/report-gnome/Makefile.am -u -r1.14.4.10 -r1.14.4.11
--- src/report/report-gnome/Makefile.am
+++ src/report/report-gnome/Makefile.am
@@ -20,6 +20,7 @@
${GNOME_PRINT_CFLAGS} \
${G_WRAP_COMPILE_ARGS} \
${GNOME_CFLAGS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_report_gnome_la_SOURCES = \
@@ -45,6 +46,7 @@
${GUILE_LIBS} \
${GNOME_PRINT_LIBS} \
${GNOME_LIBS} \
+ ${QOF_LIBS} \
${GLIB_LIBS}
libgw_report_gnome_la_SOURCES = gw-report-gnome.c
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test-core/Makefile.am,v
retrieving revision 1.6.4.2
retrieving revision 1.6.4.3
diff -Lsrc/engine/test-core/Makefile.am -Lsrc/engine/test-core/Makefile.am -u -r1.6.4.2 -r1.6.4.3
--- src/engine/test-core/Makefile.am
+++ src/engine/test-core/Makefile.am
@@ -6,6 +6,7 @@
../libgw-engine.la \
../libgw-kvp.la \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
-lltdl
libgncmod_test_engine_la_SOURCES = gncmod-test-engine.c test-engine-stuff.c
@@ -15,6 +16,7 @@
../libgncmod-engine.la \
../libgw-engine.la \
../libgw-kvp.la \
+ ${QOF_LIBS} \
${GLIB_LIBS}
noinst_HEADERS=test-engine-stuff.h
@@ -25,5 +27,5 @@
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GUILE_INCS}
-
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/engine/test/Makefile.am,v
retrieving revision 1.29.4.8
retrieving revision 1.29.4.9
diff -Lsrc/engine/test/Makefile.am -Lsrc/engine/test/Makefile.am -u -r1.29.4.8 -r1.29.4.9
--- src/engine/test/Makefile.am
+++ src/engine/test/Makefile.am
@@ -7,6 +7,7 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/engine/test-core \
${GUILE_INCS} \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS}
LDADD = \
@@ -17,6 +18,7 @@
../libgw-kvp.la \
../test-core/libgncmod-test-engine.la \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
-lltdl
# these tests are ordered kind more or less in the order
@@ -80,7 +82,7 @@
test-transaction-voiding
test_link_SOURCES = test-link.c
-test_link_LDADD = ../libgncmod-engine.la
+test_link_LDADD = ../libgncmod-engine.la ${QOF_LIBS}
EXTRA_DIST = \
test-create-account \
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-search/Makefile.am,v
retrieving revision 1.12.2.8
retrieving revision 1.12.2.9
diff -Lsrc/gnome-search/Makefile.am -Lsrc/gnome-search/Makefile.am -u -r1.12.2.8 -r1.12.2.9
--- src/gnome-search/Makefile.am
+++ src/gnome-search/Makefile.am
@@ -17,6 +17,7 @@
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_PRINT_CFLAGS}
libgncmod_gnome_search_la_SOURCES = \
@@ -57,6 +58,7 @@
${GTKHTML_LIBS} \
${GLADE_LIBS} \
${GLIB_LIBS} \
+ ${QOF_LIBS} \
${GNOME_PRINT_LIBS}
gladedir = $(GNC_GLADE_DIR)
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/report/stylesheets/Makefile.am,v
retrieving revision 1.6.4.7
retrieving revision 1.6.4.8
diff -Lsrc/report/stylesheets/Makefile.am -Lsrc/report/stylesheets/Makefile.am -u -r1.6.4.7 -r1.6.4.8
--- src/report/stylesheets/Makefile.am
+++ src/report/stylesheets/Makefile.am
@@ -12,6 +12,7 @@
libgncmod_stylesheets_la_LDFLAGS=-module
libgncmod_stylesheets_la_LIBADD = \
+ ${QOF_LIBS} \
${top_builddir}/src/report/report-system/libgncmod-report-system.la
AM_CFLAGS = \
@@ -23,6 +24,7 @@
-I${top_srcdir}/src/report/report-gnome \
${GUILE_INCS} \
${GLIB_CFLAGS} \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS}
.scm-links:
More information about the gnucash-changes
mailing list