diff options
| author | Milan Crha <mcrha@redhat.com> | 2009-08-07 20:09:35 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2009-08-07 20:09:35 +0800 |
| commit | 33aa045fc2608bd070c3f31f28ac9d3e702f5137 (patch) | |
| tree | 9b4dd9ab77176db7aaea4405b877c79fa6359b55 /calendar | |
| parent | 756345862e01121f70d4842ee6fe8ebb0cd0fc9b (diff) | |
| download | gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.tar gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.tar.gz gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.tar.bz2 gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.tar.lz gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.tar.xz gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.tar.zst gsoc2013-evolution-33aa045fc2608bd070c3f31f28ac9d3e702f5137.zip | |
Fix a build break with libevolution-cal-shared
Diffstat (limited to 'calendar')
| -rw-r--r-- | 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 1ba4bce636..463e953fcc 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@ |