r22539 - gnucash/trunk/src - Fix automake INCLUDE deprecation warnings
John Ralls
jralls at code.gnucash.org
Tue Nov 6 22:08:15 EST 2012
Author: jralls
Date: 2012-11-06 22:08:15 -0500 (Tue, 06 Nov 2012)
New Revision: 22539
Trac: http://svn.gnucash.org/trac/changeset/22539
Modified:
gnucash/trunk/src/app-utils/Makefile.am
gnucash/trunk/src/backend/dbi/Makefile.am
gnucash/trunk/src/backend/dbi/test/Makefile.am
gnucash/trunk/src/backend/sql/Makefile.am
gnucash/trunk/src/backend/sql/test/Makefile.am
gnucash/trunk/src/backend/xml/Makefile.am
gnucash/trunk/src/backend/xml/test/Makefile.am
gnucash/trunk/src/bin/Makefile.am
gnucash/trunk/src/business/Makefile.am
gnucash/trunk/src/business/business-gnome/Makefile.am
gnucash/trunk/src/business/business-ledger/Makefile.am
gnucash/trunk/src/core-utils/Makefile.am
gnucash/trunk/src/debug/Makefile.am
gnucash/trunk/src/debug/valgrind/Makefile.am
gnucash/trunk/src/engine/Makefile.am
gnucash/trunk/src/gnc-module/Makefile.am
gnucash/trunk/src/gnome-search/Makefile.am
gnucash/trunk/src/gnome-utils/Makefile.am
gnucash/trunk/src/gnome-utils/test/Makefile.am
gnucash/trunk/src/gnome/Makefile.am
gnucash/trunk/src/html/Makefile.am
gnucash/trunk/src/import-export/Makefile.am
gnucash/trunk/src/import-export/aqbanking/Makefile.am
gnucash/trunk/src/import-export/csv-export/Makefile.am
gnucash/trunk/src/import-export/csv-import/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/import-export/qif/Makefile.am
gnucash/trunk/src/libqof/qof/Makefile.am
gnucash/trunk/src/optional/gtkmm/Makefile.am
gnucash/trunk/src/pixmaps/Makefile.am
gnucash/trunk/src/plugins/bi_import/Makefile.am
gnucash/trunk/src/plugins/customer_import/Makefile.am
gnucash/trunk/src/python/Makefile.am
gnucash/trunk/src/register/ledger-core/Makefile.am
gnucash/trunk/src/register/register-core/Makefile.am
gnucash/trunk/src/register/register-gnome/Makefile.am
gnucash/trunk/src/report/business-reports/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/test-core/Makefile.am
Log:
Fix automake INCLUDE deprecation warnings
Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/app-utils/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -180,4 +180,4 @@
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\"
Modified: gnucash/trunk/src/backend/dbi/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/backend/dbi/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -5,7 +5,7 @@
# "${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 @@
${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\"
Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -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-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
Modified: gnucash/trunk/src/backend/sql/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/backend/sql/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -6,7 +6,7 @@
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 @@
${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\"
Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -36,7 +36,7 @@
${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 @@
${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 @@
-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)
Modified: gnucash/trunk/src/backend/xml/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/backend/xml/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -103,4 +103,4 @@
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\"
Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -256,4 +256,4 @@
test-real-data.sh \
test-xml2-is-file.c
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.xml\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.xml\"
Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/bin/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -180,4 +180,4 @@
environment.in \
gnucash-setup-env-osx.in
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.bin\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\"
Modified: gnucash/trunk/src/business/Makefile.am
===================================================================
--- gnucash/trunk/src/business/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/business/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -1,3 +1,3 @@
SUBDIRS = \
business-ledger \
- business-gnome
\ No newline at end of file
+ business-gnome
Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -122,4 +122,4 @@
CLEANFILES = $(BUILT_SOURCES) .scm-links ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.gnome\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.gnome\"
Modified: gnucash/trunk/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-ledger/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/business/business-ledger/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -43,4 +43,4 @@
${GTK_CFLAGS} \
${GLIB_CFLAGS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.ledger\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.ledger\"
Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/core-utils/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -114,7 +114,7 @@
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
Modified: gnucash/trunk/src/debug/Makefile.am
===================================================================
--- gnucash/trunk/src/debug/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/debug/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -1,3 +1,3 @@
SUBDIRS = \
- valgrind
\ No newline at end of file
+ valgrind
Modified: gnucash/trunk/src/debug/valgrind/Makefile.am
===================================================================
--- gnucash/trunk/src/debug/valgrind/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/debug/valgrind/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -6,4 +6,4 @@
valgrind-libfontconfig.supp \
valgrind-libgda.supp \
valgrind-libguile.supp \
- valgrind-x11.supp
\ No newline at end of file
+ valgrind-x11.supp
Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/engine/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -217,4 +217,4 @@
clean-local:
rm -rf gnucash
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.engine\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.engine\"
Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/gnc-module/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -64,4 +64,4 @@
CLEANFILES = .scm-links ${SCM_FILE_LINKS}
MAINTAINERCLEANFILES = swig-gnc-module.c
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.module\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.module\"
Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/gnome/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -141,4 +141,4 @@
CLEANFILES = gnucash.desktop
MAINTAINERCLEANFILES = swig-gnome.c
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\"
Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/gnome-search/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -65,4 +65,4 @@
EXTRA_DIST = \
${gtkbuilder_DATA}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.search\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.search\"
Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/gnome-utils/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -273,4 +273,4 @@
rm -f ${DESTDIR}${pkgdatadir}/gnome
endif
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\"
Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -35,7 +35,7 @@
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 \
Modified: gnucash/trunk/src/html/Makefile.am
===================================================================
--- gnucash/trunk/src/html/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/html/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -88,4 +88,4 @@
rm -f ${DESTDIR}${pkgdatadir}/gnome
endif
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.html\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.html\"
Modified: gnucash/trunk/src/import-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -71,4 +71,4 @@
$(gtkbuilder_DATA) \
generic-import-design.txt
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.i-e\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.i-e\"
Modified: gnucash/trunk/src/import-export/aqbanking/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/aqbanking/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/aqbanking/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -48,7 +48,7 @@
${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 @@
EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"
Modified: gnucash/trunk/src/import-export/csv-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-export/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/csv-export/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -57,4 +57,4 @@
EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.export.csv\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.export.csv\"
Modified: gnucash/trunk/src/import-export/csv-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-import/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/csv-import/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -62,4 +62,4 @@
EXTRA_DIST = $(ui_DATA) $(gtkbuilder_DATA)
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.csv\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.csv\"
Modified: gnucash/trunk/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/log-replay/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/log-replay/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -43,4 +43,4 @@
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\"
Modified: gnucash/trunk/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/ofx/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/ofx/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -48,4 +48,4 @@
EXTRA_DIST = $(ui_DATA)
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.ofx\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.ofx\"
Modified: gnucash/trunk/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/qif/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -36,4 +36,4 @@
${GLIB_CFLAGS} \
${GUILE_INCS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif\"
Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -107,4 +107,4 @@
CLEANFILES += .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.qif.import\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.qif.import\"
Modified: gnucash/trunk/src/libqof/qof/Makefile.am
===================================================================
--- gnucash/trunk/src/libqof/qof/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/libqof/qof/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -98,4 +98,4 @@
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\"
Modified: gnucash/trunk/src/optional/gtkmm/Makefile.am
===================================================================
--- gnucash/trunk/src/optional/gtkmm/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/optional/gtkmm/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -63,4 +63,4 @@
EXTRA_DIST = ${ui_DATA} ${gtkbuilder_DATA}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\"
Modified: gnucash/trunk/src/pixmaps/Makefile.am
===================================================================
--- gnucash/trunk/src/pixmaps/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/pixmaps/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -170,4 +170,4 @@
.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
Modified: gnucash/trunk/src/plugins/bi_import/Makefile.am
===================================================================
--- gnucash/trunk/src/plugins/bi_import/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/plugins/bi_import/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -30,7 +30,7 @@
${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 @@
${QOF_CFLAGS} \
${GLIB_CFLAGS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\"
Modified: gnucash/trunk/src/plugins/customer_import/Makefile.am
===================================================================
--- gnucash/trunk/src/plugins/customer_import/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/plugins/customer_import/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -28,7 +28,7 @@
${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 @@
${QOF_CFLAGS} \
${GLIB_CFLAGS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.customer_import\"
Modified: gnucash/trunk/src/python/Makefile.am
===================================================================
--- gnucash/trunk/src/python/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/python/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -59,4 +59,4 @@
CLEANFILES = .py-links
DISTCLEANFILES = ${PY_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.python\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.python\"
Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -56,4 +56,4 @@
${GLIB_CFLAGS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.ledger\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.ledger\"
Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/register/register-core/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -67,4 +67,4 @@
CLEANFILES = $(BUILT_SOURCES)
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.core\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.core\"
Modified: gnucash/trunk/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-gnome/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/register/register-gnome/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -68,4 +68,4 @@
${GTK_XIM_FLAGS} \
${GNOMECANVAS_CFLAGS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.gnome\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.gnome\"
Modified: gnucash/trunk/src/report/business-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/business-reports/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/business-reports/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -47,4 +47,4 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.reports\"
+AM_CPPFLAGS = -DG_LOG_DOMAIN=\"gnc.business.reports\"
Modified: gnucash/trunk/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/locale-specific/us/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -63,4 +63,4 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.locale.us\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.locale.us\"
Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -105,4 +105,4 @@
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\"
Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/report-system/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -96,4 +96,4 @@
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\"
Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -84,4 +84,4 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.standard\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.standard\"
Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -76,4 +76,4 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.core\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.core\"
Modified: gnucash/trunk/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/report/utility-reports/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -56,4 +56,4 @@
CLEANFILES = .scm-links
DISTCLEANFILES = ${SCM_FILE_LINKS}
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.report.util\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.report.util\"
Modified: gnucash/trunk/src/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/test-core/Makefile.am 2012-11-07 00:24:41 UTC (rev 22538)
+++ gnucash/trunk/src/test-core/Makefile.am 2012-11-07 03:08:15 UTC (rev 22539)
@@ -103,4 +103,4 @@
MAINTAINERCLEANFILES = \
swig-unittest-support-guile.c \
- swig-unittest-support-python.c
\ No newline at end of file
+ swig-unittest-support-python.c
More information about the gnucash-changes
mailing list