aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--addressbook/ChangeLog12
-rw-r--r--addressbook/contact-editor/Makefile.am10
-rw-r--r--addressbook/gui/component/Makefile.am3
-rw-r--r--addressbook/gui/component/select-names/Makefile.am3
-rw-r--r--addressbook/gui/contact-editor/Makefile.am10
-rw-r--r--addressbook/gui/widgets/Makefile.am4
-rw-r--r--addressbook/printing/Makefile.am12
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/Makefile.am3
-rw-r--r--composer/ChangeLog5
-rw-r--r--composer/Makefile.am4
11 files changed, 37 insertions, 34 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 50e8296bff..e68eca698a 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,15 @@
+2000-10-15 Dan Winship <danw@helixcode.com>
+
+ * gui/component/select-names/Makefile.am:
+ * gui/component/Makefile.am: Remove CPPFLAGS since they just
+ duplicate flags that were already in INCLUDES.
+
+ * printing/Makefile.am (ecpsdir):
+ * gui/widgets/Makefile.am:
+ * contact-editor/Makefile.am: Move -D flags from CPPFLAGS to
+ INCLUDES so they don't override any CPPFLAGS set at configure
+ time.
+
2000-10-14 Michael Meeks <michael@helixcode.com>
* gui/component/addressbook.c (control_activate): if we are in
diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am
index a424cbc55d..1016d38301 100644
--- a/addressbook/contact-editor/Makefile.am
+++ b/addressbook/contact-editor/Makefile.am
@@ -1,9 +1,3 @@
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTIONDIR=\""$(evolutiondir)"\"
-
INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
@@ -11,6 +5,10 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
-I$(top_srcdir)/widgets/e-table \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
-DG_LOG_DOMAIN=\"contact-editor\"
noinst_LIBRARIES = \
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 63125a42f2..642c7f91c7 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -1,8 +1,5 @@
SUBDIRS = select-names
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \
diff --git a/addressbook/gui/component/select-names/Makefile.am b/addressbook/gui/component/select-names/Makefile.am
index 6116b36b06..ef8d0bf14f 100644
--- a/addressbook/gui/component/select-names/Makefile.am
+++ b/addressbook/gui/component/select-names/Makefile.am
@@ -20,9 +20,6 @@ oaf_DATA = evolution-addressbook-select-names.oafinfo
#
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index a424cbc55d..1016d38301 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -1,9 +1,3 @@
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
- -DDATADIR=\""$(datadir)"\" \
- -DEVOLUTION_DATADIR=\""$(datadir)"\" \
- -DEVOLUTIONDIR=\""$(evolutiondir)"\"
-
INCLUDES = \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
@@ -11,6 +5,10 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/ \
-I$(top_srcdir)/addressbook/backend \
-I$(top_srcdir)/widgets/e-table \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+ -DDATADIR=\""$(datadir)"\" \
+ -DEVOLUTION_DATADIR=\""$(datadir)"\" \
+ -DEVOLUTIONDIR=\""$(evolutiondir)"\" \
-DG_LOG_DOMAIN=\"contact-editor\"
noinst_LIBRARIES = \
diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am
index c0c4c7d488..03bd9a4d6e 100644
--- a/addressbook/gui/widgets/Makefile.am
+++ b/addressbook/gui/widgets/Makefile.am
@@ -1,8 +1,6 @@
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"e-minicard\" \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend/ebook \
-I$(top_srcdir)/addressbook/contact-editor \
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index 959f8ff924..a3156db610 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -11,19 +11,17 @@ glade_DATA = \
e-contact-print.glade \
e-contact-print.glade.h
-CPPFLAGS = \
+INCLUDES = \
+ $(GNOME_INCLUDEDIR) \
+ -DG_LOG_DOMAIN=\"addressbook-printing\" \
+ -I$(top_srcdir)/addressbook \
+ -I$(top_srcdir) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(GNOME_PRINT_CFLAGS) \
$(BONOBO_GNOME_CFLAGS)
-INCLUDES = \
- $(GNOME_INCLUDEDIR) \
- -DG_LOG_DOMAIN=\"addressbook-printing\" \
- -I$(top_srcdir)/addressbook \
- -I$(top_srcdir)
-
noinst_LIBRARIES = \
libecontactprint.a
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index afda2ef5cd..3f94458346 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-15 Dan Winship <danw@helixcode.com>
+
+ * gui/Makefile.am: Remove CPPFLAGS def since the -D there was
+ already in INCLUDES
+
2000-10-14 Ettore Perazzoli <ettore@helixcode.com>
* gui/evolution-calendar.oafinfo: Added an
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index de1f72b2c6..9b5a81a68a 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -4,9 +4,6 @@ help_base = $(datadir)/gnome/help/cal
bin_PROGRAMS = evolution-calendar
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
-
INCLUDES = \
-DG_LOG_DOMAIN=\"calendar-gui\" \
-I$(top_builddir)/shell \
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 \
generated by cgit (git 2.34.1) at 2024-12-29 09:00:49 +0800
class='commitgraph'>* - Remove vestiges of alpha supportak2015-01-161-4/+0 * Update sound-juicer to 3.14.0.kwm2015-01-162-5/+3 * Add missing USE_OPENSSL=yestijl2015-01-155-5/+13 * Adding audio/filter_audio, to be used by net-im/qTox.thierry2015-01-154-0/+34 * - Depend on specific version of libportaudio, to not pick up library from por...amdmi32015-01-152-1/+3 * Update MAINTAINERfeld2015-01-141-1/+1 * - Update to 1.3.10madpilot2015-01-142-9/+16 * Update to 4.3.4ehaupt2015-01-132-3/+3 * Update midipp to 2.1.15.kwm2015-01-132-3/+3 * Add bcg729-1.0.0, a software G729A encoder and decoder library written in C.sobomax2015-01-136-0/+54 * - Update devel/qca to version 2.1.0tijl2015-01-131-2/+1 * - Update to upstream snapshot as of 20150104riggs2015-01-112-4/+6 * Switch default python3 version from 3.3 to 3.4.demon2015-01-114-1/+4 * Update to FLAC 1.3.1. No significant user-visible changes.naddy2015-01-1111-178/+77 * Allow building with libc++ r224926antoine2015-01-111-0/+11 * - Fix crash (use new GLib threads) [1]olivierd2015-01-116-1/+151 * Patch a header so other ports can include ittijl2015-01-102-0/+18 * Add USES=pkgconfigtijl2015-01-101-1/+1 * Update audio/speex to 1.2rc2. One of the libraries has been split off intotijl2015-01-0910-58/+47 * Don't hardcode python version.kwm2015-01-092-28/+30 * Missed to svn delete one patch file while updating. Cleaning up previousbofh2015-01-082-29/+1 * Update to 3.2.6ehaupt2015-01-072-4/+3 * - Revert data directory change - this breaks some dependent ports and needs m...amdmi32015-01-073-4/+4 * Update MASTER_SITESehaupt2015-01-061-3/+1 * Move MASTER_SITES from CRITICAL to LOCAL/ehauptehaupt2015-01-0611-11/+11 * Move MASTER_SITES from CRITICAL to LOCAL/ehauptehaupt2015-01-0625-25/+25 * Assign maintainership of FPC ports to new FPC ports teammarino2015-01-056-6/+6 * Bump PORTREVISION after update of x11-fm/thunarolivierd2015-01-051-1/+1 * Fix build failure with non-default ALSA optionriggs2015-01-051-0/+17 * Update to 2.0romain2015-01-047-16/+256 * audio/p5-Net-FreeDB: Update version 0.09=>0.10bofh2015-01-043-6/+9 * - Convert USE_PYTHON -> USES leftovers missed in the previous commitsmva2015-01-041-1/+2 * - Convert <OPTION>_USE= PYTHON... to <OPTION>_USES= python...mva2015-01-033-3/+4 * - Update *_DEPENDSsunpoet2015-01-031-2/+6