From f56cc90a1fa66b6a66a323d97fe5419e8ceff85c Mon Sep 17 00:00:00 2001
From: Dave Peticolas <dave@krondo.com>
Date: Sat, 10 Jun 2000 21:23:38 +0000
Subject: [PATCH] Adjust compilation arguments.

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@2450 57a11ea4-9604-0410-9ed3-97b8803252fd
---
 src/Makefile.am                | 2 +-
 src/Makefile.in                | 2 +-
 src/engine/Makefile.am         | 2 +-
 src/engine/Makefile.in         | 2 +-
 src/gnome/Makefile.am          | 2 +-
 src/gnome/Makefile.in          | 2 +-
 src/register/Makefile.am       | 2 +-
 src/register/Makefile.in       | 2 +-
 src/register/gnome/Makefile.am | 2 +-
 src/register/gnome/Makefile.in | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4ebad4c5db..c2df7fa7b9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,7 +62,7 @@ noinst_HEADERS = \
 EXTRA_DIST = \
   .cvsignore
 
-CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@
+CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES = \
   -I./engine \
diff --git a/src/Makefile.in b/src/Makefile.in
index 85363b2ba8..29a33a5498 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -139,7 +139,7 @@ noinst_HEADERS =    AccWindow.h   AdjBWindow.h   Destroy.h   EuroUtils.h   FileB
 EXTRA_DIST =    .cvsignore
 
 
-CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GNOME_CFLAGS@
+CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GNOME_CFLAGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES =    -I./engine   -I./guile   -I./register
 
diff --git a/src/engine/Makefile.am b/src/engine/Makefile.am
index 883d0981a6..87ad45b908 100644
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@@ -61,6 +61,6 @@ EXTRA_DIST = \
   design.txt \
   extensions.txt
 
-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS}
+CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES = -I..
diff --git a/src/engine/Makefile.in b/src/engine/Makefile.in
index f71e89de63..200ed53f80 100644
--- a/src/engine/Makefile.in
+++ b/src/engine/Makefile.in
@@ -135,7 +135,7 @@ noinst_HEADERS =    AccInfo.h   AccInfoP.h   Account.h   AccountP.h   BackendP.h
 EXTRA_DIST =    .cvsignore   README.query-api   design.txt   extensions.txt
 
 
-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS}
+CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES = -I..
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/src/gnome/Makefile.am b/src/gnome/Makefile.am
index d29f90db4c..daa494e23d 100644
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@@ -74,7 +74,7 @@ EXTRA_DIST = \
   gnc-dialogs.glade \
   gnucash.desktop
 
-CFLAGS += ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS}
+CFLAGS += ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES = \
   -I${top_srcdir}/src \
diff --git a/src/gnome/Makefile.in b/src/gnome/Makefile.in
index 7429840696..2b87e29b44 100644
--- a/src/gnome/Makefile.in
+++ b/src/gnome/Makefile.in
@@ -131,7 +131,7 @@ noinst_HEADERS =    account-tree.h   account-treeP.h   cursors.h   dialog-accoun
 EXTRA_DIST =    .cvsignore   gnc-dialogs.glade   gnucash.desktop
 
 
-CFLAGS =  ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS}
+CFLAGS =  ${GNOME_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES =    -I${top_srcdir}/src   -I${top_srcdir}/src/engine   -I${top_srcdir}/src/g-wrap   -I${top_srcdir}/src/guile   -I${top_srcdir}/src/register   -I${top_srcdir}/src/register/gnome
 
diff --git a/src/register/Makefile.am b/src/register/Makefile.am
index f028d8fc07..1d74529bcc 100644
--- a/src/register/Makefile.am
+++ b/src/register/Makefile.am
@@ -36,7 +36,7 @@ EXTRA_DIST = \
   .cvsignore \
   design.txt
 
-CFLAGS = @CFLAGS@ @GNOME_CFLAGS@
+CFLAGS = @CFLAGS@ ${GNOME_CFLAGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES = \
   -I${top_srcdir}/src \
diff --git a/src/register/Makefile.in b/src/register/Makefile.in
index 0e73ba7cea..b57c95742f 100644
--- a/src/register/Makefile.in
+++ b/src/register/Makefile.in
@@ -127,7 +127,7 @@ noinst_HEADERS =    QuickFill.h   basiccell.h   cellblock.h   combocell.h   date
 EXTRA_DIST =    .cvsignore   design.txt
 
 
-CFLAGS = @CFLAGS@ @GNOME_CFLAGS@
+CFLAGS = @CFLAGS@ ${GNOME_CFLAGS} ${GUILE_COMPILE_ARGS}
 
 INCLUDES =    -I${top_srcdir}/src   -I${top_srcdir}/src/engine   -I${top_srcdir}/src/guile   -I${top_srcdir}/src/register/gnome
 
diff --git a/src/register/gnome/Makefile.am b/src/register/gnome/Makefile.am
index a20ef3b0f7..9dbcc2455b 100644
--- a/src/register/gnome/Makefile.am
+++ b/src/register/gnome/Makefile.am
@@ -26,7 +26,7 @@ noinst_HEADERS = \
 EXTRA_DIST = \
   .cvsignore
 
-CFLAGS = @CFLAGS@ @GNOME_CFLAGS@
+CFLAGS = @CFLAGS@ ${GNOME_CFLAGS}
 
 INCLUDES = \
   -I${top_srcdir}/src \
diff --git a/src/register/gnome/Makefile.in b/src/register/gnome/Makefile.in
index 351a314ef6..47b4511beb 100644
--- a/src/register/gnome/Makefile.in
+++ b/src/register/gnome/Makefile.in
@@ -127,7 +127,7 @@ noinst_HEADERS =    gnucash-color.h   gnucash-cursor.h   gnucash-grid.h   gnucas
 EXTRA_DIST =    .cvsignore
 
 
-CFLAGS = @CFLAGS@ @GNOME_CFLAGS@
+CFLAGS = @CFLAGS@ ${GNOME_CFLAGS}
 
 INCLUDES =    -I${top_srcdir}/src   -I${top_srcdir}/src/engine   -I${top_srcdir}/src/guile   -I${top_srcdir}/src/register