[Gnucash-changes] Mac OSX support fixes
Neil Williams
codehelp at cvs.gnucash.org
Wed Aug 17 02:59:56 EDT 2005
Log Message:
-----------
Mac OSX support fixes
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash:
.cvsignore
ChangeLog
configure.in
gnucash/rpm:
.cvsignore
gnucash/src:
.cvsignore
gnucash/src/app-utils:
Makefile.am
gnucash/src/app-utils/test:
Makefile.am
test-exp-parser.c
gnucash/src/backend:
.cvsignore
gnucash/src/doc:
.cvsignore
gnucash/src/doc/design:
.cvsignore
gnucash/src/doc/xml:
.cvsignore
gnucash/src/gnc-module/test/misc-mods:
Makefile.am
gnucash/src/gnome:
.cvsignore
gnucash/src/gnome/glade:
.cvsignore
gnucash/src/gnome/schemas:
.cvsignore
gnucash/src/gnome/ui:
.cvsignore
gnucash/src/gnome-utils:
Makefile.am
gnucash/src/import-export/hbci:
hbci-interaction.c
gnucash/src/test-core:
Makefile.am
Revision Data
-------------
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/backend/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -Lsrc/backend/.cvsignore -Lsrc/backend/.cvsignore -u -r1.2 -r1.2.6.1
--- src/backend/.cvsignore
+++ src/backend/.cvsignore
@@ -1,2 +1,4 @@
Makefile
Makefile.in
+.DS_Store
+
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/doc/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -Lsrc/doc/.cvsignore -Lsrc/doc/.cvsignore -u -r1.3 -r1.3.4.1
--- src/doc/.cvsignore
+++ src/doc/.cvsignore
@@ -3,3 +3,5 @@
html
Makefile
Makefile.in
+.DS_Store
+
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/doc/design/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.7.8.1
diff -Lsrc/doc/design/.cvsignore -Lsrc/doc/design/.cvsignore -u -r1.7 -r1.7.8.1
--- src/doc/design/.cvsignore
+++ src/doc/design/.cvsignore
@@ -19,3 +19,5 @@
*.info-*
*.html
texinfo.tex
+.DS_Store
+
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/doc/xml/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -Lsrc/doc/xml/.cvsignore -Lsrc/doc/xml/.cvsignore -u -r1.1 -r1.1.6.1
--- src/doc/xml/.cvsignore
+++ src/doc/xml/.cvsignore
@@ -1,2 +1,4 @@
Makefile
Makefile.in
+.DS_Store
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnc-module/test/misc-mods/Makefile.am,v
retrieving revision 1.7.4.2
retrieving revision 1.7.4.3
diff -Lsrc/gnc-module/test/misc-mods/Makefile.am -Lsrc/gnc-module/test/misc-mods/Makefile.am -u -r1.7.4.2 -r1.7.4.3
--- src/gnc-module/test/misc-mods/Makefile.am
+++ src/gnc-module/test/misc-mods/Makefile.am
@@ -1,7 +1,8 @@
AM_CFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${GUILE_INCS}
LDADD = -L../.. -L../../.libs
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.19.4.1
diff -Lsrc/gnome/.cvsignore -Lsrc/gnome/.cvsignore -u -r1.19 -r1.19.4.1
--- src/gnome/.cvsignore
+++ src/gnome/.cvsignore
@@ -16,5 +16,5 @@
gw-gnc.html
i18n.h
gnc-version.h
-
+.DS_Store
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/glade/.cvsignore,v
retrieving revision 1.1.8.1
retrieving revision 1.1.8.2
diff -Lsrc/gnome/glade/.cvsignore -Lsrc/gnome/glade/.cvsignore -u -r1.1.8.1 -r1.1.8.2
--- src/gnome/glade/.cvsignore
+++ src/gnome/glade/.cvsignore
@@ -1,3 +1,5 @@
Makefile
Makefile.in
*.gladep
+.DS_Store
+
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/schemas/Attic/.cvsignore,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/gnome/schemas/.cvsignore -Lsrc/gnome/schemas/.cvsignore -u -r1.1.2.1 -r1.1.2.2
--- src/gnome/schemas/.cvsignore
+++ src/gnome/schemas/.cvsignore
@@ -16,5 +16,5 @@
gw-gnc.html
i18n.h
gnc-version.h
-
+.DS_Store
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/ui/Attic/.cvsignore,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -Lsrc/gnome/ui/.cvsignore -Lsrc/gnome/ui/.cvsignore -u -r1.1.2.1 -r1.1.2.2
--- src/gnome/ui/.cvsignore
+++ src/gnome/ui/.cvsignore
@@ -1,2 +1,4 @@
Makefile
Makefile.in
+.DS_Store
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome-utils/Makefile.am,v
retrieving revision 1.48.2.36
retrieving revision 1.48.2.37
diff -Lsrc/gnome-utils/Makefile.am -Lsrc/gnome-utils/Makefile.am -u -r1.48.2.36 -r1.48.2.37
--- src/gnome-utils/Makefile.am
+++ src/gnome-utils/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = schemas . test ui
PWD := $(shell pwd)
-pkglib_LTLIBRARIES = libgncmod-gnome-utils.la libgw-gnome-utils.la
+lib_LTLIBRARIES = libgncmod-gnome-utils.la libgw-gnome-utils.la
# Note that src/gnome-utils CANNOT depend on src/gnome!
AM_CFLAGS = \
@@ -19,16 +19,17 @@
-I${top_srcdir}/lib/goffice/split \
-I${top_srcdir}/lib \
-I${top_srcdir}/src \
- ${GUILE_INCS} \
${LIBGUPPI_CFLAGS} \
${GLIB_CFLAGS} \
${GLADE_CFLAGS} \
${GNOME_PRINT_CFLAGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
+ ${GUILE_INCS} \
${G_WRAP_COMPILE_ARGS} \
${GSF_CFLAGS}
+
libgncmod_gnome_utils_la_SOURCES = \
QuickFill.c \
account-quickfill.c \
@@ -176,11 +177,11 @@
${top_builddir}/src/network-utils/libgncmod-network-utils.la \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/lib/goffice/libgoffice.la \
- ${GUILE_LIBS} \
${LIBGUPPI_LIBS} \
${GNOME_LIBS} \
${GNOME_PRINT_LIBS} \
${GTKHTML_LIBS} \
+ ${GUILE_LIBS} \
${GDK_PIXBUF_LIBS} \
${GLADE_LIBS} \
${GUILE_LIBS} \
Index: hbci-interaction.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/import-export/hbci/hbci-interaction.c,v
retrieving revision 1.16.4.17
retrieving revision 1.16.4.18
diff -Lsrc/import-export/hbci/hbci-interaction.c -Lsrc/import-export/hbci/hbci-interaction.c -u -r1.16.4.17 -r1.16.4.18
--- src/import-export/hbci/hbci-interaction.c
+++ src/import-export/hbci/hbci-interaction.c
@@ -351,7 +351,7 @@
break;
}
else {
- g_assert (maxLen > strlen(passwd));
+ g_assert (maxLen > strlen(resultbuffer));
strcpy(resultbuffer, passwd);
g_free (memset (passwd, 0, strlen (passwd)));
g_free(title);
@@ -418,7 +418,7 @@
break;
}
else {
- g_assert (maxLen > strlen(passwd));
+ g_assert (maxLen > strlen(resultbuffer));
strcpy(resultbuffer, passwd);
g_free (memset (passwd, 0, strlen (passwd)));
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/.cvsignore,v
retrieving revision 1.34.4.5
retrieving revision 1.34.4.6
diff -L.cvsignore -L.cvsignore -u -r1.34.4.5 -r1.34.4.6
--- .cvsignore
+++ .cvsignore
@@ -54,3 +54,8 @@
autom4te.cache
ltmain.sh
mkinstalldirs
+.DS_Store
+*.prj
+*.pws
+.tm_project.cache
+
Index: configure.in
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/configure.in,v
retrieving revision 1.359.2.58
retrieving revision 1.359.2.59
diff -Lconfigure.in -Lconfigure.in -u -r1.359.2.58 -r1.359.2.59
--- configure.in
+++ configure.in
@@ -153,8 +153,9 @@
### MacOS 10.x requires some special handling...
# Some systems (MacOS) require -lintl
-AC_SEARCH_LIBS(gettext, intl, ,[
- AC_MSG_ERROR([Cannot find gettext -- do you need to build -lintl?])], )
+# not true for darwin 10.3 - halts the build.
+#AC_SEARCH_LIBS(gettext, intl, ,[
+# AC_MSG_ERROR([Cannot find gettext -- do you need to build -lintl?])], )
AC_MSG_CHECKING(for darwin)
case $host_os in
@@ -164,6 +165,16 @@
update to latest darwin])
;;
darwin*)
+ dnl Use fink under MacOS X to find popt
+ AC_MSG_CHECKING(for fink support)
+ if test -d "/sw/lib" -a -d "/sw/include"; then
+ AM_CFLAGS="$AM_CFLAGS -I/sw/include"
+ LDFLAGS="$LDFLAGS -L/sw/lib"
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+ AC_CHECK_HEADERS(popt.h)
AC_MSG_RESULT([yes, patching libtool to always build dylibs])
mv libtool libtool.old
sed -e 's/^deplibs_check_method.*/deplibs_check_method=pass_all/g' \
@@ -871,7 +882,7 @@
### --------------------------------------------------------------------------
### popt
-
+AC_CHECK_HEADERS(popt.h)
AC_CHECK_LIB(popt, poptStrippedArgv,, [AC_MSG_ERROR([
popt 1.5 or newer is required to build gnucash. You can download
@@ -959,6 +970,14 @@
fi
fi
AS_SCRUB_INCLUDE(GTKHTML_CFLAGS)
+dnl if Mac OSX, also scrub /sw/include
+dnl GIVEN_CFLAGS=$(echo $GIVEN_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;")
+case $host_os in
+ darwin*)
+ GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | sed -e "s;-I/sw/include ;;" | sed -e "s;-I/sw/include$;;")
+ GTKHTML_CFLAGS=$(echo $GTKHTML_CFLAGS | sed -e "s;-I/sw/include/gtkhtml ;;" | sed -e "s;-I/sw/includ/gtkhtmle$;;")
+ ;;
+esac
AC_SUBST(GTKHTML_CFLAGS)
AC_SUBST(GTKHTML_LIBS)
Index: ChangeLog
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/ChangeLog,v
retrieving revision 1.1487.2.265
retrieving revision 1.1487.2.266
diff -LChangeLog -LChangeLog -u -r1.1487.2.265 -r1.1487.2.266
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,160 @@
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ * .cvsignore :
+ * configure.in : Mac changes.
+ * rpm/.cvsignore :
+ * src/.cvsignore : All .cvsignore changes in this
+ commit are for the Mac.
+ * src/app-utils/Makefile.am : Mac build fix.
+ * src/app-utils/test/Makefile.am : Mac build fix.
+ * src/app-utils/test/test-exp-parser.c : Mac build fix.
+ * src/backend/.cvsignore :
+ * src/backend/file/gnc-xml.h : Remove temporary fix.
+ * src/backend/file/sixtp.c : Tweak
+ * src/backend/file/test/.cvsignore :
+ * src/backend/file/test/test-xml-pricedb.c : Improve failure
+ reporting.
+ * src/backend/file/test/test-xml-transaction.c : Improve
+ failure reporting.
+
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ QOF Sync.
+ * src/backend/qsf/.cvsignore :
+ * src/backend/qsf/Makefile.am : Tweaked
+ * src/backend/qsf/pilot-qsf-GnuCashInvoice.xml : QOF_TYPE_CHOICE
+ * src/backend/qsf/qof-backend-qsf.h : Tweak
+ * src/backend/qsf/qsf-backend.c : QOF_TYPE_CHOICE
+ * src/backend/qsf/qsf-object.xsd.xml : QOF_TYPE_CHOICE
+ * src/backend/qsf/qsf-xml-map.c : map conversion, v1
+ * src/backend/qsf/qsf-xml.c : Cast changes and bug fix.
+ * src/backend/qsf/qsf-xml.h : KVP, COLLECT and CHOICE
+ * src/business/.cvsignore :
+
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ Business-core/file/: cast changes and removal of private headers.
+ Also removed GNCBook references. CashUtil Sync.
+ * src/business/business-core/.cvsignore :
+ * src/business/business-core/file/.cvsignore :
+ * src/business/business-core/file/gnc-bill-term-xml-v2.c :
+ * src/business/business-core/file/gnc-customer-xml-v2.c :
+ * src/business/business-core/file/gnc-employee-xml-v2.c :
+ * src/business/business-core/file/gnc-entry-xml-v2.c :
+ * src/business/business-core/file/gnc-invoice-xml-v2.c :
+ * src/business/business-core/file/gnc-job-xml-v2.c :
+ * src/business/business-core/file/gnc-lot-xml-v2.c :
+ * src/business/business-core/file/gnc-order-xml-v2.c :
+ * src/business/business-core/file/gnc-owner-xml-v2.c :
+ * src/business/business-core/file/gnc-tax-table-xml-v2.c :
+ * src/business/business-core/file/gnc-vendor-xml-v2.c :
+
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ CashUtil Sync
+ * src/business/business-core/gncAddress.c : Removal of private headers
+ * src/business/business-core/gncBillTerm.c : Using a string as the
+ QOF billterm type parameter.
+ * src/business/business-core/gncBillTerm.h :
+ * src/business/business-core/gncCustomer.c : Removal of private headers
+ and cast fixes. Fixed printable.
+ * src/business/business-core/gncEntry.c : Removal of private headers
+ * src/business/business-core/gncInvoice.c : Removal of private headers
+ and cast fixes. Change functions ready for a later change to use
+ QOF_TYPE_CHOICE - not implemented here yet.
+ * src/business/business-core/gncJob.c : Removal of private headers
+ and cast fixes. Change functions ready for a later change to use
+ QOF_TYPE_CHOICE - not implemented here yet.
+ * src/business/business-core/gncOrder.c : Removal of private headers
+ and cast fixes.
+ * src/business/business-core/gncOwner.c : Removal of private headers
+ and cast fixes.
+ * src/business/business-core/gncTaxTable.c : Removal of private headers.
+ * src/business/business-core/test/test-customer.c : Make sure customer
+ object is registered before trying to use a QofObject call.
+ * src/business/business-core/test/test-employee.c : Tweak
+ * src/business/business-core/test/test-job.c : Tweak
+ * src/business/business-core/test/test-vendor.c : Tweak
+ * src/business/business-gnome/.cvsignore :
+ * src/business/business-utils/.cvsignore :
+ * src/doc/.cvsignore :
+ * src/doc/design/.cvsignore :
+ * src/doc/xml/.cvsignore :
+
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ CashUtil Sync.
+ * src/engine/.cvsignore :
+ * src/engine/Account.c : Removal of private headers.
+ * src/engine/FreqSpec.c : Removal of private headers
+ and cast fixes.
+ * src/engine/Group.c : Removal of private headers.
+ * src/engine/Makefile.am : Taking qofmath128.c out of
+ the include list - replace with qofmath128.h
+ * src/engine/SX-book.c : Removal of private headers.
+ * src/engine/SchedXaction.c : Removal of private headers.
+ * src/engine/Scrub2.c : Cast fixes.
+ * src/engine/Transaction.c : Removal of private headers
+ and cast fixes. QOF QofSetterFunc changes to ensure the
+ transaction is open before editing.
+ * src/engine/gnc-commodity.c : Removal of private headers.
+
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ QOF Sync
+ * src/engine/gnc-engine-util.h : Enhanced enumas string macro
+ * src/engine/gnc-event-p.h : Move gen_event into the API.
+ * src/engine/gnc-event.h : gnc_engine_gen_event
+ * src/engine/gnc-lot-p.h : Remove unneeded header.
+ * src/engine/gnc-lot.c : Remove unneeded header.
+ * src/engine/gnc-numeric.c : qofmath128 change.
+ * src/engine/gnc-numeric.h : Doxygen fix.
+ * src/engine/gnc-pricedb.c : Remove private headers and outline the
+ areas of FileBackend / QofBackend that need modification to work with
+ CashUtil.
+ * src/engine/qof-be-utils.h : Begin to map the macros to functions
+ to allow routines to be used when QOF is external.
+ * src/engine/qof.h : qofchoice
+ * src/engine/qof_book_merge.c : QOF_TYPE_CHOICE
+ * src/engine/qof_book_merge.h : header tweak
+ * src/engine/qofbackend-p.h : header tweak
+ * src/engine/qofbackend.c : Definition of qof-be-utils functions.
+ * src/engine/qofbackend.h : Move qof_book_get_backend
+ * src/engine/qofbook.h : Remove qof_book_get_backend
+ * src/engine/qofclass.c : Downgrade warning for CashUtil.
+ * src/engine/qofclass.h : Tweak.
+ * src/engine/qofgobj.c : Cast fix.
+ * src/engine/qofid.h : QOF_TYPE_COLLECT & QOF_TYPE_CHOICE
+ * src/engine/qofinstance.c : Dirty instance handling
+ * src/engine/qofinstance.h : Dirty instance API
+ * src/engine/qofobject.h : Doxygen tweak.
+ * src/engine/qofquery.c : typo
+ * src/engine/qofquery.h : tweak
+ * src/engine/qofquerycore-p.h : QOF_TYPE_CHOICE
+ * src/engine/qofquerycore.c : QOF_TYPE_CHOICE
+ * src/engine/qofquerycore.h : QOF_TYPE_CHOICE
+ * src/engine/qofsession-p.h : Tweak.
+ * src/engine/qofsession.c : Ensure objects are open for
+ editing before trying to commit data.
+ * src/engine/qofsession.h : QOF_TYPE_CHOICE
+ * src/engine/qofsql.c : Cast fixes.
+
+2005-08-17 Neil Williams <linux at codehelp.co.uk>
+
+ Mac changes.
+ * src/engine/test-core/Makefile.am :
+ * src/engine/test-core/test-engine-stuff.c : Improved
+ failure reporting.
+ * src/gnc-module/test/misc-mods/Makefile.am : The linking
+ order is important for Mac OSX because of a bug in the gtkhtml
+ implementation.
+ * src/gnome-utils/Makefile.am :
+ * src/gnome/.cvsignore :
+ * src/gnome/glade/.cvsignore :
+ * src/gnome/schemas/.cvsignore :
+ * src/gnome/ui/.cvsignore :
+ * src/test-core/Makefile.am :
+
2005-08-16 Christian Stimming <stimming at tuhh.de>
* src/import-export/hbci/hbci-interaction.c (inputBoxCB): Aaarg,
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/rpm/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.3.10.1
diff -Lrpm/.cvsignore -Lrpm/.cvsignore -u -r1.3 -r1.3.10.1
--- rpm/.cvsignore
+++ rpm/.cvsignore
@@ -1,3 +1,4 @@
Makefile
Makefile.in
gnucash.spec
+.DS_Store
Index: .cvsignore
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.14.6.1
diff -Lsrc/.cvsignore -Lsrc/.cvsignore -u -r1.14 -r1.14.6.1
--- src/.cvsignore
+++ src/.cvsignore
@@ -8,3 +8,5 @@
.deps
.libs
gnc-dir.h
+.DS_Store
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/Makefile.am,v
retrieving revision 1.29.4.10
retrieving revision 1.29.4.11
diff -Lsrc/app-utils/Makefile.am -Lsrc/app-utils/Makefile.am -u -r1.29.4.10 -r1.29.4.11
--- src/app-utils/Makefile.am
+++ src/app-utils/Makefile.am
@@ -72,6 +72,7 @@
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/calculation/libgncmod-calculation.la \
+ ${top_builddir}/src/core-utils/libcore-utils.la \
${GUILE_LIBS} \
${GLIB_LIBS}
Index: test-exp-parser.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/test/test-exp-parser.c,v
retrieving revision 1.5.4.2
retrieving revision 1.5.4.3
diff -Lsrc/app-utils/test/test-exp-parser.c -Lsrc/app-utils/test/test-exp-parser.c -u -r1.5.4.2 -r1.5.4.3
--- src/app-utils/test/test-exp-parser.c
+++ src/app-utils/test/test-exp-parser.c
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <libguile.h>
-
+#include "gnc-gconf-utils.h"
#include "gnc-exp-parser.h"
#include "gnc-numeric.h"
#include "test-stuff.h"
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/app-utils/test/Makefile.am,v
retrieving revision 1.23.4.1
retrieving revision 1.23.4.2
diff -Lsrc/app-utils/test/Makefile.am -Lsrc/app-utils/test/Makefile.am -u -r1.23.4.1 -r1.23.4.2
--- src/app-utils/test/Makefile.am
+++ src/app-utils/test/Makefile.am
@@ -6,6 +6,14 @@
test-scm-query-string \
test-print-parse-amount
+test_exp_parser_SOURCES = \
+ ${top_builddir}/src/core-utils/gnc-gconf-utils.c \
+ test-exp-parser.c
+
+test_print_parse_amount_SOURCES = \
+ ${top_builddir}/src/core-utils/gnc-gconf-utils.c \
+ test-print-parse-amount.c
+
GNC_TEST_DEPS := @GNC_TEST_SRFI_LOAD_CMD@ \
--gnc-module-dir ${top_builddir}/src/gnc-module \
--gnc-module-dir ${top_builddir}/src/engine \
@@ -26,13 +34,15 @@
$(shell ${top_srcdir}/src/gnc-test-env --no-exports ${GNC_TEST_DEPS})
LDADD = \
- ../../engine/libgncmod-engine.la \
- ../../gnc-module/libgncmodule.la \
- ../libgncmod-app-utils.la \
- ../../engine/libgw-engine.la \
+ ${top_builddir}/src/engine/libgncmod-engine.la \
+ ${top_builddir}/src/gnc-module/libgncmodule.la \
+ ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
+ ${top_builddir}/src/engine/libgw-engine.la \
${top_builddir}/src/test-core/libgncmod-test.la \
${top_builddir}/src/engine/test-core/libgncmod-test-engine.la \
- ${GUILE_LIBS}
+ ${top_builddir}/src/core-utils/libcore-utils.la \
+ ${GUILE_LIBS} \
+ ${GCONF_LIBS}
noinst_PROGRAMS = \
test-link-module \
@@ -52,5 +62,8 @@
-I${top_srcdir}/src/engine/test-core \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnc-module \
+ -I${top_srcdir}/src/core-utils \
${GUILE_INCS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${GCONF_CFLAGS}
+
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/test-core/Makefile.am,v
retrieving revision 1.6.4.1
retrieving revision 1.6.4.2
diff -Lsrc/test-core/Makefile.am -Lsrc/test-core/Makefile.am -u -r1.6.4.1 -r1.6.4.2
--- src/test-core/Makefile.am
+++ src/test-core/Makefile.am
@@ -11,4 +11,5 @@
AM_CFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS} \
+ ${GUILE_INCS}
More information about the gnucash-changes
mailing list