Attachment #30227 for bug #49265

View | Details | Raw Unified | Return to bug 49265
Collapse All | Expand All

Lines 45-52 Link Here

(-)evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.am (-2 lines)
45	-I$(top_builddir)/addressbook/ename \	45	-I$(top_builddir)/addressbook/ename \
46	-I$(top_builddir)/shell \	46	-I$(top_builddir)/shell \
47	-I$(top_srcdir)/shell \	47	-I$(top_srcdir)/shell \
48	-DG_DISABLE_DEPRECATED \
49	-DLIBGNOME_DISABLE_DEPRECATED \
50	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	48	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
51		49
52	privlib_LTLIBRARIES = libebook.la libebook-static.la	50	privlib_LTLIBRARIES = libebook.la libebook-static.la

Lines 263-270 Link Here

(-)evolution-1.4.5.orig/addressbook/backend/ebook/Makefile.in (-2 lines)
263	-I$(top_builddir)/addressbook/ename \	263	-I$(top_builddir)/addressbook/ename \
264	-I$(top_builddir)/shell \	264	-I$(top_builddir)/shell \
265	-I$(top_srcdir)/shell \	265	-I$(top_srcdir)/shell \
266	-DG_DISABLE_DEPRECATED \
267	-DLIBGNOME_DISABLE_DEPRECATED \
268	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	266	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
269		267
270		268

Lines 23-30 Link Here

(-)evolution-1.4.5.orig/addressbook/backend/pas/Makefile.am (-2 lines)
23	-I$(top_srcdir) \	23	-I$(top_srcdir) \
24	-I$(top_srcdir)/addressbook/backend \	24	-I$(top_srcdir)/addressbook/backend \
25	-I$(top_builddir)/addressbook/backend \	25	-I$(top_builddir)/addressbook/backend \
26	-DG_DISABLE_DEPRECATED \
27	-DLIBGNOME_DISABLE_DEPRECATED \
28	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	26	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
29		27
30	LDAP_SCHEMA = \	28	LDAP_SCHEMA = \

Lines 239-246 Link Here

(-)evolution-1.4.5.orig/addressbook/backend/pas/Makefile.in (-2 lines)
239	-I$(top_srcdir) \	239	-I$(top_srcdir) \
240	-I$(top_srcdir)/addressbook/backend \	240	-I$(top_srcdir)/addressbook/backend \
241	-I$(top_builddir)/addressbook/backend \	241	-I$(top_builddir)/addressbook/backend \
242	-DG_DISABLE_DEPRECATED \
243	-DLIBGNOME_DISABLE_DEPRECATED \
244	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	242	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
245		243
246		244

Lines 21-30 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/component/Makefile.am (-4 lines)
21	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \	21	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
22	-DPREFIX=\""$(prefix)"\" \	22	-DPREFIX=\""$(prefix)"\" \
23	$(LDAP_CFLAGS) \	23	$(LDAP_CFLAGS) \
24	-DG_DISABLE_DEPRECATED \
25	-DGTK_DISABLE_DEPRECATED \
26	-DLIBGNOME_DISABLE_DEPRECATED \
27	-DLIBGNOMEUI_DISABLE_DEPRECATED \
28	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	24	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
29		25
30	component_LTLIBRARIES = libevolution-addressbook.la	26	component_LTLIBRARIES = libevolution-addressbook.la

Lines 241-250 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/component/Makefile.in (-4 lines)
241	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \	241	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
242	-DPREFIX=\""$(prefix)"\" \	242	-DPREFIX=\""$(prefix)"\" \
243	$(LDAP_CFLAGS) \	243	$(LDAP_CFLAGS) \
244	-DG_DISABLE_DEPRECATED \
245	-DGTK_DISABLE_DEPRECATED \
246	-DLIBGNOME_DISABLE_DEPRECATED \
247	-DLIBGNOMEUI_DISABLE_DEPRECATED \
248	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	244	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
249		245
250		246

Lines 43-52 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.am (-4 lines)
43	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \	43	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
44	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \	44	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
45	-DPREFIX=\""$(prefix)"\" \	45	-DPREFIX=\""$(prefix)"\" \
46	-DG_DISABLE_DEPRECATED \
47	-DGTK_DISABLE_DEPRECATED \
48	-DLIBGNOME_DISABLE_DEPRECATED \
49	-DLIBGNOMEUI_DISABLE_DEPRECATED \
50	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	46	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
51		47
52	noinst_LTLIBRARIES = libeselectnames.la	48	noinst_LTLIBRARIES = libeselectnames.la

Lines 258-267 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/component/select-names/Makefile.in (-4 lines)
258	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \	258	-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
259	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \	259	-DEVOLUTION_UIDIR=\""$(evolutionuidir)"\" \
260	-DPREFIX=\""$(prefix)"\" \	260	-DPREFIX=\""$(prefix)"\" \
261	-DG_DISABLE_DEPRECATED \
262	-DGTK_DISABLE_DEPRECATED \
263	-DLIBGNOME_DISABLE_DEPRECATED \
264	-DLIBGNOMEUI_DISABLE_DEPRECATED \
265	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	261	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
266		262
267		263

Lines 12-21 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.am (-4 lines)
12	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \	12	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
13	-DPREFIX=\""$(prefix)"\" \	13	-DPREFIX=\""$(prefix)"\" \
14	-DG_LOG_DOMAIN=\"contact-editor\" \	14	-DG_LOG_DOMAIN=\"contact-editor\" \
15	-DG_DISABLE_DEPRECATED \
16	-DGTK_DISABLE_DEPRECATED \
17	-DLIBGNOME_DISABLE_DEPRECATED \
18	-DLIBGNOMEUI_DISABLE_DEPRECATED \
19	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	15	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
20		16
21	noinst_LTLIBRARIES = \	17	noinst_LTLIBRARIES = \

Lines 232-241 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/contact-editor/Makefile.in (-4 lines)
232	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \	232	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
233	-DPREFIX=\""$(prefix)"\" \	233	-DPREFIX=\""$(prefix)"\" \
234	-DG_LOG_DOMAIN=\"contact-editor\" \	234	-DG_LOG_DOMAIN=\"contact-editor\" \
235	-DG_DISABLE_DEPRECATED \
236	-DGTK_DISABLE_DEPRECATED \
237	-DLIBGNOME_DISABLE_DEPRECATED \
238	-DLIBGNOMEUI_DISABLE_DEPRECATED \
239	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	235	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
240		236
241		237

Lines 13-22 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.am (-4 lines)
13	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \	13	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
14	-DPREFIX=\""$(prefix)"\" \	14	-DPREFIX=\""$(prefix)"\" \
15	-DG_LOG_DOMAIN=\"contact-list-editor\" \	15	-DG_LOG_DOMAIN=\"contact-list-editor\" \
16	-DG_DISABLE_DEPRECATED \
17	-DGTK_DISABLE_DEPRECATED \
18	-DLIBGNOME_DISABLE_DEPRECATED \
19	-DLIBGNOMEUI_DISABLE_DEPRECATED \
20	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	16	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
21		17
22	noinst_LTLIBRARIES = \	18	noinst_LTLIBRARIES = \

Lines 233-242 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/contact-list-editor/Makefile.in (-4 lines)
233	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \	233	-DEVOLUTION_UIDIR=\""$(evolutionuidir)\"" \
234	-DPREFIX=\""$(prefix)"\" \	234	-DPREFIX=\""$(prefix)"\" \
235	-DG_LOG_DOMAIN=\"contact-list-editor\" \	235	-DG_LOG_DOMAIN=\"contact-list-editor\" \
236	-DG_DISABLE_DEPRECATED \
237	-DGTK_DISABLE_DEPRECATED \
238	-DLIBGNOME_DISABLE_DEPRECATED \
239	-DLIBGNOMEUI_DISABLE_DEPRECATED \
240	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	236	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
241		237
242		238

Lines 4-13 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/merging/Makefile.am (-4 lines)
4	-I$(top_srcdir) \	4	-I$(top_srcdir) \
5	-I$(top_srcdir)/addressbook/backend \	5	-I$(top_srcdir)/addressbook/backend \
6	-I$(top_builddir)/addressbook/backend \	6	-I$(top_builddir)/addressbook/backend \
7	-DG_DISABLE_DEPRECATED \
8	-DGTK_DISABLE_DEPRECATED \
9	-DLIBGNOME_DISABLE_DEPRECATED \
10	-DLIBGNOMEUI_DISABLE_DEPRECATED \
11	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	7	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
12		8
13	noinst_LTLIBRARIES = \	9	noinst_LTLIBRARIES = \

Lines 224-233 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/merging/Makefile.in (-4 lines)
224	-I$(top_srcdir) \	224	-I$(top_srcdir) \
225	-I$(top_srcdir)/addressbook/backend \	225	-I$(top_srcdir)/addressbook/backend \
226	-I$(top_builddir)/addressbook/backend \	226	-I$(top_builddir)/addressbook/backend \
227	-DG_DISABLE_DEPRECATED \
228	-DGTK_DISABLE_DEPRECATED \
229	-DLIBGNOME_DISABLE_DEPRECATED \
230	-DLIBGNOMEUI_DISABLE_DEPRECATED \
231	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	227	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
232		228
233		229

Lines 13-22 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/search/Makefile.am (-4 lines)
13	-I$(top_srcdir)/widgets/misc \	13	-I$(top_srcdir)/widgets/misc \
14	-I$(top_builddir)/shell \	14	-I$(top_builddir)/shell \
15	-DSEARCH_RULE_DIR=\"$(ruledir)\" \	15	-DSEARCH_RULE_DIR=\"$(ruledir)\" \
16	-DG_DISABLE_DEPRECATED \
17	-DGTK_DISABLE_DEPRECATED \
18	-DLIBGNOME_DISABLE_DEPRECATED \
19	-DLIBGNOMEUI_DISABLE_DEPRECATED \
20	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	16	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
21		17
22	noinst_LTLIBRARIES = \	18	noinst_LTLIBRARIES = \

Lines 233-242 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/search/Makefile.in (-4 lines)
233	-I$(top_srcdir)/widgets/misc \	233	-I$(top_srcdir)/widgets/misc \
234	-I$(top_builddir)/shell \	234	-I$(top_builddir)/shell \
235	-DSEARCH_RULE_DIR=\"$(ruledir)\" \	235	-DSEARCH_RULE_DIR=\"$(ruledir)\" \
236	-DG_DISABLE_DEPRECATED \
237	-DGTK_DISABLE_DEPRECATED \
238	-DLIBGNOME_DISABLE_DEPRECATED \
239	-DLIBGNOMEUI_DISABLE_DEPRECATED \
240	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	236	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
241		237
242		238

Lines 11-20 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.am (-4 lines)
11	-I$(top_srcdir)/addressbook/gui/component \	11	-I$(top_srcdir)/addressbook/gui/component \
12	-I$(top_srcdir)/widgets/misc \	12	-I$(top_srcdir)/widgets/misc \
13	-I$(top_builddir)/shell \	13	-I$(top_builddir)/shell \
14	-DG_DISABLE_DEPRECATED \
15	-DGTK_DISABLE_DEPRECATED \
16	-DLIBGNOME_DISABLE_DEPRECATED \
17	-DLIBGNOMEUI_DISABLE_DEPRECATED \
18	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	14	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
19		15
20	CORBA_COMPOSER_SOURCE_H = \	16	CORBA_COMPOSER_SOURCE_H = \

Lines 231-240 Link Here

(-)evolution-1.4.5.orig/addressbook/gui/widgets/Makefile.in (-4 lines)
231	-I$(top_srcdir)/addressbook/gui/component \	231	-I$(top_srcdir)/addressbook/gui/component \
232	-I$(top_srcdir)/widgets/misc \	232	-I$(top_srcdir)/widgets/misc \
233	-I$(top_builddir)/shell \	233	-I$(top_builddir)/shell \
234	-DG_DISABLE_DEPRECATED \
235	-DGTK_DISABLE_DEPRECATED \
236	-DLIBGNOME_DISABLE_DEPRECATED \
237	-DLIBGNOMEUI_DISABLE_DEPRECATED \
238	$(EVOLUTION_ADDRESSBOOK_CFLAGS)	234	$(EVOLUTION_ADDRESSBOOK_CFLAGS)
239		235
240		236

Lines 13-19 Link Here

(-)evolution-1.4.5.orig/addressbook/tools/Makefile.am (-1 lines)
13	-I$(top_srcdir)/addressbook \	13	-I$(top_srcdir)/addressbook \
14	-I$(top_srcdir)/addressbook/backend \	14	-I$(top_srcdir)/addressbook/backend \
15	-I$(top_builddir)/addressbook/backend \	15	-I$(top_builddir)/addressbook/backend \
16	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
17	$(GNOME_FULL_CFLAGS)	16	$(GNOME_FULL_CFLAGS)
18		17
19	evolution_addressbook_export_SOURCES = \	18	evolution_addressbook_export_SOURCES = \

Lines 234-240 Link Here

(-)evolution-1.4.5.orig/addressbook/tools/Makefile.in (-1 lines)
234	-I$(top_srcdir)/addressbook \	234	-I$(top_srcdir)/addressbook \
235	-I$(top_srcdir)/addressbook/backend \	235	-I$(top_srcdir)/addressbook/backend \
236	-I$(top_builddir)/addressbook/backend \	236	-I$(top_builddir)/addressbook/backend \
237	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
238	$(GNOME_FULL_CFLAGS)	237	$(GNOME_FULL_CFLAGS)
239		238
240		239

Lines 16-22 Link Here

(-)evolution-1.4.5.orig/camel/Makefile.am (-1 lines)
16	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \	16	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
17	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \	17	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
18	-DG_LOG_DOMAIN=\"camel\" \	18	-DG_LOG_DOMAIN=\"camel\" \
19	-DG_DISABLE_DEPRECATED \
20	$(CAMEL_CFLAGS)	19	$(CAMEL_CFLAGS)
21		20
22	libcamel_la_SOURCES = \	21	libcamel_la_SOURCES = \

Lines 235-241 Link Here

(-)evolution-1.4.5.orig/camel/Makefile.in (-1 lines)
235	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \	235	-DCAMEL_LIBEXECDIR=\""$(camellibexecdir)"\" \
236	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \	236	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
237	-DG_LOG_DOMAIN=\"camel\" \	237	-DG_LOG_DOMAIN=\"camel\" \
238	-DG_DISABLE_DEPRECATED \
239	$(CAMEL_CFLAGS)	238	$(CAMEL_CFLAGS)
240		239
241		240

Lines 14-21 Link Here

(-)evolution-1.4.5.orig/camel/providers/imap/Makefile.am (-2 / +1 lines)
14	$(CAMEL_CFLAGS) \	14	$(CAMEL_CFLAGS) \
15	$(GNOME_INCLUDEDIR) \	15	$(GNOME_INCLUDEDIR) \
16	$(GTK_INCLUDEDIR) \	16	$(GTK_INCLUDEDIR) \
17	-DG_LOG_DOMAIN=\"camel-imap-provider\" \	17	-DG_LOG_DOMAIN=\"camel-imap-provider\"
18	-DG_DISABLE_DEPRECATED
19		18
20	libcamelimap_la_SOURCES = \	19	libcamelimap_la_SOURCES = \
21	camel-imap-command.c \	20	camel-imap-command.c \

Lines 233-240 Link Here

(-)evolution-1.4.5.orig/camel/providers/imap/Makefile.in (-2 / +1 lines)
233	$(CAMEL_CFLAGS) \	233	$(CAMEL_CFLAGS) \
234	$(GNOME_INCLUDEDIR) \	234	$(GNOME_INCLUDEDIR) \
235	$(GTK_INCLUDEDIR) \	235	$(GTK_INCLUDEDIR) \
236	-DG_LOG_DOMAIN=\"camel-imap-provider\" \	236	-DG_LOG_DOMAIN=\"camel-imap-provider\"
237	-DG_DISABLE_DEPRECATED
238		237
239		238
240	libcamelimap_la_SOURCES = \	239	libcamelimap_la_SOURCES = \

Lines 14-21 Link Here

(-)evolution-1.4.5.orig/camel/providers/local/Makefile.am (-2 / +1 lines)
14	$(CAMEL_CFLAGS) \	14	$(CAMEL_CFLAGS) \
15	$(GNOME_INCLUDEDIR) \	15	$(GNOME_INCLUDEDIR) \
16	$(GTK_INCLUDEDIR) \	16	$(GTK_INCLUDEDIR) \
17	-DG_LOG_DOMAIN=\"camel-local-provider\" \	17	-DG_LOG_DOMAIN=\"camel-local-provider\"
18	-DG_DISABLE_DEPRECATED
19		18
20	libcamellocal_la_SOURCES = \	19	libcamellocal_la_SOURCES = \
21	camel-local-folder.c \	20	camel-local-folder.c \

Lines 233-240 Link Here

(-)evolution-1.4.5.orig/camel/providers/local/Makefile.in (-2 / +1 lines)
233	$(CAMEL_CFLAGS) \	233	$(CAMEL_CFLAGS) \
234	$(GNOME_INCLUDEDIR) \	234	$(GNOME_INCLUDEDIR) \
235	$(GTK_INCLUDEDIR) \	235	$(GTK_INCLUDEDIR) \
236	-DG_LOG_DOMAIN=\"camel-local-provider\" \	236	-DG_LOG_DOMAIN=\"camel-local-provider\"
237	-DG_DISABLE_DEPRECATED
238		237
239		238
240	libcamellocal_la_SOURCES = \	239	libcamellocal_la_SOURCES = \

Lines 13-20 Link Here

(-)evolution-1.4.5.orig/camel/providers/nntp/Makefile.am (-2 / +1 lines)
13	$(CAMEL_CFLAGS) \	13	$(CAMEL_CFLAGS) \
14	$(GNOME_INCLUDEDIR) \	14	$(GNOME_INCLUDEDIR) \
15	$(GTK_INCLUDEDIR) \	15	$(GTK_INCLUDEDIR) \
16	-DG_LOG_DOMAIN=\"camel-nntp-provider\" \	16	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
17	-DG_DISABLE_DEPRECATED
18		17
19	libcamelnntp_la_SOURCES = \	18	libcamelnntp_la_SOURCES = \
20	camel-nntp-provider.c \	19	camel-nntp-provider.c \

Lines 232-239 Link Here

(-)evolution-1.4.5.orig/camel/providers/nntp/Makefile.in (-2 / +1 lines)
232	$(CAMEL_CFLAGS) \	232	$(CAMEL_CFLAGS) \
233	$(GNOME_INCLUDEDIR) \	233	$(GNOME_INCLUDEDIR) \
234	$(GTK_INCLUDEDIR) \	234	$(GTK_INCLUDEDIR) \
235	-DG_LOG_DOMAIN=\"camel-nntp-provider\" \	235	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
236	-DG_DISABLE_DEPRECATED
237		236
238		237
239	libcamelnntp_la_SOURCES = \	238	libcamelnntp_la_SOURCES = \

Lines 15-22 Link Here

(-)evolution-1.4.5.orig/camel/providers/pop3/Makefile.am (-2 / +1 lines)
15	$(CAMEL_CFLAGS) \	15	$(CAMEL_CFLAGS) \
16	$(GNOME_INCLUDEDIR) \	16	$(GNOME_INCLUDEDIR) \
17	$(GTK_INCLUDEDIR) \	17	$(GTK_INCLUDEDIR) \
18	-DG_LOG_DOMAIN=\"camel-pop3-provider\" \	18	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
19	-DG_DISABLE_DEPRECATED
20		19
21	libcamelpop3_la_SOURCES = \	20	libcamelpop3_la_SOURCES = \
22	camel-pop3-engine.c \	21	camel-pop3-engine.c \

Lines 234-241 Link Here

(-)evolution-1.4.5.orig/camel/providers/pop3/Makefile.in (-2 / +1 lines)
234	$(CAMEL_CFLAGS) \	234	$(CAMEL_CFLAGS) \
235	$(GNOME_INCLUDEDIR) \	235	$(GNOME_INCLUDEDIR) \
236	$(GTK_INCLUDEDIR) \	236	$(GTK_INCLUDEDIR) \
237	-DG_LOG_DOMAIN=\"camel-pop3-provider\" \	237	-DG_LOG_DOMAIN=\"camel-pop3-provider\"
238	-DG_DISABLE_DEPRECATED
239		238
240		239
241	libcamelpop3_la_SOURCES = \	240	libcamelpop3_la_SOURCES = \

Lines 14-21 Link Here

(-)evolution-1.4.5.orig/camel/providers/sendmail/Makefile.am (-2 / +1 lines)
14	$(CAMEL_CFLAGS) \	14	$(CAMEL_CFLAGS) \
15	$(GNOME_INCLUDEDIR) \	15	$(GNOME_INCLUDEDIR) \
16	$(GTK_INCLUDEDIR) \	16	$(GTK_INCLUDEDIR) \
17	-DG_LOG_DOMAIN=\"camel-sendmail-provider\" \	17	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
18	-DG_DISABLE_DEPRECATED
19		18
20	libcamelsendmail_la_SOURCES = \	19	libcamelsendmail_la_SOURCES = \
21	camel-sendmail-provider.c \	20	camel-sendmail-provider.c \

Lines 233-240 Link Here

(-)evolution-1.4.5.orig/camel/providers/sendmail/Makefile.in (-2 / +1 lines)
233	$(CAMEL_CFLAGS) \	233	$(CAMEL_CFLAGS) \
234	$(GNOME_INCLUDEDIR) \	234	$(GNOME_INCLUDEDIR) \
235	$(GTK_INCLUDEDIR) \	235	$(GTK_INCLUDEDIR) \
236	-DG_LOG_DOMAIN=\"camel-sendmail-provider\" \	236	-DG_LOG_DOMAIN=\"camel-sendmail-provider\"
237	-DG_DISABLE_DEPRECATED
238		237
239		238
240	libcamelsendmail_la_SOURCES = \	239	libcamelsendmail_la_SOURCES = \

Lines 18-25 Link Here

(-)evolution-1.4.5.orig/camel/providers/smtp/Makefile.am (-2 / +1 lines)
18	$(NSPR_CFLAGS) \	18	$(NSPR_CFLAGS) \
19	$(NSS_CFLAGS) \	19	$(NSS_CFLAGS) \
20	$(OPENSSL_CFLAGS) \	20	$(OPENSSL_CFLAGS) \
21	-DG_LOG_DOMAIN=\"camel-smtp-provider\" \	21	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
22	-DG_DISABLE_DEPRECATED
23		22
24	libcamelsmtp_la_SOURCES = \	23	libcamelsmtp_la_SOURCES = \
25	camel-smtp-provider.c \	24	camel-smtp-provider.c \

Lines 237-244 Link Here

(-)evolution-1.4.5.orig/camel/providers/smtp/Makefile.in (-2 / +1 lines)
237	$(NSPR_CFLAGS) \	237	$(NSPR_CFLAGS) \
238	$(NSS_CFLAGS) \	238	$(NSS_CFLAGS) \
239	$(OPENSSL_CFLAGS) \	239	$(OPENSSL_CFLAGS) \
240	-DG_LOG_DOMAIN=\"camel-smtp-provider\" \	240	-DG_LOG_DOMAIN=\"camel-smtp-provider\"
241	-DG_DISABLE_DEPRECATED
242		241
243		242
244	libcamelsmtp_la_SOURCES = \	243	libcamelsmtp_la_SOURCES = \

Lines 54-61 Link Here

(-)evolution-1.4.5.orig/composer/Makefile.am (-2 lines)
54	-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \	54	-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
55	-DPREFIX=\"$(prefix)\" \	55	-DPREFIX=\"$(prefix)\" \
56	-DG_LOG_DOMAIN=\"composer\" \	56	-DG_LOG_DOMAIN=\"composer\" \
57	-DG_DISABLE_DEPRECATED \
58	-DGTK_DISABLE_DEPRECATED \
59	$(EVOLUTION_MAIL_CFLAGS)	57	$(EVOLUTION_MAIL_CFLAGS)
60		58
61	libcomposer_la_SOURCES = \	59	libcomposer_la_SOURCES = \

Lines 266-273 Link Here

(-)evolution-1.4.5.orig/composer/Makefile.in (-2 lines)
266	-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \	266	-DEVOLUTION_GLADEDIR=\"$(gladedir)\" \
267	-DPREFIX=\"$(prefix)\" \	267	-DPREFIX=\"$(prefix)\" \
268	-DG_LOG_DOMAIN=\"composer\" \	268	-DG_LOG_DOMAIN=\"composer\" \
269	-DG_DISABLE_DEPRECATED \
270	-DGTK_DISABLE_DEPRECATED \
271	$(EVOLUTION_MAIL_CFLAGS)	269	$(EVOLUTION_MAIL_CFLAGS)
272		270
273		271

Lines 9-16 Link Here

(-)evolution-1.4.5.orig/e-util/Makefile.am (-2 lines)
9	-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \	9	-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
10	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \	10	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
11	-DG_LOG_DOMAIN=\"e-utils\" \	11	-DG_LOG_DOMAIN=\"e-utils\" \
12	-DG_DISABLE_DEPRECATED \
13	-DGTK_DISABLE_DEPRECATED \
14	$(DB3_CFLAGS) \	12	$(DB3_CFLAGS) \
15	$(GNOME_PILOT_CFLAGS) \	13	$(GNOME_PILOT_CFLAGS) \
16	$(E_UTIL_CFLAGS)	14	$(E_UTIL_CFLAGS)

Lines 229-236 Link Here

(-)evolution-1.4.5.orig/e-util/Makefile.in (-2 lines)
229	-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \	229	-DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
230	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \	230	-DEVOLUTION_CATEGORY_ICONS=\""$(imagesdir)/categories"\" \
231	-DG_LOG_DOMAIN=\"e-utils\" \	231	-DG_LOG_DOMAIN=\"e-utils\" \
232	-DG_DISABLE_DEPRECATED \
233	-DGTK_DISABLE_DEPRECATED \
234	$(DB3_CFLAGS) \	232	$(DB3_CFLAGS) \
235	$(GNOME_PILOT_CFLAGS) \	233	$(GNOME_PILOT_CFLAGS) \
236	$(E_UTIL_CFLAGS)	234	$(E_UTIL_CFLAGS)

Lines 8-15 Link Here

(-)evolution-1.4.5.orig/filter/Makefile.am (-2 lines)
8	-I $(top_srcdir)/shell \	8	-I $(top_srcdir)/shell \
9	-DFILTER_GLADEDIR=\"$(gladedir)\" \	9	-DFILTER_GLADEDIR=\"$(gladedir)\" \
10	-DG_LOG_DOMAIN=\"filter\" \	10	-DG_LOG_DOMAIN=\"filter\" \
11	-DG_DISABLE_DEPRECATED \
12	-DGTK_DISABLE_DEPRECATED \
13	$(LIBFILTER_CFLAGS)	11	$(LIBFILTER_CFLAGS)
14		12
15	noinst_LTLIBRARIES = \	13	noinst_LTLIBRARIES = \

Lines 228-235 Link Here

(-)evolution-1.4.5.orig/filter/Makefile.in (-2 lines)
228	-I $(top_srcdir)/shell \	228	-I $(top_srcdir)/shell \
229	-DFILTER_GLADEDIR=\"$(gladedir)\" \	229	-DFILTER_GLADEDIR=\"$(gladedir)\" \
230	-DG_LOG_DOMAIN=\"filter\" \	230	-DG_LOG_DOMAIN=\"filter\" \
231	-DG_DISABLE_DEPRECATED \
232	-DGTK_DISABLE_DEPRECATED \
233	$(LIBFILTER_CFLAGS)	231	$(LIBFILTER_CFLAGS)
234		232
235		233

Lines 34-41 Link Here

(-)evolution-1.4.5.orig/mail/Makefile.am (-2 lines)
34	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \	34	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
35	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \	35	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
36	-DPREFIX=\""$(prefix)"\" \	36	-DPREFIX=\""$(prefix)"\" \
37	-DG_DISABLE_DEPRECATED \
38	-DGTK_DISABLE_DEPRECATED \
39	-DG_LOG_DOMAIN=\"evolution-mail\"	37	-DG_LOG_DOMAIN=\"evolution-mail\"
40		38
41	component_LTLIBRARIES = libevolution-mail.la	39	component_LTLIBRARIES = libevolution-mail.la

Lines 254-261 Link Here

(-)evolution-1.4.5.orig/mail/Makefile.in (-2 lines)
254	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \	254	-DCAMEL_PROVIDERDIR=\""$(camel_providerdir)"\" \
255	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \	255	-DMAIL_IMPORTERSDIR=\""$(importerdir)"\" \
256	-DPREFIX=\""$(prefix)"\" \	256	-DPREFIX=\""$(prefix)"\" \
257	-DG_DISABLE_DEPRECATED \
258	-DGTK_DISABLE_DEPRECATED \
259	-DG_LOG_DOMAIN=\"evolution-mail\"	257	-DG_LOG_DOMAIN=\"evolution-mail\"
260		258
261		259

Lines 1-8 Link Here

(-)evolution-1.4.5.orig/shell/Makefile.am (-2 lines)
1	SUBDIRS = glade importer	1	SUBDIRS = glade importer
2		2
3	INCLUDES = \	3	INCLUDES = \
4	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
5	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
6	-I$(top_srcdir)/widgets \	4	-I$(top_srcdir)/widgets \
7	-I$(top_srcdir)/widgets/misc \	5	-I$(top_srcdir)/widgets/misc \
8	-I$(top_srcdir)/libical/src/libical \	6	-I$(top_srcdir)/libical/src/libical \

Lines 221-228 Link Here

(-)evolution-1.4.5.orig/shell/Makefile.in (-2 lines)
221	SUBDIRS = glade importer	221	SUBDIRS = glade importer
222		222
223	INCLUDES = \	223	INCLUDES = \
224	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
225	-DBONOBO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED \
226	-I$(top_srcdir)/widgets \	224	-I$(top_srcdir)/widgets \
227	-I$(top_srcdir)/widgets/misc \	225	-I$(top_srcdir)/widgets/misc \
228	-I$(top_srcdir)/libical/src/libical \	226	-I$(top_srcdir)/libical/src/libical \

Lines 21-27 Link Here

(-)evolution-1.4.5.orig/tools/Makefile.am (-1 lines)
21	-I$(top_srcdir)/addressbook \	21	-I$(top_srcdir)/addressbook \
22	-I$(top_srcdir)/addressbook/backend \	22	-I$(top_srcdir)/addressbook/backend \
23	-I$(top_builddir)/addressbook/backend \	23	-I$(top_builddir)/addressbook/backend \
24	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
25	$(GNOME_FULL_CFLAGS)	24	$(GNOME_FULL_CFLAGS)
26		25
27	EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \	26	EXTRA_DIST = $(privlibexec_SCRIPTS) verify-evolution-install.sh \

Lines 242-248 Link Here

(-)evolution-1.4.5.orig/tools/Makefile.in (-1 lines)
242	-I$(top_srcdir)/addressbook \	242	-I$(top_srcdir)/addressbook \
243	-I$(top_srcdir)/addressbook/backend \	243	-I$(top_srcdir)/addressbook/backend \
244	-I$(top_builddir)/addressbook/backend \	244	-I$(top_builddir)/addressbook/backend \
245	-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
246	$(GNOME_FULL_CFLAGS)	245	$(GNOME_FULL_CFLAGS)
247		246
248		247

Lines 6-12 Link Here

(-)evolution-1.4.5.orig/widgets/misc/Makefile.am (-1 lines)
6	-I$(top_srcdir)/widgets/shortcut-bar \	6	-I$(top_srcdir)/widgets/shortcut-bar \
7	-DMAP_DIR=\""$(imagesdir)"\" \	7	-DMAP_DIR=\""$(imagesdir)"\" \
8	-DG_LOG_DOMAIN=__FILE__ \	8	-DG_LOG_DOMAIN=__FILE__ \
9	-DG_DISABLE_DEPRECATED \
10	$(GNOME_FULL_CFLAGS)	9	$(GNOME_FULL_CFLAGS)
11		10
12	privlib_LTLIBRARIES = \	11	privlib_LTLIBRARIES = \

Lines 227-233 Link Here

(-)evolution-1.4.5.orig/widgets/misc/Makefile.in (-1 lines)
227	-I$(top_srcdir)/widgets/shortcut-bar \	227	-I$(top_srcdir)/widgets/shortcut-bar \
228	-DMAP_DIR=\""$(imagesdir)"\" \	228	-DMAP_DIR=\""$(imagesdir)"\" \
229	-DG_LOG_DOMAIN=__FILE__ \	229	-DG_LOG_DOMAIN=__FILE__ \
230	-DG_DISABLE_DEPRECATED \
231	$(GNOME_FULL_CFLAGS)	230	$(GNOME_FULL_CFLAGS)
232		231
233		232

Return to bug 49265