--- src/editor/Makefile.am.orig	Tue Feb  6 16:31:19 2001
+++ src/editor/Makefile.am	Sun Jun 24 22:59:18 2001
@@ -9,12 +9,14 @@
 INCLUDES = -I$(top_srcdir)/src/mail
 
 CFLAGS = \
+	@CFLAGS@ \
 	@DMALLOC_CFLAGS@ \
 	@DEBUG_CFLAGS@ \
 	@GLIB_CFLAGS@
 
 
 CXXFLAGS = \
+	@CXXFLAGS@ \
 	@DMALLOC_CFLAGS@ \
 	@DEBUG_CFLAGS@ \
 	@GLIB_CFLAGS@
--- src/mail/Makefile.am.orig	Sat Mar 31 01:52:33 2001
+++ src/mail/Makefile.am	Sun Jun 24 22:59:18 2001
@@ -42,6 +42,7 @@
 	util.cpp
 
 CFLAGS = \
+	@CFLAGS@ \
 	@REGEX_CFLAGS@ \
 	@FACES_CFLAGS@ \
 	@GLIB_CFLAGS@ \
@@ -50,6 +51,7 @@
 	@DEBUG_CFLAGS@
 
 CXXFLAGS = \
+	@CXXFLAGS@ \
 	@REGEX_CFLAGS@ \
 	@FACES_CFLAGS@ \
 	@GLIB_CFLAGS@ \
--- src/ui/Makefile.am.orig	Sun Mar 25 19:35:02 2001
+++ src/ui/Makefile.am	Sun Jun 24 22:59:18 2001
@@ -48,6 +48,7 @@
 
 
 CFLAGS = \
+	@CFLAGS@ \
 	@REGEX_CFLAGS@ \
 	@FACES_CFLAGS@ \
 	@SOUND_CFLAGS@ \
@@ -57,6 +58,7 @@
 
 
 CXXFLAGS = \
+	@CXXFLAGS@ \
 	@REGEX_CFLAGS@ \
 	@FACES_CFLAGS@ \
 	@SOUND_CFLAGS@ \
