r17655 - gnucash/trunk - Bug #514043: Use AM_CPPFLAGS instead of AM_CFLAGS.
Christian Stimming
cstim at cvs.gnucash.org
Sat Oct 25 16:30:48 EDT 2008
Author: cstim
Date: 2008-10-25 16:30:47 -0400 (Sat, 25 Oct 2008)
New Revision: 17655
Trac: http://svn.gnucash.org/trac/changeset/17655
Modified:
gnucash/trunk/lib/glib28/Makefile.am
gnucash/trunk/lib/libc/Makefile.am
gnucash/trunk/lib/libqof/backend/file/Makefile.am
gnucash/trunk/lib/libqof/qof/Makefile.am
gnucash/trunk/lib/stf/Makefile.am
gnucash/trunk/packaging/win32/Makefile.am
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/app-utils/test/Makefile.am
gnucash/trunk/src/backend/file/Makefile.am
gnucash/trunk/src/backend/file/test/Makefile.am
gnucash/trunk/src/backend/postgres/Makefile.am
gnucash/trunk/src/backend/postgres/test/Makefile.am
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/business/business-core/Makefile.am
gnucash/trunk/src/business/business-core/file/Makefile.am
gnucash/trunk/src/business/business-core/test/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/core-utils/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/experimental/cgi-bin/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnc-module/test/Makefile.am
gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
gnucash/trunk/src/gnome-search/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/import-export/binary-import/Makefile.am
gnucash/trunk/src/import-export/binary-import/test/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/ofx/test/Makefile.am
gnucash/trunk/src/import-export/qif-import/Makefile.am
gnucash/trunk/src/import-export/qif-io-core/Makefile.am
gnucash/trunk/src/import-export/qif-io-core/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/register/ledger-core/Makefile.am
gnucash/trunk/src/register/ledger-core/test/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/register/register-core/test/Makefile.am
gnucash/trunk/src/register/register-gnome/Makefile.am
gnucash/trunk/src/register/register-gnome/test/Makefile.am
gnucash/trunk/src/report/locale-specific/us/Makefile.am
gnucash/trunk/src/report/report-gnome/Makefile.am
gnucash/trunk/src/report/report-system/Makefile.am
gnucash/trunk/src/report/standard-reports/Makefile.am
gnucash/trunk/src/report/stylesheets/Makefile.am
gnucash/trunk/src/report/utility-reports/Makefile.am
gnucash/trunk/src/tax/us/Makefile.am
gnucash/trunk/src/test-core/Makefile.am
Log:
Bug #514043: Use AM_CPPFLAGS instead of AM_CFLAGS.
AM_CFLAGS is passed both to the compiler (.c -> .o) and to the linker, so it
should only have flags that are appropriate for both steps. AM_CPPFLAGS is
passed only to the compiler, so flags that are only appropriate for that step
(-I and -D flags, for example), should be in _CPPFLAGS instead of _CFLAGS.
Every gnucash-2.2.3 Makefile.am that passes -I flags gets it wrong, placing
them in _CFLAGS. It's not a functional bug (the linker ignores -I flags), but a
ton of superfluous flags makes the build output pretty verbose and hard to
debug when things do go wrong.
To make matters more confusing as a developer, the FOO_CFLAGS variable set by
PKG_CHECK_MODULES(FOO) is actually for _CPPFLAGS in the Makefile.am
('pkg-config --cflags' returns the -I flags).
A related -I bug (one that *is* functionally broken) is that sometimes a local
(build dir) -I flag is passed after a global (installed dependent library) one.
If my system happens to have a header installed from some unrelated thing,
compiler will find *that* one instead of the expected one in the source
directory. Should always pass all local -I before any global ones.
Patch by andi5 plus one manual addition in src/gnome-utils/Makefile.am
Modified: gnucash/trunk/lib/glib28/Makefile.am
===================================================================
--- gnucash/trunk/lib/glib28/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/lib/glib28/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -13,6 +13,6 @@
libgnc_glib_la_LIBADD = ${GLIB26_LIBS}
-AM_CFLAGS = ${GLIB_CFLAGS}
+AM_CPPFLAGS = ${GLIB_CFLAGS}
EXTRA_DIST = $(DUMMYSRCS) $(REALSRCS) $(REALHDRS)
Modified: gnucash/trunk/lib/libc/Makefile.am
===================================================================
--- gnucash/trunk/lib/libc/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/lib/libc/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -18,7 +18,7 @@
libc_missing_la_LIBADD = $(LTLIBOBJS)
if OS_WIN32
- AM_CFLAGS = -DOS_WIN32
+ AM_CPPFLAGS = -DOS_WIN32
endif
# Not currently used. If added to AC_REPLACE_FUNCS then this line
Modified: gnucash/trunk/lib/libqof/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/backend/file/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/lib/libqof/backend/file/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,13 +2,13 @@
pkglib_LTLIBRARIES = libgncqof-backend-qsf.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I.. -I../.. \
+ -I$(top_srcdir)/lib/libc \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
${QOF_CFLAGS} \
${LIBXML2_CFLAGS} \
- ${GLIB_CFLAGS} \
- -I$(top_srcdir)/lib/libc
+ ${GLIB_CFLAGS}
libgncqof_backend_qsf_la_SOURCES = \
qsf-backend.c \
Modified: gnucash/trunk/lib/libqof/qof/Makefile.am
===================================================================
--- gnucash/trunk/lib/libqof/qof/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/lib/libqof/qof/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -6,9 +6,9 @@
$(REGEX_LIBS) \
$(top_builddir)/lib/libc/libc-missing.la
-AM_CFLAGS = \
- $(GLIB_CFLAGS) \
- -I$(top_srcdir)/lib/libc
+AM_CPPFLAGS = \
+ -I$(top_srcdir)/lib/libc \
+ $(GLIB_CFLAGS)
libgnc_qof_la_SOURCES = \
gnc-date.c \
Modified: gnucash/trunk/lib/stf/Makefile.am
===================================================================
--- gnucash/trunk/lib/stf/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/lib/stf/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -8,6 +8,6 @@
libgnc_stf_la_LIBADD = $(GOFFICE_LIBS)
-AM_CFLAGS = $(GOFFICE_CFLAGS)
+AM_CPPFLAGS = $(GOFFICE_CFLAGS)
EXTRA_DIST = $(REALSRCS) $(REALHDRS)
Modified: gnucash/trunk/packaging/win32/Makefile.am
===================================================================
--- gnucash/trunk/packaging/win32/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/packaging/win32/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -19,7 +19,7 @@
bin_PROGRAMS = redirect
redirect_SOURCES = redirect.c
redirect_LDADD = $(GLIB_LIBS)
- AM_CFLAGS = $(GLIB_CFLAGS)
+ AM_CPPFLAGS = $(GLIB_CFLAGS)
pkgdata_DATA = Greek-4-5.1.11.isl
else
EXTRA_DIST += redirect.c
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/app-utils/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,7 +2,7 @@
pkglib_LTLIBRARIES = libgncmod-app-utils.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/lib/libc \
-I${top_srcdir}/src \
-I${top_builddir}/src \
@@ -10,9 +10,9 @@
-I${top_srcdir}/src/calculation \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GCONF_CFLAGS} \
${GTK_CFLAGS}
Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/app-utils/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -55,7 +55,7 @@
EXTRA_DIST = \
test-load-module
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
@@ -63,7 +63,7 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/core-utils \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GCONF_CFLAGS}
Modified: gnucash/trunk/src/backend/file/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/file/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/backend/file/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -4,15 +4,15 @@
lib_LTLIBRARIES = libgnc-backend-xml-utils.la
pkglib_LTLIBRARIES = libgncmod-backend-xml.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I.. -I../.. \
-DLOCALE_DIR=\""$(datadir)/locale"\" \
-I${top_srcdir}/src/backend \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/core-utils\
-I${top_srcdir}/lib/libc\
+ ${QOF_CFLAGS} \
${LIBXML2_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
${GCONF_CFLAGS}
Modified: gnucash/trunk/src/backend/file/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/file/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/backend/file/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -228,7 +228,7 @@
${QOF_LIBS} \
${top_builddir}/lib/libc/libc-missing.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
@@ -238,9 +238,9 @@
-I${top_srcdir}/src/engine/test-core \
-I${top_srcdir}/src/backend/file \
-I${top_srcdir}/src/backend/qsf \
+ ${QOF_CFLAGS} \
${LIBXML2_CFLAGS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GUILE_INCS} \
${GCONF_CFLAGS}
Modified: gnucash/trunk/src/backend/postgres/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/postgres/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/backend/postgres/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,14 +2,14 @@
lib_LTLIBRARIES = libgnc-backend-postgres.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I.. -I../.. \
-I../../engine \
-I${srcdir}/../.. \
-I${top_srcdir}/src/backend \
-I${top_srcdir}/src/engine \
+ ${QOF_CFLAGS} \
${PGSQL_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
libgnc_backend_postgres_la_LDFLAGS = -module -avoid-version
Modified: gnucash/trunk/src/backend/postgres/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/postgres/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/backend/postgres/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -61,7 +61,7 @@
${top_srcdir}/src/backend/postgres/putil.c \
test-escape.c
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
${QOF_CFLAGS} \
-I${top_srcdir}/src/test-core \
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/bin/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,9 +1,7 @@
# Order is important here.
SUBDIRS = . overrides test
-AM_CFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
- ${GUILE_INCS} \
- ${QOF_CFLAGS} \
+AM_CPPFLAGS = -I${top_builddir} ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GTK_CFLAGS} \
-DPKGSYSCONFDIR=\"${GNC_CONFIGDIR}\" \
-DPKGDATADIR=\"${GNC_SHAREDIR}\" \
-DGNC_HELPDIR=\"${GNC_HELPDIR}\" \
@@ -15,7 +13,9 @@
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnome \
-I${top_builddir}/src/gnome-utils \
- -I${top_srcdir}/src/gnc-module
+ -I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
+ ${GUILE_INCS}
bin_PROGRAMS = gnucash-bin
gnucash_bin_SOURCES = gnucash-bin.c
Modified: gnucash/trunk/src/business/business-core/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/business-core/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,14 +2,14 @@
pkglib_LTLIBRARIES = libgncmod-business-core.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
libgncmod_business_core_la_SOURCES = \
swig-business-core.c \
Modified: gnucash/trunk/src/business/business-core/file/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/file/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/business-core/file/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,15 +2,15 @@
pkglib_LTLIBRARIES = libgncmod-business-backend-xml.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/backend \
-I${top_srcdir}/src/backend/file \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/business/business-core \
+ ${QOF_CFLAGS} \
${LIBXML2_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_business_backend_xml_la_SOURCES = \
Modified: gnucash/trunk/src/business/business-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-core/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/business-core/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,13 +1,13 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/business/business-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
LDADD = \
${top_builddir}/src/gnc-module/libgnc-module.la \
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,7 +2,7 @@
pkglib_LTLIBRARIES = libgncmod-business-gnome.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/core-utils \
@@ -16,16 +16,16 @@
-I${top_srcdir}/src/business/business-core \
-I${top_srcdir}/src/business/business-ledger \
-I${top_srcdir}/src/business/dialog-tax-table \
+ -I${top_srcdir}/src/register/register-core \
+ -I${top_srcdir}/src/register/register-gnome \
+ -I${top_srcdir}/src/register/ledger-core \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GLADE_CFLAGS} \
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GLIB_CFLAGS} \
- ${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
+ ${GUILE_INCS}
libgncmod_business_gnome_la_SOURCES = \
business-options-gnome.c \
Modified: gnucash/trunk/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-ledger/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/business-ledger/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -32,7 +32,7 @@
${QOF_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src/business/business-core \
-I${top_srcdir}/src/business/business-utils \
-I${top_srcdir}/src/business/dialog-tax-table \
@@ -43,9 +43,9 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/register/register-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLADE_CFLAGS} \
- ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-utils/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/business-utils/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,15 +1,15 @@
pkglib_LTLIBRARIES = libgncmod-business-utils.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/business/business-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GNOME_CFLAGS}
libgncmod_business_utils_la_SOURCES = \
Modified: gnucash/trunk/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/business/dialog-tax-table/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = libgncmod-dialog-tax-table.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -8,12 +8,12 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/business/business-core \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GLADE_CFLAGS} \
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GUILE_INCS}
libgncmod_dialog_tax_table_la_SOURCES = \
Modified: gnucash/trunk/src/calculation/Makefile.am
===================================================================
--- gnucash/trunk/src/calculation/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/calculation/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -28,10 +28,10 @@
numeric_ops.c \
numeric_ops.h
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/core-utils/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -31,7 +31,7 @@
-I${top_srcdir}/src -o $@ $<
endif
-AM_CFLAGS = \
+AM_CPPFLAGS = \
${GUILE_INCS} \
${GLIB_CFLAGS} \
${GCONF_CFLAGS} \
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/engine/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,7 +2,7 @@
pkglib_LTLIBRARIES = libgncmod-engine.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src \
Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/engine/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,13 +1,13 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir} \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/engine/test-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
LDADD = \
Modified: gnucash/trunk/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test-core/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/engine/test-core/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -16,11 +16,11 @@
noinst_HEADERS=test-engine-stuff.h test-engine-strings.h
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GUILE_INCS}
Modified: gnucash/trunk/src/experimental/cgi-bin/Makefile.am
===================================================================
--- gnucash/trunk/src/experimental/cgi-bin/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/experimental/cgi-bin/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -3,7 +3,7 @@
bin_PROGRAMS = hello hello2 fastcgi-hello hello3 gnc-server
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I../../engine -I${srcdir}/../../engine \
-I../../backend/xml -I${srcdir}/../../backend/xml \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,10 +1,11 @@
SUBDIRS = . test
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
- ${GLIB_CFLAGS} ${GUILE_INCS}
+ ${GLIB_CFLAGS} \
+ ${GUILE_INCS}
lib_LTLIBRARIES = libgnc-module.la
Modified: gnucash/trunk/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnc-module/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,7 +2,7 @@
LDADD = ../libgnc-module.la ${GLIB_LIBS} ${GUILE_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} \
Modified: gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GLIB_CFLAGS} \
Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} \
Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/gnc-module/test/mod-foo \
Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,4 +1,4 @@
-AM_CFLAGS=\
+AM_CPPFLAGS=\
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} \
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnome/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -100,7 +100,7 @@
gnucash.desktop.in \
gnome.i
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/core-utils \
@@ -116,13 +116,13 @@
-I${top_srcdir}/src/report/report-system \
-I${top_srcdir}/src/report/report-gnome \
-I${top_srcdir}/lib/libc \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GNOME_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
- $(GLIB_CFLAGS) \
- ${QOF_CFLAGS}
+ $(GLIB_CFLAGS)
# We build this in an earlier directory.
Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnome-search/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,6 +1,6 @@
pkglib_LTLIBRARIES = libgncmod-gnome-search.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -8,13 +8,13 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/business/business-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
- ${GLIB_CFLAGS} \
- ${QOF_CFLAGS}
+ ${GLIB_CFLAGS}
libgncmod_gnome_search_la_SOURCES = \
gncmod-gnome-search.c \
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -4,7 +4,7 @@
# Note that src/gnome-utils CANNOT depend on src/gnome!
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/engine \
@@ -219,7 +219,7 @@
${gncscm_DATA}
if !GTKHTML_USES_GTKPRINT
- AM_CFLAGS += ${GNOME_PRINT_CFLAGS}
+ AM_CPPFLAGS += ${GNOME_PRINT_CFLAGS}
libgncmod_gnome_utils_la_LIBADD += ${GNOME_PRINT_LIBS}
endif
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -58,7 +58,7 @@
generic-import.glade \
import-provider-format.glade
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -66,13 +66,13 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
EXTRA_DIST = \
$(glade_DATA) \
Modified: gnucash/trunk/src/import-export/binary-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/binary-import/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/binary-import/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,17 +2,17 @@
pkglib_LTLIBRARIES = libgncmod-binary-import.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnome \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GNOME_CFLAGS}
#FIXME remove the following deps
Modified: gnucash/trunk/src/import-export/binary-import/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/binary-import/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/binary-import/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -7,4 +7,4 @@
noinst_PROGRAMS = \
test-link-module
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
Modified: gnucash/trunk/src/import-export/csv/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/csv/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -26,11 +26,11 @@
${top_builddir}/src/gnc-module/libgnc-module.la \
${top_builddir}/lib/stf/libgnc-stf.la \
${top_builddir}/lib/libc/libc-missing.la \
+ ${QOF_LIBS} \
${GOFFICE_LIBS} \
- ${QOF_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -41,11 +41,11 @@
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/lib/libc \
-I${top_srcdir}/lib \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
$(GOFFICE_CFLAGS)
Modified: gnucash/trunk/src/import-export/hbci/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/hbci/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/hbci/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -58,7 +58,7 @@
${GLIB_LIBS} \
${AQBANKING_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -71,11 +71,11 @@
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
-I${top_srcdir}/src/register/ledger-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
${AQBANKING_CFLAGS}
Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -22,7 +22,7 @@
${GTK_LIBS} \
${GLIB_LIBS} ${QOF_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -31,11 +31,11 @@
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/import-export \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
uidir = $(GNC_UI_DIR)
Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -24,7 +24,7 @@
${GLIB_LIBS} \
${LIBOFX_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -33,11 +33,11 @@
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/import-export \
+ ${QOF_CFLAGS} \
${GNOME_CFLAGS} \
${GTKHTML_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
${LIBOFX_CFLAGS}
Modified: gnucash/trunk/src/import-export/ofx/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/ofx/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,6 +1,6 @@
TESTS=test-link
-AM_CFLAGS=${LIBOFX_CFLAGS}
+AM_CPPFLAGS=${LIBOFX_CFLAGS}
check_PROGRAMS=test-link
test_link_SOURCES=test-link.c
Modified: gnucash/trunk/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/qif/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -26,15 +26,15 @@
${REGEX_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/import-export \
+ ${QOF_CFLAGS} \
${GLIB_CFLAGS} \
- ${GUILE_INCS} \
- ${QOF_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 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/qif/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,4 +1,4 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/test-core \
@@ -6,9 +6,9 @@
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/import-export \
-I${top_srcdir}/src/import-export/qif \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
- ${GLIB_CFLAGS}
+ ${GLIB_CFLAGS}
LDADD = \
${top_builddir}/src/gnc-module/libgnc-module.la \
Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -51,7 +51,7 @@
gladedir = ${GNC_GLADE_DIR}
glade_DATA = qif.glade
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/core-utils \
@@ -61,12 +61,12 @@
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/import-export \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
${GDK_PIXBUF_CFLAGS} \
- ${QOF_CFLAGS} \
${GTKHTML_CFLAGS}
uidir = $(GNC_UI_DIR)
Modified: gnucash/trunk/src/import-export/qif-io-core/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/qif-io-core/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,7 +2,7 @@
pkglib_LTLIBRARIES = libgncmod-qifiocore.la
-AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
libgncmod_qifiocore_la_SOURCES = gncmod-qifiocore.c
Modified: gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/qif-io-core/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,6 +1,6 @@
LDADD=${top_builddir}/src/gnc-module/libgnc-module.la ${GLIB_LIBS}
-AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
TESTS=test-load-module test-parser test-reader test-file-formats \
test-import-phase-1
Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/import-export/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -1,12 +1,12 @@
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/test-core \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/import-export \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
LDADD = \
Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -40,7 +40,7 @@
${QOF_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
@@ -49,10 +49,10 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/register/register-core \
-I${top_srcdir}/src/register/register-gnome \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
Modified: gnucash/trunk/src/register/ledger-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/register/ledger-core/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -5,4 +5,4 @@
test_link_module_SOURCES=test-link-module.c
test_link_module_LDADD=../libgncmod-ledger-core.la
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -51,16 +51,16 @@
table-layout.h \
table-model.h
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/app-utils \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/gnome-utils \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GNOME_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
CLEANFILES = $(BUILT_SOURCES)
Modified: gnucash/trunk/src/register/register-core/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/register/register-core/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -19,4 +19,4 @@
#EXTRA_DIST = test-load-module
-AM_CFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
+AM_CPPFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
Modified: gnucash/trunk/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/register/register-gnome/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -50,7 +50,7 @@
quickfillcell-gnome.h \
table-gnome.h
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/core-utils \
-I${top_srcdir}/src/engine \
@@ -59,11 +59,11 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/register/ledger-core \
-I${top_srcdir}/src/register/register-core \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLADE_CFLAGS} \
${GLIB_CFLAGS} \
${GTK_XIM_FLAGS} \
- ${QOF_CFLAGS} \
${GNOME_CFLAGS}
INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.gnome\"
Modified: gnucash/trunk/src/register/register-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/test/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/register/register-gnome/test/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -19,4 +19,4 @@
#EXTRA_DIST = test-load-module
-AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CPPFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
Modified: gnucash/trunk/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/report/locale-specific/us/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -13,7 +13,7 @@
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} ${GLIB_CFLAGS}
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -2,7 +2,7 @@
pkglib_LTLIBRARIES = libgncmod-report-gnome.la
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_builddir}/src \
-I${top_srcdir}/src/core-utils \
@@ -12,11 +12,11 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/report/report-system \
+ ${QOF_CFLAGS} \
${GLADE_CFLAGS} \
${GUILE_INCS} \
${GTKHTML_CFLAGS} \
${GNOME_CFLAGS} \
- ${QOF_CFLAGS} \
${GLIB_CFLAGS}
libgncmod_report_gnome_la_SOURCES = \
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -25,7 +25,7 @@
-I${top_srcdir}/src -o $@ $<
endif
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/app-utils \
Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -12,7 +12,7 @@
${GUILE_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} ${GLIB_CFLAGS}
Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -20,16 +20,16 @@
${GUILE_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/engine \
-I${top_srcdir}/src/gnc-module \
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/report/report-gnome \
+ ${QOF_CFLAGS} \
${GUILE_INCS} \
${GLIB_CFLAGS} \
- ${QOF_CFLAGS} \
${GNOME_CFLAGS}
gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
Modified: gnucash/trunk/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/report/utility-reports/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -11,7 +11,7 @@
libgncmod_utility_reports_la_LDFLAGS = -module -avoid-version
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GUILE_INCS} ${GLIB_CFLAGS}
Modified: gnucash/trunk/src/tax/us/Makefile.am
===================================================================
--- gnucash/trunk/src/tax/us/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/tax/us/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -11,7 +11,7 @@
${GUILE_LIBS} \
${GLIB_LIBS}
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GLIB_CFLAGS} ${GUILE_INCS}
Modified: gnucash/trunk/src/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/test-core/Makefile.am 2008-10-25 20:05:20 UTC (rev 17654)
+++ gnucash/trunk/src/test-core/Makefile.am 2008-10-25 20:30:47 UTC (rev 17655)
@@ -8,7 +8,7 @@
noinst_HEADERS=test-stuff.h
-AM_CFLAGS = \
+AM_CPPFLAGS = \
-I${top_srcdir}/src \
-I${top_srcdir}/src/gnc-module \
${GLIB_CFLAGS} \
More information about the gnucash-changes
mailing list