[Gnucash-changes] r14327 - gnucash/trunk - Add lib/glib26 to the include and library paths.

[David Hampton]

Author: hampton
Date: 2006-06-04 21:48:35 -0400 (Sun, 04 Jun 2006)
New Revision: 14327
Trac: http://svn.gnucash.org/trac/changeset/14327

Modified:
   gnucash/trunk/ChangeLog
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/business/dialog-tax-table/Makefile.am
   gnucash/trunk/src/gnome-search/Makefile.am
   gnucash/trunk/src/gnome-utils/test/Makefile.am
   gnucash/trunk/src/import-export/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/report/stylesheets/Makefile.am
Log:
Add lib/glib26 to the include and library paths.


Modified: gnucash/trunk/ChangeLog
===================================================================
--- gnucash/trunk/ChangeLog	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/ChangeLog	2006-06-05 01:48:35 UTC (rev 14327)
@@ -1,3 +1,12 @@
+2006-05-04  David Hampton  <hampton at employees.org>
+
+	* various Makefile.am files: Add lib/glib26 to the include and
+	library paths.
+
+	* src/gnome-utils/gnc-plugin-page.h: Include gkeyfile.h instead of
+	explicitly declaring a data type. This prevents include file
+	ordering problems.
+
 2006-05-04  Derek Atkins  <derek at ihtfp.com>
 
 	* src/gnome-utils/gnc-plugin-file-history.c:

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/bin/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -8,6 +8,7 @@
   -DDATADIR=\"${GNC_SHAREDIR}\" \
   -DLIBDIR=\"${GNC_LIBDIR}\" \
   -DGNC_HELPDIR=\"${GNC_HELPDIR}\" \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/app-utils \
@@ -21,6 +22,7 @@
 gnucash_bin_SOURCES = gnucash-bin.c
 gnucash_bin_LDADD = ${GUILE_LIBS} ${GLIB_LIBS} ${GNOME_LIBS} ${GTK_LIBS} \
 ${QOF_LIBS} \
+${top_builddir}/lib/glib26/libgncglib.la \
 ${top_builddir}/src/engine/libgncmod-engine.la \
 ${top_builddir}/src/gnome/libgncgnome.la \
 ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \

Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -3,6 +3,7 @@
 pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la libgw-dialog-tax-table.la
 
 AM_CFLAGS = \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \
@@ -34,6 +35,7 @@
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${GLADE_LIBS} \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \

Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/gnome-search/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -10,6 +10,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/business/business-core \
+  -I${top_srcdir}/lib/glib26 \
   ${G_WRAP_COMPILE_ARGS} \
   ${GUILE_INCS} \
   ${GTKHTML_CFLAGS} \
@@ -55,6 +56,7 @@
   ${top_builddir}/src/app-utils/libgncmod-app-utils.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
   ${top_builddir}/src/core-utils/libcore-utils.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
   ${GTKHTML_LIBS} \

Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -41,6 +41,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/app-utils \
+  -I${top_srcdir}/lib/glib26 \
   ${GLIB_CFLAGS} ${GUILE_INCS} ${GNOME_CFLAGS} ${GLADE_CFLAGS} ${QOF_CFLAGS}
 
 test_gnc_recurrence_SOURCES=test-gnc-recurrence.c

Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/import-export/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -45,6 +45,7 @@
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/core-utils/libcore-utils.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${GNOME_LIBS} \
   ${GLADE_LIBS} \
   ${QOF_LIBS} \
@@ -56,6 +57,7 @@
   import-provider-format.glade
 
 AM_CFLAGS = \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \

Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -17,9 +17,11 @@
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/core-utils/libcore-utils.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${GLIB_LIBS} ${QOF_LIBS}
 
 AM_CFLAGS = \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \

Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -18,11 +18,13 @@
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/core-utils/libcore-utils.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${QOF_LIBS} \
   ${GLIB_LIBS} \
   ${LIBOFX_LIBS}
 
 AM_CFLAGS = \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \

Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -23,6 +23,7 @@
   ${top_builddir}/src/core-utils/libcore-utils.la \
   ${top_builddir}/src/engine/libgncmod-engine.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${G_WRAP_LINK_ARGS} \
   ${GUILE_LIBS} \
   ${GNOME_LIBS} \
@@ -51,6 +52,7 @@
 glade_DATA = qif.glade
 
 AM_CFLAGS = \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/engine \

Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am	2006-06-05 01:47:16 UTC (rev 14326)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am	2006-06-05 01:48:35 UTC (rev 14327)
@@ -16,11 +16,13 @@
   ${top_builddir}/src/report/report-system/libgncmod-report-system.la \
   ${top_builddir}/src/gnome-utils/libgncmod-gnome-utils.la \
   ${top_builddir}/src/gnc-module/libgncmodule.la \
+  ${top_builddir}/lib/glib26/libgncglib.la \
   ${QOF_LIBS} \
   ${GUILE_LIBS} \
   ${GLIB_LIBS}
 
 AM_CFLAGS = \
+  -I${top_srcdir}/lib/glib26 \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/gnc-module \