Try yet again...
This commit is contained in:
parent
07a69727c8
commit
73463c00f5
@ -1,6 +1,6 @@
|
|||||||
diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail/Makefile.am
|
diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail/Makefile.am
|
||||||
--- evolution-2.27.2/mail/Makefile.am.fix-shared-mail 2009-05-24 13:35:00.000000000 -0400
|
--- evolution-2.27.2/mail/Makefile.am.fix-shared-mail 2009-05-24 13:35:00.000000000 -0400
|
||||||
+++ evolution-2.27.2/mail/Makefile.am 2009-05-29 10:23:51.000000000 -0400
|
+++ evolution-2.27.2/mail/Makefile.am 2009-05-29 14:34:24.000000000 -0400
|
||||||
@@ -31,9 +31,8 @@ INCLUDES = \
|
@@ -31,9 +31,8 @@ INCLUDES = \
|
||||||
-DPREFIX=\""$(prefix)"\" \
|
-DPREFIX=\""$(prefix)"\" \
|
||||||
-DG_LOG_DOMAIN=\"evolution-mail\"
|
-DG_LOG_DOMAIN=\"evolution-mail\"
|
||||||
@ -13,7 +13,15 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail
|
|||||||
|
|
||||||
# Mail.idl
|
# Mail.idl
|
||||||
MAIL_IDL = Evolution-Mail.idl
|
MAIL_IDL = Evolution-Mail.idl
|
||||||
@@ -172,9 +171,9 @@ libevolution_mail_la_LIBADD = \
|
@@ -148,7 +147,6 @@ SMIME_LIBS = \
|
||||||
|
$(top_builddir)/smime/gui/libevolution-smime.la
|
||||||
|
endif
|
||||||
|
|
||||||
|
-
|
||||||
|
libevolution_mail_la_LIBADD = \
|
||||||
|
$(top_builddir)/mail/libevolution-mail-shared.la \
|
||||||
|
$(top_builddir)/e-util/libeutil.la \
|
||||||
|
@@ -172,11 +170,11 @@ libevolution_mail_la_LIBADD = \
|
||||||
libevolution_mail_la_LDFLAGS = \
|
libevolution_mail_la_LDFLAGS = \
|
||||||
-avoid-version -module $(NO_UNDEFINED)
|
-avoid-version -module $(NO_UNDEFINED)
|
||||||
|
|
||||||
@ -24,9 +32,26 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail
|
|||||||
+ em-filter-i18n.h \
|
+ em-filter-i18n.h \
|
||||||
+ libevolution-mail-shared.la
|
+ libevolution-mail-shared.la
|
||||||
|
|
||||||
libevolution_mail_shared_la_SOURCES = \
|
-libevolution_mail_shared_la_SOURCES = \
|
||||||
|
+libevolution_mail_shared_la_SOURCES = \
|
||||||
em-account-editor.c \
|
em-account-editor.c \
|
||||||
@@ -252,10 +251,13 @@ libevolution_mail_shared_la_LIBADD =
|
em-account-editor.h \
|
||||||
|
em-event.c \
|
||||||
|
@@ -238,12 +236,7 @@ libevolution_mail_shared_la_SOURCES =
|
||||||
|
message-tag-followup.c \
|
||||||
|
message-tag-followup.h
|
||||||
|
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-
|
||||||
|
-libevolution_mail_shared_la_LIBADD = \
|
||||||
|
+libevolution_mail_shared_la_LIBADD = \
|
||||||
|
$(top_builddir)/e-util/libeutil.la \
|
||||||
|
$(top_builddir)/widgets/misc/libemiscwidgets.la \
|
||||||
|
$(top_builddir)/composer/libcomposer.la \
|
||||||
|
@@ -252,10 +245,29 @@ libevolution_mail_shared_la_LIBADD =
|
||||||
$(SMIME_LIBS) \
|
$(SMIME_LIBS) \
|
||||||
$(THREADS_LIBS)
|
$(THREADS_LIBS)
|
||||||
|
|
||||||
@ -34,9 +59,25 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail
|
|||||||
- -avoid-version -module $(NO_UNDEFINED)
|
- -avoid-version -module $(NO_UNDEFINED)
|
||||||
+libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED)
|
+libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED)
|
||||||
|
|
||||||
+# This forces the shared library to be installed before
|
+# --- BIG NASTY AUTOMAKE HACK ---
|
||||||
+# the component library, so libtool relinking will work.
|
+#
|
||||||
+install-componentLTLIBRARIES: install-privsolibLTLIBRARIES
|
+# Automake apparently sorts Makefile.am rules alphabetically. And
|
||||||
|
+# since component_LTLIBRARIES < privsolib_LTLIBRARIES, it tries to
|
||||||
|
+# install libevolution-mail.la before libevolution-mail-shared.la,
|
||||||
|
+# which fails when libtool tries to relink libevolution-mail.la
|
||||||
|
+# against the not-yet-installed libevolution-mail-shared.la.
|
||||||
|
+install-data-am: \
|
||||||
|
+ install-privsolibLTLIBRARIES \
|
||||||
|
+ install-componentLTLIBRARIES \
|
||||||
|
+ install-data-local \
|
||||||
|
+ install-errorDATA \
|
||||||
|
+ install-etspecDATA \
|
||||||
|
+ install-filterDATA \
|
||||||
|
+ install-gladeDATA \
|
||||||
|
+ install-idlDATA \
|
||||||
|
+ install-mailincludeHEADERS \
|
||||||
|
+ install-schemaDATA \
|
||||||
|
+ install-serverDATA
|
||||||
|
|
||||||
+# .server files
|
+# .server files
|
||||||
|
|
||||||
|
@ -551,9 +551,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{evo_plugin_dir}/org-gnome-folder-permissions.xml
|
%{evo_plugin_dir}/org-gnome-folder-permissions.xml
|
||||||
%{evo_plugin_dir}/org-gnome-folder-subscription.xml
|
%{evo_plugin_dir}/org-gnome-folder-subscription.xml
|
||||||
|
|
||||||
%{evo_plugin_dir}/org-gnome-face.eplug
|
|
||||||
%{evo_plugin_dir}/liborg-gnome-face.so
|
|
||||||
|
|
||||||
%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
|
%{evo_plugin_dir}/org-gnome-groupwise-features.eplug
|
||||||
%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
|
%{evo_plugin_dir}/liborg-gnome-groupwise-features.so
|
||||||
%{evo_plugin_dir}/org-gnome-compose-send-options.xml
|
%{evo_plugin_dir}/org-gnome-compose-send-options.xml
|
||||||
|
Loading…
Reference in New Issue
Block a user