From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkcal/Makefile.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'libkcal/Makefile.am') diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am index f76d32044..2fa8c2889 100644 --- a/libkcal/Makefile.am +++ b/libkcal/Makefile.am @@ -10,15 +10,17 @@ libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0 $(LIB_QT libkcal_la_LIBADD = versit/libversit.la $(LIB_KIO) \ -lical -licalss \ $(top_builddir)/ktnef/lib/libktnef.la \ + ../libkmime/libkmime.la \ ../libemailfunctions/libemailfunctions.la \ -lkresources -lkabc libkcal_la_SOURCES = \ + assignmentvisitor.cpp comparisonvisitor.cpp \ incidencebase.cpp incidence.cpp journal.cpp todo.cpp event.cpp \ freebusy.cpp attendee.cpp attachment.cpp recurrencerule.cpp recurrence.cpp alarm.cpp \ customproperties.cpp calendar.cpp calendarlocal.cpp \ calformat.cpp vcalformat.cpp icalformat.cpp icalformatimpl.cpp \ - incidenceformatter.cpp \ + incidenceformatter.cpp calhelper.cpp calselectdialog.cpp \ vcaldrag.cpp icaldrag.cpp \ exceptions.cpp \ scheduler.cpp imipscheduler.cpp dummyscheduler.cpp \ @@ -34,18 +36,20 @@ libkcal_la_SOURCES = \ qtopiaformat.cpp \ htmlexportsettings.kcfgc htmlexport.cpp calendarnull.cpp \ freebusyurlstore.cpp \ - confirmsavedialog.cpp + confirmsavedialog.cpp \ + attachmenthandler.cpp libkcalincludedir = $(includedir)/libkcal libkcalinclude_HEADERS = alarm.h attachment.h attendee.h calendar.h \ calendarlocal.h calendarnull.h calendarresources.h calfilter.h calformat.h \ calstorage.h customproperties.h dndfactory.h duration.h event.h \ exceptions.h filestorage.h freebusy.h htmlexportsettings.h htmlexport.h icaldrag.h icalformat.h \ - incidencebase.h incidence.h incidenceformatter.h journal.h kcalversion.h listbase.h period.h person.h \ + incidencebase.h incidence.h incidenceformatter.h calhelper.h calselectdialog.h \ + journal.h kcalversion.h listbase.h period.h person.h \ qtopiaformat.h recurrencerule.h recurrence.h resourcecached.h resourcecalendar.h \ resourcelocalconfig.h resourcelocaldirconfig.h resourcelocaldir.h \ resourcelocal.h scheduler.h libkcal_export.h \ - todo.h vcaldrag.h vcalformat.h + todo.h vcaldrag.h vcalformat.h attachmenthandler.h kde_module_LTLIBRARIES = kcal_local.la kcal_localdir.la -- cgit v1.2.1