diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-12-28 03:10:15 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-12-28 03:32:39 +0800 |
commit | 59bd81691def7f7f8c0ead2edaacd374b6791067 (patch) | |
tree | e09951e7f35561f573fc56a50f42c706ac25aae5 | |
parent | 6a074300e533a82fb1a09b470724e54b155f8cd5 (diff) | |
download | gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.gz gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.bz2 gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.lz gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.xz gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.tar.zst gsoc2013-evolution-59bd81691def7f7f8c0ead2edaacd374b6791067.zip |
Compiler and linker flag cleanups.
63 files changed, 207 insertions, 116 deletions
diff --git a/a11y/Makefile.am b/a11y/Makefile.am index 7896c88374..1f218dc99b 100644 --- a/a11y/Makefile.am +++ b/a11y/Makefile.am @@ -5,6 +5,7 @@ privsolib_LTLIBRARIES = libevolution-a11y.la libevolution_a11y_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ + $(GNOME_PLATFORM_CFLAGS) \ $(A11Y_CFLAGS) libevolution_a11y_la_SOURCES = \ diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index 002e2f1246..8f66bbf0de 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -15,6 +15,7 @@ libecontacteditor_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\" \ -DG_LOG_DOMAIN=\"contact-editor\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) libecontacteditor_la_SOURCES = \ @@ -36,7 +37,8 @@ libecontacteditor_la_LIBADD = \ $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = \ contact-editor.ui \ diff --git a/addressbook/gui/contact-list-editor/Makefile.am b/addressbook/gui/contact-list-editor/Makefile.am index c10d02a4a1..f875f3c3d7 100644 --- a/addressbook/gui/contact-list-editor/Makefile.am +++ b/addressbook/gui/contact-list-editor/Makefile.am @@ -14,6 +14,7 @@ libecontactlisteditor_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=\"contact-list-editor\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) libecontactlisteditor_la_SOURCES = \ @@ -24,14 +25,15 @@ libecontactlisteditor_la_SOURCES = \ libecontactlisteditor_la_LDFLAGS = $(NO_UNDEFINED) -libecontactlisteditor_la_LIBADD = \ - $(top_builddir)/addressbook/util/libeabutil.la \ - $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ - $(top_builddir)/widgets/table/libetable.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) +libecontactlisteditor_la_LIBADD = \ + $(top_builddir)/addressbook/util/libeabutil.la \ + $(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \ + $(top_builddir)/widgets/table/libetable.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = contact-list-editor.ui diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index 217a4288fb..04b72bfa4a 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -9,8 +9,9 @@ libecontactprint_la_CPPFLAGS = \ -DG_LOG_DOMAIN=\"addressbook-printing\" \ -I$(top_srcdir)/addressbook \ -I$(top_srcdir) \ - -DEVOLUTION_UIDIR=\""$(uidir)"\" \ + -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) noinst_LTLIBRARIES = libecontactprint.la @@ -22,7 +23,8 @@ libecontactprint_la_SOURCES = \ libecontactprint_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(GNOME_PLATFORM_LIBS) noinst_PROGRAMS = contact-print-test @@ -33,6 +35,7 @@ contact_print_test_CPPFLAGS = \ -I$(top_srcdir) \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ -DEVOLUTION_ECPSDIR=\""$(ecpsdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) contact_print_test_SOURCES = test-print.c @@ -42,7 +45,8 @@ contact_print_test_LDADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ $(ecps_DATA) diff --git a/addressbook/util/Makefile.am b/addressbook/util/Makefile.am index f777f3c940..6338e221fe 100644 --- a/addressbook/util/Makefile.am +++ b/addressbook/util/Makefile.am @@ -11,7 +11,8 @@ libeabutil_la_CPPFLAGS = \ -I$(top_builddir)/shell \ -I$(top_srcdir)/shell \ -I$(top_srcdir)/widgets \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) libeabutil_la_SOURCES = \ addressbook.c \ @@ -22,10 +23,11 @@ libeabutil_la_SOURCES = \ libeabutil_la_LDFLAGS = $(NO_UNDEFINED) libeabutil_la_LIBADD = \ - $(EVOLUTION_ADDRESSBOOK_LIBS) \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la + $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) dist-hook: cd $(distdir); rm -f $(BUILT_SOURCES) diff --git a/calendar/conduits/Makefile.am b/calendar/conduits/Makefile.am index 430168130f..27abb0962a 100644 --- a/calendar/conduits/Makefile.am +++ b/calendar/conduits/Makefile.am @@ -1,5 +1,3 @@ SUBDIRS = common calendar memo todo - - -include $(top_srcdir)/git.mk diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 7d2e1f564b..5c3f4579e8 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -224,10 +224,10 @@ libevolution_calendar_la_LIBADD = \ $(top_builddir)/widgets/table/libetable.la \ $(top_builddir)/filter/libfilter.la \ $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) \ - $(LIBSOUP_LIBS) \ $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) + $(LIBSOUP_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_calendar_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/calendar/gui/alarm-notify/Makefile.am b/calendar/gui/alarm-notify/Makefile.am index e861267d1e..44e0187180 100644 --- a/calendar/gui/alarm-notify/Makefile.am +++ b/calendar/gui/alarm-notify/Makefile.am @@ -9,6 +9,8 @@ evolution_alarm_notify_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_LIBEXECDIR=\""$(privlibexecdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ + $(CAMEL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(CANBERRA_CFLAGS) @@ -36,7 +38,8 @@ evolution_alarm_notify_LDADD = \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) \ - $(CANBERRA_LIBS) + $(CANBERRA_LIBS) \ + $(GNOME_PLATFORM_LIBS) if OS_WIN32 evolution_alarm_notify_LDFLAGS = -mwindows diff --git a/calendar/gui/dialogs/Makefile.am b/calendar/gui/dialogs/Makefile.am index 8b7c456156..7b0be1b6bd 100644 --- a/calendar/gui/dialogs/Makefile.am +++ b/calendar/gui/dialogs/Makefile.am @@ -49,6 +49,7 @@ ecalendarinclude_HEADERS = \ libcal_dialogs_la_LIBADD = \ $(top_builddir)/addressbook/util/libeabutil.la \ + $(CAMEL_LIBS) \ $(GNOME_PLATFORM_LIBS) libcal_dialogs_la_SOURCES = \ diff --git a/calendar/importers/Makefile.am b/calendar/importers/Makefile.am index e1788106ab..a5274b60e1 100644 --- a/calendar/importers/Makefile.am +++ b/calendar/importers/Makefile.am @@ -7,6 +7,7 @@ libevolution_calendar_importers_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/calendar \ -I$(top_builddir)/calendar \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) libevolution_calendar_importers_la_SOURCES = \ @@ -18,6 +19,7 @@ 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 \ - $(EVOLUTION_CALENDAR_LIBS) + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) -include $(top_srcdir)/git.mk diff --git a/composer/Makefile.am b/composer/Makefile.am index 147c37d2a7..108ab470ee 100644 --- a/composer/Makefile.am +++ b/composer/Makefile.am @@ -37,6 +37,7 @@ libcomposer_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\"$(uidir)\" \ -DPREFIX=\"$(prefix)\" \ -DG_LOG_DOMAIN=\"composer\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) libcomposer_la_SOURCES = \ @@ -61,7 +62,8 @@ 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) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = evolution-composer.ui diff --git a/configure.ac b/configure.ac index ecf88edd00..2c3812d91b 100644 --- a/configure.ac +++ b/configure.ac @@ -1259,7 +1259,7 @@ AC_SUBST(CERT_UI_LIBS) dnl ************ dnl E_UTIL Flags dnl ************ -EVO_SET_COMPILE_FLAGS(E_UTIL, gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS $E_UTIL_X11_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS $E_UTIL_X11_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) @@ -1268,14 +1268,14 @@ E_UTIL_LIBS="$E_UTIL_LIBS $MATH_LIB" dnl ************** dnl TZDIALOG Flags dnl ************** -EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS) +EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE camel-$EDS_PACKAGE) AC_SUBST(TZDIALOG_CFLAGS) AC_SUBST(TZDIALOG_LIBS) dnl *************** dnl E_WIDGETS Flags dnl *************** -EVO_SET_COMPILE_FLAGS(E_WIDGETS, gio-2.0 gconf-2.0 gobject-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor) +EVO_SET_COMPILE_FLAGS(E_WIDGETS, libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE gtkhtml-editor) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) @@ -1296,7 +1296,7 @@ AC_SUBST(LIBFILTER_LIBS) dnl *********** dnl Shell Flags dnl *********** -EVO_SET_COMPILE_FLAGS(SHELL, gnome-desktop-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) +EVO_SET_COMPILE_FLAGS(SHELL, libgtkhtml-$GTKHTML_PACKAGE unique-1.0 libedataserverui-$EDS_PACKAGE) AC_SUBST(SHELL_CFLAGS) AC_SUBST(SHELL_LIBS) @@ -1304,7 +1304,7 @@ AC_SUBST(SHELL_LIBS) dnl ***************** dnl Addressbook Flags dnl ***************** -EVOLUTION_ADDRESSBOOK_DEPS="gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor unique-1.0" +EVOLUTION_ADDRESSBOOK_DEPS="libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE gtkhtml-editor unique-1.0" EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS) @@ -1337,7 +1337,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-2.4 >= 2.3.0) AC_SUBST(LIBSOUP_CFLAGS) AC_SUBST(LIBSOUP_LIBS) -EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE unique-1.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE unique-1.0) AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) AC_SUBST(EVOLUTION_CALENDAR_LIBS) @@ -1350,7 +1350,7 @@ fi dnl ********** dnl Mail Flags dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE unique-1.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE unique-1.0) AC_SUBST(EVOLUTION_MAIL_CFLAGS) AC_SUBST(EVOLUTION_MAIL_LIBS) @@ -1366,7 +1366,7 @@ AC_SUBST(DATASERVER_EXEC_VERSION) dnl ********** dnl Test Flags dnl ********** -EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, gtk+-2.0 gconf-2.0 libxml-2.0 unique-1.0) +EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, unique-1.0) AC_SUBST(EVOLUTION_TEST_CFLAGS) AC_SUBST(EVOLUTION_TEST_LIBS) diff --git a/e-util/Makefile.am b/e-util/Makefile.am index f0d98bd8c1..8a15c521f6 100644 --- a/e-util/Makefile.am +++ b/e-util/Makefile.am @@ -80,6 +80,7 @@ libeutil_la_CPPFLAGS = \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DSEARCH_RULE_DIR=\"$(ruledir)\" \ -DG_LOG_DOMAIN=\"e-utils\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(GNOME_PILOT_CFLAGS) \ $(E_UTIL_CFLAGS) @@ -140,6 +141,7 @@ libeutil_la_LIBADD = \ $(ICONV_LIBS) \ $(E_UTIL_LIBS) \ $(GNOME_PILOT_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(INTLLIBS) econdinclude_HEADERS = \ diff --git a/em-format/Makefile.am b/em-format/Makefile.am index 0f126d0a98..212b45f074 100644 --- a/em-format/Makefile.am +++ b/em-format/Makefile.am @@ -11,6 +11,7 @@ libemformat_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) libemformat_la_SOURCES = \ @@ -24,6 +25,7 @@ libemformat_la_LDFLAGS = $(NO_UNDEFINED) libemformat_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) -include $(top_srcdir)/git.mk diff --git a/filter/Makefile.am b/filter/Makefile.am index 7e8914846b..3d7a864053 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -57,8 +57,8 @@ libfilter_la_LDFLAGS = $(NO_UNDEFINED) libfilter_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) \ $(LIBFILTER_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(REGEX_LIBS) EXTRA_DIST = \ diff --git a/mail/Makefile.am b/mail/Makefile.am index 934a971f9b..80047bfafc 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -170,14 +170,14 @@ libevolution_mail_la_LIBADD = \ $(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \ $(top_builddir)/em-format/libemformat.la \ $(top_builddir)/filter/libfilter.la \ - $(GNOME_PLATFORM_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ $(CERT_UI_LIBS) \ $(THREADS_LIBS) \ $(CANBERRA_LIBS) \ $(GTKHTML_LIBS) \ $(E_WIDGETS_LIBS) \ - $(SMIME_LIBS) + $(SMIME_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_mail_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am index 72537b8729..641cd450e9 100644 --- a/modules/addressbook/Makefile.am +++ b/modules/addressbook/Makefile.am @@ -23,8 +23,9 @@ libevolution_module_addressbook_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ - $(LDAP_CFLAGS) \ - $(EVOLUTION_ADDRESSBOOK_CFLAGS) + $(GNOME_PLATFORM_CFLAGS) \ + $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ + $(LDAP_CFLAGS) libevolution_module_addressbook_la_SOURCES = \ evolution-module-addressbook.c \ @@ -57,24 +58,26 @@ if ENABLE_SMIME SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la endif -libevolution_module_addressbook_la_LIBADD = \ - $(SMIME_LIB) \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/composer/libcomposer.la \ - $(top_builddir)/addressbook/printing/libecontactprint.la \ - $(top_builddir)/shell/libeshell.la \ - $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ - $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ - $(top_builddir)/filter/libfilter.la \ - $(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)/widgets/table/libetable.la \ - $(top_builddir)/widgets/text/libetext.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/widgets/menus/libmenus.la \ - $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ - $(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS) +libevolution_module_addressbook_la_LIBADD = \ + $(SMIME_LIB) \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/addressbook/printing/libecontactprint.la \ + $(top_builddir)/shell/libeshell.la \ + $(top_builddir)/addressbook/gui/merging/libeabbookmerging.la \ + $(top_builddir)/addressbook/gui/widgets/libeabwidgets.la \ + $(top_builddir)/filter/libfilter.la \ + $(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)/widgets/table/libetable.la \ + $(top_builddir)/widgets/text/libetext.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/widgets/menus/libmenus.la \ + $(top_builddir)/addressbook/importers/libevolution-addressbook-importers.la \ + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ + $(LDAP_LIBS) libevolution_module_addressbook_la_LDFLAGS = \ diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am index fee7c6826d..0a22b2f568 100644 --- a/modules/calendar/Makefile.am +++ b/modules/calendar/Makefile.am @@ -77,9 +77,9 @@ libevolution_module_calendar_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/widgets/table/libetable.la \ - $(GNOME_PLATFORM_LIBS) \ $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_calendar_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am index fd05667a9d..bf0b9f1cce 100644 --- a/modules/mail/Makefile.am +++ b/modules/mail/Makefile.am @@ -62,10 +62,10 @@ libevolution_module_mail_la_LIBADD = \ $(top_builddir)/widgets/menus/libmenus.la \ $(top_builddir)/filter/libfilter.la \ $(EVOLUTION_MAIL_LIBS) \ - $(GNOME_PLATFORM_LIBS) \ $(CAMEL_LIBS) \ $(GTKHTML_LIBS) \ - $(E_WIDGETS_LIBS) + $(E_WIDGETS_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/plugins/addressbook-file/Makefile.am b/plugins/addressbook-file/Makefile.am index 6eb00096b6..afe3453bc6 100644 --- a/plugins/addressbook-file/Makefile.am +++ b/plugins/addressbook-file/Makefile.am @@ -7,13 +7,16 @@ plugin_LTLIBRARIES = liborg-gnome-addressbook-file.la liborg_gnome_addressbook_file_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_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) +liborg_gnome_addressbook_file_la_LIBADD = \ + $(EVOLUTION_ADDRESSBOOK_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 66725b0de4..2a5564236e 100644 --- a/plugins/attachment-reminder/Makefile.am +++ b/plugins/attachment-reminder/Makefile.am @@ -30,8 +30,8 @@ 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 \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 c68e46d4f8..8d7501a444 100644 --- a/plugins/audio-inline/Makefile.am +++ b/plugins/audio-inline/Makefile.am @@ -14,6 +14,7 @@ plugin_LTLIBRARIES = liborg-gnome-audio-inline.la liborg_gnome_audio_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ $(GSTREAMER_CFLAGS) @@ -25,7 +26,8 @@ liborg_gnome_audio_inline_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ $(GSTREAMER_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-audio-inline.eplug.xml diff --git a/plugins/backup-restore/Makefile.am b/plugins/backup-restore/Makefile.am index 9ffb2e340e..c4e033f733 100644 --- a/plugins/backup-restore/Makefile.am +++ b/plugins/backup-restore/Makefile.am @@ -16,6 +16,7 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SHELL_CFLAGS) \ $(E_UTIL_CFLAGS) @@ -23,9 +24,10 @@ liborg_gnome_backup_restore_la_CPPFLAGS = \ 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 = \ - $(SHELL_LIBS) \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/shell/libeshell.la + $(top_builddir)/shell/libeshell.la \ + $(SHELL_LIBS) \ + $(GNOME_PLATFORM_LIBS) privlibexec_PROGRAMS = evolution-backup evolution_backup_SOURCES = backup.c @@ -39,13 +41,15 @@ evolution_backup_CPPFLAGS = \ -DSYSCONFDIR=\""$(sysconfdir)"\" \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(SHELL_CFLAGS) \ $(E_UTIL_CFLAGS) evolution_backup_LDADD = \ + $(top_builddir)/e-util/libeutil.la \ $(SHELL_LIBS) \ - $(top_builddir)/e-util/libeutil.la + $(GNOME_PLATFORM_LIBS) if OS_WIN32 evolution_backup_LDFLAGS = -mwindows diff --git a/plugins/bbdb/Makefile.am b/plugins/bbdb/Makefile.am index 4f1d9066cf..e4e9cdff03 100644 --- a/plugins/bbdb/Makefile.am +++ b/plugins/bbdb/Makefile.am @@ -16,6 +16,7 @@ liborg_gnome_evolution_bbdb_la_CPPFLAGS = \ -I$(top_builddir)/composer \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) @@ -28,7 +29,8 @@ 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) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-evolution-bbdb.eplug.xml diff --git a/plugins/bogo-junk-plugin/Makefile.am b/plugins/bogo-junk-plugin/Makefile.am index 863fa4ad87..e4c03ae9dc 100644 --- a/plugins/bogo-junk-plugin/Makefile.am +++ b/plugins/bogo-junk-plugin/Makefile.am @@ -8,6 +8,7 @@ liborg_gnome_bogo_junk_plugin_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DWELCOME_MESSAGE=\""$(privdatadir)/default/C/mail/local/Inbox"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) liborg_gnome_bogo_junk_plugin_la_SOURCES = bf-junk-filter.c diff --git a/plugins/caldav/Makefile.am b/plugins/caldav/Makefile.am index 18c2a91648..f75d1c0f4c 100644 --- a/plugins/caldav/Makefile.am +++ b/plugins/caldav/Makefile.am @@ -21,7 +21,8 @@ liborg_gnome_evolution_caldav_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EPLUGIN_LIBS) \ - $(LIBSOUP_LIBS) + $(LIBSOUP_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 bbf8b7dfef..ba8af51ad4 100644 --- a/plugins/calendar-file/Makefile.am +++ b/plugins/calendar-file/Makefile.am @@ -7,6 +7,7 @@ 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) @@ -15,7 +16,8 @@ liborg_gnome_calendar_file_la_SOURCES = calendar-file.c liborg_gnome_calendar_file_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_calendar_file_la_LIBADD = \ - $(EVOLUTION_CALENDAR_LIBS) + $(EVOLUTION_CALENDAR_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 cf432dd451..2e2a49ba0c 100644 --- a/plugins/calendar-http/Makefile.am +++ b/plugins/calendar-http/Makefile.am @@ -7,6 +7,7 @@ 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) @@ -14,7 +15,9 @@ liborg_gnome_calendar_http_la_SOURCES = calendar-http.c liborg_gnome_calendar_http_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_calendar_http_la_LIBADD = $(EVOLUTION_CALENDAR_LIBS) +liborg_gnome_calendar_http_la_LIBADD = \ + $(EVOLUTION_CALENDAR_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 d2801a6395..96f1fd2da7 100644 --- a/plugins/calendar-weather/Makefile.am +++ b/plugins/calendar-weather/Makefile.am @@ -9,6 +9,7 @@ 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)"\" \ @@ -21,7 +22,8 @@ liborg_gnome_calendar_weather_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_CALENDAR_LIBS) \ - $(LIBGWEATHER_LIBS) + $(LIBGWEATHER_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ org-gnome-calendar-weather.eplug.xml \ diff --git a/plugins/contacts-map/Makefile.am b/plugins/contacts-map/Makefile.am index 4c3585620c..2c8a86dd9e 100644 --- a/plugins/contacts-map/Makefile.am +++ b/plugins/contacts-map/Makefile.am @@ -7,6 +7,7 @@ liborg_gnome_contacts_map_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) @@ -22,7 +23,8 @@ liborg_gnome_contacts_map_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(CHAMPLAIN_LIBS) \ $(GEOCLUE_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-contacts-map.eplug.xml diff --git a/plugins/default-mailer/Makefile.am b/plugins/default-mailer/Makefile.am index 50dd13ebd3..a3b85d1ab5 100644 --- a/plugins/default-mailer/Makefile.am +++ b/plugins/default-mailer/Makefile.am @@ -18,8 +18,8 @@ liborg_gnome_default_mailer_la_SOURCES = default-mailer.c liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_default_mailer_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in diff --git a/plugins/default-source/Makefile.am b/plugins/default-source/Makefile.am index 3339f1e406..6f4a9043d1 100644 --- a/plugins/default-source/Makefile.am +++ b/plugins/default-source/Makefile.am @@ -7,6 +7,7 @@ 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) @@ -17,7 +18,8 @@ liborg_gnome_default_source_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_default_source_la_LIBADD = \ $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) + $(EVOLUTION_ADDRESSBOOK_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 3f67f845ed..def545a489 100644 --- a/plugins/email-custom-header/Makefile.am +++ b/plugins/email-custom-header/Makefile.am @@ -23,11 +23,11 @@ liborg_gnome_email_custom_header_la_SOURCES = \ liborg_gnome_email_custom_header_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/composer/libcomposer.la \ + $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 4e41c01cbf..0f4cec9b95 100644 --- a/plugins/external-editor/Makefile.am +++ b/plugins/external-editor/Makefile.am @@ -28,6 +28,7 @@ liborg_gnome_external_editor_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/composer \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(SHELL_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ $(E_UTIL_CFLAGS) diff --git a/plugins/face/Makefile.am b/plugins/face/Makefile.am index d8bd983ae3..8bac8fa7e6 100644 --- a/plugins/face/Makefile.am +++ b/plugins/face/Makefile.am @@ -12,6 +12,7 @@ liborg_gnome_face_la_CPPFLAGS = \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/mail \ -I$(top_builddir)/composer \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DCONNECTOR_UIDIR=\""$(uidir)"\" @@ -22,7 +23,8 @@ 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) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 a6d62fa1a2..eeffd15d28 100644 --- a/plugins/google-account-setup/Makefile.am +++ b/plugins/google-account-setup/Makefile.am @@ -9,7 +9,8 @@ liborg_gnome_evolution_google_la_CPPFLAGS = \ -I . \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ - -DCALDAV_UIDIR=\""$(uidir)"\" \ + -DCALDAV_UIDIR=\""$(uidir)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) @@ -21,7 +22,8 @@ liborg_gnome_evolution_google_la_SOURCES = \ liborg_gnome_evolution_google_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(EVOLUTION_CALENDAR_LIBS) \ - $(EPLUGIN_LIBS) + $(EPLUGIN_LIBS) \ + $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_google_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am index 97aff65f8b..f1047fce32 100644 --- a/plugins/groupwise-features/Makefile.am +++ b/plugins/groupwise-features/Makefile.am @@ -58,9 +58,8 @@ liborg_gnome_groupwise_features_la_LIBADD= \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ - $(CAMEL_GROUPWISE_LIBS) - - + $(CAMEL_GROUPWISE_LIBS) \ + $(GNOME_PLATFORM_LIBS) liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/hula-account-setup/Makefile.am b/plugins/hula-account-setup/Makefile.am index ba86505d92..8997f5b48e 100644 --- a/plugins/hula-account-setup/Makefile.am +++ b/plugins/hula-account-setup/Makefile.am @@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-evolution-hula-account-setup.la liborg_gnome_evolution_hula_account_setup_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_UIDIR=\""$(uidir)"\" @@ -23,7 +24,8 @@ liborg_gnome_evolution_hula_account_setup_la_LIBADD= \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/filter/libfilter.la \ $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-evolution-hula-account-setup.eplug.xml diff --git a/plugins/imap-features/Makefile.am b/plugins/imap-features/Makefile.am index f79fef3474..de16f4e94d 100644 --- a/plugins/imap-features/Makefile.am +++ b/plugins/imap-features/Makefile.am @@ -12,6 +12,7 @@ liborg_gnome_imap_features_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/mail \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) \ $(CAMEL_IMAP_CFLAGS) \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ @@ -22,7 +23,8 @@ 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_MAIL_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 7f333f18f5..62346f4c17 100644 --- a/plugins/itip-formatter/Makefile.am +++ b/plugins/itip-formatter/Makefile.am @@ -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 \ - $(GNOME_PLATFORM_LIBS) \ $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) error_DATA = org-gnome-itip-formatter.error errordir = $(privdatadir)/errors @@ -37,6 +37,4 @@ EXTRA_DIST = \ org-gnome-itip-formatter.eplug.xml \ org-gnome-itip-formatter.error.xml - - -include $(top_srcdir)/git.mk diff --git a/plugins/mail-notification/Makefile.am b/plugins/mail-notification/Makefile.am index 1ff323baae..1a7e81ebac 100644 --- a/plugins/mail-notification/Makefile.am +++ b/plugins/mail-notification/Makefile.am @@ -31,8 +31,8 @@ liborg_gnome_mail_notification_la_LIBADD = \ $(LIBNOTIFY_LIBS) \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) \ + $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_MAIL_LIBS) \ $(GNOME_PLATFORM_LIBS) schemadir = $(GCONF_SCHEMA_FILE_DIR) diff --git a/plugins/mail-to-task/Makefile.am b/plugins/mail-to-task/Makefile.am index 9f2a142c15..481390ced0 100644 --- a/plugins/mail-to-task/Makefile.am +++ b/plugins/mail-to-task/Makefile.am @@ -24,9 +24,9 @@ liborg_gnome_mail_to_task_la_LIBADD = \ $(top_builddir)/calendar/common/libevolution-calendarprivate.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(GNOME_PLATFORM_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 68fcb26259..c429a5ca84 100644 --- a/plugins/mailing-list-actions/Makefile.am +++ b/plugins/mailing-list-actions/Makefile.am @@ -20,8 +20,8 @@ liborg_gnome_mailing_list_actions_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/shell/libeshell.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 bbbfae7d3b..f868aa0bdb 100644 --- a/plugins/mark-all-read/Makefile.am +++ b/plugins/mark-all-read/Makefile.am @@ -8,6 +8,7 @@ liborg_gnome_mark_all_read_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) liborg_gnome_mark_all_read_la_SOURCES = mark-all-read.c @@ -18,7 +19,8 @@ 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) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-mark-all-read.eplug.xml diff --git a/plugins/plugin-manager/Makefile.am b/plugins/plugin-manager/Makefile.am index 2966642c77..ec28d0bcdd 100644 --- a/plugins/plugin-manager/Makefile.am +++ b/plugins/plugin-manager/Makefile.am @@ -8,6 +8,7 @@ liborg_gnome_plugin_manager_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) liborg_gnome_plugin_manager_la_SOURCES = plugin-manager.c @@ -17,7 +18,8 @@ liborg_gnome_plugin_manager_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_plugin_manager_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ org-gnome-plugin-manager.eplug.xml diff --git a/plugins/prefer-plain/Makefile.am b/plugins/prefer-plain/Makefile.am index 61222e990e..b747c55a69 100644 --- a/plugins/prefer-plain/Makefile.am +++ b/plugins/prefer-plain/Makefile.am @@ -7,6 +7,7 @@ plugin_LTLIBRARIES = liborg-gnome-prefer-plain.la liborg_gnome_prefer_plain_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) liborg_gnome_prefer_plain_la_SOURCES = prefer-plain.c @@ -16,7 +17,8 @@ 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_MAIL_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 57ee130703..68c8a19264 100644 --- a/plugins/pst-import/Makefile.am +++ b/plugins/pst-import/Makefile.am @@ -31,9 +31,10 @@ liborg_gnome_pst_import_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_pst_import_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) \ + $(CAMEL_LIBS) \ $(EVOLUTION_CALENDAR_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 60d5e125b5..94c29f11b5 100644 --- a/plugins/publish-calendar/Makefile.am +++ b/plugins/publish-calendar/Makefile.am @@ -13,6 +13,8 @@ liborg_gnome_publish_calendar_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ + $(GNOME_PLATFORM_CFLAGS) \ + $(E_UTIL_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ -DEVOLUTION_PLUGINDIR="\"$(plugindir)\"" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" @@ -34,7 +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 \ - $(EVOLUTION_CALENDAR_LIBS) + $(E_UTIL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = \ org-gnome-publish-calendar.eplug.xml \ diff --git a/plugins/sa-junk-plugin/Makefile.am b/plugins/sa-junk-plugin/Makefile.am index 42ea8a8218..34e0f82566 100644 --- a/plugins/sa-junk-plugin/Makefile.am +++ b/plugins/sa-junk-plugin/Makefile.am @@ -18,8 +18,8 @@ liborg_gnome_sa_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) liborg_gnome_sa_junk_plugin_la_LIBADD = \ $(top_builddir)/mail/libevolution-mail.la \ $(top_builddir)/e-util/libeutil.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) BUILT_SOURCES = $(plugin_DATA) $(error_DATA) diff --git a/plugins/save-calendar/Makefile.am b/plugins/save-calendar/Makefile.am index 0e95ec6fde..a4b7a4ef1c 100644 --- a/plugins/save-calendar/Makefile.am +++ b/plugins/save-calendar/Makefile.am @@ -8,6 +8,7 @@ liborg_gnome_save_calendar_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) liborg_gnome_save_calendar_la_SOURCES = \ @@ -21,7 +22,8 @@ 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_CALENDAR_LIBS) \ + $(GNOME_PLATFORM_LIBS) EXTRA_DIST = org-gnome-save-calendar.eplug.xml diff --git a/plugins/startup-wizard/Makefile.am b/plugins/startup-wizard/Makefile.am index 375b46de62..4c0ced17f5 100644 --- a/plugins/startup-wizard/Makefile.am +++ b/plugins/startup-wizard/Makefile.am @@ -10,6 +10,7 @@ liborg_gnome_evolution_startup_wizard_la_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ -I$(top_builddir)/shell \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_CALENDAR_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) @@ -24,7 +25,8 @@ liborg_gnome_evolution_startup_wizard_la_LIBADD = \ $(top_builddir)/calendar/gui/libevolution-calendar.la \ $(top_builddir)/mail/libevolution-mail.la \ $(EVOLUTION_CALENDAR_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) liborg_gnome_evolution_startup_wizard_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) diff --git a/plugins/subject-thread/Makefile.am b/plugins/subject-thread/Makefile.am index a5686b6dc8..c03d4040ed 100644 --- a/plugins/subject-thread/Makefile.am +++ b/plugins/subject-thread/Makefile.am @@ -7,11 +7,14 @@ plugin_DATA = org-gnome-subject-thread.eplug liborg_gnome_subject_thread_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) liborg_gnome_subject_thread_la_SOURCES = subject-thread.c liborg_gnome_subject_thread_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) -liborg_gnome_subject_thread_la_LIBADD = \ + +liborg_gnome_subject_thread_la_LIBADD = \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_MAIL_LIBS) EXTRA_DIST = org-gnome-subject-thread.eplug.xml diff --git a/plugins/templates/Makefile.am b/plugins/templates/Makefile.am index 9a4c8ed5c0..c694ac89ba 100644 --- a/plugins/templates/Makefile.am +++ b/plugins/templates/Makefile.am @@ -24,8 +24,8 @@ liborg_gnome_templates_la_LIBADD = \ $(top_builddir)/composer/libcomposer.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(GNOME_PLATFORM_LIBS) \ - $(EVOLUTION_MAIL_LIBS) + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 b503b9f0c0..4cc8a30573 100644 --- a/plugins/tnef-attachments/Makefile.am +++ b/plugins/tnef-attachments/Makefile.am @@ -29,8 +29,8 @@ 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 \ - $(GNOME_PLATFORM_LIBS) \ $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ -lytnef EXTRA_DIST = org-gnome-tnef-attachments.eplug.xml diff --git a/plugins/vcard-inline/Makefile.am b/plugins/vcard-inline/Makefile.am index ead97d798c..f595145418 100644 --- a/plugins/vcard-inline/Makefile.am +++ b/plugins/vcard-inline/Makefile.am @@ -15,6 +15,7 @@ liborg_gnome_vcard_inline_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/widgets \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(EVOLUTION_MAIL_CFLAGS) @@ -28,8 +29,9 @@ liborg_gnome_vcard_inline_la_LIBADD = \ $(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) + $(EVOLUTION_ADDRESSBOOK_LIBS) \ + $(EVOLUTION_MAIL_LIBS) \ + $(GNOME_PLATFORM_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 bc281a732d..f1096df75f 100644 --- a/plugins/webdav-account-setup/Makefile.am +++ b/plugins/webdav-account-setup/Makefile.am @@ -8,14 +8,16 @@ liborg_gnome_evolution_webdav_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I . \ -I$(top_srcdir) \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) liborg_gnome_evolution_webdav_la_SOURCES = \ webdav-contacts-source.c -liborg_gnome_evolution_webdav_la_LIBADD = \ - $(EPLUGIN_LIBS) \ - $(EVOLUTION_ADDRESSBOOK_LIBS) +liborg_gnome_evolution_webdav_la_LIBADD = \ + $(EPLUGIN_LIBS) \ + $(EVOLUTION_ADDRESSBOOK_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 876b945f8f..b941ee2753 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -56,6 +56,7 @@ libeshell_la_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(datadir)"\" \ -DG_LOG_DOMAIN=\"evolution-shell\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(TZDIALOG_CFLAGS) \ $(SHELL_CFLAGS) @@ -138,7 +139,8 @@ evolution_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ $(TZDIALOG_LIBS) \ - $(SHELL_LIBS) \ + $(SHELL_LIBS) \ + $(GNOME_PLATFORM_LIBS) \ $(EVOLUTIONICONRC) if OS_WIN32 diff --git a/shell/test/Makefile.am b/shell/test/Makefile.am index 0756a472a3..7ba2eaf55b 100644 --- a/shell/test/Makefile.am +++ b/shell/test/Makefile.am @@ -9,6 +9,7 @@ libevolution_module_test_la_CPPFLAGS = \ -I$(top_srcdir)/widgets/misc \ -I$(top_builddir)/shell \ -DG_LOG_DOMAIN=\"evolution-test\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_TEST_CFLAGS) libevolution_module_test_la_SOURCES = \ @@ -20,7 +21,8 @@ libevolution_module_test_la_SOURCES = \ libevolution_module_test_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ - $(EVOLUTION_TEST_LIBS) + $(EVOLUTION_TEST_LIBS) \ + $(GNOME_PLATFORM_LIBS) libevolution_module_test_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) diff --git a/smime/gui/Makefile.am b/smime/gui/Makefile.am index 60476d3446..2a28121fc1 100644 --- a/smime/gui/Makefile.am +++ b/smime/gui/Makefile.am @@ -17,6 +17,7 @@ libevolution_smime_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CERT_UI_CFLAGS) @@ -40,6 +41,7 @@ libevolution_smime_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/smime/lib/libessmime.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) libevolution_smime_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/smime/lib/Makefile.am b/smime/lib/Makefile.am index 4868b59a39..a1db64ad43 100644 --- a/smime/lib/Makefile.am +++ b/smime/lib/Makefile.am @@ -12,6 +12,7 @@ libessmime_la_CPPFLAGS = \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DPREFIX=\""$(prefix)"\" \ + $(GNOME_PLATFORM_CFLAGS) \ $(CERT_UI_CFLAGS) libessmime_la_SOURCES = \ @@ -28,6 +29,7 @@ libessmime_la_SOURCES = \ libessmime_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ + $(GNOME_PLATFORM_LIBS) \ $(CERT_UI_LIBS) libessmime_la_LDFLAGS = $(NO_UNDEFINED) diff --git a/smime/tests/Makefile.am b/smime/tests/Makefile.am index 762e4977cc..aa726538fd 100644 --- a/smime/tests/Makefile.am +++ b/smime/tests/Makefile.am @@ -3,6 +3,7 @@ noinst_PROGRAMS=import-cert TEST_CPPFLAGS= \ $(AM_CPPFLAGS) \ -I$(top_srcdir)/smime/lib \ + $(GNOME_PLATFORM_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) \ $(CERT_UI_CFLAGS) diff --git a/widgets/e-timezone-dialog/Makefile.am b/widgets/e-timezone-dialog/Makefile.am index ebdb6e2c00..fe5d468b3a 100644 --- a/widgets/e-timezone-dialog/Makefile.am +++ b/widgets/e-timezone-dialog/Makefile.am @@ -6,6 +6,7 @@ libetimezonedialog_la_CPPFLAGS = \ -I$(top_srcdir)/widgets \ -DEVOLUTION_UIDIR=\""$(uidir)"\" \ -DG_LOG_DOMAIN=__FILE__ \ + $(GNOME_PLATFORM_CFLAGS) \ $(TZDIALOG_CFLAGS) libetimezonedialog_la_SOURCES = \ @@ -18,6 +19,8 @@ libetimezonedialog_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_LIBS) + $(TZDIALOG_LIBS) \ + $(GNOME_PLATFORM_LIBS) ui_DATA = e-timezone-dialog.ui diff --git a/widgets/misc/Makefile.am b/widgets/misc/Makefile.am index aa29f406df..26fb25f657 100644 --- a/widgets/misc/Makefile.am +++ b/widgets/misc/Makefile.am @@ -194,6 +194,7 @@ test_calendar_LDADD = \ libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ + $(GNOME_PLATFORM_LIBS) \ $(E_WIDGETS_LIBS) # test-dateedit @@ -207,6 +208,7 @@ test_dateedit_LDADD = \ libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ + $(GNOME_PLATFORM_LIBS) \ $(E_WIDGETS_LIBS) # test-preferences-window @@ -220,6 +222,7 @@ test_preferences_window_LDADD = \ libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/filter/libfilter.la \ + $(GNOME_PLATFORM_LIBS) \ $(E_WIDGETS_LIBS) |