aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-08-10 08:14:04 +0800
committerTor Lillqvist <tml@src.gnome.org>2005-08-10 08:14:04 +0800
commit729031934e960d4c96a2a8aa6fd75009b97980f0 (patch)
tree7a1466f0659d92d3e3bbe9df9320cf13c27c7da0 /mail
parenta40159746efa236f154c57ff57f0fe1cb4ec9e5e (diff)
downloadgsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.tar
gsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.tar.gz
gsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.tar.bz2
gsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.tar.lz
gsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.tar.xz
gsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.tar.zst
gsoc2013-evolution-729031934e960d4c96a2a8aa6fd75009b97980f0.zip
Link with all needed libraries. Use -no-undefined on Win32. Work around
2005-08-10 Tor Lillqvist <tml@novell.com> * Makefile.am: Link with all needed libraries. Use -no-undefined on Win32. Work around annoying MSYS feature on Win32 when installing the schemas: Echo the command to a temporary .bat file and run it with cmd.exe... svn path=/trunk/; revision=30064
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/Makefile.am29
2 files changed, 31 insertions, 5 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index abb638ef55..b524ef52a6 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-10 Tor Lillqvist <tml@novell.com>
+
+ * Makefile.am: Link with all needed libraries. Use -no-undefined
+ on Win32. Work around annoying MSYS feature on Win32 when
+ installing the schemas: Echo the command to a temporary .bat file
+ and run it with cmd.exe...
+
2005-08-08 Not Zed <NotZed@Ximian.com>
** See bug #304938.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 2e9bcad085..db3b43ab67 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -206,7 +206,9 @@ libevolution_mail_la_SOURCES = \
message-tag-followup.h
if ENABLE_SMIME
-SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la
+SMIME_LIBS = \
+ $(top_builddir)/smime/lib/libessmime.la \
+ $(top_builddir)/smime/gui/libevolution-smime.la
endif
libevolution_mail_la_LIBADD = \
@@ -214,6 +216,8 @@ libevolution_mail_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(top_builddir)/shell/libeshell.la \
$(top_builddir)/composer/libcomposer.la \
+ $(top_builddir)/widgets/table/libetable.la \
+ $(top_builddir)/widgets/text/libetext.la \
$(top_builddir)/widgets/misc/libemiscwidgets.la \
$(top_builddir)/widgets/misc/libefilterbar.la \
$(top_builddir)/filter/libfilter.la \
@@ -221,11 +225,15 @@ libevolution_mail_la_LIBADD = \
$(top_builddir)/addressbook/util/libeabutil.la \
$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
- $(SMIME_LIB) \
- $(EVOLUTION_MAIL_LIBS)
+ $(top_builddir)/mail/importers/libevolution-mail-importers.la\
+ $(SMIME_LIBS) \
+ $(EVOLUTION_MAIL_LIBS) \
+ $(GTKHTML_LIBS) \
+ $(CAMEL_LIBS) \
+ $(REGEX_LIBS)
libevolution_mail_la_LDFLAGS = \
- -avoid-version -module
+ -avoid-version -module $(NO_UNDEFINED)
libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
@@ -296,13 +304,24 @@ schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
@INTLTOOL_SCHEMAS_RULE@
+if OS_WIN32
+install-data-local:
+ if test -z "$(DESTDIR)" ; then \
+ for p in $(schema_DATA) ; do \
+ (echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
+ echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
+ cmd /c _temp.bat; \
+ rm _temp.bat; \
+ done \
+ fi
+else
install-data-local:
if test -z "$(DESTDIR)" ; then \
for p in $(schema_DATA) ; do \
GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p; \
done \
fi
-
+endif
# Prologue