[evolution] Fix a build break with libevolution-cal-shared
- From: Milan Crha <mcrha src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [evolution] Fix a build break with libevolution-cal-shared
- Date: Fri, 7 Aug 2009 12:10:48 +0000 (UTC)
commit 33aa045fc2608bd070c3f31f28ac9d3e702f5137
Author: Milan Crha <mcrha redhat com>
Date: Fri Aug 7 14:09:35 2009 +0200
Fix a build break with libevolution-cal-shared
calendar/gui/Makefile.am | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 1ba4bce..463e953 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -30,9 +30,6 @@ component_LTLIBRARIES = libevolution-calendar.la
ecalendarincludedir = $(privincludedir)/calendar/gui
ecalendarinclude_HEADERS = \
- e-cal-config.h \
- e-cal-popup.h \
- itip-utils.h \
e-attachment-handler-calendar.h \
cal-search-bar.h \
calendar-config.h \
@@ -304,6 +301,24 @@ libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
libevolution_calendar_la_DEPENDENCIES = libevolution-cal-shared.la
+# --- BIG NASTY AUTOMAKE HACK ---
+#
+# Automake apparently sorts Makefile.am rules alphabetically. And
+# since component_LTLIBRARIES < privsolib_LTLIBRARIES, it tries to
+# install libevolution-calendar.la before libevolution-cal-shared.la,
+# which fails when libtool tries to relink libevolution-calendar.la
+# against the not-yet-installed libevolution-cal-shared.la.
+install-data-am: \
+ install-privsolibLTLIBRARIES \
+ install-componentLTLIBRARIES \
+ install-data-local \
+ install-etspecDATA \
+ install-gladeDATA \
+ install-schemaDATA \
+ install-ruleDATA \
+ install-ecalendarincludeHEADERS \
+ install-serverDATA
+
server_in_files = GNOME_Evolution_Calendar.server.in.in
server_DATA = $(server_in_files:.server.in.in=.server)
@EVO_SERVER_RULE@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]