aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/addressbook/Makefile.am43
-rw-r--r--modules/calendar/Makefile.am4
-rw-r--r--modules/mail/Makefile.am4
3 files changed, 27 insertions, 24 deletions
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)