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

Clean up some of the Makefiles so we dont' link every library multiple

Browse Source 
times, causing big libtool 1.4 pain.

svn path=/trunk/; revision=15461
This commit is contained in:
Ettore Perazzoli
2002-01-24 23:16:18 +00:00
parent d656b69c9b
commit 4ba09274d6
32 changed files with 358 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+11
View File
@@ -1,3 +1,14 @@
2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* configure.in: Define a new macro EVO_SET_COMPILE_FLAGS. Define
EVOLUTION_ADDRESSBOOK_CFLAGS, EVOLUTION_ADDRESSBOOK_LIBS,
EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS,
EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS, EVOLUTION_SUMMARY_LIBS,
EVOLUTION_SUMMARY_CFLAGS, EVOLUTION_CALENDAR_LIBS,
EVOLUTION_CALENDAR_CFLAGS, EVOLUTION_CALENDAR_CONDUIT_LIBS,
EVOLUTION_CALENDAR_CONDUIT_CFLAGS through it. Remove SOUP_CFLAGS
and SOUP_LIBS.
2002-01-15 Iain Holmes <iain@ximian.com>
* configure.in: Add a check for libsoup. Define SOUP_CFLAGS and
addressbook/ChangeLog
+13
View File
@@ -1,3 +1,16 @@
2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* conduit/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS and remove unused flags
* gui/component/Makefile.am: Use EVOLUTION_ADDRESSBOOK_CFLAGS and
EVOLUTION_ADDRESSBOOK_LIBS and remove unused flags.
* backend/pas/Makefile.am: Likewise.
* backend/ebook/Makefile.am: Likewise.
* printing/Makefile.am: Likewise.
* backend/ebook/Makefile.am: Likewise.
* gui/widgets/Makefile.am (INCLUDES): Likewise.
2002-01-23 Ettore Perazzoli <ettore@ximian.com>
* gui/component/addressbook-component.c (create_component): Pass a
addressbook/backend/ebook/Makefile.am
+29 -46
View File
@@ -1,22 +1,22 @@
noinst_PROGRAMS = test-card test-client test-client-list
bin_PROGRAMS = evolution-vcard-importer \
evolution-ldif-importer \
load-pine-addressbook \
bin_PROGRAMS = evolution-vcard-importer \
evolution-ldif-importer \
load-pine-addressbook \
load-gnomecard-addressbook
CORBA_SOURCE = \
addressbook.h \
addressbook-common.c \
addressbook-stubs.c \
addressbook-skels.c \
Evolution-Composer.h \
Evolution-Composer-common.c \
Evolution-Composer-skels.c \
CORBA_SOURCE = \
addressbook.h \
addressbook-common.c \
addressbook-stubs.c \
addressbook-skels.c \
Evolution-Composer.h \
Evolution-Composer-common.c \
Evolution-Composer-skels.c \
Evolution-Composer-stubs.c
idls = \
$(srcdir)/../idl/addressbook.idl \
idls = \
$(srcdir)/../idl/addressbook.idl \
$(srcdir)/../../../composer/Evolution-Composer.idl
idl_flags = `$(GNOME_CONFIG) --cflags idl` -I $(datadir)/idl
@@ -25,7 +25,7 @@ $(CORBA_SOURCE): $(idls)
$(ORBIT_IDL) -I $(srcdir) $(idls) $(idl_flags)
INCLUDES = \
-DGNOMELOCALEDIR=\""$(localedir)"\" \
-DGNOMELOCALEDIR=\""$(localedir)"\" \
-DG_LOG_DOMAIN=\"EBook\" \
-I$(top_srcdir) \
-I$(top_srcdir)/camel \
@@ -35,8 +35,7 @@ INCLUDES = \
-I$(top_builddir)/addressbook/ename \
-I$(top_builddir)/shell \
-I$(top_srcdir)/shell \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
lib_LTLIBRARIES = libebook.la
@@ -83,9 +82,7 @@ test_client_SOURCES = \
test_client_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/libversit/libversit.la \
@@ -97,9 +94,7 @@ test_client_list_SOURCES = \
test_client_list_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
@@ -111,39 +106,35 @@ test_card_SOURCES = \
test_card_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la
evolution_vcard_importer_SOURCES = \
evolution_vcard_importer_SOURCES = \
evolution-vcard-importer.c
evolution_vcard_importer_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(DB3_LDADD) \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/libeutil.la
evolution_ldif_importer_SOURCES = \
evolution_ldif_importer_SOURCES = \
evolution-ldif-importer.c
evolution_ldif_importer_LDADD = \
evolution_ldif_importer_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(DB3_LDADD) \
$(top_builddir)/e-util/ename/libename.la \
@@ -155,9 +146,7 @@ load_pine_addressbook_SOURCES = \
load_pine_addressbook_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
@@ -170,9 +159,7 @@ load_gnomecard_addressbook_SOURCES = \
load_gnomecard_addressbook_LDADD = \
libebook.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(EVOLUTION_ADDRESSBOOK_LIBS) \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
@@ -197,7 +184,3 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
# GNOME_Evolution_Addressbook_Pine_Importer.oafinfo
EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
addressbook/backend/pas/Makefile.am
+1 -2
View File
@@ -20,8 +20,7 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
LDAP_SCHEMA = \
evolutionperson.schema
addressbook/conduit/Makefile.am
+2 -8
View File
@@ -5,8 +5,7 @@ INCLUDES = \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(PISOCK_CFLAGS) \
$(GNOME_PILOT_CFLAGS) \
$(BONOBO_GNOME_CFLAGS) \
$(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS) \
-DCAMEL_PROVIDERDIR=\""$(providerdir)"\"
# Address Conduit
@@ -24,12 +23,7 @@ libeaddress_conduit_la_LIBADD = \
$(top_builddir)/e-util/libeconduit-static.la \
$(top_builddir)/camel/libcamel-static.la \
$(top_builddir)/libibex/libibex.la \
$(PISOCK_LIBS) \
$(GNOME_PILOT_LIBS) \
$(BONOBO_CONF_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(GNOME_LIBDIR) \
$(GNOME_LIBS)
$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
e-address.conduit: e-address.conduit.in Makefile
sed -e 's^\@prefix\@^$(prefix)^g' \
addressbook/gui/component/Makefile.am
+24 -30
View File
@@ -2,8 +2,6 @@ SUBDIRS = select-names
INCLUDES = \
-DG_LOG_DOMAIN=\"evolution-addressbook\" \
$(EXTRA_GNOME_CFLAGS) \
$(GNOME_INCLUDEDIR) \
-I$(top_srcdir) \
-I$(top_builddir) \
-I$(top_srcdir)/shell \
@@ -15,14 +13,13 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/gui/widgets \
-I$(top_srcdir)/addressbook/backend \
-I$(top_builddir)/addressbook/backend \
$(BONOBO_HTML_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DCAMEL_PROVIDERDIR=\""$(providerdir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\"
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
bin_PROGRAMS = \
@@ -45,28 +42,25 @@ evolution_addressbook_SOURCES = \
e-address-popup.h \
e-address-popup.c
evolution_addressbook_LDADD = \
select-names/libeselectnames.la \
$(top_builddir)/shell/libeshell.la \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
$(GNOME_VFS_LIBS) \
$(BONOBO_CONF_LIBS) \
$(top_builddir)/addressbook/gui/widgets/libeminicard.a \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
evolution_addressbook_LDADD = \
select-names/libeselectnames.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/addressbook/gui/widgets/libeminicard.a \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/ename/libename.la \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.a \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/addressbook/printing/libecontactprint.a \
$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \
$(top_builddir)/addressbook/gui/merging/libecardmerging.a \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/menus/libmenus.la
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.a \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/addressbook/printing/libecontactprint.a \
$(top_builddir)/addressbook/gui/search/libeaddressbooksearch.a \
$(top_builddir)/addressbook/gui/merging/libecardmerging.a \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(EVOLUTION_ADDRESSBOOK_LIBS)
evolution_addressbook_LDFLAGS = `gnome-config --libs gdk_pixbuf` -export-dynamic
@@ -79,10 +73,10 @@ oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
gladedir = $(datadir)/evolution/glade
glade_DATA = addressbook-config.glade
EXTRA_DIST = \
$(glade_DATA) \
$(oaf_DATA) \
addressbook-config.glade\
EXTRA_DIST = \
$(glade_DATA) \
$(oaf_DATA) \
addressbook-config.glade \
$(oaf_in_files)
if ENABLE_PURIFY
addressbook/gui/widgets/Makefile.am
+6 -15
View File
@@ -10,8 +10,7 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/gui/component \
-I$(top_srcdir)/widgets/misc \
-I$(top_builddir)/shell \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
libeminicard.a
@@ -56,8 +55,7 @@ libeminicard_a_SOURCES = \
#
#minicard_label_test_LDADD = \
# libeminicard.a \
# $(EXTRA_GNOME_LIBS) \
# $(BONOBO_GNOME_LIBS) \
# $(EVOLUTION_ADDRESSBOOK_LIBS) \
# $(top_builddir)/e-util/libeutil.la
#
#minicard_test_SOURCES = \
@@ -76,9 +74,7 @@ libeminicard_a_SOURCES = \
# $(top_builddir)/widgets/misc/libemiscwidgets.a \
# $(top_builddir)/addressbook/gui/component/select-names/libeselectnames.la \
# $(top_builddir)/e-util/libeutil.la \
# $(EXTRA_GNOME_LIBS) \
# $(BONOBO_GNOME_LIBS) \
# $(GNOME_PRINT_LIBS) \
# $(EVOLUTION_ADDRESSBOOK_LIBS) \
# libeminicard.a
#
#reflow_test_SOURCES = \
@@ -94,16 +90,13 @@ libeminicard_a_SOURCES = \
# $(top_builddir)/addressbook/printing/libecontactprint.a \
# $(top_builddir)/widgets/misc/libemiscwidgets.a \
# $(top_builddir)/e-util/libeutil.la \
# $(EXTRA_GNOME_LIBS) \
# $(BONOBO_GNOME_LIBS) \
# $(GNOME_PRINT_LIBS)
# $(EVOLUTION_ADDRESSBOOK_LIBS)
#minicard_view_test_SOURCES = \
# test-minicard-view.c
#minicard_view_test_LDADD = \
# $(EXTRA_GNOME_LIBS) \
# $(BONOBO_GNOME_LIBS) \
# $(EVOLUTION_ADDRESSBOOK_LIBS)
# libeminicard.a \
# $(top_builddir)/addressbook/backend/ebook/libebook.la \
# $(top_builddir)/e-util/libeutil.la \
@@ -130,9 +123,7 @@ libeminicard_a_SOURCES = \
# $(top_builddir)/widgets/misc/libemiscwidgets.a \
# $(top_builddir)/e-util/libeutil.la \
# $(top_builddir)/addressbook/gui/merging/libecardmerging.a \
# $(EXTRA_GNOME_LIBS) \
# $(BONOBO_GNOME_LIBS) \
# $(GNOME_PRINT_LIBS)
# $(EVOLUTION_ADDRESSBOOK_LIBS)
gladedir = $(datadir)/evolution/glade
glade_DATA =
addressbook/printing/Makefile.am
+20 -28
View File
@@ -18,9 +18,7 @@ INCLUDES = \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \
-DDATADIR=\""$(datadir)"\" \
$(GNOME_PRINT_CFLAGS) \
$(BONOBO_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS)
$(EVOLUTION_ADDRESSBOOK_CFLAGS)
noinst_LIBRARIES = \
libecontactprint.a
@@ -34,42 +32,36 @@ libecontactprint_a_SOURCES = \
e-contact-print.c \
e-contact-print.h
noinst_PROGRAMS = \
contact-print-test \
noinst_PROGRAMS = \
contact-print-test \
contact-print-style-editor-test
contact_print_test_SOURCES = \
test-print.c
contact_print_test_LDADD = \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/ename/libename.la \
libecontactprint.a \
$(BONOBO_CONF_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(GNOME_PRINT_LIBS)
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/ename/libename.la \
libecontactprint.a \
$(EVOLUTION_ADDRESSBOOK_LIBS)
contact_print_style_editor_test_SOURCES = \
test-contact-print-style-editor.c
contact_print_style_editor_test_LDADD = \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/ename/libename.la \
libecontactprint.a \
$(BONOBO_CONF_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_GNOME_LIBS) \
$(GNOME_PRINT_LIBS)
$(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/camel/libcamel.la \
$(top_builddir)/libibex/libibex.la \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/e-util/ename/libename.la \
libecontactprint.a \
$(EVOLUTION_ADDRESSBOOK_LIBS)
EXTRA_DIST = \
EXTRA_DIST = \
$(glade_DATA) \
$(ecps_DATA)
calendar/ChangeLog
+13
View File
@@ -1,3 +1,16 @@
2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* conduits/calendar/Makefile.am: Use
EVOLUTION_CALENDAR_CONDUIT_LIBS and
EVOLUTION_CALENDAR_CONDUIT_CFLAGS.
* conduits/todo/Makefile.am: Likewise.
* cal-client/Makefile.am: Use EVOLUTION_CALENDAR_LIBS and
EVOLUTION_CALENDAR_CFLAGS.
* cal-util/Makefile.am: Likewise.
* gui/alarm-notify/Makefile.am: Likewise.
* gui/Makefile.am: Likewise.
2002-01-23 Ettore Perazzoli <ettore@ximian.com>
* gui/component-factory.c (create_object): Pass a NULL @icon to
calendar/cal-client/Makefile.am
+6 -9
View File
@@ -30,8 +30,7 @@ INCLUDES = \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libwombat \
-I$(top_srcdir)/libwombat \
$(BONOBO_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS)
$(EVOLUTION_CALENDAR_CFLAGS)
lib_LTLIBRARIES = libcal-client.la
@@ -76,14 +75,12 @@ client_test_INCLUDES = \
$(INCLUDES) \
-DG_LOG_DOMAIN=\"client-test\"
client_test_LDADD = \
$(BONOBO_VFS_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_CONF_LIBS) \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
client_test_LDADD = \
$(EVOLUTION_CALENDAR_LIBS) \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
$(top_builddir)/libwombat/libwombat.la \
$(top_builddir)/libwombat/libwombat.la \
libcal-client.la
BUILT_SOURCES = $(CORBA_GENERATED)
calendar/cal-util/Makefile.am
+4 -4
View File
@@ -42,8 +42,8 @@ libcal_util_static_la_LDFLAGS = --all-static
test_recur_SOURCES = \
test-recur.c
test_recur_LDADD = \
libcal-util.la \
$(top_builddir)/libversit/libversit.la \
test_recur_LDADD = \
libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
$(EXTRA_GNOME_LIBS)
$(EVOLUTION_CALENDAR_LIBS)
calendar/conduits/calendar/Makefile.am
+2 -9
View File
@@ -6,10 +6,7 @@ INCLUDES = \
-I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(BONOBO_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
$(PISOCK_CFLAGS) \
$(GNOME_PILOT_CFLAGS)
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
# Calendar Conduit
e_calendar_conduitsdir=$(libdir)/gnome-pilot/conduits
@@ -26,11 +23,7 @@ libecalendar_conduit_la_LIBADD = \
$(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/libwombat/libwombat-static.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_GNOME_LIBS) \
$(BONOBO_CONF_LIBS) \
$(PISOCK_LIBS) \
$(GNOME_LIBDIR) \
$(GNOME_LIBS)
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
e-calendar.conduit: e-calendar.conduit.in Makefile
sed -e 's^\@prefix\@^$(prefix)^g' \
calendar/conduits/todo/Makefile.am
+2 -9
View File
@@ -6,10 +6,7 @@ INCLUDES = \
-I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/e-util \
-I$(top_builddir)/e-util \
$(BONOBO_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
$(PISOCK_CFLAGS) \
$(GNOME_PILOT_CFLAGS)
$(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
# ToDo Conduit
e_todo_conduitsdir=$(libdir)/gnome-pilot/conduits
@@ -26,11 +23,7 @@ libetodo_conduit_la_LIBADD = \
$(top_builddir)/libical/src/libical/libical-static.la \
$(top_builddir)/libwombat/libwombat-static.la \
$(top_builddir)/e-util/libeconduit-static.la \
$(BONOBO_GNOME_LIBS) \
$(BONOBO_CONF_LIBS) \
$(PISOCK_LIBS) \
$(GNOME_LIBDIR) \
$(GNOME_LIBS)
$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
e-todo.conduit: e-todo.conduit.in Makefile
sed -e 's^\@prefix\@^$(prefix)^g' \
calendar/gui/Makefile.am
+3 -11
View File
@@ -49,16 +49,13 @@ INCLUDES = \
-I$(top_builddir)/addressbook/backend/ebook \
-I$(top_srcdir)/widgets \
-I$(includedir) \
$(BONOBO_HTML_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(GAL_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\"
-DEVOLUTION_IMAGESDIR=\""$(datadir)"/images/evolution\" \
$(EVOLUTION_CALENDAR_CFLAGS)
iconsdir = $(datadir)/images/evolution
@@ -176,12 +173,7 @@ evolution_calendar_LDADD = \
dialogs/libcal-dialogs.a \
$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(EXTRA_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
$(GNOME_VFS_LIBS) \
$(BONOBO_CONF_LIBS) \
$(GAL_LIBS) \
$(INTLLIBS)
$(EVOLUTION_CALENDAR_LIBS)
evolution_calendar_LDFLAGS = -export-dynamic
calendar/gui/alarm-notify/Makefile.am
+9 -17
View File
@@ -28,14 +28,11 @@ INCLUDES = \
-I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/widgets \
-I$(includedir) \
$(BONOBO_VFS_GNOME_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
$(BONOBO_HTML_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\"
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
iconsdir = $(datadir)/images/evolution
@@ -58,19 +55,14 @@ evolution_alarm_notify_SOURCES = \
save.c \
save.h
evolution_alarm_notify_LDADD = \
libalarm.a \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
evolution_alarm_notify_LDADD = \
libalarm.a \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
$(top_builddir)/libwombat/libwombat.la \
$(top_builddir)/e-util/libeutil.la \
$(BONOBO_CONF_LIBS) \
$(BONOBO_VFS_GNOME_LIBS) \
$(BONOBO_HTML_GNOME_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(GAL_LIBS) \
$(INTLLIBS)
$(top_builddir)/libwombat/libwombat.la \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_CALENDAR_LIBS)
evolution_alarm_notify_LDFLAGS = -export-dynamic
calendar/gui/dialogs/Makefile.am
+3 -4
View File
@@ -25,13 +25,12 @@ INCLUDES = \
-I$(top_srcdir)/addressbook/backend/ebook \
-I$(top_builddir)/addressbook/backend/ebook \
-I$(includedir) \
$(EXTRA_GNOME_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ICONSDIR=\""$(iconsdir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
$(BONOBO_VFS_GNOME_CFLAGS) \
-DGNOMELOCALEDIR=\""$(localedir)"\"
-DGNOMELOCALEDIR=\""$(localedir)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
noinst_LIBRARIES = libcal-dialogs.a
calendar/importers/Makefile.am
+1 -2
View File
@@ -12,8 +12,7 @@ INCLUDES = \
-I$(top_builddir)/calendar \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
$(BONOBO_GNOME_CFLAGS) \
$(GNOME_INCLUDEDIR)
$(EVOLUTION_CALENDAR_CFLAGS)
evolution_calendar_importer_SOURCES = \
evolution-calendar-importer.h \
calendar/pcs/Makefile.am
+2 -3
View File
@@ -6,9 +6,8 @@ INCLUDES = \
-I$(top_builddir)/libical/src/libical \
-I$(top_srcdir)/libwombat \
-I$(top_builddir)/libwombat \
$(BONOBO_VFS_GNOME_CFLAGS) \
$(EXTRA_GNOME_CFLAGS) \
-DGNOMELOCALEDIR=\""$(localedir)"\"
-DGNOMELOCALEDIR=\""$(localedir)"\" \
$(EVOLUTION_CALENDAR_CFLAGS)
CORBA_GENERATED = \
evolution-calendar.h \
camel/ChangeLog
+9
View File
@@ -1,3 +1,12 @@
2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* tests/folder/Makefile.am: s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/.
* tests/message/Makefile.am: Likewise.
* tests/mime-filter/Makefile.am: Likewise.
* tests/misc/Makefile.am: Likewise.
* tests/smime/Makefile.am: Likewise.
* tests/stream/Makefile.am: Likewise.
2002-01-24 Jeffrey Stedfast <fejj@ximian.com>
* camel-filter-driver.c (do_beep): Call the beep callback
camel/providers/sendmail/camel-sendmail-transport.c
+2 -2
View File
@@ -131,8 +131,8 @@ sendmail_send_internal (CamelMedium *message, const char **argv, CamelException
/* Child process */
nullfd = open ("/dev/null", O_RDWR);
dup2 (fd[0], STDIN_FILENO);
dup2 (nullfd, STDOUT_FILENO);
dup2 (nullfd, STDERR_FILENO);
/* dup2 (nullfd, STDOUT_FILENO);
dup2 (nullfd, STDERR_FILENO);*/
close (nullfd);
close (fd[1]);
camel/tests/folder/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ LDADD = \
$(top_builddir)/libibex/libibex.la \
$(GNOME_LIBDIR) \
$(top_builddir)/camel/tests/lib/libcameltest.a \
$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
check_PROGRAMS = \
test1 test4 test5 \
camel/tests/message/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ LDADD = \
$(top_builddir)/libibex/libibex.la \
$(GNOME_LIBDIR) \
$(top_builddir)/camel/tests/lib/libcameltest.a \
$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
check_PROGRAMS = \
test1 \
camel/tests/mime-filter/Makefile.am
+1 -1
View File
@@ -11,7 +11,7 @@ LDADD = \
$(top_builddir)/libibex/libibex.la \
$(GNOME_LIBDIR) \
$(top_builddir)/camel/tests/lib/libcameltest.a \
$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
EXTRA_DIST = \
crlf-1.in \
camel/tests/misc/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ LDADD = \
$(top_builddir)/libibex/libibex.la \
$(GNOME_LIBDIR) \
$(top_builddir)/camel/tests/lib/libcameltest.a \
$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
check_PROGRAMS = \
url
camel/tests/smime/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ LDADD = \
$(top_builddir)/libibex/libibex.la \
$(GNOME_LIBDIR) \
$(top_builddir)/camel/tests/lib/libcameltest.a \
$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
check_PROGRAMS = \
pgp \
camel/tests/stream/Makefile.am
+1 -1
View File
@@ -10,7 +10,7 @@ LDADD = \
$(top_builddir)/libibex/libibex.la \
$(GNOME_LIBDIR) \
$(top_builddir)/camel/tests/lib/libcameltest.a \
$(GNOMEUI_LIBS) $(INTLLIBS) $(MAILER_LIBS)
$(GNOMEUI_LIBS) $(INTLLIBS) $(EVOLUTION_MAIL_LIBS)
check_PROGRAMS = \
test1 test2 test3
configure.in
+46 -9
View File
@@ -649,18 +649,55 @@ CAMEL_LIBS="`gnome-config --libs gal xml` $THREADS_LIBS"
AC_SUBST(CAMEL_CFLAGS)
AC_SUBST(CAMEL_LIBS)
AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
deps="$2"
extra_cflags="$3"
extra_libs="$4"
$1_CFLAGS="`gnome-config --cflags $deps` $extra_cflags"
$1_LIBS="`gnome-config --libs $deps` $extra_libs"
])
dnl --- evolution-addressbook flags
EVOLUTION_ADDRESSBOOK_DEPS="bonobo_conf bonobox_print gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK_CONDUIT, gpilot $EVOLUTION_ADDRESSBOOK_DEPS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
dnl -- evolution-executive-summary flags
EVO_SET_COMPILE_FLAGS(EVOLUTION_EXECUTIVE_SUMMARY,
bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf soup vfs)
AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
AC_SUBST(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
dnl --- evolution-calendar flags
EVOLUTION_CALENDAR_DEPS="bonobo_conf bonobox bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs"
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR_CONDUIT, gpilot $EVOLUTION_CALENDAR_DEPS)
AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_CFLAGS)
AC_SUBST(EVOLUTION_CALENDAR_CONDUIT_LIBS)
dnl --- evolution-mail flags
camel_providerdir='$(libdir)/evolution/camel-providers/'$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION
AC_SUBST(camel_providerdir)
MAILER_CFLAGS="`gnome-config --cflags gtkhtml libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal bonobo_conf bonobox bonobox_print vfs oaf` $THREADS_CFLAGS"
MAILER_LIBS="`gnome-config --libs gtkhtml libglade gdk_pixbuf gnomecanvaspixbuf gnomeui gal bonobo_conf bonobox bonobox_print vfs oaf` $THREADS_LIBS"
AC_SUBST(MAILER_CFLAGS)
AC_SUBST(MAILER_LIBS)
SOUP_CFLAGS="`gnome-config --cflags soup`"
SOUP_LIBS="`gnome-config --libs soup`"
AC_SUBST(SOUP_CFLAGS)
AC_SUBST(SOUP_LIBS)
EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL,
bonobo_conf bonobox_print gal gdk_pixbuf gnomecanvaspixbuf gnomeui gtkhtml libglade oaf vfs,
$THREADS_CFLAGS, $THREADS_LIBS)
AC_SUBST(EVOLUTION_MAIL_CFLAGS)
AC_SUBST(EVOLUTION_MAIL_LIBS)
dnl ******************************
dnl Pilot checking
doc/devel/calendar/cal-client/evolution-cal-client-decl.txt
+123 -113
View File
@@ -1,116 +1,3 @@
<MACRO>
<NAME>CAL_CLIENT_MULTI_TYPE</NAME>
#define CAL_CLIENT_MULTI_TYPE (cal_client_multi_get_type ())
</MACRO>
<MACRO>
<NAME>CAL_CLIENT_MULTI</NAME>
#define CAL_CLIENT_MULTI(obj) (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti))
</MACRO>
<MACRO>
<NAME>CAL_CLIENT_MULTI_CLASS</NAME>
#define CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass))
</MACRO>
<MACRO>
<NAME>IS_CAL_CLIENT_MULTI</NAME>
#define IS_CAL_CLIENT_MULTI(obj) (GTK_CHECK_TYPE ((obj), CAL_CLIENT_MULTI_TYPE))
</MACRO>
<MACRO>
<NAME>IS_CAL_CLIENT_MULTI_CLASS</NAME>
#define IS_CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE))
</MACRO>
<STRUCT>
<NAME>CalClientMulti</NAME>
</STRUCT>
<STRUCT>
<NAME>CalClientMultiClass</NAME>
</STRUCT>
<STRUCT>
<NAME>CalClientMultiPrivate</NAME>
</STRUCT>
<STRUCT>
<NAME>CalClientMulti</NAME>
struct CalClientMulti {
GtkObject object;
/* Private data */
CalClientMultiPrivate *priv;
};
</STRUCT>
<FUNCTION>
<NAME>cal_client_multi_get_type</NAME>
<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_new</NAME>
<RETURNS>CalClientMulti *</RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_add_client</NAME>
<RETURNS>void </RETURNS>
CalClientMulti *multi, CalClient *client
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_set_auth_func</NAME>
<RETURNS>void </RETURNS>
CalClientMulti *multi,CalClientAuthFunc func,gpointer user_data
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_open_calendar</NAME>
<RETURNS>CalClient *</RETURNS>
CalClientMulti *multi,const char *str_uri,gboolean only_if_exists
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_client_for_uri</NAME>
<RETURNS>CalClient *</RETURNS>
CalClientMulti *multi,const char *uri
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_n_objects</NAME>
<RETURNS>int </RETURNS>
CalClientMulti *multi, CalObjType type
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_object</NAME>
<RETURNS>CalClientGetStatus </RETURNS>
CalClientMulti *multi,const char *uid,CalComponent **comp
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_timezone</NAME>
<RETURNS>CalClientGetStatus </RETURNS>
CalClientMulti *multi,const char *tzid,icaltimezone **zone
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_uids</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi, CalObjType type
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_changes</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi,CalObjType type,const char *change_id
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_objects_in_range</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi,CalObjType type,time_t start,time_t end
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_free_busy</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi,GList *users,time_t start,time_t end
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_generate_instances</NAME>
<RETURNS>void </RETURNS>
CalClientMulti *multi,CalObjType type,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_alarms_in_range</NAME>
<RETURNS>GSList *</RETURNS>
CalClientMulti *multi,time_t start, time_t end
</FUNCTION>
<ENUM>
<NAME>CalClientChangeType</NAME>
typedef enum {
@@ -234,6 +121,16 @@ CalClient *client, icaltimezone *zone
CalClient *client, const char *str_uri, gboolean only_if_exists
</FUNCTION>
<FUNCTION>
<NAME>cal_client_open_default_calendar</NAME>
<RETURNS>gboolean </RETURNS>
CalClient *client, gboolean only_if_exists
</FUNCTION>
<FUNCTION>
<NAME>cal_client_open_default_tasks</NAME>
<RETURNS>gboolean </RETURNS>
CalClient *client, gboolean only_if_exists
</FUNCTION>
<FUNCTION>
<NAME>cal_client_uri_list</NAME>
<RETURNS>GList *</RETURNS>
CalClient *client, CalMode mode
@@ -478,3 +375,116 @@ QueryListenerObjUpdatedFn obj_updated_fn,QueryListenerObjRemovedFn obj_removed_f
<RETURNS>void </RETURNS>
QueryListener *ql
</FUNCTION>
<MACRO>
<NAME>CAL_CLIENT_MULTI_TYPE</NAME>
#define CAL_CLIENT_MULTI_TYPE (cal_client_multi_get_type ())
</MACRO>
<MACRO>
<NAME>CAL_CLIENT_MULTI</NAME>
#define CAL_CLIENT_MULTI(obj) (GTK_CHECK_CAST ((obj), CAL_CLIENT_MULTI_TYPE, CalClientMulti))
</MACRO>
<MACRO>
<NAME>CAL_CLIENT_MULTI_CLASS</NAME>
#define CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), CAL_CLIENT_MULTI_TYPE, CalClientMultiClass))
</MACRO>
<MACRO>
<NAME>IS_CAL_CLIENT_MULTI</NAME>
#define IS_CAL_CLIENT_MULTI(obj) (GTK_CHECK_TYPE ((obj), CAL_CLIENT_MULTI_TYPE))
</MACRO>
<MACRO>
<NAME>IS_CAL_CLIENT_MULTI_CLASS</NAME>
#define IS_CAL_CLIENT_MULTI_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), CAL_CLIENT_MULTI_TYPE))
</MACRO>
<STRUCT>
<NAME>CalClientMulti</NAME>
</STRUCT>
<STRUCT>
<NAME>CalClientMultiClass</NAME>
</STRUCT>
<STRUCT>
<NAME>CalClientMultiPrivate</NAME>
</STRUCT>
<STRUCT>
<NAME>CalClientMulti</NAME>
struct CalClientMulti {
GtkObject object;
/* Private data */
CalClientMultiPrivate *priv;
};
</STRUCT>
<FUNCTION>
<NAME>cal_client_multi_get_type</NAME>
<RETURNS>GtkType </RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_new</NAME>
<RETURNS>CalClientMulti *</RETURNS>
void
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_add_client</NAME>
<RETURNS>void </RETURNS>
CalClientMulti *multi, CalClient *client
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_set_auth_func</NAME>
<RETURNS>void </RETURNS>
CalClientMulti *multi,CalClientAuthFunc func,gpointer user_data
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_open_calendar</NAME>
<RETURNS>CalClient *</RETURNS>
CalClientMulti *multi,const char *str_uri,gboolean only_if_exists
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_client_for_uri</NAME>
<RETURNS>CalClient *</RETURNS>
CalClientMulti *multi,const char *uri
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_n_objects</NAME>
<RETURNS>int </RETURNS>
CalClientMulti *multi, CalObjType type
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_object</NAME>
<RETURNS>CalClientGetStatus </RETURNS>
CalClientMulti *multi,const char *uid,CalComponent **comp
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_timezone</NAME>
<RETURNS>CalClientGetStatus </RETURNS>
CalClientMulti *multi,const char *tzid,icaltimezone **zone
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_uids</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi, CalObjType type
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_changes</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi,CalObjType type,const char *change_id
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_objects_in_range</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi,CalObjType type,time_t start,time_t end
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_free_busy</NAME>
<RETURNS>GList *</RETURNS>
CalClientMulti *multi,GList *users,time_t start,time_t end
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_generate_instances</NAME>
<RETURNS>void </RETURNS>
CalClientMulti *multi,CalObjType type,time_t start,time_t end,CalRecurInstanceFn cb,gpointer cb_data
</FUNCTION>
<FUNCTION>
<NAME>cal_client_multi_get_alarms_in_range</NAME>
<RETURNS>GSList *</RETURNS>
CalClientMulti *multi,time_t start, time_t end
</FUNCTION>
mail/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: s/MAILER_CFLAGS/EVOLUTION_MAIL_CFLAGS/,
s/MAILER_LIBS/EVOLUTION_MAIL_LIBS/.
2002-01-24 Jeffrey Stedfast <fejj@ximian.com>
* mail-session.c (session_system_beep): This wrapper for gdk_beep().
mail/Makefile.am
+2 -2
View File
@@ -16,7 +16,7 @@ INCLUDES = \
-I$(top_srcdir)/shell \
-I$(top_srcdir)/shell/importer \
-I$(top_builddir)/shell/importer \
$(MAILER_CFLAGS) \
$(EVOLUTION_MAIL_CFLAGS) \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \
@@ -123,7 +123,7 @@ evolution_mail_LDADD = \
$(top_builddir)/filter/libfilter.la \
$(top_builddir)/shell/importer/libevolution-importer.la \
$(top_builddir)/widgets/menus/libmenus.la \
$(MAILER_LIBS)
$(EVOLUTION_MAIL_LIBS)
evolution_mail_LDFLAGS = \
-export-dynamic
my-evolution/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2002-01-24 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am: Use EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS and
EVOLUTION_EXECUTIVE_SUMMARY_LIBS.
2002-01-24 Iain Holmes <iain@ximian.com>
* Locations: Applied the Ukraine patch from Leonid Kanter
my-evolution/Makefile.am
+9 -19
View File
@@ -8,16 +8,11 @@ INCLUDES = \
-I$(top_builddir)/calendar/cal-client \
-I$(top_srcdir)/libical/src/libical \
-I$(top_builddir)/libical/src/libical \
$(EXTRA_GNOME_CFLAGS) \
$(GNOME_VFS_CFLAGS) \
$(GTKHTML_CFLAGS) \
$(BONOBO_CONF_CFLAGS) \
$(BONOBO_GNOME_CFLAGS) \
$(SOUP_CFLAGS) \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \
-DEVOLUTION_DATADIR=\""$(datadir)"\" \
-DG_LOG_DOMAIN=\"evolution-executive-summary\"
-DG_LOG_DOMAIN=\"evolution-executive-summary\" \
$(EVOLUTION_EXECUTIVE_SUMMARY_CFLAGS)
IDLS = \
$(top_srcdir)/mail/Mail.idl
@@ -61,21 +56,16 @@ evolution_executive_summary_SOURCES = \
weather.h
evolution_executive_summary_LDADD = \
$(top_builddir)/calendar/gui/alarm-notify/libalarm.a \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/gui/alarm-notify/libalarm.a \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/calendar/cal-client/libcal-client.la \
$(top_builddir)/calendar/cal-util/libcal-util.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libversit/libversit.la \
$(top_builddir)/libical/src/libical/libical-evolution.la \
$(top_builddir)/libwombat/libwombat.la \
$(BONOBO_GNOME_LIBS) \
$(BONOBO_CONF_LIBS) \
$(EXTRA_GNOME_LIBS) \
$(SOUP_LIBS) \
-lgal \
$(GTKHTML_LIBS)
$(top_builddir)/libwombat/libwombat.la \
$(EVOLUTION_EXECUTIVE_SUMMARY_LIBS)
Locationdir = $(datadir)/evolution
Location_DATA = Locations