aboutsummaryrefslogtreecommitdiffstats
path: root/composer
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2000-10-16 07:18:24 +0800
committerDan Winship <danw@src.gnome.org>2000-10-16 07:18:24 +0800
commit50ceceaaef60df956983ead4e259442caec1de26 (patch)
tree9c2419c1390d954e1b853e1da3e58a564cd964e4 /composer
parentf020f430899c68b2ae2da01e7447617d09ccaff9 (diff)
downloadgsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.gz
gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.tar.zst
gsoc2013-evolution-50ceceaaef60df956983ead4e259442caec1de26.zip
Move a bunch of CPPFLAGS defs into INCLUDES so they doesn't override
any CPPFLAGS set at configure time svn path=/trunk/; revision=5935
Diffstat (limited to 'composer')
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/Makefile.am4
2 files changed, 6 insertions, 3 deletions
diff --git a/composer/ChangeLog b/composer/ChangeLog
index b625664ac7..670e2eb9c8 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-15 Dan Winship <danw@helixcode.com>
+
+ * Makefile.am: Move CPPFLAGS flags to INCLUDES to avoid bashing
+ any CPPFLAGS set at configure time.
+
2000-10-14 Jeffrey Stedfast <fejj@helixcode.com>
* e-msg-composer-attachment.c (set_entry): If the entry widget is
diff --git a/composer/Makefile.am b/composer/Makefile.am
index f6559b43a6..ea7407b326 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -44,11 +44,9 @@ INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(UNICODE_CFLAGS) \
+ -DE_GLADEDIR=\"$(gladedir)\" \
-DG_LOG_DOMAIN=\"composer\"
-CPPFLAGS = \
- -DE_GLADEDIR=\"$(gladedir)\"
-
libcomposer_la_SOURCES = \
$(IDL_GENERATED) \
e-msg-composer-address-dialog.c \