* 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

1 files changed, 6 insertions, 38 deletions

diff --git a/wizards/Makefile.am b/wizards/Makefile.am
index 0a211294c..613322330 100644
--- a/wizards/Makefile.am
+++ b/wizards/Makefile.am
@@ -4,22 +4,21 @@ INCLUDES = -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \
            -I$(top_srcdir)/kresources/kolab/shared -I$(top_srcdir) \
            -I$(top_srcdir)/knotes \
            -I$(top_srcdir)/certmanager/lib \
-           -I$(top_builddir)/kresources/groupwise \
            -I$(top_builddir)/kresources/lib \
            -I$(top_srcdir)/kresources/lib \
            $(all_includes)
 
 bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \
-               groupwisewizard exchangewizard scalixwizard
+               exchangewizard
 
 kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \
-                         libkolabwizard.la libgroupwisewizard.la \
-                         libexchangewizard.la libscalixwizard.la
+                         libkolabwizard.la \
+                         libexchangewizard.la 
 
 
 groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \
-                        libkolabwizard.la libgroupwisewizard.la \
+                        libkolabwizard.la \
                         libexchangewizard.la
 groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp
 
@@ -64,22 +63,6 @@ sloxwizard_LDADD = libsloxwizard.la
 sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 sloxwizard_SOURCES = sloxmain.cpp
 
-# GroupWise
-libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
-libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \
-  kmailchanges.cpp
-libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \
-                          $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \
-                          $(top_builddir)/libkdepim/libkdepim.la \
-                          $(top_builddir)/libkpimidentities/libkpimidentities.la
-libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \
-                                      $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h
-
-
-groupwisewizard_LDADD = libgroupwisewizard.la
-groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-groupwisewizard_SOURCES = groupwisemain.cpp
-
 # Exchange
 libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
 libexchangewizard_la_SOURCES = exchangewizard.cpp
@@ -91,25 +74,10 @@ exchangewizard_LDADD = libexchangewizard.la
 exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 exchangewizard_SOURCES = exchangemain.cpp
 
-# Scalix
-libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
-libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \
-                           $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \
-                           $(top_builddir)/libkcal/libkcal.la \
-                           $(top_builddir)/libkdepim/libkdepim.la \
-                           $(top_builddir)/libkpimidentities/libkpimidentities.la
-
-libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfgc \
-  scalixkmailchanges.cpp
-
-scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI)
-scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-scalixwizard_SOURCES = scalixmain.cpp
-
 noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \
-                 groupwisewizard.h exchangewizard.h
+                 exchangewizard.h
 
-kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg
+kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/kdepimwizards.pot