Talking about linking, I've been working on the following patches which greatly reduces time spent linking at make install. It's still rough and might break anything that is not a modern linux hence why I never posted them in a bug report. I use them to build evolution at work and it cuts full compilation/installation to 3/4th of regular time. If there is interest in these I'll open a bug. Fixing sources disposition and intermediate librairies could help achieve more speed. -- Gilles Dartiguelongue <gilles dartiguelongue esiee org>
--- a11y/Makefile.am | 17 ++++++++++------- a11y/addressbook/Makefile.am | 8 +++++--- a11y/calendar/Makefile.am | 10 ++++++---- a11y/e-table/Makefile.am | 2 +- a11y/widgets/Makefile.am | 12 +++++++----- 5 files changed, 29 insertions(+), 20 deletions(-) Index: b/a11y/Makefile.am =================================================================== --- a/a11y/Makefile.am +++ b/a11y/Makefile.am @@ -24,11 +24,14 @@ libevolution_a11y_la_SOURCES = \ gal-a11y-util.h \ gal-a11y-factory.h -libevolution_a11y_la_LDFLAGS = $(NO_UNDEFINED) +libevolution_a11y_la_LDFLAGS = \ + -avoid-version + $(GNOME_PLATFORM_LIBS) \ + $(A11Y_LIBS) \ + $(NO_UNDEFINED) -libevolution_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - e-text/libgal-a11y-etext.la \ - e-table/libgal-a11y-etable.la \ - $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) +libevolution_a11y_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) \ + $(top_builddir)/a11y/e-text/libgal-a11y-etext.la \ + $(top_builddir)/a11y/e-table/libgal-a11y-etable.la +# $(top_builddir)/e-util/libeutil.la Index: b/a11y/e-table/Makefile.am =================================================================== --- a/a11y/e-table/Makefile.am +++ b/a11y/e-table/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = \ noinst_LTLIBRARIES = libgal-a11y-etable.la -libgal_a11y_etable_la_SOURCES = \ +libgal_a11y_etable_la_SOURCES = \ gal-a11y-e-tree.c \ gal-a11y-e-tree-factory.c \ gal-a11y-e-cell.c \ Index: b/a11y/calendar/Makefile.am =================================================================== --- a/a11y/calendar/Makefile.am +++ b/a11y/calendar/Makefile.am @@ -46,9 +46,11 @@ libevolution_calendar_a11y_la_SOURCES = ea-gnome-calendar.c \ ea-gnome-calendar.h -libevolution_calendar_a11y_la_LDFLAGS = $(NO_UNDEFINED) +libevolution_calendar_a11y_la_LDFLAGS = \ + -avoid-version \ + $(NO_UNDEFINED) \ + $(EVOLUTION_CALENDAR_LIBS) libevolution_calendar_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(EVOLUTION_CALENDAR_LIBS) + $(WIN32_BOOTSTRAP_LIBS) +# $(top_builddir)/a11y/libevolution-a11y.la Index: b/a11y/widgets/Makefile.am =================================================================== --- a/a11y/widgets/Makefile.am +++ b/a11y/widgets/Makefile.am @@ -27,10 +27,12 @@ libevolution_widgets_a11y_la_SOURCES = ea-widgets.c \ ea-widgets.h -libevolution_widgets_a11y_la_LDFLAGS = $(NO_UNDEFINED) +libevolution_widgets_a11y_la_LDFLAGS = \ + -avoid-version \ + $(NO_UNDEFINED) \ + $(E_WIDGETS_LIBS) libevolution_widgets_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(top_builddir)/e-util/libeutil.la \ - $(E_WIDGETS_LIBS) + $(WIN32_BOOTSTRAP_LIBS) +# $(top_builddir)/a11y/libevolution-a11y.la +# $(top_builddir)/e-util/libeutil.la Index: b/a11y/addressbook/Makefile.am =================================================================== --- a/a11y/addressbook/Makefile.am +++ b/a11y/addressbook/Makefile.am @@ -26,8 +26,10 @@ libevolution_addressbook_a11y_la_SOURCES ea-addressbook.c \ ea-addressbook.h -libevolution_addressbook_a11y_la_LDFLAGS = $(NO_UNDEFINED) +libevolution_addressbook_a11y_la_LDFLAGS = \ + -avoid-version \ + $(NO_UNDEFINED) \ + $(EVOLUTION_ADDRESSBOOK_LIBS) libevolution_addressbook_a11y_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(WIN32_BOOTSTRAP_LIBS)
--- calendar/conduits/calendar/Makefile.am | 4 ++-- calendar/conduits/common/Makefile.am | 9 ++++----- calendar/gui/Makefile.am | 23 ++++++++++++----------- calendar/gui/alarm-notify/Makefile.am | 5 ++++- calendar/importers/Makefile.am | 14 +++++++------- 5 files changed, 29 insertions(+), 26 deletions(-) Index: b/calendar/gui/alarm-notify/Makefile.am =================================================================== --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -49,7 +49,10 @@ evolution_alarm_notify_SOURCES = \ evolution_alarm_notify_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la + + +evolution_alarm_notify_LDFLAGS = \ $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) Index: b/calendar/gui/Makefile.am =================================================================== --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -220,22 +220,23 @@ libevolution_calendar_la_SOURCES = \ libevolution_calendar_la_LIBADD = \ $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ $(top_builddir)/calendar/gui/dialogs/libcal-dialogs.la \ $(top_builddir)/calendar/importers/libevolution-calendar-importers.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libefilterbar.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/filter/libfilter.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/a11y/calendar/libevolution-calendar-a11y.la \ - $(LIBSOUP_LIBS) \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) + $(top_builddir)/filter/libfilter.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ + $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la -libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) +libevolution_calendar_la_LDFLAGS = \ + -avoid-version -module \ + $(LIBSOUP_LIBS) \ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(NO_UNDEFINED) server_in_files = GNOME_Evolution_Calendar.server.in.in server_DATA = $(server_in_files:.server.in.in=.server) Index: b/calendar/importers/Makefile.am =================================================================== --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -8,13 +8,13 @@ INCLUDES = \ -I$(top_builddir)/calendar \ $(EVOLUTION_CALENDAR_CFLAGS) -libevolution_calendar_importers_la_SOURCES = \ - evolution-calendar-importer.h \ +libevolution_calendar_importers_la_SOURCES = \ + evolution-calendar-importer.h \ icalendar-importer.c -libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) - -libevolution_calendar_importers_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ +libevolution_calendar_importers_la_LDFLAGS = \ $(EVOLUTION_CALENDAR_LIBS) + +libevolution_calendar_importers_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/calendar/common/libevolution-calendarprivate.la Index: b/calendar/conduits/common/Makefile.am =================================================================== --- a/calendar/conduits/common/Makefile.am +++ b/calendar/conduits/common/Makefile.am @@ -4,7 +4,7 @@ INCLUDES = \ $(EVOLUTION_CALENDAR_CONDUIT_CFLAGS) # Calendar Conduit library -privconduit_LTLIBRARIES = libecalendar_common_conduit.la +noinst_LTLIBRARIES = libecalendar_common_conduit.la ecalendar_common_conduitincludedir = $(privincludedir)/calendar/conduits/common @@ -14,10 +14,9 @@ ecalendar_common_conduitinclude_HEADERS libecalendar_common_conduit_la_SOURCES = \ libecalendar-common-conduit.c -libecalendar_common_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +libecalendar_common_conduit_la_LDFLAGS = -export-dynamic libecalendar_common_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/e-util/libeconduit.la Index: b/calendar/conduits/calendar/Makefile.am =================================================================== --- a/calendar/conduits/calendar/Makefile.am +++ b/calendar/conduits/calendar/Makefile.am @@ -16,9 +16,9 @@ libecalendar_conduit_la_SOURCES = \ libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) libecalendar_conduit_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/e-util/libeconduit.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeconduit.la \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS)
--- Makefile.am | 7 +++---- data/Makefile.am | 5 +++-- e-util/Makefile.am | 12 ++++++++---- filter/Makefile.am | 9 +++++---- mail/Makefile.am | 15 ++++++++------- mail/importers/Makefile.am | 21 +++++++++++---------- smime/gui/Makefile.am | 14 ++++++++------ smime/lib/Makefile.am | 10 ++++++---- 8 files changed, 52 insertions(+), 41 deletions(-) Index: b/smime/gui/Makefile.am =================================================================== --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -33,13 +33,15 @@ libevolution_smime_la_SOURCES = \ component.h -libevolution_smime_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/smime/lib/libessmime.la \ - $(CERT_UI_LIBS) +libevolution_smime_la_LIBADD = \ + $(top_builddir)/smime/lib/libessmime.la +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/shell/libeshell.la -libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) +libevolution_smime_la_LDFLAGS = \ + -avoid-version \ + $(NO_UNDEFINED) \ + $(CERT_UI_LIBS) glade_DATA = smime-ui.glade Index: b/data/Makefile.am =================================================================== --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,8 @@ desktopdir = $(datadir)/applications desktop_in_in_file = evolution.desktop.in.in desktop_file = $(desktop_in_in_file:.desktop.in.in=.desktop) -%.desktop.in: %.desktop.in.in + +$(desktop_in_in_file:.desktop.in.in=.desktop.in): $(desktop_in_in_file) sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|" -e "s|\ DATASERVER_EXEC_VERSION\@|$(DATASERVER_EXEC_VERSION)|" $< > $@ @INTLTOOL_DESKTOP_RULE@ @@ -9,7 +10,7 @@ desktop_file = $(desktop_in_in_file:.des keysdir = $(datadir)/mime-info keys_in_file = evolution.keys.in.in keys_file = $(keys_in_file:.keys.in.in=.keys) -%.keys.in: %.keys.in.in +$(keys_in_file:.keys.in.in=.keys.in): $(keys_in_file) sed -e "s|\ BASE_VERSION\@|$(BASE_VERSION)|" $< > $@ @INTLTOOL_KEYS_RULE@ Index: b/smime/lib/Makefile.am =================================================================== --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -28,11 +28,13 @@ libessmime_la_SOURCES = \ e-pkcs12.c \ e-pkcs12.h -libessmime_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(CERT_UI_LIBS) +#libessmime_la_LIBADD = +# $(top_builddir)/e-util/libeutil.la -libessmime_la_LDFLAGS = $(NO_UNDEFINED) +libessmime_la_LDFLAGS = \ + -avoid-version \ + $(NO_UNDEFINED) \ + $(CERT_UI_LIBS) MARSHAL_GENERATED = smime-marshal.c smime-marshal.h @EVO_MARSHAL_RULE@ Index: b/mail/Makefile.am =================================================================== --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -193,11 +193,8 @@ SMIME_LIBS = \ endif libevolution_mail_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/misc/libefilterbar.la \ $(top_builddir)/filter/libfilter.la \ @@ -205,16 +202,20 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(top_builddir)/mail/importers/libevolution-mail-importers.la \ + $(top_builddir)/mail/importers/libevolution-mail-importers.la + +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/widgets/table/libetable.la +# $(top_builddir)/widgets/text/libetext.la + +libevolution_mail_la_LDFLAGS = \ + -avoid-version -module $(NO_UNDEFINED) \ $(SMIME_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ $(GTKHTML_LIBS) \ $(REGEX_LIBS) \ $(THREADS_LIBS) -libevolution_mail_la_LDFLAGS = \ - -avoid-version -module $(NO_UNDEFINED) - libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h # .server files Index: b/mail/importers/Makefile.am =================================================================== --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -4,12 +4,11 @@ endif privsolib_LTLIBRARIES = libevolution-mail-importers.la -INCLUDES = -I.. \ - -I$(srcdir)/.. \ - -I$(top_srcdir) \ +INCLUDES = \ + -I$(top_srcdir)/mail \ + -I$(top_srcdir)/addressbook/backend \ + -I$(top_builddir)/addressbook/backend \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ - -I$(top_srcdir)/addressbook/backend \ - -I$(top_builddir)/addressbook/backend \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ $(IMPORTERS_CFLAGS) @@ -20,10 +19,12 @@ libevolution_mail_importers_la_SOURCES = pine-importer.c \ evolution-mbox-importer.c -libevolution_mail_importers_la_LDFLAGS = $(NO_UNDEFINED) +libevolution_mail_importers_la_LDFLAGS = \ + $(IMPORTERS_LIBS) \ + $(NO_UNDEFINED) libevolution_mail_importers_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/filter/libfilter.la \ - $(IMPORTERS_LIBS) + $(WIN32_BOOTSTRAP_LIBS) +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/filter/libfilter.la + Index: b/filter/Makefile.am =================================================================== --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -42,13 +42,13 @@ libfilter_la_SOURCES = \ rule-editor.c \ rule-editor.h -libfilter_la_LDFLAGS = $(NO_UNDEFINED) - -libfilter_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ +libfilter_la_LDFLAGS = \ $(LIBFILTER_LIBS) \ $(REGEX_LIBS) +#libfilter_la_LIBADD = \ +# $(top_builddir)/e-util/libeutil.la + EXTRA_DIST = \ $(glade_DATA) \ filter.error.xml \ @@ -58,6 +58,7 @@ EXTRA_DIST = \ # basic rules. error_DATA = filter.error errordir = $(privdatadir)/errors + @EVO_PLUGIN_RULE@ MARSHAL_GENERATED = filter-marshal.c filter-marshal.h Index: b/e-util/Makefile.am =================================================================== --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -124,7 +124,9 @@ libeutil_la_SOURCES = \ MARSHAL_GENERATED = e-util-marshal.c e-util-marshal.h @EVO_MARSHAL_RULE@ -libeutil_la_LDFLAGS = $(NO_UNDEFINED) +libeutil_la_LDFLAGS = \ + -avoid-version \ + $(NO_UNDEFINED) libeutil_la_LIBADD = \ $(WIN32_BOOTSTRAP_LIBS) \ @@ -150,9 +152,11 @@ endif libeconduit_la_SOURCES = $(pilot_compile) -libeconduit_la_LDFLAGS = $(NO_UNDEFINED) - -libeconduit_la_LIBADD = $(E_UTIL_LIBS) $(GNOME_PILOT_LIBS) +libeconduit_la_LDFLAGS = \ + -avoid-version \ + $(E_UTIL_LIBS) \ + $(GNOME_PILOT_LIBS) \ + $(NO_UNDEFINED) error_DATA = e-system.error errordir = $(privdatadir)/errors Index: b/Makefile.am =================================================================== --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ changelogs = \ ChangeLog.pre-1-4 pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = \ +pkgconfig_DATA = \ evolution-shell.pc \ evolution-plugin.pc @@ -24,7 +24,7 @@ EXTRA_DIST = \ intltool-update.in \ intltool-extract.in \ evolution-zip.in \ - gnome-doc-utils.make \ + gnome-doc-utils.make \ $(pkgconfig_DATA:.pc=.pc.in) if ENABLE_SMIME @@ -61,8 +61,7 @@ DISTCLEANFILES = \ intltool-merge \ intltool-update \ iconv-detect.h \ - gnome-doc-utils.make \ - $(pkgconfig_DATA) + gnome-doc-utils.make # Scrollkeeper must be disabled for distcheck to work because # distcheck uses a custom prefix. See GNOME bug #354357.
--- plugins/bogo-junk-plugin/Makefile.am | 4 ++- plugins/calendar-weather/Makefile.am | 13 ++++++---- plugins/default-mailer/Makefile.am | 4 ++- plugins/exchange-operations/Makefile.am | 19 +++++--------- plugins/face/Makefile.am | 7 ----- plugins/groupwise-account-setup/Makefile.am | 18 +++++++------- plugins/groupwise-features/Makefile.am | 36 ++++++++++++++-------------- plugins/hula-account-setup/Makefile.am | 16 +++++++----- plugins/imap-features/Makefile.am | 24 +++++++++--------- plugins/import-ics-attachments/Makefile.am | 18 +++++++------- plugins/itip-formatter/Makefile.am | 17 +++++++------ plugins/mail-account-disable/Makefile.am | 10 ++++--- plugins/mail-to-meeting/Makefile.am | 2 - plugins/mail-to-task/Makefile.am | 19 ++++++++++---- plugins/mark-all-read/Makefile.am | 16 +++++++----- plugins/plugin-manager/Makefile.am | 13 ++++++---- plugins/publish-calendar/Makefile.am | 11 ++++---- plugins/startup-wizard/Makefile.am | 26 ++++++++++---------- 18 files changed, 148 insertions(+), 125 deletions(-) Index: b/plugins/bogo-junk-plugin/Makefile.am =================================================================== --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -8,7 +8,9 @@ plugin_DATA = org-gnome-bogo-junk-plugin plugin_LTLIBRARIES = liborg-gnome-bogo-junk-plugin.la liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c -liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_bogo_junk_plugin_la_LDFLAGS = \ + -module -avoid-version + $(EVOLUTION_MAIL_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = bogo-junk-plugin.schemas.in Index: b/plugins/default-mailer/Makefile.am =================================================================== --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -12,7 +12,9 @@ plugin_DATA = org-gnome-default-m plugin_LTLIBRARIES = liborg-gnome-default-mailer.la liborg_gnome_default_mailer_la_SOURCES = default-mailer.c -liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version +liborg_gnome_default_mailer_la_LDFLAGS = \ + -module -avoid-version \ + $(NO_UNDEFINED) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in Index: b/plugins/import-ics-attachments/Makefile.am =================================================================== --- a/plugins/import-ics-attachments/Makefile.am +++ b/plugins/import-ics-attachments/Makefile.am @@ -1,7 +1,7 @@ INCLUDES = \ - -I$(top_srcdir)\ - -I$(top_srcdir)/camel \ - -I$(top_srcdir)/widgets/misc \ + -I $(top_srcdir) \ + -I $(top_srcdir)/camel \ + -I $(top_srcdir)/widgets/misc \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ @@ -20,11 +20,13 @@ plugin_DATA = org-gnome-evolution-mail-a plugin_LTLIBRARIES = liborg-gnome-evolution-mail-attachments-import-ics.la liborg_gnome_evolution_mail_attachments_import_ics_la_SOURCES = icsimporter.c -liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) +liborg_gnome_evolution_mail_attachments_import_ics_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_MAIL_LIBS) \ + $(NO_UNDEFINED) + +#liborg_gnome_evolution_mail_attachments_import_ics_la_LIBADD = +# $(top_builddir)/e-util/libeutil.la EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml Index: b/plugins/groupwise-features/Makefile.am =================================================================== --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -1,14 +1,16 @@ if OS_WIN32 -NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la +NO_UNDEFINED_REQUIRED_LIBS = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/calendar/gui/libevolution-calendar.la endif INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - -I$(top_srcdir)/widgets/misc \ - -I$(top_srcdir)/camel \ - -I$(top_builddir)/composer \ - -I$(top_builddir)/mail \ + -I $(top_srcdir) \ + -I $(top_srcdir)/widgets \ + -I $(top_srcdir)/widgets/misc \ + -I $(top_srcdir)/camel \ + -I $(top_builddir)/composer \ + -I $(top_builddir)/mail \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ @@ -41,19 +43,19 @@ liborg_gnome_groupwise_features_la_SOURC process-meeting.c \ mail-retract.c -liborg_gnome_groupwise_features_la_LIBADD= \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/filter/libfilter.la \ - $(NO_UNDEFINED_REQUIRED_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_GROUPWISE_LIBS) +#liborg_gnome_groupwise_features_la_LIBADD= +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/filter/libfilter.la +# $(top_builddir)/widgets/misc/libemiscwidgets.la +liborg_gnome_groupwise_features_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ + $(CAMEL_GROUPWISE_LIBS) \ + $(NO_UNDEFINED) -liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) glade_DATA = \ properties.glade \ Index: b/plugins/exchange-operations/Makefile.am =================================================================== --- a/plugins/exchange-operations/Makefile.am +++ b/plugins/exchange-operations/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = -I . \ - -I$(top_srcdir) \ +INCLUDES = \ + -I . \ + -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/calendar \ -I$(top_builddir)/composer \ @@ -49,16 +50,10 @@ liborg_gnome_exchange_operations_la_SOUR exchange-send-options.c \ exchange-send-options.h -liborg_gnome_exchange_operations_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \ - $(CAMEL_EXCHANGE_LIBS) \ - $(EVOLUTION_MAIL_LIBS) - -liborg_gnome_exchange_operations_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_exchange_operations_la_LDFLAGS = \ + -module -avoid-version \ + $(CAMEL_EXCHANGE_LIBS) \ + $(NO_UNDEFINED) glade_DATA = \ exchange-change-password.glade \ Index: b/plugins/plugin-manager/Makefile.am =================================================================== --- a/plugins/plugin-manager/Makefile.am +++ b/plugins/plugin-manager/Makefile.am @@ -1,6 +1,7 @@ INCLUDES = \ -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_MAIL_CFLAGS) \ + $(E_UTIL_CFLAGS) @EVO_PLUGIN_RULE@ @@ -8,10 +9,12 @@ plugin_DATA = org-gnome-plugin-manager.e plugin_LTLIBRARIES = liborg-gnome-plugin-manager.la liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c -liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_plugin_manager_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_MAIL_LIBS) + +liborg_gnome_plugin_manager_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_MAIL_LIBS) \ + $(E_UTIL_LIBS) \ + $(NO_UNDEFINED) EXTRA_DIST = \ org-gnome-plugin-manager.eplug.xml \ Index: b/plugins/mark-all-read/Makefile.am =================================================================== --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = \ - -I$(top_srcdir)\ - -I$(top_srcdir)/camel \ + -I $(top_srcdir) \ + -I $(top_srcdir)/camel \ $(EVOLUTION_MAIL_CFLAGS) @EVO_PLUGIN_RULE@ @@ -8,13 +8,15 @@ INCLUDES = \ plugin_DATA = org-gnome-mark-all-read.eplug plugin_LTLIBRARIES = liborg-gnome-mark-all-read.la -liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c -liborg_gnome_mark_all_read_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_mark_all_read_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la \ +liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c + +liborg_gnome_mark_all_read_la_LDFLAGS = \ + -module -avoid-version \ $(EVOLUTION_MAIL_LIBS) +#liborg_gnome_mark_all_read_la_LIBADD = \ +# $(top_builddir)/e-util/libeutil.la + EXTRA_DIST = org-gnome-mark-all-read.eplug.xml BUILT_SOURCES = $(plugin_DATA) Index: b/plugins/hula-account-setup/Makefile.am =================================================================== --- a/plugins/hula-account-setup/Makefile.am +++ b/plugins/hula-account-setup/Makefile.am @@ -14,14 +14,16 @@ liborg_gnome_evolution_hula_account_setu camel-hula-listener.h \ hula-account-setup.c -liborg_gnome_evolution_hula_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - -liborg_gnome_evolution_hula_account_setup_la_LIBADD= \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/filter/libfilter.la \ - $(EVOLUTION_CALENDAR_LIBS) \ +liborg_gnome_evolution_hula_account_setup_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) + $(NO_UNDEFINED) + +#liborg_gnome_evolution_hula_account_setup_la_LIBADD= +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/widgets/misc/libemiscwidgets.la +# $(top_builddir)/filter/libfilter.la EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml Index: b/plugins/mail-to-meeting/Makefile.am =================================================================== --- a/plugins/mail-to-meeting/Makefile.am +++ b/plugins/mail-to-meeting/Makefile.am @@ -8,7 +8,7 @@ plugin_DATA = org-gnome-mail-to-meeting. plugin_LTLIBRARIES = liborg-gnome-mail-to-meeting.la liborg_gnome_mail_to_meeting_la_SOURCES = mail-to-meeting.c -liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version +liborg_gnome_mail_to_meeting_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) EXTRA_DIST = org-gnome-mail-to-meeting.eplug.xml Index: b/plugins/face/Makefile.am =================================================================== --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -9,7 +9,6 @@ INCLUDES = -I. \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DCONNECTOR_GLADEDIR=\""$(gladedir)"\" - @EVO_PLUGIN_RULE@ plugin_DATA = \ @@ -19,12 +18,6 @@ plugin_LTLIBRARIES = liborg-gnome-face.l liborg_gnome_face_la_SOURCES = \ face.c -liborg_gnome_face_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(NO_UNDEFINED_REQUIRED_LIBS) liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) Index: b/plugins/startup-wizard/Makefile.am =================================================================== --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -1,5 +1,6 @@ -INCLUDES = -I . \ - -I$(top_srcdir) \ +INCLUDES = \ + -I . \ + -I $(top_srcdir) \ -I$(top_builddir)/shell \ $(EVOLUTION_MAIL_CFLAGS) @@ -11,16 +12,17 @@ plugin_LTLIBRARIES = liborg-gnome-evolut liborg_gnome_evolution_startup_wizard_la_SOURCES = \ startup-wizard.c -liborg_gnome_evolution_startup_wizard_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) - -liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +#liborg_gnome_evolution_startup_wizard_la_LIBADD = \ +# $(top_builddir)/e-util/libeutil.la \ +# $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ +# $(top_builddir)/widgets/misc/libemiscwidgets.la + +liborg_gnome_evolution_startup_wizard_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ + $(E_WIDGETS_LIBS) \ + $(E_UTIL_LIBS) EXTRA_DIST = org-gnome-evolution-startup-wizard.eplug.xml Index: b/plugins/imap-features/Makefile.am =================================================================== --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -1,11 +1,13 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = $(top_builddir)/mail/libevolution-mail.la +else +NO_UNDEFINED_REQUIRED_LIBS = endif INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/mail \ - -I$(top_srcdir)/libedataserver \ + -I $(top_srcdir) \ + -I $(top_srcdir)/mail \ + -I $(top_srcdir)/libedataserver \ $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_IMAP_CFLAGS) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ @@ -16,18 +18,16 @@ INCLUDES = \ plugin_DATA = org-gnome-imap-features.eplug plugin_LTLIBRARIES = liborg-gnome-imap-features.la -liborg_gnome_imap_features_la_SOURCES = \ - imap-headers.c +liborg_gnome_imap_features_la_SOURCES = imap-headers.c -liborg_gnome_imap_features_la_LIBADD= \ - $(NO_UNDEFINED_REQUIRED_LIBS) \ - $(EVOLUTION_MAIL_LIBS) +liborg_gnome_imap_features_la_LIBADD = \ + $(NO_UNDEFINED_REQUIRED_LIBS) +liborg_gnome_imap_features_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_MAIL_LIBS) -liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) - -glade_DATA = \ - imap-headers.glade +glade_DATA = imap-headers.glade errordir = $(privdatadir)/errors Index: b/plugins/mail-to-task/Makefile.am =================================================================== --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -1,17 +1,26 @@ INCLUDES = \ -I$(top_srcdir) \ - $(EVOLUTION_MAIL_CFLAGS) + -I$(top_builddir) \ + $(EVOLUTION_MAIL_CFLAGS) \ + $(EVOLUTION_CALENDAR_CFLAGS) \ + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" @EVO_PLUGIN_RULE@ -plugin_DATA = org-gnome-mail-to-task.eplug org-gnome-mail-to-task.xml +plugin_DATA = \ + org-gnome-mail-to-task.eplug \ + org-gnome-mail-to-task.xml + plugin_LTLIBRARIES = liborg-gnome-mail-to-task.la liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c -liborg_gnome_mail_to_task_la_LDFLAGS = -module -avoid-version +liborg_gnome_mail_to_task_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(NO_UNDEFINED) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml \ org-gnome-mail-to-task.xml -BUILT_SOURCES = org-gnome-mail-to-task.eplug -CLEANFILES = $(BUILT_SOURCES) +CLEANFILES = org-gnome-publish-calendar.eplug Index: b/plugins/itip-formatter/Makefile.am =================================================================== --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -9,13 +9,15 @@ plugin_DATA = org-gnome-itip-formatter.e plugin_LTLIBRARIES = liborg-gnome-itip-formatter.la liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h -liborg_gnome_itip_formatter_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_itip_formatter_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) + +liborg_gnome_itip_formatter_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(CAMEL_LIBS) \ + $(E_UTIL_LIBS) + +#liborg_gnome_itip_formatter_la_LIBADD = \ +# $(top_builddir)/e-util/libeutil.la error_DATA = org-gnome-itip-formatter.error errordir = $(privdatadir)/errors @@ -28,4 +30,3 @@ EXTRA_DIST = \ org-gnome-itip-formatter.eplug.xml \ org-gnome-itip-formatter.error.xml - Index: b/plugins/calendar-weather/Makefile.am =================================================================== --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -2,8 +2,8 @@ eds_datadir = `pkg-config --variable=pri weatherdatadir = $(datadir)/evolution/$(BASE_VERSION)/weather INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/shell \ + -I $(top_srcdir) \ + -I $(top_builddir)/shell \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SOURCE_SEL_CFLAGS) \ -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ @@ -24,11 +24,14 @@ plugin_DATA = org-gnome-calendar-weather plugin_LTLIBRARIES = liborg-gnome-calendar-weather.la liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c -liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_calendar_weather_la_LIBADD = \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ +liborg_gnome_calendar_weather_la_LDFLAGS = \ + -module -avoid-version $(EVOLUTION_CALENDAR_LIBS) +liborg_gnome_calendar_weather_la_LIBADD = +#\ +# $(top_builddir)/calendar/gui/libevolution-calendar.la + EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ $(weatherdata_DATA) Index: b/plugins/groupwise-account-setup/Makefile.am =================================================================== --- a/plugins/groupwise-account-setup/Makefile.am +++ b/plugins/groupwise-account-setup/Makefile.am @@ -16,15 +16,17 @@ liborg_gnome_gw_account_setup_la_SOURCES camel-gw-listener.h \ groupwise-account-setup.c -liborg_gnome_gw_account_setup_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_gw_account_setup_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ + $(CAMEL_GROUPWISE_LIBS) \ + $(NO_UNDEFINED) -liborg_gnome_gw_account_setup_la_LIBADD= \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/filter/libfilter.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_GROUPWISE_LIBS) +#liborg_gnome_gw_account_setup_la_LIBADD= +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/widgets/misc/libemiscwidgets.la +# $(top_builddir)/filter/libfilter.la EXTRA_DIST = org-gnome-gw-account-setup.eplug.xml Index: b/plugins/mail-account-disable/Makefile.am =================================================================== --- a/plugins/mail-account-disable/Makefile.am +++ b/plugins/mail-account-disable/Makefile.am @@ -10,10 +10,12 @@ plugin_DATA = org-gnome-mail-account-dis plugin_LTLIBRARIES = libmail-account-disable.la libmail_account_disable_la_SOURCES = mail-account-disable.c -libmail_account_disable_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -libmail_account_disable_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) +libmail_account_disable_la_LDFLAGS = \ + -module -avoid-version \ + $(NO_UNDEFINED) + +#libmail_account_disable_la_LIBADD = \ +# $(top_builddir)/e-util/libeutil.la EXTRA_DIST = org-gnome-mail-account-disable.eplug.xml Index: b/plugins/publish-calendar/Makefile.am =================================================================== --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -27,12 +27,13 @@ liborg_gnome_publish_calendar_la_SOURCES url-editor-dialog.c \ url-editor-dialog.h -liborg_gnome_publish_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) +liborg_gnome_publish_calendar_la_LDFLAGS = \ + -module -avoid-version \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(NO_UNDEFINED) -liborg_gnome_publish_calendar_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(EVOLUTION_CALENDAR_LIBS) +#liborg_gnome_publish_calendar_la_LIBADD = +# $(top_builddir)/e-util/libeutil.la EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \
--- widgets/e-timezone-dialog/Makefile.am | 31 ++++++++++++++++++------------- widgets/menus/Makefile.am | 17 +++++++---------- widgets/misc/Makefile.am | 27 ++++++++++++++------------- widgets/table/Makefile.am | 13 +++++++------ widgets/text/Makefile.am | 17 ++++++++--------- 5 files changed, 54 insertions(+), 51 deletions(-) Index: b/widgets/text/Makefile.am =================================================================== --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -1,5 +1,8 @@ if OS_WIN32 -WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la +WIN32_BOOTSTRAP_LIBS = $(top_builddir)/win32/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(top_builddir)/widgets/table/libetable.la endif INCLUDES = \ @@ -8,7 +11,6 @@ INCLUDES = \ $(GNOME_PLATFORM_CFLAGS) \ -DG_LOG_DOMAIN=\"e-text\" - privsolib_LTLIBRARIES = libetext.la libetext_la_SOURCES = \ @@ -23,12 +25,9 @@ libetextinclude_HEADERS = \ e-text-model.h \ e-text.h -libetext_la_LDFLAGS = $(NO_UNDEFINED) +libetext_la_LDFLAGS = \ + $(GNOME_PLATFORM_LIBS) \ + $(REGEX_LIBS) libetext_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(GNOME_PLATFORM_LIBS) \ - $(REGEX_LIBS) + $(WIN32_BOOTSTRAP_LIBS) Index: b/widgets/menus/Makefile.am =================================================================== --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -40,15 +40,12 @@ libmenusinclude_HEADERS = \ gal-view-new-dialog.h \ gal-view.h -libmenus_la_LDFLAGS = $(NO_UNDEFINED) - -libmenus_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +libmenus_la_LDFLAGS = \ $(E_UTIL_LIBS) -icons = -EXTRA_DIST = \ - $(icons) \ - $(glade_DATA) +#libmenus_la_LIBADD = +# $(top_builddir)/widgets/misc/libemiscwidgets.la +# $(top_builddir)/e-util/libeutil.la +# $(top_builddir)/widgets/table/libetable.la + +EXTRA_DIST = $(glade_DATA) Index: b/widgets/table/Makefile.am =================================================================== --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -1,6 +1,8 @@ if OS_WIN32 WIN32_BOOTSTRAP_LIBS = \ $(top_builddir)/win32/libemiscwidgets.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/win32/libetext.la endif @@ -147,14 +149,13 @@ libetableinclude_HEADERS = \ e-tree-table-adapter.h \ e-tree.h -libetable_la_LDFLAGS = $(NO_UNDEFINED) +libetable_la_LDFLAGS = \ + $(E_WIDGETS_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(NO_UNDEFINED) libetable_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(E_WIDGETS_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(WIN32_BOOTSTRAP_LIBS) icons = \ add-col.xpm \ Index: b/widgets/e-timezone-dialog/Makefile.am =================================================================== --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -1,24 +1,29 @@ -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DG_LOG_DOMAIN=__FILE__ \ +#if OS_WIN32 +#WIN32_BOOTSTRAP_LIBS = \ +# $(top_builddir)/e-util/libeutil.la \ +# $(top_builddir)/widgets/misc/libemiscwidgets.la \ +#endif + +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DG_LOG_DOMAIN=__FILE__ \ $(TZDIALOG_CFLAGS) -privsolib_LTLIBRARIES = \ +privsolib_LTLIBRARIES = \ libetimezonedialog.la -libetimezonedialog_la_SOURCES = \ - e-timezone-dialog.c \ +libetimezonedialog_la_SOURCES = \ + e-timezone-dialog.c \ e-timezone-dialog.h -libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) - -libetimezonedialog_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +libetimezonedialog_la_LDFLAGS = \ $(EVOLUTION_CALENDAR_LIBS) +libetimezonedialog_la_LIBADD = \ + $(WIN32_BOOTSTRAP_LIBS) + glade_DATA = e-timezone-dialog.glade EXTRA_DIST = $(glade_DATA) Index: b/widgets/misc/Makefile.am =================================================================== --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -9,10 +9,11 @@ INCLUDES = \ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) \ + $(E_UTIL_CFLAGS) \ $(ICONV_CFLAGS) +# $(EVOLUTION_MAIL_CFLAGS) +# $(GNOME_PLATFORM_CFLAGS) privsolib_LTLIBRARIES = \ libemiscwidgets.la \ @@ -128,29 +129,29 @@ libemiscwidgets_la_SOURCES = \ e-colors.c -libemiscwidgets_la_LDFLAGS = $(NO_UNDEFINED) +libemiscwidgets_la_LDFLAGS = \ + $(NO_UNDEFINED) \ + $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTON_MAIL_LIBS) \ + $(ICONV_LIBS) -libemiscwidgets_la_LIBADD = $(top_builddir)/e-util/libeutil.la \ +libemiscwidgets_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/widgets/text/libetext.la \ - $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ $(top_builddir)/a11y/libevolution-a11y.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTON_MAIL_LIBS) \ - $(ICONV_LIBS) + $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la libefilterbar_la_SOURCES = \ e-filter-bar.c \ e-filter-bar.h -libefilterbar_la_LDFLAGS = $(NO_UNDEFINED) +libefilterbar_la_LDFLAGS = \ + $(NO_UNDEFINED) \ + $(E_WIDGETS_LIBS) libefilterbar_la_LIBADD = \ - $(WIN32_BOOTSTRAP_LIBS) \ - libemiscwidgets.la \ - $(E_WIDGETS_LIBS) + $(WIN32_BOOTSTRAP_LIBS) noinst_PROGRAMS = \ test-calendar \
Attachment:
signature.asc
Description: Ceci est une partie de message =?ISO-8859-1?Q?num=E9riquement?= =?ISO-8859-1?Q?_sign=E9e?=