Use AM_CFLAGS instead of CFLAGS in Makefile.am.

Fix some includes as a result. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5729 57a11ea4-9604-0410-9ed3-97b8803252fd
2025-02-25 18:55:30 -06:00 · 2001-10-26 12:10:06 +00:00 · 2001-10-26 12:10:06 +00:00 · 03ae286b49
commit 03ae286b49
parent 89754aed65
54 changed files with 72 additions and 74 deletions
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -84,8 +84,7 @@ EXTRA_DIST = \
  gnucash-make-guids.in \
  gnucash-run-script.in

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I./app-utils \
  -I./engine \
  -I./guile \
--- a/src/app-file/Makefile.am
+++ b/src/app-file/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = . gnome

 pkglib_LTLIBRARIES = libgncmod-app-file.la libgw-app-file.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
--- a/src/app-file/gnome/Makefile.am
+++ b/src/app-file/gnome/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = . #test

 pkglib_LTLIBRARIES = libgncmod-app-file-gnome.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
--- a/src/app-utils/Makefile.am
+++ b/src/app-utils/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = . test

 pkglib_LTLIBRARIES = libgncmod-app-utils.la libgw-app-utils.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/calculation \
  -I${top_srcdir}/src/engine \
--- a/src/app-utils/test/Makefile.am
+++ b/src/app-utils/test/Makefile.am
@ -30,8 +30,7 @@ noinst_PROGRAMS = \

 EXTRA_DIST = test-load-module

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/test-core \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/engine/test-core \
--- a/src/backend/file/Makefile.am
+++ b/src/backend/file/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = . test

 pkglib_LTLIBRARIES = libgncmod-backend-file.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I.. -I../.. \
  -I../../engine \
  -I../../gnc-module \
--- a/src/backend/file/test/Makefile.am
+++ b/src/backend/file/test/Makefile.am
@ -54,7 +54,7 @@ LDADD = -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
        ./libgnc-test-file-stuff.la \
        -lltdl

-CFLAGS = \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/test-core \
  -I${top_srcdir}/src/engine \
--- a/src/backend/file/test/test-load-example-account.c
+++ b/src/backend/file/test/test-load-example-account.c
@ -1,4 +1,5 @@
 #include <glib.h>
+#include <guile/gh.h>
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@ -7,6 +8,7 @@
 #include <unistd.h>
 #include <dirent.h>

+#include "gnc-module.h"
 #include "gnc-engine-util.h"
 #include "io-gncxml-v2.h"
 #include "gnc-engine.h"
--- a/src/backend/file/test/test-load-xml2.c
+++ b/src/backend/file/test/test-load-xml2.c
@ -1,4 +1,5 @@
 #include <glib.h>
+#include <guile/gh.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/types.h>
--- a/src/backend/file/test/test-xml-account.c
+++ b/src/backend/file/test/test-xml-account.c
@ -1,10 +1,12 @@
 #include "config.h"

 #include <glib.h>
+#include <guile/gh.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

+#include "gnc-module.h"
 #include "gnc-xml-helper.h"
 #include "gnc-xml.h"
 #include "gnc-engine-util.h"
--- a/src/backend/file/test/test-xml-commodity.c
+++ b/src/backend/file/test/test-xml-commodity.c
@ -1,10 +1,12 @@
 #include "config.h"

 #include <glib.h>
+#include <guile/gh.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

+#include "gnc-module.h"
 #include "gnc-xml-helper.h"
 #include "gnc-xml.h"
 #include "gnc-engine-util.h"
--- a/src/backend/file/test/test-xml-pricedb.c
+++ b/src/backend/file/test/test-xml-pricedb.c
@ -1,10 +1,12 @@
 #include "config.h"

 #include <glib.h>
+#include <guile/gh.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

+#include "gnc-module.h"
 #include "gnc-xml-helper.h"
 #include "gnc-xml.h"
 #include "gnc-engine-util.h"
--- a/src/backend/file/test/test-xml-transaction.c
+++ b/src/backend/file/test/test-xml-transaction.c
@ -1,6 +1,7 @@
 #include "config.h"

 #include <glib.h>
+#include <guile/gh.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@ -9,6 +10,7 @@
 #include <dirent.h>
 #include <sys/stat.h>

+#include "gnc-module.h"
 #include "gnc-xml-helper.h"
 #include "gnc-xml.h"
 #include "gnc-engine-util.h"
--- a/src/backend/net/Makefile.am
+++ b/src/backend/net/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = .

 pkglib_LTLIBRARIES = libgncmod-backend-net.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I.. -I../.. \
  -I../../engine \
  -I../../gnc-module \
--- a/src/backend/postgres/Makefile.am
+++ b/src/backend/postgres/Makefile.am
@ -48,7 +48,7 @@ EXTRA_DIST = \
  table-version.sql \
  demo.c 

-CFLAGS = @CFLAGS@ -I.. -I../.. -I../../engine -I../../gnc-module ${GLIB_CFLAGS}
+AM_CFLAGS = -I.. -I../.. -I../../engine -I../../gnc-module ${GLIB_CFLAGS}

 # Some of the required C files are built with the m4 pre-processor
 # As a result, we need to manually specify dependencies, clean targets.
--- a/src/backend/postgres/test/Makefile.am
+++ b/src/backend/postgres/test/Makefile.am
@ -27,7 +27,7 @@ LDADD = -L${top_srcdir}/src/gnc-module -L${top_srcdir}/src/gnc-module/.libs \
 	${top_srcdir}/src/backend/file/libgncmod-backend-file.la \
        -lltdl

-CFLAGS = \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/test-core \
  -I${top_srcdir}/src/engine \
--- a/src/backend/postgres/test/test-db.c
+++ b/src/backend/postgres/test/test-db.c
@ -1,4 +1,5 @@
 #include <glib.h>
+#include <guile/gh.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@ -7,6 +8,7 @@
 #include "Backend.h"
 #include "TransLog.h"
 #include "gnc-engine.h"
+#include "gnc-engine-util.h"
 #include "gnc-module.h"
 #include "gnc-session.h"

--- a/src/backend/rpc/Makefile.am
+++ b/src/backend/rpc/Makefile.am
@ -43,8 +43,8 @@ EXTRA_DIST = \
  $(RPCGEN_SRCS)

 LDADD = -lpthread
-CFLAGS = \
-  @CFLAGS@ \
+
+AM_CFLAGS = \
  -I.. -I../../engine -I../../gnc-module ${GLIB_CFLAGS} -DGNCACCT_COMMODITY

 #RPCGEN=rpcgen -M
--- a/src/calculation/Makefile.am
+++ b/src/calculation/Makefile.am
@ -24,4 +24,4 @@ EXTRA_DIST = \
  numeric_ops.c \
  numeric_ops.h

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS}
--- a/src/engine/Makefile.am
+++ b/src/engine/Makefile.am
@ -3,7 +3,7 @@ SUBDIRS = . test-core test
 pkglib_LTLIBRARIES = \
  libgncmod-engine.la libgw-glib.la libgw-engine.la libgw-kvp.la

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GNUCASH_ENGINE_BASE_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GNUCASH_ENGINE_BASE_CFLAGS}

 libgncmod_engine_la_SOURCES = \
  Account.c \
--- a/src/engine/test-core/Makefile.am
+++ b/src/engine/test-core/Makefile.am
@ -14,8 +14,7 @@ libgncmod_test_engine_la_LIBADD = \

 noinst_HEADERS=test-engine-stuff.h

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/test-core \
  -I${top_srcdir}/src/engine \
--- a/src/engine/test/Makefile.am
+++ b/src/engine/test/Makefile.am
@ -1,6 +1,5 @@

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/test-core \
  -I.. \
--- a/src/experimental/cgi-bin/Makefile.am
+++ b/src/experimental/cgi-bin/Makefile.am
@ -5,7 +5,7 @@ bin_PROGRAMS = hello hello2 fastcgi-hello hello3 gnc-server

 EXTRA_DIST = .cvsignore

-CFLAGS = @CFLAGS@ -I../../engine ${GLIB_CFLAGS}
+AM_CFLAGS = -I../../engine ${GLIB_CFLAGS}

 LDADD = 			\
  ../../engine/libgncengine.la 	\
--- a/src/gnc-module/Makefile.am
+++ b/src/gnc-module/Makefile.am
@ -1,6 +1,6 @@
 SUBDIRS = . test

-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}
+AM_CFLAGS = ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} ${GUILE_INCS}

 lib_LTLIBRARIES = libgncmodule.la 
 pkglib_LTLIBRARIES = libgw-gnc-module.la
--- a/src/gnc-module/test/Makefile.am
+++ b/src/gnc-module/test/Makefile.am
@ -1,7 +1,8 @@
 SUBDIRS = mod-foo mod-bar mod-baz misc-mods

 LDADD = ../libgncmodule.la ${GLIB_LIBS} -lltdl
-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} -I../ ${GUILE_INCS}
+
+AM_CFLAGS = ${GLIB_CFLAGS} -I../ ${GUILE_INCS}

 TESTS = \
  test-load-c \
--- a/src/gnc-module/test/misc-mods/Makefile.am
+++ b/src/gnc-module/test/misc-mods/Makefile.am
@ -1,5 +1,6 @@
-CFLAGS=@CFLAGS@ ${GLIB_CFLAGS} -I../../
-LDADD=-L../.. -L../../.libs
+AM_CFLAGS = ${GLIB_CFLAGS} -I../../
+
+LDADD = -L../.. -L../../.libs

 checklibdir=${PWD}
 checklib_LTLIBRARIES=libfuturemodsys.la libincompatdep.la libagedver.la
--- a/src/gnc-module/test/mod-bar/Makefile.am
+++ b/src/gnc-module/test/mod-bar/Makefile.am
@ -1,5 +1,4 @@
-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I../.. \
  ${G_WRAP_COMPILE_ARGS} \
  ${GUILE_INCS} \
--- a/src/gnc-module/test/mod-baz/Makefile.am
+++ b/src/gnc-module/test/mod-baz/Makefile.am
@ -1,4 +1,9 @@
-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} ${G_WRAP_COMPILE_ARGS} -I../mod-foo -I../.. ${GUILE_INCS}
+AM_CFLAGS = \
+  -I../.. \
+  -I../mod-foo \
+  ${GLIB_CFLAGS} \
+  ${G_WRAP_COMPILE_ARGS} \
+  ${GUILE_INCS}

 checklibdir = ${PWD}
 checklib_LTLIBRARIES = libbaz.la libgncmodbaz.la
--- a/src/gnc-module/test/mod-foo/Makefile.am
+++ b/src/gnc-module/test/mod-foo/Makefile.am
@ -1,5 +1,4 @@
-CFLAGS=\
-  @CFLAGS@ \
+AM_CFLAGS=\
  -I${top_srcdir}/src/gnc-module \
  ${GUILE_INCS} \
  ${G_WRAP_COMPILE_ARGS} \
--- a/src/gnome-utils/Makefile.am
+++ b/src/gnome-utils/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = . test

 pkglib_LTLIBRARIES = libgncmod-gnome-utils.la libgw-gnome-utils.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/network-utils \
--- a/src/gnome-utils/test/Makefile.am
+++ b/src/gnome-utils/test/Makefile.am
@ -29,4 +29,4 @@ noinst_PROGRAMS = \

 #EXTRA_DIST = test-load-module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
--- a/src/gnome/Makefile.am
+++ b/src/gnome/Makefile.am
@ -87,7 +87,7 @@ EXTRA_DIST = \
  gnucash.keys.in \
  gnucash.mime

-CFLAGS = @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/calculation \
  -I${top_srcdir}/src/engine \
--- a/src/import-export/binary-import/Makefile.am
+++ b/src/import-export/binary-import/Makefile.am
@ -3,8 +3,7 @@ DIST_SUBDIRS = test

 pkglib_LTLIBRARIES = libgncmod-binary-import.la libgw-binary-import.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/app-utils \
--- a/src/import-export/binary-import/test/Makefile.am
+++ b/src/import-export/binary-import/test/Makefile.am
@ -37,4 +37,4 @@ noinst_PROGRAMS = \

 #EXTRA_DIST = test-load-module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
--- a/src/import-export/qif-import/Makefile.am
+++ b/src/import-export/qif-import/Makefile.am
@ -36,7 +36,7 @@ gncscm_DATA = \
 gladedir = ${GNC_GLADE_DIR}
 glade_DATA = qif.glade

-CFLAGS = @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/gnc-module \
--- a/src/import-export/qif-io-core/Makefile.am
+++ b/src/import-export/qif-io-core/Makefile.am
@ -1,7 +1,8 @@
 SUBDIRS = . test

 pkglib_LTLIBRARIES = libgncmod-qifiocore.la
-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}

 libgncmod_qifiocore_la_SOURCES = gncmod-qifiocore.c
 libgncmod_qifiocore_la_LDFLAGS = -module
--- a/src/import-export/qif-io-core/test/Makefile.am
+++ b/src/import-export/qif-io-core/test/Makefile.am
@ -1,5 +1,6 @@
 LDADD=${top_srcdir}/src/gnc-module/libgncmodule.la ${GLIB_LIBS} -lltdl
-CFLAGS=@CFLAGS@ -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS} 
+
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS} 

 TESTS=test-load-module test-parser test-reader test-file-formats \
 test-import-phase-1
--- a/src/network-utils/Makefile.am
+++ b/src/network-utils/Makefile.am
@ -2,8 +2,7 @@ SUBDIRS = . test

 pkglib_LTLIBRARIES = libgncmod-network-utils.la

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/gnc-module \
  ${GLIB_CFLAGS} \
  ${GHTTP_CFLAGS} \
--- a/src/network-utils/test/Makefile.am
+++ b/src/network-utils/test/Makefile.am
@ -19,8 +19,7 @@ noinst_PROGRAMS = \

 #EXTRA_DIST = test-load-module

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src/test-core \
  -I.. \
  ${GLIB_CFLAGS}
--- a/src/optional/swig/Makefile.am
+++ b/src/optional/swig/Makefile.am
@ -27,9 +27,7 @@ EXTRA_DIST = \
  perl5_typemaps.i \
  gnucash-swig-defines.c

-# CFLAGS = @CFLAGS@ -Dbool=char
-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I@PERLINCL@/CORE \
  ${GNOME_INCLUDEDIR} \
  -I${top_srcdir}/src/engine
@ -40,7 +38,7 @@ CFLAGS = \

 libgncswig_la_LIBADD = \
  -lgncengine -lxml -lgnc_postgres \
-  @GLIB_LIBS@ 
+  ${GLIB_LIBS} 


 SWIG_INPUT_HDRS := \
--- a/src/register/ledger-core/Makefile.am
+++ b/src/register/ledger-core/Makefile.am
@ -24,8 +24,7 @@ noinst_HEADERS = \

 libgncmod_ledger_core_la_LDFLAGS = -module

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/guile \
--- a/src/register/ledger-core/test/Makefile.am
+++ b/src/register/ledger-core/test/Makefile.am
@ -37,4 +37,4 @@ noinst_PROGRAMS = \

 #EXTRA_DIST = test-load-module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS}
--- a/src/register/register-core/Makefile.am
+++ b/src/register/register-core/Makefile.am
@ -43,8 +43,7 @@ gncinclude_HEADERS = \
 EXTRA_DIST = \
  .cvsignore 

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/app-utils \
--- a/src/register/register-core/test/Makefile.am
+++ b/src/register/register-core/test/Makefile.am
@ -31,4 +31,4 @@ noinst_PROGRAMS = \

 #EXTRA_DIST = test-load-module

-CFLAGS = @CFLAGS@ ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
+AM_CFLAGS = ${GLIB_CFLAGS} -I${top_srcdir}/src/test-core -I..
--- a/src/register/register-gnome/Makefile.am
+++ b/src/register/register-gnome/Makefile.am
@ -40,8 +40,7 @@ noinst_HEADERS = \
 EXTRA_DIST = \
  .cvsignore

-CFLAGS = \
-  @CFLAGS@ \
+AM_CFLAGS = \
  -I${top_srcdir}/src \
  -I${top_srcdir}/src/engine \
  -I${top_srcdir}/src/guile \
--- a/src/register/register-gnome/test/Makefile.am
+++ b/src/register/register-gnome/test/Makefile.am
@ -34,5 +34,5 @@ noinst_PROGRAMS = \

 #EXTRA_DIST = test-load-module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS} 
+AM_CFLAGS = -I${top_srcdir}/src/test-core -I.. ${GLIB_CFLAGS} 

--- a/src/report/locale-specific/Makefile.am
+++ b/src/report/locale-specific/Makefile.am
@ -1 +1 @@
-SUBDIRS=us
+SUBDIRS = us
--- a/src/report/locale-specific/us/Makefile.am
+++ b/src/report/locale-specific/us/Makefile.am
@ -7,7 +7,7 @@ libgncmod_locale_reports_us_la_SOURCES = \

 libgncmod_locale_reports_us_la_LDFLAGS = -module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}

 .scm-links:
 	rm -f gnucash report locale-specific us 
--- a/src/report/report-system/Makefile.am
+++ b/src/report/report-system/Makefile.am
@ -17,11 +17,7 @@ libgncmod_report_system_la_LIBADD = \
  ${GUILE_LIBS} 


-CFLAGS = \
-  @CFLAGS@ \
-  -I${top_srcdir}/src/gnc-module \
-  ${GLIB_CFLAGS} \
-  ${GUILE_INCS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}

 .scm-links:
 	rm -f gnucash report
--- a/src/report/standard-reports/Makefile.am
+++ b/src/report/standard-reports/Makefile.am
@ -7,7 +7,7 @@ libgncmod_standard_reports_la_SOURCES = \

 libgncmod_standard_reports_la_LDFLAGS = -module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}

 .scm-links:
 	rm -f gnucash report
--- a/src/report/stylesheets/Makefile.am
+++ b/src/report/stylesheets/Makefile.am
@ -7,7 +7,7 @@ libgncmod_stylesheets_la_SOURCES = \

 libgncmod_stylesheets_la_LDFLAGS=-module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}

 .scm-links:
 	rm -f gnucash report
--- a/src/report/utility-reports/Makefile.am
+++ b/src/report/utility-reports/Makefile.am
@ -7,7 +7,7 @@ libgncmod_utility_reports_la_SOURCES = \

 libgncmod_utility_reports_la_LDFLAGS = -module

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GUILE_INCS} ${GLIB_CFLAGS}

 .scm-links:
 	rm -f gnucash report
--- a/src/tax/us/Makefile.am
+++ b/src/tax/us/Makefile.am
@ -7,7 +7,7 @@ libgncmod_tax_us_la_SOURCES = \

 libgncmod_tax_us_la_LDFLAGS = -module

-CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS} ${GUILE_INCS}

 .scm-links:
 	rm -f gnucash tax
--- a/src/test-core/Makefile.am
+++ b/src/test-core/Makefile.am
@ -8,4 +8,4 @@ libgncmod_test_la_LIBADD = \

 noinst_HEADERS=test-stuff.h

-CFLAGS = @CFLAGS@ -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS}
+AM_CFLAGS = -I${top_srcdir}/src/gnc-module ${GLIB_CFLAGS}