diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-10-05 09:32:41 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-10-05 10:27:14 +0800 |
| commit | 1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba (patch) | |
| tree | 8b3d99bcac99c3a3edbb2939ea0226c187a39eb4 | |
| parent | 273b10a5baebd97bea4aeb1dae158f93ce93eb72 (diff) | |
| download | gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.gz gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.bz2 gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.lz gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.xz gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.tar.zst gsoc2013-evolution-1f38f4d92ca8eb97381b2c9a7022830a6d4bcaba.zip | |
Simplify library dependency flags.
We have a confusing array of nearly-identical CFLAGS/LIBS definitions in
configure.ac. Time to simplify. Instead let's just have one definition
that includes all the libraries provided by Evolution-Data-Server (incl.
Camel). That, in combination with GNOME_PLATFORM, gives us most of what
we need for compliation and linking, and we can sprinkle definitions for
additional library dependencies in Makefile.am's as needed.
79 files changed, 365 insertions, 451 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index eb457da7fa..254af85207 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -11,8 +11,8 @@ libecontacteditor_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libecontacteditor_la_SOURCES = \ eab-editor.c \ @@ -34,7 +34,7 @@ libecontacteditor_la_LIBADD = \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ $(top_builddir)/widgets/menus/libmenus.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) ui_DATA = \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index 657bbf1da9..bcd398955d 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -10,9 +10,8 @@ libecontactlisteditor_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(CAMEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libecontactlisteditor_la_SOURCES = \ e-contact-list-editor.c \ @@ -29,9 +28,8 @@ libecontactlisteditor_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ - $(CAMEL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = contact-list-editor.ui diff --git a/addressbook/gui/merging/Makefile.am b/addressbook/gui/merging/Makefile.am index 01af6b2534..b1c2b45cf4 100644 --- a/addressbook/gui/merging/Makefile.am +++ b/addressbook/gui/merging/Makefile.am @@ -7,8 +7,9 @@ libeabbookmerging_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) libeabbookmerging_la_SOURCES = \ eab-contact-compare.c \ diff --git a/addressbook/gui/widgets/Makefile.am b/addressbook/gui/widgets/Makefile.am index 40c57650bb..546a218ff2 100644 --- a/addressbook/gui/widgets/Makefile.am +++ b/addressbook/gui/widgets/Makefile.am @@ -18,9 +18,10 @@ libeabwidgets_la_CPPFLAGS = \ -I$(top_srcdir)/addressbook/util \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(CHAMPLAIN_CFLAGS) + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) eabincludedir = $(privincludedir)/addressbook/gui/widgets @@ -71,8 +72,10 @@ libeabwidgets_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/a11y/libevolution-a11y.la \ $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CHAMPLAIN_LIBS) + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/addressbook/importers/Makefile.am b/addressbook/importers/Makefile.am index 742f46a334..ea29cdc38b 100644 --- a/addressbook/importers/Makefile.am +++ b/addressbook/importers/Makefile.am @@ -9,7 +9,8 @@ libevolution_addressbook_importers_la_CPPFLAGS = \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_addressbook_importers_la_SOURCES = \ evolution-ldif-importer.c \ @@ -23,6 +24,7 @@ libevolution_addressbook_importers_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(IMPORTERS_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GTKHTML_LIBS) -include $(top_srcdir)/git.mk diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index c315b49d0a..edf3cc9795 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -11,8 +11,8 @@ libecontactprint_la_CPPFLAGS = \ -I$(top_srcdir) \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) noinst_LTLIBRARIES = libecontactprint.la @@ -22,8 +22,9 @@ libecontactprint_la_SOURCES = \ e-contact-print.h libecontactprint_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) noinst_PROGRAMS = contact-print-test @@ -34,17 +35,17 @@ contact_print_test_CPPFLAGS = \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir) \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) contact_print_test_SOURCES = test-print.c contact_print_test_LDADD = \ libecontactprint.la \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ diff --git a/addressbook/tools/Makefile.am b/addressbook/tools/Makefile.am index 35d742ef3d..26ead07ac5 100644 --- a/addressbook/tools/Makefile.am +++ b/addressbook/tools/Makefile.am @@ -16,7 +16,7 @@ evolution_addressbook_export_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ -I$(top_srcdir)/addressbook \ -I$(top_builddir)/addressbook \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) evolution_addressbook_export_SOURCES = \ evolution-addressbook-export.c \ @@ -25,7 +25,7 @@ evolution_addressbook_export_SOURCES = \ evolution-addressbook-export.h evolution_addressbook_export_LDADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) if OS_WIN32 evolution_addressbook_export_LDFLAGS = -mwindows diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index fe45b3d7e2..ea70fbb9ca 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -11,8 +11,8 @@ libeabutil_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libeabutil_la_SOURCES = \ eab-book-util.c \ @@ -24,7 +24,7 @@ libeabutil_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) dist-hook: diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 1531bb8d60..ce1f832ba3 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -67,10 +67,10 @@ libevolution_calendar_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(LIBSOUP_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(CAMEL_CFLAGS) + $(GTKHTML_CFLAGS) \ + $(LIBSOUP_CFLAGS) etspec_DATA = \ e-calendar-table.etspec \ @@ -213,10 +213,10 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/e-util/libeutil.la \ - $(CAMEL_LIBS) \ - $(LIBSOUP_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ + $(LIBSOUP_LIBS) libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index c15181ad9c..82fdeeb77e 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -18,9 +18,9 @@ evolution_alarm_notify_CPPFLAGS = \ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CAMEL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ $(CANBERRA_CFLAGS) ui_DATA = \ @@ -44,10 +44,10 @@ evolution_alarm_notify_SOURCES = \ evolution_alarm_notify_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(CANBERRA_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(CANBERRA_LIBS) \ $(EVOLUTIONALARMNOTIFYICON) if OS_WIN32 diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 684550990b..b7235ede2a 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -12,11 +12,10 @@ libcal_dialogs_la_CPPFLAGS = \ -I$(top_srcdir)/widgets/misc \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DPREFIX=\""$(prefix)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(CAMEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) ecalendarincludedir = $(privincludedir)/calendar/gui/dialogs @@ -51,7 +50,7 @@ ecalendarinclude_HEADERS = \ libcal_dialogs_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ - $(CAMEL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) libcal_dialogs_la_SOURCES = \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index dc7b0dc89f..b16109978e 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -8,8 +8,9 @@ libevolution_calendar_importers_la_CPPFLAGS = \ -I$(top_srcdir)/calendar \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/calendar \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(GTKHTML_CFLAGS) libevolution_calendar_importers_la_SOURCES = \ evolution-calendar-importer.h \ @@ -17,11 +18,12 @@ libevolution_calendar_importers_la_SOURCES = \ libevolution_calendar_importers_la_LDFLAGS = $(NO_UNDEFINED) -libevolution_calendar_importers_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) +libevolution_calendar_importers_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) -include $(top_srcdir)/git.mk diff --git a/capplet/Makefile.am b/capplet/Makefile.am index 14247f1fbb..f5b32eff7c 100644 --- a/capplet/Makefile.am +++ b/capplet/Makefile.am @@ -15,8 +15,8 @@ evolution_settings_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/smime/lib \ -I$(top_srcdir)/smime/gui \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ @@ -42,13 +42,12 @@ evolution_settings_LDFLAGS = -mwindows endif evolution_settings_LDADD = \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/capplet/settings/Makefile.am b/capplet/settings/Makefile.am index dd8c3c9a45..9bd84db94b 100644 --- a/capplet/settings/Makefile.am +++ b/capplet/settings/Makefile.am @@ -16,10 +16,11 @@ libevolution_mail_settings_la_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/smime/lib \ -I$(top_srcdir)/smime/gui \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ + $(GTKHTML_CFLAGS) \ -DANJAL_SETTINGS \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ @@ -52,13 +53,12 @@ libevolution_mail_settings_la_SOURCES = \ mail-guess-servers.h libevolution_mail_settings_la_LIBADD = \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/mail/libevolution-mail.la \ diff --git a/composer/Makefile.am b/composer/Makefile.am index 5cd2eab05c..013d04c8bd 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -37,8 +37,9 @@ libcomposer_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\"$(uidir)\" \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"composer\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) libcomposer_la_SOURCES = \ $(libcomposerinclude_HEADERS) \ @@ -62,8 +63,9 @@ libcomposer_la_LIBADD = \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) ui_DATA = evolution-composer.ui diff --git a/configure.ac b/configure.ac index 5d079c1726..ea039fbeee 100644 --- a/configure.ac +++ b/configure.ac @@ -255,11 +255,14 @@ AC_SUBST(GNOME_PLATFORM_CFLAGS) AC_SUBST(GNOME_PLATFORM_LIBS) PKG_CHECK_MODULES([EVOLUTION_DATA_SERVER], - [libebook-1.2 >= eds_minimum_version + [camel-1.2 >= eds_minimum_version + libebook-1.2 >= eds_minimum_version libecal-1.2 >= eds_minimum_version libedataserver-1.2 >= eds_minimum_version libedataserverui-3.0 >= eds_minimum_version libebackend-1.2 >= eds_minimum_version]) +AC_SUBST(EVOLUTION_DATA_SERVER_CFLAGS) +AC_SUBST(EVOLUTION_DATA_SERVER_LIBS) dnl ****************************** dnl Canberra / Canberra-GTK Sound @@ -684,7 +687,9 @@ dnl ************************* dnl GTKHTML check dnl XXX Drop the version from the package name? dnl ************************* -PKG_CHECK_MODULES([GTKHTML], [libgtkhtml-4.0 >= gtkhtml_minimum_version]) +PKG_CHECK_MODULES([GTKHTML], + [libgtkhtml-4.0 >= gtkhtml_minimum_version + gtkhtml-editor-4.0]) AC_SUBST(GTKHTML_CFLAGS) AC_SUBST(GTKHTML_LIBS) @@ -1193,13 +1198,6 @@ if test "x$enable_nm$enable_connman" = "xyesyes"; then fi AM_CONDITIONAL([ENABLE_CONNMAN], [test "$enable_connman" = yes]) -dnl ****************************** -dnl Camel Flags -dnl ****************************** -EVO_SET_COMPILE_FLAGS(CAMEL, camel-1.2, $MANUAL_NSS_CFLAGS, $MOXILLA_NSS_CFLAGS) -AC_SUBST(CAMEL_CFLAGS) -AC_SUBST(CAMEL_LIBS) - if test "x$mozilla_nss" != "x"; then EVO_SET_COMPILE_FLAGS(MOZILLA_NSS, $mozilla_nss) MOZILLA_L_DIR=`${PKG_CONFIG} --libs-only-L $mozilla_nss` @@ -1219,64 +1217,11 @@ dnl (which are dragged in through libedataserverui), as both dnl gnutls and mozilla-nss have a header called "pkcs12.h" which is dnl included in smime/lib/e-pkcs12.c. It wants the Mozilla NSS one. dnl -EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-3.0) -CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS $CERT_UI_CFLAGS" -CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS $CERT_UI_LIBS" +CERT_UI_CFLAGS="$MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS" +CERT_UI_LIBS="$MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS" AC_SUBST(CERT_UI_CFLAGS) AC_SUBST(CERT_UI_LIBS) -dnl ************ -dnl E_UTIL Flags -dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, libebackend-1.2 libedataserverui-3.0 camel-1.2 $mozilla_nspr, $MANUAL_NSPR_CFLAGS $MANUAL_NSPR_LIBS) -AC_SUBST(E_UTIL_CFLAGS) -AC_SUBST(E_UTIL_LIBS) - -E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB" - -dnl ************** -dnl TZDIALOG Flags -dnl ************** -EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-1.2 camel-1.2) -AC_SUBST(TZDIALOG_CFLAGS) -AC_SUBST(TZDIALOG_LIBS) - -dnl *************** -dnl E_WIDGETS Flags -dnl *************** -EVO_SET_COMPILE_FLAGS(E_WIDGETS, libedataserverui-3.0 gtkhtml-editor-4.0) -AC_SUBST(E_WIDGETS_CFLAGS) -AC_SUBST(E_WIDGETS_LIBS) - -dnl *************** -dnl IMPORTERS Flags -dnl *************** -EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-3.0 camel-1.2 libebook-1.2) -AC_SUBST(IMPORTERS_CFLAGS) -AC_SUBST(IMPORTERS_LIBS) - -dnl *************** -dnl LIBFILTER Flags -dnl *************** -EVO_SET_COMPILE_FLAGS(LIBFILTER, libedataserver-1.2 camel-1.2) -AC_SUBST(LIBFILTER_CFLAGS) -AC_SUBST(LIBFILTER_LIBS) - -dnl *********** -dnl Shell Flags -dnl *********** -EVO_SET_COMPILE_FLAGS(SHELL, libgtkhtml-4.0 libedataserverui-3.0) -AC_SUBST(SHELL_CFLAGS) -AC_SUBST(SHELL_LIBS) - -dnl ***************** -dnl Addressbook Flags -dnl ***************** -EVOLUTION_ADDRESSBOOK_DEPS="libgtkhtml-4.0 libebook-1.2 libedataserverui-3.0 camel-1.2 gtkhtml-editor-4.0" -EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) -AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) - dnl *************** dnl Libnotify Flags dnl *************** @@ -1299,11 +1244,11 @@ fi dnl ************** dnl Calendar Flags dnl ************** -EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version) +PKG_CHECK_MODULES([LIBSOUP], [libsoup-gnome-2.4 >= libsoup_minimum_version]) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.7.0) +PKG_CHECK_MODULES([GDATA], [libgdata >= 0.7.0]) AC_SUBST(GDATA_CFLAGS) AC_SUBST(GDATA_LIBS) @@ -1311,16 +1256,12 @@ if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher]) fi -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0) -AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) -AC_SUBST(EVOLUTION_CALENDAR_LIBS) - dnl **************************** dnl Check for ical_set_unknown_token_handling_setting function dnl **************************** AC_MSG_CHECKING([ical_set_unknown_token_handling_setting function]) -save_cflags=$CFLAGS; CFLAGS=$EVOLUTION_CALENDAR_CFLAGS -save_libs=$LIBS; LIBS="$EVOLUTION_CALENDAR_LIBS" +save_cflags=$CFLAGS; CFLAGS="$EVOLUTION_DATA_SERVER_CFLAGS" +save_libs=$LIBS; LIBS="$EVOLUTION_DATA_SERVER_LIBS" AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include <libical/ical.h>]], [[ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN)]])], @@ -1329,19 +1270,6 @@ CFLAGS=$save_cflags LIBS=$save_libs AC_MSG_RESULT([$ac_cv_have_iuth]) -dnl ********** -dnl Mail Flags -dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-1.2 libgtkhtml-4.0 gtkhtml-editor-4.0 $mozilla_nss libebook-1.2 libedataserverui-3.0) -AC_SUBST(EVOLUTION_MAIL_CFLAGS) -AC_SUBST(EVOLUTION_MAIL_LIBS) - -dnl *************************** -dnl Evolution-Data-Server Flags -dnl *************************** -DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2` -AC_SUBST(DATASERVER_EXEC_VERSION) - dnl ***************** dnl EggSMClient Flags dnl ***************** diff --git a/doc/reference/shell/Makefile.am b/doc/reference/shell/Makefile.am index 52134aba8f..114b0e2bf5 100644 --- a/doc/reference/shell/Makefile.am +++ b/doc/reference/shell/Makefile.am @@ -51,8 +51,8 @@ expand_content_files= GTKDOC_CFLAGS= \ -I$(top_builddir) \ -I$(top_srcdir) \ - $(SHELL_CFLAGS) \ - $(EVOLUTION_DATA_SERVER_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GTKHTML_CFLAGS) GTKDOC_LIBS= \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/e-util/libeutil.la \ @@ -61,8 +61,8 @@ GTKDOC_LIBS= \ $(top_builddir)/smclient/libeggdesktopfile.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(SHELL_LIBS) \ - $(EVOLUTION_DATA_SERVER_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GTKHTML_LIBS) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/e-util/Makefile.am b/e-util/Makefile.am index 42fda2d9dd..b5d4559cce 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -85,8 +85,8 @@ libeutil_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_RULEDIR=\"$(ruledir)\" \ -DG_LOG_DOMAIN=\"e-utils\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libeutil_la_SOURCES = \ $(eutilinclude_HEADERS) \ @@ -133,10 +133,10 @@ libeutil_la_SOURCES = \ libeutil_la_LDFLAGS = $(NO_UNDEFINED) -libeutil_la_LIBADD = \ - $(ICONV_LIBS) \ - $(E_UTIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ +libeutil_la_LIBADD = \ + $(ICONV_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(INTLLIBS) error_DATA = e-system.error diff --git a/em-format/Makefile.am b/em-format/Makefile.am index df052fe915..07ff63cc2a 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -12,8 +12,8 @@ libemformat_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libemformat_la_SOURCES = \ $(emformatinclude_HEADERS) \ @@ -27,7 +27,7 @@ libemformat_la_LDFLAGS = $(NO_UNDEFINED) libemformat_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) -include $(top_srcdir)/git.mk diff --git a/filter/Makefile.am b/filter/Makefile.am index c8c978025c..e28014559b 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -8,8 +8,8 @@ libfilter_la_CPPFLAGS = \ -I $(top_srcdir)/e-util \ -DEVOLUTION_UIDIR=\"$(uidir)\" \ -DG_LOG_DOMAIN=\"filter\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(LIBFILTER_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) filterincludedir = $(privincludedir)/filter @@ -57,7 +57,7 @@ libfilter_la_LDFLAGS = $(NO_UNDEFINED) libfilter_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(LIBFILTER_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(REGEX_LIBS) diff --git a/mail/Makefile.am b/mail/Makefile.am index 97a2fe39a4..1ddbec649c 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -25,16 +25,17 @@ libevolution_mail_la_CPPFLAGS = \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/smime/lib \ -I$(top_srcdir)/smime/gui \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(CERT_UI_CFLAGS) \ $(CANBERRA_CFLAGS) \ $(CLUTTER_CFLAGS) \ + $(GTKHTML_CFLAGS) \ -DEVOLUTION_DATADIR=\""$(datadir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_ICONDIR=\""$(icondir)"\" \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_GALVIEWSDIR=\""$(viewsdir)"\" \ -DEVOLUTION_BUTTONSDIR=\""$(buttonsdir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ @@ -209,14 +210,13 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/filter/libfilter.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) \ $(CANBERRA_LIBS) \ $(CLUTTER_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ - $(SMIME_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(SMIME_LIBS) libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/mail/importers/Makefile.am b/mail/importers/Makefile.am index 0c1864928b..fa1a400f03 100644 --- a/mail/importers/Makefile.am +++ b/mail/importers/Makefile.am @@ -6,11 +6,11 @@ libevolution_mail_importers_la_CPPFLAGS = \ -I$(srcdir)/.. \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ -DG_LOG_DOMAIN=\"evolution-mail-importer\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - $(IMPORTERS_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_mail_importers_la_SOURCES = \ mail-importer.c \ @@ -28,8 +28,8 @@ libevolution_mail_importers_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(IMPORTERS_LIBS) + $(GTKHTML_LIBS) -include $(top_srcdir)/git.mk diff --git a/maint/Makefile.am b/maint/Makefile.am index dc2b1165bd..175832e0f7 100644 --- a/maint/Makefile.am +++ b/maint/Makefile.am @@ -16,8 +16,6 @@ libgladeevolution_la_LIBADD = \ $(top_srcdir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index b6dec30b0a..5757ac2e74 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -19,8 +19,9 @@ libevolution_module_addressbook_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(LDAP_CFLAGS) \ $(CHAMPLAIN_CFLAGS) @@ -72,8 +73,9 @@ libevolution_module_addressbook_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) \ $(LDAP_LIBS) diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am index 7803267836..5fbf45e5b4 100644 --- a/modules/bogofilter/Makefile.am +++ b/modules/bogofilter/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_bogofilter_la_CPPFLAGS = \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-bogofilter\" \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_bogofilter_la_SOURCES = \ evolution-bogofilter.c @@ -14,8 +14,8 @@ libevolution_module_bogofilter_la_SOURCES = \ libevolution_module_bogofilter_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_bogofilter_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index c725dedb1c..4f09f92692 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -7,9 +7,9 @@ libevolution_module_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ - $(CAMEL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(GTKHTML_CFLAGS) libevolution_module_calendar_la_SOURCES = \ evolution-module-calendar.c \ @@ -94,9 +94,9 @@ libevolution_module_calendar_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/table/libetable.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) libevolution_module_calendar_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am index 691fbe0bb1..2d4a774c70 100644 --- a/modules/composer-autosave/Makefile.am +++ b/modules/composer-autosave/Makefile.am @@ -5,8 +5,9 @@ libevolution_module_composer_autosave_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-composer-autosave\" \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GNOME_PLATFORM_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_module_composer_autosave_la_SOURCES = \ evolution-composer-autosave.c \ @@ -20,8 +21,9 @@ libevolution_module_composer_autosave_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) libevolution_module_composer_autosave_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/connman/Makefile.am b/modules/connman/Makefile.am index 58defdd838..d01a8f0daa 100644 --- a/modules/connman/Makefile.am +++ b/modules/connman/Makefile.am @@ -4,6 +4,7 @@ libevolution_module_connman_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-connman\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) libevolution_module_connman_la_SOURCES = \ @@ -12,6 +13,7 @@ libevolution_module_connman_la_SOURCES = \ libevolution_module_connman_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) libevolution_module_connman_la_LDFLAGS = \ diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index 0bea9ac1a2..90cf1aa54f 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -5,13 +5,13 @@ libevolution_module_mail_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(CAMEL_CFLAGS) \ -DEVOLUTION_ETSPECDIR=\""$(etspecdir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_PRIVDATADIR=\""$(privdatadir)"\" \ - -DG_LOG_DOMAIN=\"evolution-module-mail\" + -DG_LOG_DOMAIN=\"evolution-module-mail\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ + $(GTKHTML_CFLAGS) libevolution_module_mail_la_SOURCES = \ evolution-module-mail.c \ @@ -66,11 +66,9 @@ libevolution_module_mail_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_LIBS) \ - $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) libevolution_module_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am index c6ab97f9fa..4e5598b498 100644 --- a/modules/mailto-handler/Makefile.am +++ b/modules/mailto-handler/Makefile.am @@ -4,8 +4,9 @@ libevolution_module_mailto_handler_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-mailto-handler\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(GTKHTML_CFLAGS) libevolution_module_mailto_handler_la_SOURCES = \ evolution-mailto-handler.c @@ -13,8 +14,9 @@ libevolution_module_mailto_handler_la_SOURCES = \ libevolution_module_mailto_handler_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(GTKHTML_LIBS) libevolution_module_mailto_handler_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/network-manager/Makefile.am b/modules/network-manager/Makefile.am index bcfcaa7ecb..81b61ac864 100644 --- a/modules/network-manager/Makefile.am +++ b/modules/network-manager/Makefile.am @@ -4,8 +4,8 @@ libevolution_module_network_manager_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-network-manager\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) \ $(NM_CFLAGS) libevolution_module_network_manager_la_SOURCES = \ @@ -14,8 +14,8 @@ libevolution_module_network_manager_la_SOURCES = \ libevolution_module_network_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_network_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am index ed86fa7b0b..def90c1d06 100644 --- a/modules/offline-alert/Makefile.am +++ b/modules/offline-alert/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_offline_alert_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-offline-alert\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_offline_alert_la_SOURCES = \ evolution-offline-alert.c @@ -14,8 +14,8 @@ libevolution_module_offline_alert_la_SOURCES = \ libevolution_module_offline_alert_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_offline_alert_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am index a5dfd97a0b..ccb7ada29a 100644 --- a/modules/online-accounts/Makefile.am +++ b/modules/online-accounts/Makefile.am @@ -4,10 +4,8 @@ libevolution_module_online_accounts_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-online-accounts\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(GOA_CFLAGS) libevolution_module_online_accounts_la_SOURCES = \ @@ -20,10 +18,8 @@ libevolution_module_online_accounts_la_SOURCES = \ libevolution_module_online_accounts_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ $(GOA_LIBS) libevolution_module_online_accounts_la_LDFLAGS = \ diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am index b958a9ab42..1f74550cb7 100644 --- a/modules/plugin-lib/Makefile.am +++ b/modules/plugin-lib/Makefile.am @@ -5,7 +5,7 @@ libevolution_module_plugin_lib_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"evolution-plugin-lib\" \ -I$(top_srcdir) \ -DEVOLUTION_PREFIX=\""$(prefix)"\" \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) libevolution_module_plugin_lib_la_SOURCES = \ evolution-module-plugin-lib.c \ @@ -14,7 +14,7 @@ libevolution_module_plugin_lib_la_SOURCES = \ libevolution_module_plugin_lib_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) libevolution_module_plugin_lib_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am index 1e66fb4bd8..f350426b50 100644 --- a/modules/plugin-manager/Makefile.am +++ b/modules/plugin-manager/Makefile.am @@ -5,8 +5,8 @@ libevolution_module_plugin_manager_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-plugin-manager\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_plugin_manager_la_SOURCES = \ evolution-plugin-manager.c @@ -14,8 +14,8 @@ libevolution_module_plugin_manager_la_SOURCES = \ libevolution_module_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(SHELL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_plugin_manager_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/plugin-mono/Makefile.am b/modules/plugin-mono/Makefile.am index 8c9ba8ed81..a685cd89bd 100644 --- a/modules/plugin-mono/Makefile.am +++ b/modules/plugin-mono/Makefile.am @@ -4,7 +4,7 @@ libevolution_module_plugin_mono_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-plugin-mono\" \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(MONO_CFLAGS) libevolution_module_plugin_mono_la_SOURCES = \ @@ -14,7 +14,7 @@ libevolution_module_plugin_mono_la_SOURCES = \ libevolution_module_plugin_mono_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(MONO_LIBS) libevolution_module_plugin_mono_la_LDFLAGS = \ diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am index 6bc2dcf91c..435ab31c0f 100644 --- a/modules/plugin-python/Makefile.am +++ b/modules/plugin-python/Makefile.am @@ -4,7 +4,7 @@ libevolution_module_plugin_python_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -DG_LOG_DOMAIN=\"evolution-plugin-python\" \ -I$(top_srcdir) \ - $(E_UTIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(PY_INCLUDES) libevolution_module_plugin_python_la_SOURCES = \ @@ -15,7 +15,7 @@ libevolution_module_plugin_python_la_SOURCES = \ libevolution_module_plugin_python_la_LIBADD = \ -ldl -lutil -lm \ $(top_builddir)/e-util/libeutil.la \ - $(E_UTIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(PY_LIBS) libevolution_module_plugin_python_la_LDFLAGS = \ diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am index b21e876c90..8ea91303b4 100644 --- a/modules/spamassassin/Makefile.am +++ b/modules/spamassassin/Makefile.am @@ -4,8 +4,8 @@ libevolution_module_spamassassin_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-spamassassin\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_spamassassin_la_SOURCES = \ evolution-spamassassin.c @@ -14,8 +14,8 @@ libevolution_module_spamassassin_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_spamassassin_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am index 90ee736f5c..2643387010 100644 --- a/modules/startup-wizard/Makefile.am +++ b/modules/startup-wizard/Makefile.am @@ -5,9 +5,8 @@ libevolution_module_startup_wizard_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-startup-wizard\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libevolution_module_startup_wizard_la_SOURCES = \ evolution-startup-wizard.c @@ -20,9 +19,8 @@ libevolution_module_startup_wizard_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/capplet/settings/libevolution-mail-settings.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_startup_wizard_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/windows-sens/Makefile.am b/modules/windows-sens/Makefile.am index 5036642d09..a9b9d31865 100644 --- a/modules/windows-sens/Makefile.am +++ b/modules/windows-sens/Makefile.am @@ -1,20 +1,22 @@ module_LTLIBRARIES = libevolution-module-windows-sens.la -libevolution_module_windows_sens_la_CPPFLAGS = \ +libevolution_module_windows_sens_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-windows-sens\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) -libevolution_module_windows_sens_la_SOURCES = \ +libevolution_module_windows_sens_la_SOURCES = \ evolution-windows-sens.c libevolution_module_windows_sens_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(SENS_LIBS) -libevolution_module_windows_sens_la_LDFLAGS = \ +libevolution_module_windows_sens_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -include $(top_srcdir)/git.mk diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am index afe3453bc6..08401d45c8 100644 --- a/plugins/addressbook-file/Makefile.am +++ b/plugins/addressbook-file/Makefile.am @@ -7,15 +7,15 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la liborg_gnome_addressbook_file_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_addressbook_file_la_SOURCES = addressbook-file.c liborg_gnome_addressbook_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_addressbook_file_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-addressbook-file.eplug.xml diff --git a/plugins/attachment-reminder/Makefile.am b/plugins/attachment-reminder/Makefile.am index 684d1d2b21..d6b1116693 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -14,9 +14,10 @@ liborg_gnome_evolution_attachment_reminder_la_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + $(GTKHTML_CFLAGS) liborg_gnome_evolution_attachment_reminder_la_SOURCES = attachment-reminder.c @@ -30,8 +31,9 @@ liborg_gnome_evolution_attachment_reminder_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-attachment-reminder.schemas.in diff --git a/plugins/audio-inline/Makefile.am b/plugins/audio-inline/Makefile.am index f813fa0edb..d5dc1a5a60 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -15,9 +15,10 @@ liborg_gnome_audio_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(GSTREAMER_CFLAGS) + $(GSTREAMER_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_audio_inline_la_SOURCES = audio-inline.c @@ -26,9 +27,10 @@ liborg_gnome_audio_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_audio_inline_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(GSTREAMER_LIBS) + $(GSTREAMER_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-audio-inline.eplug.xml diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index c4e033f733..05748c24c5 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -16,18 +16,18 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_backup_restore_la_SOURCES = backup-restore.c liborg_gnome_backup_restore_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(SHELL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c @@ -41,14 +41,12 @@ evolution_backup_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) evolution_backup_LDADD = \ $(top_builddir)/e-util/libeutil.la \ - $(SHELL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) if OS_WIN32 diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index e4e9cdff03..e92d0549e6 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -16,9 +16,9 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_evolution_bbdb_la_SOURCES = bbdb.c bbdb.h gaimbuddies.c @@ -29,8 +29,9 @@ liborg_gnome_evolution_bbdb_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index f75d1c0f4c..6d89204eff 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -3,25 +3,23 @@ plugin_DATA = org-gnome-evolution-caldav.eplug plugin_LTLIBRARIES = liborg-gnome-evolution-caldav.la -liborg_gnome_evolution_caldav_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -I . \ - -I$(top_srcdir) \ - -DCALDAV_UIDIR=\""$(uidir)"\" \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBSOUP_CFLAGS) - -liborg_gnome_evolution_caldav_la_SOURCES = \ - caldav-source.c \ - caldav-browse-server.h \ +liborg_gnome_evolution_caldav_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -I . \ + -I$(top_srcdir) \ + -DCALDAV_UIDIR=\""$(uidir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) + +liborg_gnome_evolution_caldav_la_SOURCES = \ + caldav-source.c \ + caldav-browse-server.h \ caldav-browse-server.c -liborg_gnome_evolution_caldav_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ +liborg_gnome_evolution_caldav_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) \ - $(LIBSOUP_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_caldav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/calendar-file/Makefile.am b/plugins/calendar-file/Makefile.am index a4577e5019..c36053f550 100644 --- a/plugins/calendar-file/Makefile.am +++ b/plugins/calendar-file/Makefile.am @@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-file.la liborg_gnome_calendar_file_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_calendar_file_la_SOURCES = calendar-file.c @@ -17,7 +16,7 @@ liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_calendar_file_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-calendar-file.eplug.xml diff --git a/plugins/calendar-http/Makefile.am b/plugins/calendar-http/Makefile.am index 54457c3c8b..7333fd31d5 100644 --- a/plugins/calendar-http/Makefile.am +++ b/plugins/calendar-http/Makefile.am @@ -7,9 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-calendar-http.la liborg_gnome_calendar_http_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_calendar_http_la_SOURCES = calendar-http.c @@ -17,7 +16,7 @@ liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_calendar_http_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-calendar-http.eplug.xml diff --git a/plugins/calendar-weather/Makefile.am b/plugins/calendar-weather/Makefile.am index 5cc4b8cd07..4283318ffb 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -9,11 +9,10 @@ liborg_gnome_calendar_weather_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) \ -DWEATHER_DATADIR=\""$(weatherdatadir)"\" \ -DWEATHER_EDS_DATADIR=\""$(eds_datadir)/weather"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ $(GWEATHER_CFLAGS) liborg_gnome_calendar_weather_la_SOURCES = calendar-weather.c @@ -21,9 +20,9 @@ liborg_gnome_calendar_weather_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GWEATHER_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GWEATHER_LIBS) EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ diff --git a/plugins/dbx-import/Makefile.am b/plugins/dbx-import/Makefile.am index ecd4890c37..67d5e0d5d3 100644 --- a/plugins/dbx-import/Makefile.am +++ b/plugins/dbx-import/Makefile.am @@ -1,9 +1,7 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(top_builddir)/e-util/libeutil.la endif @EVO_PLUGIN_RULE@ @@ -17,10 +15,9 @@ liborg_gnome_dbx_import_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(CAMEL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_dbx_import_la_SOURCES = dbx-importer.c @@ -30,11 +27,9 @@ liborg_gnome_dbx_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CAMEL_LIBS) + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-dbx-import.eplug.xml diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index f9778926bc..07efb18d20 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -7,10 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-default-source.la liborg_gnome_default_source_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(SOURCE_SEL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_default_source_la_SOURCES = default-source.c @@ -19,8 +17,7 @@ liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_default_source_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-default-source.eplug.xml diff --git a/plugins/email-custom-header/Makefile.am b/plugins/email-custom-header/Makefile.am index 9778980b9f..d76a894cce 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -7,27 +7,27 @@ plugin_LTLIBRARIES = liborg-gnome-email-custom-header.la liborg_gnome_email_custom_header_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I. \ - -I$(top_srcdir) \ + -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ - -I$(top_builddir)/mail \ + -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DCONNECTOR_UIDIR=\""$(uidir)"\" + $(GTKHTML_CFLAGS) liborg_gnome_email_custom_header_la_SOURCES = \ email-custom-header.c \ - email-custom-header.h + email-custom-header.h liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) liborg_gnome_email_custom_header_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/external-editor/Makefile.am b/plugins/external-editor/Makefile.am index 02591aaebc..7f801d7d06 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -1,6 +1,5 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la @@ -28,10 +27,9 @@ liborg_gnome_external_editor_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/composer \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(SHELL_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_external_editor_la_SOURCES = \ external-editor.c @@ -45,8 +43,9 @@ liborg_gnome_external_editor_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-external-editor.schemas.in diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index c358f8df83..9c413dbb18 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -12,20 +12,20 @@ liborg_gnome_face_la_CPPFLAGS = \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DCONNECTOR_UIDIR=\""$(uidir)"\" + $(GTKHTML_CFLAGS) liborg_gnome_face_la_SOURCES = face.c -liborg_gnome_face_la_LIBADD = \ +liborg_gnome_face_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) liborg_gnome_face_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/google-account-setup/Makefile.am b/plugins/google-account-setup/Makefile.am index ed3ab93d5d..7380912a40 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -10,9 +10,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -DCALDAV_UIDIR=\""$(uidir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(GDATA_CFLAGS) liborg_gnome_evolution_google_la_SOURCES = \ @@ -23,8 +22,7 @@ liborg_gnome_evolution_google_la_SOURCES = \ liborg_gnome_evolution_google_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(GDATA_LIBS) diff --git a/plugins/image-inline/Makefile.am b/plugins/image-inline/Makefile.am index 1c456e2d14..9cb4f9f242 100644 --- a/plugins/image-inline/Makefile.am +++ b/plugins/image-inline/Makefile.am @@ -9,7 +9,6 @@ liborg_gnome_image_inline_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(GTKIMAGEVIEW_CFLAGS) liborg_gnome_image_inline_la_SOURCES = image-inline.c @@ -20,7 +19,6 @@ liborg_gnome_image_inline_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(GTKIMAGEVIEW_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-image-inline.eplug.xml diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index de16f4e94d..3f492bf698 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -12,9 +12,8 @@ liborg_gnome_imap_features_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(CAMEL_IMAP_CFLAGS) \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" @@ -23,7 +22,7 @@ liborg_gnome_imap_features_la_SOURCES = imap-headers.c liborg_gnome_imap_features_la_LIBADD= \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_imap_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/itip-formatter/Makefile.am b/plugins/itip-formatter/Makefile.am index 62346f4c17..793908ecad 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -7,9 +7,9 @@ liborg_gnome_itip_formatter_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_itip_formatter_la_SOURCES = itip-formatter.c itip-view.c itip-view.h @@ -22,9 +22,9 @@ liborg_gnome_itip_formatter_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) error_DATA = org-gnome-itip-formatter.error errordir = $(privdatadir)/errors diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index ed916e64ec..bcac34a81c 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -15,23 +15,25 @@ liborg_gnome_mail_notification_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ - $(CANBERRA_CFLAGS) + $(CANBERRA_CFLAGS) \ + $(GTKHTML_CFLAGS) liborg_gnome_mail_notification_la_SOURCES = mail-notification.c liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_mail_notification_la_LIBADD = \ - $(CANBERRA_LIBS) \ - $(LIBNOTIFY_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(LIBNOTIFY_LIBS) \ + $(CANBERRA_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-mail-notification.schemas.in diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index c263702904..845a82c7a3 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -8,9 +8,9 @@ liborg_gnome_mail_to_task_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_mail_to_task_la_SOURCES = mail-to-task.c @@ -23,9 +23,9 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mail-to-task.eplug.xml diff --git a/plugins/mailing-list-actions/Makefile.am b/plugins/mailing-list-actions/Makefile.am index c429a5ca84..77f6fdce6e 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -8,8 +8,9 @@ liborg_gnome_mailing_list_actions_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_mailing_list_actions_la_SOURCES = mailing-list-actions.c @@ -20,8 +21,9 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) error_DATA = org-gnome-mailing-list-actions.error errordir = $(privdatadir)/errors diff --git a/plugins/mark-all-read/Makefile.am b/plugins/mark-all-read/Makefile.am index f868aa0bdb..c159b7af02 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -8,8 +8,9 @@ liborg_gnome_mark_all_read_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c @@ -19,8 +20,9 @@ liborg_gnome_mark_all_read_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-mark-all-read.eplug.xml diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index b747c55a69..5375da81fd 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -7,8 +7,8 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la liborg_gnome_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c @@ -17,7 +17,7 @@ liborg_gnome_prefer_plain_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_prefer_plain_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/em-format/libemformat.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-prefer-plain.eplug.xml diff --git a/plugins/pst-import/Makefile.am b/plugins/pst-import/Makefile.am index 71b37a9d0f..1ded6e0f80 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -2,7 +2,6 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) endif @@ -17,11 +16,10 @@ liborg_gnome_pst_import_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ - $(LIBPST_CFLAGS) \ - $(CAMEL_CFLAGS) + $(GTKHTML_CFLAGS) \ + $(LIBPST_CFLAGS) liborg_gnome_pst_import_la_SOURCES = pst-importer.c @@ -31,11 +29,10 @@ liborg_gnome_pst_import_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(LIBPST_LIBS) \ - $(CAMEL_LIBS) + $(GTKHTML_LIBS) \ + $(LIBPST_LIBS) EXTRA_DIST = org-gnome-pst-import.eplug.xml diff --git a/plugins/publish-calendar/Makefile.am b/plugins/publish-calendar/Makefile.am index 94c29f11b5..b19dc8d1a4 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -13,9 +13,9 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(E_UTIL_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) \ + $(LIBNOTIFY_CFLAGS) \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" @@ -36,9 +36,9 @@ liborg_gnome_publish_calendar_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ - $(E_UTIL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(LIBNOTIFY_LIBS) EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \ diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index a4b7a4ef1c..982b6724ec 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -8,8 +8,8 @@ liborg_gnome_save_calendar_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_CALENDAR_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_save_calendar_la_SOURCES = \ save-calendar.c \ @@ -22,7 +22,7 @@ liborg_gnome_save_calendar_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_save_calendar_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_CALENDAR_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-save-calendar.eplug.xml diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 9104b3eb07..a64a10e1dd 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -10,10 +10,9 @@ liborg_gnome_templates_la_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -I$(top_builddir) \ -I$(top_builddir)/composer \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ - -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" + $(GTKHTML_CFLAGS) liborg_gnome_templates_la_SOURCES = templates.c @@ -24,8 +23,9 @@ liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-template-placeholders.schemas.in diff --git a/plugins/tnef-attachments/Makefile.am b/plugins/tnef-attachments/Makefile.am index 97240ce075..6391f666c3 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -1,6 +1,5 @@ if OS_WIN32 NO_UNDEFINED_REQUIRED_LIBS = \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la @@ -17,7 +16,6 @@ liborg_gnome_tnef_attachments_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) \ $(TNEF_CFLAGS) liborg_gnome_tnef_attachments_la_SOURCES = tnef-plugin.c @@ -27,7 +25,6 @@ liborg_gnome_tnef_attachments_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINE liborg_gnome_tnef_attachments_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/em-format/libemformat.la \ - $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) \ -lytnef diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index f595145418..07b747af79 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -15,23 +15,23 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ - $(EVOLUTION_MAIL_CFLAGS) + $(GTKHTML_CFLAGS) liborg_gnome_vcard_inline_la_SOURCES = vcard-inline.c liborg_gnome_vcard_inline_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_vcard_inline_la_LIBADD = \ - $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ - $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ - $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ - $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) +liborg_gnome_vcard_inline_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail.la \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ + $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ + $(top_builddir)/addressbook/printing/libecontactprint.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(GTKHTML_LIBS) EXTRA_DIST = org-gnome-vcard-inline.eplug.xml diff --git a/plugins/webdav-account-setup/Makefile.am b/plugins/webdav-account-setup/Makefile.am index 305d4ff06d..d4d9d006aa 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -8,16 +8,15 @@ liborg_gnome_evolution_webdav_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I . \ -I$(top_srcdir) \ - $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) liborg_gnome_evolution_webdav_la_SOURCES = \ webdav-contacts-source.c liborg_gnome_evolution_webdav_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(EPLUGIN_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_webdav_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/shell/Makefile.am b/shell/Makefile.am index 2b312038ba..ad9a0bb308 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -61,9 +61,8 @@ libeshell_la_CPPFLAGS = \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(EGG_SMCLIENT_CFLAGS) \ - $(CLUTTER_CFLAGS) \ - $(TZDIALOG_CFLAGS) \ - $(SHELL_CFLAGS) + $(GTKHTML_CFLAGS) \ + $(CLUTTER_CFLAGS) libeshell_la_SOURCES = \ $(eshellinclude_HEADERS) \ @@ -99,8 +98,7 @@ libeshell_la_LIBADD = \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(EGG_SMCLIENT_LIBS) \ - $(CLUTTER_LIBS) \ - $(SHELL_LIBS) + $(CLUTTER_LIBS) # Evolution executable @@ -131,10 +129,10 @@ evolution_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(datadir)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(TZDIALOG_CFLAGS) \ - $(CLUTTER_CFLAGS) \ - $(SHELL_CFLAGS) + $(GTKHTML_CFLAGS) \ + $(CLUTTER_CFLAGS) evolution_SOURCES = \ main.c @@ -146,8 +144,7 @@ evolution_LDADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ - $(TZDIALOG_LIBS) \ - $(SHELL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(CLUTTER_LIBS) \ $(EVOLUTIONICON) diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 2a28121fc1..c8fe999fc7 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -17,8 +17,8 @@ libevolution_smime_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CERT_UI_CFLAGS) libevolution_smime_la_SOURCES = \ @@ -41,6 +41,7 @@ libevolution_smime_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/smime/lib/libessmime.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index d0f4873503..df2fb96208 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -14,7 +14,6 @@ libessmime_la_CPPFLAGS = \ -DPREFIX=\""$(prefix)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(CAMEL_CFLAGS) \ $(CERT_UI_CFLAGS) libessmime_la_SOURCES = \ @@ -33,7 +32,6 @@ libessmime_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(CAMEL_LIBS) \ $(CERT_UI_LIBS) libessmime_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am index aa726538fd..be4cea34dc 100644 --- a/smime/tests/Makefile.am +++ b/smime/tests/Makefile.am @@ -3,8 +3,8 @@ noinst_PROGRAMS=import-cert TEST_CPPFLAGS= \ $(AM_CPPFLAGS) \ -I$(top_srcdir)/smime/lib \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CERT_UI_CFLAGS) TEST_LIBS= \ @@ -12,6 +12,7 @@ TEST_LIBS= \ -L/home/toshok/src/mozilla/mozilla/dist/lib \ $(CERT_UI_LIBS) \ $(top_builddir)/e-util/libeutil.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) import_cert_LDADD=$(TEST_LIBS) diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index fe5d468b3a..396ce6a4a5 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -6,8 +6,8 @@ libetimezonedialog_la_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ - $(GNOME_PLATFORM_CFLAGS) \ - $(TZDIALOG_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libetimezonedialog_la_SOURCES = \ e-timezone-dialog.c \ @@ -18,8 +18,7 @@ libetimezonedialog_la_LDFLAGS = $(NO_UNDEFINED) libetimezonedialog_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_LIBS) - $(TZDIALOG_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) ui_DATA = e-timezone-dialog.ui diff --git a/widgets/menus/Makefile.am b/widgets/menus/Makefile.am index 3a33e64651..0dc38fce28 100644 --- a/widgets/menus/Makefile.am +++ b/widgets/menus/Makefile.am @@ -6,8 +6,8 @@ libmenus_la_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=\"menus\" \ - $(GNOME_PLATFORM_CFLAGS) \ - $(E_UTIL_CFLAGS) + $(EVOLUTION_DATA_SERVER_CFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) libmenus_la_SOURCES = \ gal-define-views-dialog.c \ @@ -46,8 +46,8 @@ libmenus_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(GNOME_PLATFORM_LIBS) \ - $(E_UTIL_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) icons = EXTRA_DIST = \ diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index 33bde9301c..cd5cada041 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -78,15 +78,15 @@ libemiscwidgets_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/filter \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ - $(EVOLUTION_MAIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ $(CHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) \ - $(CLUTTER_CFLAGS) - + $(CLUTTER_CFLAGS) \ + $(GTKHTML_CFLAGS) libemiscwidgets_la_SOURCES = \ $(widgetsinclude_HEADERS) \ @@ -165,13 +165,14 @@ libemiscwidgets_la_LIBADD = \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/a11y/libevolution-a11y.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(MATH_LIB) \ $(ICONV_LIBS) \ $(CHAMPLAIN_LIBS) \ $(GEOCLUE_LIBS) \ - $(CLUTTER_LIBS) + $(CLUTTER_LIBS) \ + $(GTKHTML_LIBS) noinst_PROGRAMS = \ test-calendar \ @@ -183,9 +184,9 @@ test_widgets_misc_CPPFLAGS= \ -I$(top_srcdir) \ -I$(top_srcdir)/filter \ -I$(top_srcdir)/widgets \ - -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ + -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ - $(EVOLUTION_MAIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) # test-calendar @@ -199,8 +200,8 @@ test_calendar_LDADD = \ libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ - $(GNOME_PLATFORM_LIBS) \ - $(E_WIDGETS_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) # test-dateedit @@ -213,8 +214,8 @@ test_dateedit_LDADD = \ libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ - $(GNOME_PLATFORM_LIBS) \ - $(E_WIDGETS_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) # test-preferences-window @@ -227,8 +228,8 @@ test_preferences_window_LDADD = \ libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ - $(GNOME_PLATFORM_LIBS) \ - $(E_WIDGETS_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = $(ui_DATA) diff --git a/widgets/table/Makefile.am b/widgets/table/Makefile.am index 0ae1e2b7e9..36af5ec2bf 100644 --- a/widgets/table/Makefile.am +++ b/widgets/table/Makefile.am @@ -7,11 +7,10 @@ libetable_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(E_UTIL_CFLAGS) \ - $(E_WIDGETS_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ - -DEVOLUTION_UIDIR=\"$(uidir)\" \ - -DG_LOG_DOMAIN=\"e-table\" + -DEVOLUTION_UIDIR=\"$(uidir)\" \ + -DG_LOG_DOMAIN=\"e-table\" libetable_la_SOURCES = \ e-cell.c \ @@ -173,10 +172,9 @@ libetable_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/text/libetext.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(E_UTIL_LIBS) \ - $(E_WIDGETS_LIBS) \ - $(MATH_LIB) \ - $(GNOME_PLATFORM_LIBS) + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(MATH_LIB) icons = \ arrow-down.xpm \ diff --git a/widgets/text/Makefile.am b/widgets/text/Makefile.am index 2577c6fe14..d7c62af74e 100644 --- a/widgets/text/Makefile.am +++ b/widgets/text/Makefile.am @@ -4,7 +4,7 @@ libetext_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - $(E_UTIL_CFLAGS) \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ -DG_LOG_DOMAIN=\"e-text\" @@ -35,8 +35,9 @@ libetext_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libgnomecanvas/libgnomecanvas.la \ - $(E_UTIL_LIBS) \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ - $(REGEX_LIBS) + $(REGEX_LIBS) \ + $(MATH_LIB) -include $(top_srcdir)/git.mk |