Add lib/glib26 to the include and library paths.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@14327 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
David Hampton 2006-06-05 01:48:35 +00:00
parent 025df33973
commit e5c0029700
10 changed files with 26 additions and 0 deletions

View File

@ -1,3 +1,12 @@
2006-05-04 David Hampton <hampton@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@ihtfp.com>
* src/gnome-utils/gnc-plugin-file-history.c:

View File

@ -8,6 +8,7 @@ AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
-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 @@ 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}/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 \

View File

@ -3,6 +3,7 @@ PWD := $(shell pwd)
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 @@ libgncmod_dialog_tax_table_la_LIBADD = \
${top_builddir}/src/app-utils/libgncmod-app-utils.la \
${top_builddir}/src/engine/libgncmod-engine.la \
${top_builddir}/src/gnc-module/libgncmodule.la \
${top_builddir}/lib/glib26/libgncglib.la \
${GLADE_LIBS} \
${GUILE_LIBS} \
${GNOME_LIBS} \

View File

@ -10,6 +10,7 @@ AM_CFLAGS = \
-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 @@ libgncmod_gnome_search_la_LIBADD = \
${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} \

View File

@ -41,6 +41,7 @@ INCLUDES= \
-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

View File

@ -45,6 +45,7 @@ libgncmod_generic_import_la_LIBADD = \
${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 @@ glade_DATA = \
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 \

View File

@ -17,9 +17,11 @@ libgncmod_log_replay_la_LIBADD = \
${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 \

View File

@ -18,11 +18,13 @@ libgncmod_ofx_la_LIBADD = \
${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 \

View File

@ -23,6 +23,7 @@ libgncmod_qif_import_la_LIBADD = \
${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 @@ gladedir = ${GNC_GLADE_DIR}
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 \

View File

@ -16,11 +16,13 @@ libgncmod_stylesheets_la_LIBADD = \
${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 \