Second batch of kdepim stability and functionality repairs

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1126473 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 3 insertions, 8 deletions

diff --git a/libkcal/Makefile.am b/libkcal/Makefile.am
index ccdebd9d9..b35079d10 100644
--- a/libkcal/Makefile.am
+++ b/libkcal/Makefile.am
@@ -1,8 +1,6 @@
-SUBDIRS = libical versit tests
+SUBDIRS = versit tests
 
-INCLUDES = -I$(srcdir)/libical/src/libical \
-  -I$(srcdir)/libical/src/libicalss -I./libical/src/libical \
-  -I./libical/src/libicalss -I$(srcdir)/versit -I$(top_srcdir)/ \
+INCLUDES = -I$(srcdir)/versit -I$(top_srcdir)/ \
   -I$(top_srcdir)/ktnef \
   -I$(top_srcdir)/libemailfunctions \
   $(all_includes)
@@ -10,13 +8,11 @@ INCLUDES = -I$(srcdir)/libical/src/libical \
 lib_LTLIBRARIES   = libkcal.la
 libkcal_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 2:0:0
 libkcal_la_LIBADD  = versit/libversit.la $(LIB_KIO) \
-                     ./libical/src/libical/libical.la \
-                     ./libical/src/libicalss/libicalss.la \
+                     -lical -licalss \
                      $(top_builddir)/ktnef/lib/libktnef.la \
                      ../libemailfunctions/libemailfunctions.la \
                      -lkresources -lkabc
 
-libkcal_la_COMPILE_FIRST = ./libical/src/libical/ical.h ./libical/src/libicalss/icalss.h
 libkcal_la_SOURCES = \
 	incidencebase.cpp incidence.cpp journal.cpp todo.cpp event.cpp \
 	freebusy.cpp attendee.cpp attachment.cpp recurrencerule.cpp recurrence.cpp alarm.cpp \
@@ -76,6 +72,5 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/libkcal.pot
 
-DOXYGEN_EXCLUDE = libical
 DOXYGEN_REFERENCES=kresources
 include $(top_srcdir)/admin/Doxyfile.am