callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move a bunch of CPPFLAGS defs into INCLUDES so they doesn't override

Browse Source 
any CPPFLAGS set at configure time

svn path=/trunk/; revision=5935
This commit is contained in:
Dan Winship
2000-10-15 23:18:24 +00:00
parent f020f43089
commit 50ceceaaef
11 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addressbook/ChangeLog
View File

@ -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

10
addressbook/contact-editor/Makefile.am
View File

@ -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 = \

3
addressbook/gui/component/Makefile.am
View File

@ -1,8 +1,5 @@
SUBDIRS = select-names
CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \

3
addressbook/gui/component/select-names/Makefile.am
View File

@ -20,9 +20,6 @@ oaf_DATA = evolution-addressbook-select-names.oafinfo
#
CPPFLAGS = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \

10
addressbook/gui/contact-editor/Makefile.am
View File

@ -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 = \

4
addressbook/gui/widgets/Makefile.am
View File

@ -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 \

12
addressbook/printing/Makefile.am
View File

@ -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

5
calendar/ChangeLog
View File

@ -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

3
calendar/gui/Makefile.am
View File

@ -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 \

5
composer/ChangeLog
View File

@ -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

4
composer/Makefile.am
View File

@ -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 \