r22540 - gnucash/branches/2.4/src - [r22539]Fix automake INCLUDE deprecation warnings

John Ralls jralls at code.gnucash.org
Tue Nov 6 23:52:35 EST 2012 

Author: jralls
Date: 2012-11-06 23:52:35 -0500 (Tue, 06 Nov 2012)
New Revision: 22540
Trac: http://svn.gnucash.org/trac/changeset/22540

Modified:
   gnucash/branches/2.4/src/app-utils/Makefile.am
   gnucash/branches/2.4/src/backend/dbi/Makefile.am
   gnucash/branches/2.4/src/backend/dbi/test/Makefile.am
   gnucash/branches/2.4/src/backend/sql/Makefile.am
   gnucash/branches/2.4/src/backend/sql/test/Makefile.am
   gnucash/branches/2.4/src/backend/xml/Makefile.am
   gnucash/branches/2.4/src/backend/xml/test/Makefile.am
   gnucash/branches/2.4/src/bin/Makefile.am
   gnucash/branches/2.4/src/business/Makefile.am
   gnucash/branches/2.4/src/business/business-core/Makefile.am
   gnucash/branches/2.4/src/business/business-gnome/Makefile.am
   gnucash/branches/2.4/src/business/business-ledger/Makefile.am
   gnucash/branches/2.4/src/business/business-utils/Makefile.am
   gnucash/branches/2.4/src/business/dialog-tax-table/Makefile.am
   gnucash/branches/2.4/src/core-utils/Makefile.am
   gnucash/branches/2.4/src/debug/Makefile.am
   gnucash/branches/2.4/src/debug/valgrind/Makefile.am
   gnucash/branches/2.4/src/engine/Makefile.am
   gnucash/branches/2.4/src/gnc-module/Makefile.am
   gnucash/branches/2.4/src/gnome-search/Makefile.am
   gnucash/branches/2.4/src/gnome-utils/Makefile.am
   gnucash/branches/2.4/src/gnome-utils/test/Makefile.am
   gnucash/branches/2.4/src/gnome/Makefile.am
   gnucash/branches/2.4/src/html/Makefile.am
   gnucash/branches/2.4/src/import-export/Makefile.am
   gnucash/branches/2.4/src/import-export/aqbanking/Makefile.am
   gnucash/branches/2.4/src/import-export/csv/Makefile.am
   gnucash/branches/2.4/src/import-export/log-replay/Makefile.am
   gnucash/branches/2.4/src/import-export/ofx/Makefile.am
   gnucash/branches/2.4/src/import-export/qif-import/Makefile.am
   gnucash/branches/2.4/src/import-export/qif/Makefile.am
   gnucash/branches/2.4/src/libqof/qof/Makefile.am
   gnucash/branches/2.4/src/optional/gtkmm/Makefile.am
   gnucash/branches/2.4/src/pixmaps/Makefile.am
   gnucash/branches/2.4/src/plugins/bi_import/Makefile.am
   gnucash/branches/2.4/src/register/ledger-core/Makefile.am
   gnucash/branches/2.4/src/register/register-core/Makefile.am
   gnucash/branches/2.4/src/register/register-gnome/Makefile.am
   gnucash/branches/2.4/src/report/business-reports/Makefile.am
   gnucash/branches/2.4/src/report/locale-specific/us/Makefile.am
   gnucash/branches/2.4/src/report/report-gnome/Makefile.am
   gnucash/branches/2.4/src/report/report-system/Makefile.am
   gnucash/branches/2.4/src/report/standard-reports/Makefile.am
   gnucash/branches/2.4/src/report/stylesheets/Makefile.am
   gnucash/branches/2.4/src/report/utility-reports/Makefile.am
Log:
[r22539]Fix automake INCLUDE deprecation warnings

Modified: gnucash/branches/2.4/src/app-utils/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/app-utils/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/app-utils/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -167,4 +167,4 @@
 CLEANFILES = ${SCM_FILE_LINKS}  .scm-links
 MAINTAINERCLEANFILES = swig-app-utils.c
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.app-utils\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.app-utils\"

Modified: gnucash/branches/2.4/src/backend/dbi/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/dbi/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/backend/dbi/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/dbi/test/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/backend/dbi/test/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -60,7 +60,7 @@
         ${top_builddir}/src/backend/sql/libgnc-backend-sql.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 \
@@ -76,7 +76,7 @@
   ${GUILE_INCS} \
   ${GCONF_CFLAGS}
 
-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/branches/2.4/src/backend/sql/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/sql/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/backend/sql/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -4,7 +4,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 \
@@ -75,4 +75,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/branches/2.4/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/sql/test/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/backend/sql/test/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -34,7 +34,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 \
@@ -48,4 +48,4 @@
   ${GUILE_INCS} \
   ${GCONF_CFLAGS}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.backend.sql\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"

Modified: gnucash/branches/2.4/src/backend/xml/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/xml/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/backend/xml/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/backend/xml/test/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/backend/xml/test/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -255,4 +255,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/branches/2.4/src/bin/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/bin/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/bin/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -184,5 +184,4 @@
 if PLATFORM_WIN32
 EXTRA_DIST += guile-setup.cmd
 endif
-
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.bin\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.bin\"

Modified: gnucash/branches/2.4/src/business/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/business/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/business/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -3,4 +3,4 @@
   business-utils \
   dialog-tax-table \
   business-ledger \
-  business-gnome
\ No newline at end of file
+  business-gnome

Modified: gnucash/branches/2.4/src/business/business-core/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/business/business-core/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/business/business-core/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -59,4 +59,4 @@
 CLEANFILES = gnucash .scm-links ${SCM_FILE_LINKS}
 MAINTAINERCLEANFILES =
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.core\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.core\"

Modified: gnucash/branches/2.4/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/business/business-gnome/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/business/business-gnome/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -123,4 +123,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/branches/2.4/src/business/business-ledger/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/business/business-ledger/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/business/business-ledger/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -49,4 +49,4 @@
   ${GNOME_CFLAGS} \
   ${GLIB_CFLAGS}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.ledger\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.ledger\"

Modified: gnucash/branches/2.4/src/business/business-utils/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/business/business-utils/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/business/business-utils/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -63,4 +63,4 @@
 CLEANFILES = .scm-links
 DISTCLEANFILES = ${SCM_FILE_LINKS}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.utils\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.utils\"

Modified: gnucash/branches/2.4/src/business/dialog-tax-table/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/business/dialog-tax-table/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/business/dialog-tax-table/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -81,4 +81,4 @@
 CLEANFILES = .scm-links ${SCM_FILE_LINKS}
 MAINTAINERCLEANFILES = swig-dialog-tax-table.c
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.business.tax\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.business.tax\"

Modified: gnucash/branches/2.4/src/core-utils/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/core-utils/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/core-utils/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -85,7 +85,7 @@
 CLEANFILES = $(BUILT_SOURCES) .scm-links
 MAINTAINERCLEANFILES = swig-core-utils.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/branches/2.4/src/debug/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/debug/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/debug/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -1,3 +1,3 @@
 
 SUBDIRS = \
-  valgrind
\ No newline at end of file
+  valgrind

Modified: gnucash/branches/2.4/src/debug/valgrind/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/debug/valgrind/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/debug/valgrind/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/engine/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/engine/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/engine/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -225,4 +225,4 @@
 clean-local:
 	rm -rf gnucash
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.engine\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.engine\"

Modified: gnucash/branches/2.4/src/gnc-module/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/gnc-module/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/gnc-module/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/gnome/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/gnome/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/gnome/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -133,4 +133,4 @@
 CLEANFILES = gnucash.desktop
 MAINTAINERCLEANFILES = swig-gnome.c
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\"

Modified: gnucash/branches/2.4/src/gnome-search/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/gnome-search/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/gnome-search/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -66,4 +66,4 @@
 EXTRA_DIST = \
   ${glade_DATA}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.search\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.search\"

Modified: gnucash/branches/2.4/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/gnome-utils/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -265,4 +265,4 @@
 	rm -f ${DESTDIR}${pkgdatadir}/gnome
 endif
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui\"

Modified: gnucash/branches/2.4/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/gnome-utils/test/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/gnome-utils/test/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -36,7 +36,7 @@
 check_PROGRAMS = \
   test-link-module test-gnc-recurrence test-gnc-dialog
 
-INCLUDES= \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/engine/test-core \

Modified: gnucash/branches/2.4/src/html/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/html/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/html/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -108,4 +108,4 @@
 	rm -f ${DESTDIR}${pkgdatadir}/gnome
 endif
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.html\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.html\"

Modified: gnucash/branches/2.4/src/import-export/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -80,4 +80,4 @@
   $(glade_DATA) \
   generic-import-design.txt
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.i-e\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.i-e\"

Modified: gnucash/branches/2.4/src/import-export/aqbanking/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/aqbanking/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/aqbanking/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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 \
@@ -76,4 +76,4 @@
 
 EXTRA_DIST = ${ui_DATA} ${glade_DATA}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.aqbanking\"

Modified: gnucash/branches/2.4/src/import-export/csv/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/csv/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/csv/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -58,4 +58,4 @@
 
 EXTRA_DIST = $(ui_DATA) $(glade_DATA)
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.import.csv\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.import.csv\"

Modified: gnucash/branches/2.4/src/import-export/log-replay/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/log-replay/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/log-replay/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/import-export/ofx/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/ofx/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/ofx/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/qif/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/qif/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/import-export/qif-import/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/import-export/qif-import/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -108,4 +108,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/branches/2.4/src/libqof/qof/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/libqof/qof/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/libqof/qof/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -106,4 +106,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/branches/2.4/src/optional/gtkmm/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/optional/gtkmm/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/optional/gtkmm/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -40,4 +40,4 @@
 
 EXTRA_DIST = ${ui_DATA} ${glade_DATA}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.gui.gtkmm\"

Modified: gnucash/branches/2.4/src/pixmaps/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/pixmaps/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/pixmaps/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -168,4 +168,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/branches/2.4/src/plugins/bi_import/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/plugins/bi_import/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/plugins/bi_import/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -31,7 +31,7 @@
   ${QOF_LIBS} \
   ${GLIB_LIBS}
 
-AM_CFLAGS = \
+AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_builddir}/src \
   -I${top_srcdir}/src/gnome \
@@ -54,4 +54,4 @@
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.plugin.bi_import\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\"

Modified: gnucash/branches/2.4/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/register/ledger-core/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/register/ledger-core/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -56,4 +56,4 @@
   ${GLIB_CFLAGS}
 
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.ledger\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.ledger\"

Modified: gnucash/branches/2.4/src/register/register-core/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/register/register-core/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/register/register-core/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -68,4 +68,4 @@
 
 CLEANFILES = $(BUILT_SOURCES)
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.core\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.core\"

Modified: gnucash/branches/2.4/src/register/register-gnome/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/register/register-gnome/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/register/register-gnome/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -66,4 +66,4 @@
   ${GTK_XIM_FLAGS} \
   ${GNOME_CFLAGS}
 
-INCLUDES = -DG_LOG_DOMAIN=\"gnc.register.gnome\"
+AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.register.gnome\"

Modified: gnucash/branches/2.4/src/report/business-reports/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/business-reports/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/business-reports/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/locale-specific/us/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/locale-specific/us/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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/branches/2.4/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/report-gnome/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/report-gnome/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -106,4 +106,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/branches/2.4/src/report/report-system/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/report-system/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/report-system/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -95,4 +95,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/branches/2.4/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/standard-reports/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/standard-reports/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -82,4 +82,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/branches/2.4/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/stylesheets/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/stylesheets/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -74,4 +74,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/branches/2.4/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/branches/2.4/src/report/utility-reports/Makefile.am	2012-11-07 03:08:15 UTC (rev 22539)
+++ gnucash/branches/2.4/src/report/utility-reports/Makefile.am	2012-11-07 04:52:35 UTC (rev 22540)
@@ -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\"

More information about the gnucash-changes mailing list