From 827eb333c3d42aeb418d8bf62878d62230e8457c Mon Sep 17 00:00:00 2001 From: John Ralls Date: Wed, 7 Nov 2012 03:08:15 +0000 Subject: [PATCH] Fix automake INCLUDE deprecation warnings git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22539 57a11ea4-9604-0410-9ed3-97b8803252fd --- src/app-utils/Makefile.am | 2 +- src/backend/dbi/Makefile.am | 4 ++-- src/backend/dbi/test/Makefile.am | 8 +++++--- src/backend/sql/Makefile.am | 4 ++-- src/backend/sql/test/Makefile.am | 6 +++--- src/backend/xml/Makefile.am | 2 +- src/backend/xml/test/Makefile.am | 2 +- src/bin/Makefile.am | 2 +- src/business/Makefile.am | 2 +- src/business/business-gnome/Makefile.am | 2 +- src/business/business-ledger/Makefile.am | 2 +- src/core-utils/Makefile.am | 2 +- src/debug/Makefile.am | 2 +- src/debug/valgrind/Makefile.am | 2 +- src/engine/Makefile.am | 2 +- src/gnc-module/Makefile.am | 2 +- src/gnome-search/Makefile.am | 2 +- src/gnome-utils/Makefile.am | 2 +- src/gnome-utils/test/Makefile.am | 2 +- src/gnome/Makefile.am | 2 +- src/html/Makefile.am | 2 +- src/import-export/Makefile.am | 2 +- src/import-export/aqbanking/Makefile.am | 4 ++-- src/import-export/csv-export/Makefile.am | 2 +- src/import-export/csv-import/Makefile.am | 2 +- src/import-export/log-replay/Makefile.am | 2 +- src/import-export/ofx/Makefile.am | 2 +- src/import-export/qif-import/Makefile.am | 2 +- src/import-export/qif/Makefile.am | 2 +- src/libqof/qof/Makefile.am | 2 +- src/optional/gtkmm/Makefile.am | 2 +- src/pixmaps/Makefile.am | 2 +- src/plugins/bi_import/Makefile.am | 4 ++-- src/plugins/customer_import/Makefile.am | 4 ++-- src/python/Makefile.am | 2 +- src/register/ledger-core/Makefile.am | 2 +- src/register/register-core/Makefile.am | 2 +- src/register/register-gnome/Makefile.am | 2 +- src/report/business-reports/Makefile.am | 2 +- src/report/locale-specific/us/Makefile.am | 2 +- src/report/report-gnome/Makefile.am | 2 +- src/report/report-system/Makefile.am | 2 +- src/report/standard-reports/Makefile.am | 2 +- src/report/stylesheets/Makefile.am | 2 +- src/report/utility-reports/Makefile.am | 2 +- src/test-core/Makefile.am | 2 +- 46 files changed, 57 insertions(+), 55 deletions(-) diff --git a/src/app-utils/Makefile.am b/src/app-utils/Makefile.am index 7463efc27a..3e1a054421 100644 --- a/src/app-utils/Makefile.am +++ b/src/app-utils/Makefile.am @@ -180,4 +180,4 @@ clean-local: CLEANFILES = ${SCM_FILE_LINKS} .scm-links MAINTAINERCLEANFILES = swig-app-utils-guile.c swig-app-utils-python.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.app-utils\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.app-utils\" diff --git a/src/backend/dbi/Makefile.am b/src/backend/dbi/Makefile.am index d319a4adbc..97d0947038 100644 --- a/src/backend/dbi/Makefile.am +++ b/src/backend/dbi/Makefile.am @@ -5,7 +5,7 @@ pkglib_LTLIBRARIES = libgncmod-backend-dbi.la # "${top_srcdir}/src/debug" below is for the splint header -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I.. -I../.. \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -I${top_srcdir}/src/backend \ @@ -36,4 +36,4 @@ libgncmod_backend_dbi_la_LIBADD = \ ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${LIBDBI_LIBS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.dbi\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\" diff --git a/src/backend/dbi/test/Makefile.am b/src/backend/dbi/test/Makefile.am index 7b19004847..d0f44043b5 100644 --- a/src/backend/dbi/test/Makefile.am +++ b/src/backend/dbi/test/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/test-templates/Makefile.decl -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I${top_srcdir}/lib/libc \ -I${top_srcdir}/src \ -I${top_srcdir}/src/core-utils \ @@ -66,11 +66,13 @@ test_backend_dbi_SOURCES = \ test-dbi-business-stuff.c test_backend_dbi_LDFLAGS="-ldbi" -test_backend_dbi_CPPFLAGS=-DDBI_TEST_XML_FILENAME=\"${srcdir}/test-dbi.xml\" +test_backend_dbi_CPPFLAGS = \ + -DDBI_TEST_XML_FILENAME=\"${srcdir}/test-dbi.xml\" \ + ${AM_CPPFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.dbi\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.dbi\" # If you let make run parallel builds it complains that there is no rule to make # libgncmod-test-dbi.la. This is wrong, but I can't figure out how to fix it diff --git a/src/backend/sql/Makefile.am b/src/backend/sql/Makefile.am index 261d1c6a39..91fe77ae66 100644 --- a/src/backend/sql/Makefile.am +++ b/src/backend/sql/Makefile.am @@ -6,7 +6,7 @@ TEST_SUBDIRS = test lib_LTLIBRARIES = libgnc-backend-sql.la # "${top_srcdir}/src/debug" below is for the splint header -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I.. -I../.. \ -DLOCALE_DIR=\""$(datadir)/locale"\" \ -I${top_srcdir}/src/backend \ @@ -77,4 +77,4 @@ libgnc_backend_sql_la_LIBADD = \ ${top_builddir}/src/engine/libgncmod-engine.la \ ${top_builddir}/src/libqof/qof/libgnc-qof.la -INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.sql\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\" diff --git a/src/backend/sql/test/Makefile.am b/src/backend/sql/test/Makefile.am index 41a7ab949e..36c1d734c0 100644 --- a/src/backend/sql/test/Makefile.am +++ b/src/backend/sql/test/Makefile.am @@ -36,7 +36,7 @@ LDADD = ${top_builddir}/src/test-core/libtest-core.la \ ${top_builddir}/src/libqof/qof/libgnc-qof.la \ ${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 \ @@ -50,7 +50,7 @@ AM_CFLAGS = \ ${GUILE_INCS} \ ${GCONF_CFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.sql\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\" TEST_PROGS += test-sqlbe test_sqlbedir = ${top_srcdir}/${MODULEPATH}/test @@ -76,4 +76,4 @@ test_sqlbe_CFLAGS = \ -I$(top_srcdir)/src/backend/dbi/ \ -I$(top_srcdir)/src/libqof/qof/ \ -I$(top_srcdir)/src/test-core/ \ - $(GLIB_CFLAGS) \ No newline at end of file + $(GLIB_CFLAGS) diff --git a/src/backend/xml/Makefile.am b/src/backend/xml/Makefile.am index 6b3e4339e1..3695ee9b7f 100644 --- a/src/backend/xml/Makefile.am +++ b/src/backend/xml/Makefile.am @@ -103,4 +103,4 @@ libgncmod_backend_xml_la_LIBADD = \ libgnc-backend-xml-utils.la \ ${top_builddir}/src/libqof/qof/libgnc-qof.la -INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.xml\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\" diff --git a/src/backend/xml/test/Makefile.am b/src/backend/xml/test/Makefile.am index efee8855c5..922d78bdc4 100644 --- a/src/backend/xml/test/Makefile.am +++ b/src/backend/xml/test/Makefile.am @@ -256,4 +256,4 @@ EXTRA_DIST = \ test-real-data.sh \ test-xml2-is-file.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.xml\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\" diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 13db2f1adb..8745439610 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -180,4 +180,4 @@ EXTRA_DIST = \ environment.in \ gnucash-setup-env-osx.in -INCLUDES = -DG_LOG_DOMAIN=\"gnc.bin\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\" diff --git a/src/business/Makefile.am b/src/business/Makefile.am index 4a20a97e3e..f6306095e3 100644 --- a/src/business/Makefile.am +++ b/src/business/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = \ business-ledger \ - business-gnome \ No newline at end of file + business-gnome diff --git a/src/business/business-gnome/Makefile.am b/src/business/business-gnome/Makefile.am index 4385ec2bc4..7ef4bf5e3f 100644 --- a/src/business/business-gnome/Makefile.am +++ b/src/business/business-gnome/Makefile.am @@ -122,4 +122,4 @@ clean-local: CLEANFILES = $(BUILT_SOURCES) .scm-links ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.gnome\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.gnome\" diff --git a/src/business/business-ledger/Makefile.am b/src/business/business-ledger/Makefile.am index 92b68a4634..08e29204c4 100644 --- a/src/business/business-ledger/Makefile.am +++ b/src/business/business-ledger/Makefile.am @@ -43,4 +43,4 @@ AM_CPPFLAGS = \ ${GTK_CFLAGS} \ ${GLIB_CFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.ledger\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.ledger\" diff --git a/src/core-utils/Makefile.am b/src/core-utils/Makefile.am index 6f57afa715..58fcd8a074 100644 --- a/src/core-utils/Makefile.am +++ b/src/core-utils/Makefile.am @@ -114,7 +114,7 @@ clean-local: CLEANFILES = $(BUILT_SOURCES) .scm-links MAINTAINERCLEANFILES = swig-core-utils-guile.c swig-core-utils-python.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.core-utils\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.core-utils\" gncla-dir.h: gncla-dir.h.in ${top_builddir}/config.status Makefile rm -f $@.tmp diff --git a/src/debug/Makefile.am b/src/debug/Makefile.am index 19ab052446..c5aa9de8e2 100644 --- a/src/debug/Makefile.am +++ b/src/debug/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = \ - valgrind \ No newline at end of file + valgrind diff --git a/src/debug/valgrind/Makefile.am b/src/debug/valgrind/Makefile.am index efcaae1b20..e9a4d2ffe1 100644 --- a/src/debug/valgrind/Makefile.am +++ b/src/debug/valgrind/Makefile.am @@ -6,4 +6,4 @@ EXTRA_DIST = \ valgrind-libfontconfig.supp \ valgrind-libgda.supp \ valgrind-libguile.supp \ - valgrind-x11.supp \ No newline at end of file + valgrind-x11.supp diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am index f948af434c..dc58731abe 100644 --- a/src/engine/Makefile.am +++ b/src/engine/Makefile.am @@ -217,4 +217,4 @@ MAINTAINERCLEANFILES = swig-engine.c clean-local: rm -rf gnucash -INCLUDES = -DG_LOG_DOMAIN=\"gnc.engine\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.engine\" diff --git a/src/gnc-module/Makefile.am b/src/gnc-module/Makefile.am index e6fc8d7504..af248aa801 100644 --- a/src/gnc-module/Makefile.am +++ b/src/gnc-module/Makefile.am @@ -64,4 +64,4 @@ clean-local: CLEANFILES = .scm-links ${SCM_FILE_LINKS} MAINTAINERCLEANFILES = swig-gnc-module.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.module\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.module\" diff --git a/src/gnome-search/Makefile.am b/src/gnome-search/Makefile.am index 6c7b49299a..0177698c65 100644 --- a/src/gnome-search/Makefile.am +++ b/src/gnome-search/Makefile.am @@ -65,4 +65,4 @@ gtkbuilder_DATA = \ EXTRA_DIST = \ ${gtkbuilder_DATA} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.search\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.search\" diff --git a/src/gnome-utils/Makefile.am b/src/gnome-utils/Makefile.am index 395082f643..cf656ba3be 100644 --- a/src/gnome-utils/Makefile.am +++ b/src/gnome-utils/Makefile.am @@ -273,4 +273,4 @@ uninstall-hook: rm -f ${DESTDIR}${pkgdatadir}/gnome endif -INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\" diff --git a/src/gnome-utils/test/Makefile.am b/src/gnome-utils/test/Makefile.am index 93599110af..f456e2ee3b 100644 --- a/src/gnome-utils/test/Makefile.am +++ b/src/gnome-utils/test/Makefile.am @@ -35,7 +35,7 @@ TESTS_ENVIRONMENT = \ check_PROGRAMS = \ test-link-module test-gnc-recurrence -INCLUDES= \ +AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/engine \ -I${top_srcdir}/src/engine/test-core \ diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am index 650cb97660..fabfd32e15 100644 --- a/src/gnome/Makefile.am +++ b/src/gnome/Makefile.am @@ -141,4 +141,4 @@ AM_CPPFLAGS = \ CLEANFILES = gnucash.desktop MAINTAINERCLEANFILES = swig-gnome.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\" diff --git a/src/html/Makefile.am b/src/html/Makefile.am index 157faebbf9..123fb11e82 100644 --- a/src/html/Makefile.am +++ b/src/html/Makefile.am @@ -88,4 +88,4 @@ uninstall-hook: rm -f ${DESTDIR}${pkgdatadir}/gnome endif -INCLUDES = -DG_LOG_DOMAIN=\"gnc.html\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.html\" diff --git a/src/import-export/Makefile.am b/src/import-export/Makefile.am index 621c91b05e..3d9527e66d 100644 --- a/src/import-export/Makefile.am +++ b/src/import-export/Makefile.am @@ -71,4 +71,4 @@ EXTRA_DIST = \ $(gtkbuilder_DATA) \ generic-import-design.txt -INCLUDES = -DG_LOG_DOMAIN=\"gnc.i-e\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.i-e\" diff --git a/src/import-export/aqbanking/Makefile.am b/src/import-export/aqbanking/Makefile.am index 190dcd83ac..22ebd95cd0 100644 --- a/src/import-export/aqbanking/Makefile.am +++ b/src/import-export/aqbanking/Makefile.am @@ -48,7 +48,7 @@ libgncmod_aqbanking_la_LIBADD = \ ${GWENGUI_GTK2_LIBS} \ ${AQBANKING_LIBS} -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_srcdir}/src/import-export \ -I${top_srcdir}/src/gnome \ @@ -77,4 +77,4 @@ gtkbuilder_DATA = \ EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.aqbanking\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\" diff --git a/src/import-export/csv-export/Makefile.am b/src/import-export/csv-export/Makefile.am index 09b366969a..31f336f404 100644 --- a/src/import-export/csv-export/Makefile.am +++ b/src/import-export/csv-export/Makefile.am @@ -57,4 +57,4 @@ gtkbuilder_DATA = \ EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) -INCLUDES = -DG_LOG_DOMAIN=\"gnc.export.csv\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.export.csv\" diff --git a/src/import-export/csv-import/Makefile.am b/src/import-export/csv-import/Makefile.am index d8ab460b9a..2f3ee59ace 100644 --- a/src/import-export/csv-import/Makefile.am +++ b/src/import-export/csv-import/Makefile.am @@ -62,4 +62,4 @@ gtkbuilder_DATA = \ EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA) -INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.csv\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.csv\" diff --git a/src/import-export/log-replay/Makefile.am b/src/import-export/log-replay/Makefile.am index 649dc712f6..5416f5b4c4 100644 --- a/src/import-export/log-replay/Makefile.am +++ b/src/import-export/log-replay/Makefile.am @@ -43,4 +43,4 @@ uidir = $(GNC_UI_DIR) dist_ui_DATA = \ gnc-plugin-log-replay-ui.xml -INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.log-replay\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.log-replay\" diff --git a/src/import-export/ofx/Makefile.am b/src/import-export/ofx/Makefile.am index 0607bc4a66..6a2649f95d 100644 --- a/src/import-export/ofx/Makefile.am +++ b/src/import-export/ofx/Makefile.am @@ -48,4 +48,4 @@ ui_DATA = \ EXTRA_DIST = $(ui_DATA) -INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.ofx\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\" diff --git a/src/import-export/qif-import/Makefile.am b/src/import-export/qif-import/Makefile.am index c459bcae46..85d56efeec 100644 --- a/src/import-export/qif-import/Makefile.am +++ b/src/import-export/qif-import/Makefile.am @@ -107,4 +107,4 @@ clean-local: CLEANFILES += .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif.import\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif.import\" diff --git a/src/import-export/qif/Makefile.am b/src/import-export/qif/Makefile.am index 1316a77e08..f9c477420c 100644 --- a/src/import-export/qif/Makefile.am +++ b/src/import-export/qif/Makefile.am @@ -36,4 +36,4 @@ AM_CPPFLAGS = \ ${GLIB_CFLAGS} \ ${GUILE_INCS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif\" diff --git a/src/libqof/qof/Makefile.am b/src/libqof/qof/Makefile.am index 5c920cecc2..67fd4027ce 100644 --- a/src/libqof/qof/Makefile.am +++ b/src/libqof/qof/Makefile.am @@ -98,4 +98,4 @@ test_qofmath_CPPFLAGS=$(AM_CPPFLAGS) -DTEST_128_BIT_MULT test_qofmath_LDFLAGS=$(libgnc_qof_la_LDFLAGS) test_qofmath_LDADD=$(libgnc_qof_la_LIBADD) -INCLUDES = -DG_LOG_DOMAIN=\"qof\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"qof\" diff --git a/src/optional/gtkmm/Makefile.am b/src/optional/gtkmm/Makefile.am index 7a0e95fb75..8917a40c6d 100644 --- a/src/optional/gtkmm/Makefile.am +++ b/src/optional/gtkmm/Makefile.am @@ -63,4 +63,4 @@ gtkbuilder_DATA = EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\" diff --git a/src/pixmaps/Makefile.am b/src/pixmaps/Makefile.am index 9434911306..01343b845a 100644 --- a/src/pixmaps/Makefile.am +++ b/src/pixmaps/Makefile.am @@ -170,4 +170,4 @@ endif .PHONY: ico ico: ${ico_files_hr} ${ico_files_lr} convert ${ico_files_lr} ${ico_files_hr} tmp.ico; \ - mv tmp.ico gnucash-icon.ico \ No newline at end of file + mv tmp.ico gnucash-icon.ico diff --git a/src/plugins/bi_import/Makefile.am b/src/plugins/bi_import/Makefile.am index 41249cd520..a95ec7c894 100644 --- a/src/plugins/bi_import/Makefile.am +++ b/src/plugins/bi_import/Makefile.am @@ -30,7 +30,7 @@ libgncmod_bi_import_la_LIBADD = \ ${QOF_LIBS} \ ${GLIB_LIBS} -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_builddir}/src \ -I${top_srcdir}/src/gnome \ @@ -53,4 +53,4 @@ AM_CFLAGS = \ ${QOF_CFLAGS} \ ${GLIB_CFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\" diff --git a/src/plugins/customer_import/Makefile.am b/src/plugins/customer_import/Makefile.am index dd02939132..969118cc7a 100644 --- a/src/plugins/customer_import/Makefile.am +++ b/src/plugins/customer_import/Makefile.am @@ -28,7 +28,7 @@ libgncmod_customer_import_la_LIBADD = \ ${QOF_LIBS} \ ${GLIB_LIBS} -AM_CFLAGS = \ +AM_CPPFLAGS = \ -I${top_srcdir}/src \ -I${top_builddir}/src \ -I${top_srcdir}/src/gnome \ @@ -51,4 +51,4 @@ AM_CFLAGS = \ ${QOF_CFLAGS} \ ${GLIB_CFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\" diff --git a/src/python/Makefile.am b/src/python/Makefile.am index 8d67006a2d..17d5ac9842 100644 --- a/src/python/Makefile.am +++ b/src/python/Makefile.am @@ -59,4 +59,4 @@ EXTRA_DIST = ${gncpymod_DATA} CLEANFILES = .py-links DISTCLEANFILES = ${PY_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.python\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.python\" diff --git a/src/register/ledger-core/Makefile.am b/src/register/ledger-core/Makefile.am index e81c4f0da8..675b529d63 100644 --- a/src/register/ledger-core/Makefile.am +++ b/src/register/ledger-core/Makefile.am @@ -56,4 +56,4 @@ AM_CPPFLAGS = \ ${GLIB_CFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.ledger\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.ledger\" diff --git a/src/register/register-core/Makefile.am b/src/register/register-core/Makefile.am index 87fc6be12a..dc0cdaa5a2 100644 --- a/src/register/register-core/Makefile.am +++ b/src/register/register-core/Makefile.am @@ -67,4 +67,4 @@ AM_CPPFLAGS = \ CLEANFILES = $(BUILT_SOURCES) -INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.core\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.core\" diff --git a/src/register/register-gnome/Makefile.am b/src/register/register-gnome/Makefile.am index 15fa7d2542..c5ba2c6e5d 100644 --- a/src/register/register-gnome/Makefile.am +++ b/src/register/register-gnome/Makefile.am @@ -68,4 +68,4 @@ AM_CPPFLAGS = \ ${GTK_XIM_FLAGS} \ ${GNOMECANVAS_CFLAGS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.gnome\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.gnome\" diff --git a/src/report/business-reports/Makefile.am b/src/report/business-reports/Makefile.am index b55a702016..4f736db733 100644 --- a/src/report/business-reports/Makefile.am +++ b/src/report/business-reports/Makefile.am @@ -47,4 +47,4 @@ EXTRA_DIST = \ CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.reports\" +AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.business.reports\" diff --git a/src/report/locale-specific/us/Makefile.am b/src/report/locale-specific/us/Makefile.am index 920c93da92..4946ba8f93 100644 --- a/src/report/locale-specific/us/Makefile.am +++ b/src/report/locale-specific/us/Makefile.am @@ -63,4 +63,4 @@ EXTRA_DIST = \ CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.locale.us\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.locale.us\" diff --git a/src/report/report-gnome/Makefile.am b/src/report/report-gnome/Makefile.am index a1a93382da..effba5d992 100644 --- a/src/report/report-gnome/Makefile.am +++ b/src/report/report-gnome/Makefile.am @@ -105,4 +105,4 @@ clean-local: CLEANFILES = report .scm-links ${SCM_FILE_LINKS} MAINTAINERCLEANFILES = swig-report-gnome.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.gui\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.gui\" diff --git a/src/report/report-system/Makefile.am b/src/report/report-system/Makefile.am index 89e89bfc20..5c6d81511b 100644 --- a/src/report/report-system/Makefile.am +++ b/src/report/report-system/Makefile.am @@ -96,4 +96,4 @@ clean-local: CLEANFILES = report .scm-links ${SCM_FILE_LINKS} MAINTAINERCLEANFILES = swig-report-system.c -INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.core\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\" diff --git a/src/report/standard-reports/Makefile.am b/src/report/standard-reports/Makefile.am index 52b2cd226b..442f46ee1c 100644 --- a/src/report/standard-reports/Makefile.am +++ b/src/report/standard-reports/Makefile.am @@ -84,4 +84,4 @@ EXTRA_DIST = ${gncscmmod_DATA} ${gncscmreportmod_DATA} CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.standard\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.standard\" diff --git a/src/report/stylesheets/Makefile.am b/src/report/stylesheets/Makefile.am index 4113922ae2..afb30f4779 100644 --- a/src/report/stylesheets/Makefile.am +++ b/src/report/stylesheets/Makefile.am @@ -76,4 +76,4 @@ EXTRA_DIST = ${gncscmmod_DATA} CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.core\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\" diff --git a/src/report/utility-reports/Makefile.am b/src/report/utility-reports/Makefile.am index 3e3519978d..4b1d5f2b51 100644 --- a/src/report/utility-reports/Makefile.am +++ b/src/report/utility-reports/Makefile.am @@ -56,4 +56,4 @@ EXTRA_DIST = ${gncscmmod_DATA} CLEANFILES = .scm-links DISTCLEANFILES = ${SCM_FILE_LINKS} -INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.util\" +AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.util\" diff --git a/src/test-core/Makefile.am b/src/test-core/Makefile.am index 86b6fb74b6..e026c30c67 100644 --- a/src/test-core/Makefile.am +++ b/src/test-core/Makefile.am @@ -103,4 +103,4 @@ EXTRA_DIST = \ MAINTAINERCLEANFILES = \ swig-unittest-support-guile.c \ - swig-unittest-support-python.c \ No newline at end of file + swig-unittest-support-python.c