r23391 - gnucash/trunk - Replace all uses of GUILE_INCS with GUILE_CFLAGS

Geert Janssens gjanssens at code.gnucash.org
Wed Nov 13 10:51:24 EST 2013 

Author: gjanssens
Date: 2013-11-13 10:51:24 -0500 (Wed, 13 Nov 2013)
New Revision: 23391
Trac: http://svn.gnucash.org/trac/changeset/23391

Modified:
   gnucash/trunk/configure.ac
   gnucash/trunk/src/app-utils/Makefile.am
   gnucash/trunk/src/app-utils/test/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/test/Makefile.am
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/business/business-gnome/Makefile.am
   gnucash/trunk/src/core-utils/Makefile.am
   gnucash/trunk/src/core-utils/test/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/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-utils/test/Makefile.am
   gnucash/trunk/src/gnome/Makefile.am
   gnucash/trunk/src/html/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/qif-import/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/register-core/Makefile.am
   gnucash/trunk/src/report/locale-specific/us/Makefile.am
   gnucash/trunk/src/report/report-gnome/Makefile.am
   gnucash/trunk/src/report/report-gnome/test/Makefile.am
   gnucash/trunk/src/report/report-system/Makefile.am
   gnucash/trunk/src/report/report-system/test/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
Log:
Replace all uses of GUILE_INCS with GUILE_CFLAGS

This cleans up some left overs from before guile had a .pc file

Modified: gnucash/trunk/configure.ac
===================================================================
--- gnucash/trunk/configure.ac	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/configure.ac	2013-11-13 15:51:24 UTC (rev 23391)
@@ -420,19 +420,8 @@
 
 
 ### --------------------------------------------------------------------------
-### Guile version checks (should this be something other than the Gnome check?)
+### Guile version checks
 
-# If the user has given these values, cache them to override the
-# detected values.
-if test "x$GUILE_LIBS" != x; then
-  saved_GUILE_LIBS="$GUILE_LIBS"
-fi
-if test "x$GUILE_INCS" != x; then
-  saved_GUILE_INCS="$GUILE_INCS"
-fi
-GUILE_LIBS=""
-
-# Guile checks:
 # - check minimum version
 # - determine GUILE_CFLAGS and GUILE_LIBS
 # - test if guile module (www main) is present on the system
@@ -466,18 +455,6 @@
   ])])
 ])
 
-# Restore user defined guile settings if necessary
-GUILE_INCS="${GUILE_CFLAGS}"
-if test "x$saved_GUILE_LIBS" != x; then
-  GUILE_LIBS="$saved_GUILE_LIBS"
-fi
-if test "x$saved_GUILE_INCS" != x; then
-  GUILE_INCS="$saved_GUILE_INCS"
-fi
-
-AS_SCRUB_INCLUDE(GUILE_INCS)
-AC_SUBST(GUILE_INCS)
-
 AM_CONDITIONAL(GNC_HAVE_GUILE_WWW, test "${gnc_have_guile_www}" = yes)
 
 ### --------------------------------------------------------------------------

Modified: gnucash/trunk/src/app-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/app-utils/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -30,7 +30,7 @@
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/backend/xml \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${PYTHON_CPPFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \

Modified: gnucash/trunk/src/app-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/app-utils/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/app-utils/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -62,5 +62,5 @@
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}

Modified: gnucash/trunk/src/backend/dbi/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/dbi/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/backend/dbi/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -15,7 +15,7 @@
   -DTEST_MYSQL_URL=\"${TEST_MYSQL_URL}\" \
   -DTEST_PGSQL_URL=\"${TEST_PGSQL_URL}\" \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 LDADD = ${top_builddir}/src/test-core/libtest-core.la \
         ${top_builddir}/src/gnc-module/libgnc-module.la \

Modified: gnucash/trunk/src/backend/sql/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/backend/sql/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -16,7 +16,7 @@
   -I${top_srcdir}/lib/libc\
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${WARN_CFLAGS}
 
 libgnc_backend_sql_la_SOURCES = \

Modified: gnucash/trunk/src/backend/sql/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/sql/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/backend/sql/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -47,7 +47,7 @@
   -I${top_srcdir}/src/backend/sql \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 AM_CPPFLAGS += -DG_LOG_DOMAIN=\"gnc.backend.sql\"
 

Modified: gnucash/trunk/src/backend/xml/test/Makefile.am
===================================================================
--- gnucash/trunk/src/backend/xml/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/backend/xml/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -247,7 +247,7 @@
   -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 EXTRA_DIST = \
   grab-types.pl \

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/bin/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -18,7 +18,7 @@
   -I${top_builddir}/src \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_MAC_CFLAGS}
 
 SUFFIXES = .rc

Modified: gnucash/trunk/src/business/business-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/business/business-gnome/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/business/business-gnome/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -21,7 +21,7 @@
   -I${top_srcdir}/src/libqof/qof \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 libgncmod_business_gnome_la_SOURCES = \
   business-options-gnome.c \

Modified: gnucash/trunk/src/core-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/core-utils/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -50,7 +50,7 @@
 endif
 
 AM_CPPFLAGS = \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_MAC_CFLAGS} \
   ${QOF_CFLAGS} \

Modified: gnucash/trunk/src/core-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/core-utils/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/core-utils/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -5,7 +5,7 @@
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/core-utils \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \

Modified: gnucash/trunk/src/engine/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/engine/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -10,7 +10,7 @@
 	-I${top_srcdir}/src/gnc-module \
 	-I${top_srcdir}/src/libqof/qof \
 	${GLIB_CFLAGS} \
-	${GUILE_INCS}
+	${GUILE_CFLAGS}
 
 libgncmod_engine_la_SOURCES = \
   Account.c \

Modified: gnucash/trunk/src/engine/test/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/engine/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -11,7 +11,7 @@
   -I${top_srcdir}/src/engine/test-core \
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/core-utils \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \

Modified: gnucash/trunk/src/engine/test-core/Makefile.am
===================================================================
--- gnucash/trunk/src/engine/test-core/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/engine/test-core/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -23,4 +23,4 @@
   -I${top_srcdir}/src/engine \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}

Modified: gnucash/trunk/src/gnc-module/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnc-module/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -6,7 +6,7 @@
    -I${top_srcdir}/src/core-utils \
   -I${top_srcdir}/src/libqof/qof \
    ${GLIB_CFLAGS} \
-   ${GUILE_INCS}
+   ${GUILE_CFLAGS}
 
 lib_LTLIBRARIES = libgnc-module.la
 

Modified: gnucash/trunk/src/gnc-module/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnc-module/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -10,7 +10,7 @@
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/test-core \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 TESTS = \

Modified: gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnc-module/test/misc-mods/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -2,7 +2,7 @@
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 LDADD = -L../.. -L../../.libs
 

Modified: gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnc-module/test/mod-bar/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 PWD := $(shell pwd)

Modified: gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnc-module/test/mod-baz/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -3,7 +3,7 @@
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/gnc-module/test/mod-foo \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 PWD := $(shell pwd)
 check_LTLIBRARIES = libbaz.la libgncmodbaz.la

Modified: gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am
===================================================================
--- gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnc-module/test/mod-foo/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -1,7 +1,7 @@
 AM_CPPFLAGS=\
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 PWD := $(shell pwd)

Modified: gnucash/trunk/src/gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnome/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -141,7 +141,7 @@
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/src/libqof/qof \
   ${LIBXML2_CFLAGS} \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   $(GLIB_CFLAGS) \
   ${GTK_MAC_CFLAGS}

Modified: gnucash/trunk/src/gnome-search/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-search/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnome-search/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -8,7 +8,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
 

Modified: gnucash/trunk/src/gnome-utils/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnome-utils/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -17,7 +17,7 @@
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GNOME_KEYRING_CFLAGS} \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${QOF_CFLAGS} \
   ${LIBGDA_CFLAGS} \
   ${LIBXML2_CFLAGS} \

Modified: gnucash/trunk/src/gnome-utils/test/Makefile.am
===================================================================
--- gnucash/trunk/src/gnome-utils/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/gnome-utils/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -46,7 +46,7 @@
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 LDADD = \
   ${GNOME_LIBS} \

Modified: gnucash/trunk/src/html/Makefile.am
===================================================================
--- gnucash/trunk/src/html/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/html/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -14,7 +14,7 @@
   -I${top_srcdir}/lib/libc \
   ${QOF_CFLAGS} \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GNOME_CFLAGS} \
   ${WEBKIT_CFLAGS}

Modified: gnucash/trunk/src/import-export/csv-export/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-export/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/import-export/csv-export/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -42,7 +42,7 @@
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/lib \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   $(GOFFICE_CFLAGS)
 

Modified: gnucash/trunk/src/import-export/csv-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/csv-import/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/import-export/csv-import/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -46,7 +46,7 @@
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/lib/libc \
   -I${top_srcdir}/lib \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   $(GOFFICE_CFLAGS)
 

Modified: gnucash/trunk/src/import-export/qif/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/import-export/qif/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -34,6 +34,6 @@
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/src/libqof/qof \
   ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 AM_CPPFLAGS += -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	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/import-export/qif/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -7,7 +7,7 @@
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/src/import-export/qif \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \

Modified: gnucash/trunk/src/import-export/qif-import/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/qif-import/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/import-export/qif-import/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -60,7 +60,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS}
 

Modified: gnucash/trunk/src/import-export/test/Makefile.am
===================================================================
--- gnucash/trunk/src/import-export/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/import-export/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -6,7 +6,7 @@
   -I${top_srcdir}/src/app-utils \
   -I${top_srcdir}/src/import-export \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \

Modified: gnucash/trunk/src/register/ledger-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/ledger-core/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/register/ledger-core/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -50,7 +50,7 @@
   -I${top_srcdir}/src/register/register-core \
   -I${top_srcdir}/src/register/register-gnome \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GNOME_CFLAGS}

Modified: gnucash/trunk/src/register/register-core/Makefile.am
===================================================================
--- gnucash/trunk/src/register/register-core/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/register/register-core/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -61,7 +61,7 @@
   -I${top_srcdir}/src/gnc-module \
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
 

Modified: gnucash/trunk/src/report/locale-specific/us/Makefile.am
===================================================================
--- gnucash/trunk/src/report/locale-specific/us/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/locale-specific/us/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -18,7 +18,7 @@
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} ${GLIB_CFLAGS}
+  ${GUILE_CFLAGS} ${GLIB_CFLAGS}
 
 ## This is unused and therefore no longer installed and/or loaded
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/locale-specific

Modified: gnucash/trunk/src/report/report-gnome/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/report-gnome/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -14,7 +14,7 @@
   -I${top_srcdir}/src/html \
   -I${top_srcdir}/src/report/report-system \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GTK_CFLAGS} \
   ${GLIB_CFLAGS}
 

Modified: gnucash/trunk/src/report/report-gnome/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-gnome/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/report-gnome/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -4,7 +4,7 @@
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \

Modified: gnucash/trunk/src/report/report-system/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/report-system/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -34,7 +34,7 @@
   -I${top_srcdir}/src/app-utils \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS} \
-  ${GUILE_INCS}
+  ${GUILE_CFLAGS}
 
 gncscmdir = ${GNC_SHAREDIR}/scm
 gncscm_DATA = \

Modified: gnucash/trunk/src/report/report-system/test/Makefile.am
===================================================================
--- gnucash/trunk/src/report/report-system/test/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/report-system/test/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -4,7 +4,7 @@
   -I${top_srcdir}/src/test-core \
   -I${top_srcdir}/src/libqof/qof \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 LDADD = \

Modified: gnucash/trunk/src/report/standard-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/standard-reports/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/standard-reports/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -15,7 +15,7 @@
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS}
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/

Modified: gnucash/trunk/src/report/stylesheets/Makefile.am
===================================================================
--- gnucash/trunk/src/report/stylesheets/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/stylesheets/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -29,7 +29,7 @@
   -I${top_srcdir}/src/gnome-utils \
   -I${top_srcdir}/src/report/report-gnome \
   -I${top_srcdir}/src/libqof/qof \
-  ${GUILE_INCS} \
+  ${GUILE_CFLAGS} \
   ${GLIB_CFLAGS} \
   ${GTK_CFLAGS}
 

Modified: gnucash/trunk/src/report/utility-reports/Makefile.am
===================================================================
--- gnucash/trunk/src/report/utility-reports/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/report/utility-reports/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -14,7 +14,7 @@
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GUILE_INCS} ${GLIB_CFLAGS}
+  ${GUILE_CFLAGS} ${GLIB_CFLAGS}
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/report/
 gncscmmod_DATA = \

Modified: gnucash/trunk/src/tax/us/Makefile.am
===================================================================
--- gnucash/trunk/src/tax/us/Makefile.am	2013-11-13 15:50:59 UTC (rev 23390)
+++ gnucash/trunk/src/tax/us/Makefile.am	2013-11-13 15:51:24 UTC (rev 23391)
@@ -14,7 +14,7 @@
 AM_CPPFLAGS = \
   -I${top_srcdir}/src \
   -I${top_srcdir}/src/gnc-module \
-  ${GLIB_CFLAGS} ${GUILE_INCS}
+  ${GLIB_CFLAGS} ${GUILE_CFLAGS}
 
 gncscmmoddir = ${GNC_SHAREDIR}/guile-modules/gnucash/tax
 gncscmmod_DATA = us.scm de_DE.scm

More information about the gnucash-changes mailing list