Fix FTBFS due to missing libraries

Clean up lib paths in LDFLAGS - moved to LIBADD
For KWord and and KPresenter added linking kspell2
For KSpread added linking kutils
This closes Bug 657

18 files changed, 91 insertions, 54 deletions

diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am
index 19fb51ef..57abd956 100644
--- a/chalk/plugins/viewplugins/colorrange/Makefile.am
+++ b/chalk/plugins/viewplugins/colorrange/Makefile.am
@@ -10,9 +10,11 @@ kde_module_LTLIBRARIES = chalkcolorrange.la
 chalkcolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui
 noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h
 
-chalkcolorrange_la_LIBADD =  ../../../libchalkcommon.la
-chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
+chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
+chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
 
 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = colorrange.rc
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
index 5469f41a..a6da5063 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
+++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la
 chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc
 noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h
 
-chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkcolorspaceconversion_la_LIBADD =  ../../../libchalkcommon.la
+chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkcolorspaceconversion_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkcolorspaceconversion_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am
index a09b78e8..137b57d7 100644
--- a/chalk/plugins/viewplugins/dropshadow/Makefile.am
+++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am
@@ -20,9 +20,11 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \
 noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \
 		kis_dropshadow.h dlg_dropshadow.h
 
-chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkdropshadow_la_LIBADD =  ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la
+chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkdropshadow_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_services_DATA = chalkdropshadow.desktop
 
diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
index b326ddbc..b2009674 100644
--- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am
+++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
@@ -19,8 +19,10 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h
 
 kde_services_DATA = chalkfiltersgallery.desktop
 
-chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkfiltersgallery_la_LIBADD =  ../../../libchalkcommon.la 
+chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkfiltersgallery_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkfiltersgallery_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am
index 4b372cf2..a5c5e3d7 100644
--- a/chalk/plugins/viewplugins/histogram/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram/Makefile.am
@@ -18,8 +18,10 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget
 
 kde_services_DATA = chalkhistogram.desktop
 
-chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkhistogram_la_LIBADD =  ../../../libchalkcommon.la
+chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkhistogram_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkhistogram_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
index 02864fcb..d63edff0 100644
--- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
@@ -15,8 +15,10 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc  kis_imagerasteredcache.cc
 kde_module_LTLIBRARIES = chalkhistogramdocker.la
 noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h
 
-chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkhistogramdocker_la_LIBADD =  ../../../libchalkcommon.la
+chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkhistogramdocker_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkhistogramdocker_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am
index 11da5c9b..73a096be 100644
--- a/chalk/plugins/viewplugins/imagesize/Makefile.am
+++ b/chalk/plugins/viewplugins/imagesize/Makefile.am
@@ -18,8 +18,10 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h
 
 kde_module_LTLIBRARIES = chalkimagesize.la
 
-chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkimagesize_la_LIBADD =  ../../../libchalkcommon.la 
+chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkimagesize_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkimagesize_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am
index 03467683..c19b2986 100644
--- a/chalk/plugins/viewplugins/modify_selection/Makefile.am
+++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am
@@ -20,8 +20,10 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h
 
 kde_module_LTLIBRARIES = chalkmodifyselection.la
 
-chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkmodifyselection_la_LIBADD =  ../../../libchalkcommon.la 
+chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkmodifyselection_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkmodifyselection_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am
index 52cafd70..32da2ec3 100644
--- a/chalk/plugins/viewplugins/performancetest/Makefile.am
+++ b/chalk/plugins/viewplugins/performancetest/Makefile.am
@@ -16,9 +16,11 @@ kde_module_LTLIBRARIES = chalkperftest.la
 chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc
 noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h
 
-chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkperftest_la_LIBADD =  ../../../libchalkcommon.la
+chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkperftest_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_services_DATA = chalkperftest.desktop
 
diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am
index 25d48e39..61d729bf 100644
--- a/chalk/plugins/viewplugins/rotateimage/Makefile.am
+++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am
@@ -16,9 +16,11 @@ kde_module_LTLIBRARIES = chalkrotateimage.la
 chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc
 noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h
 
-chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkrotateimage_la_LIBADD =  ../../../libchalkcommon.la
+chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkrotateimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_services_DATA = chalkrotateimage.desktop
 
diff --git a/chalk/plugins/viewplugins/screenshot/Makefile.am b/chalk/plugins/viewplugins/screenshot/Makefile.am
index 7bde0565..5394cf76 100644
--- a/chalk/plugins/viewplugins/screenshot/Makefile.am
+++ b/chalk/plugins/viewplugins/screenshot/Makefile.am
@@ -15,9 +15,11 @@ kde_module_LTLIBRARIES = chalkscreenshot.la
 chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui
 noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h
 
-chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -ltdeprint
-chalkscreenshot_la_LIBADD =  ../../../libchalkcommon.la 
+chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -ltdeprint
+chalkscreenshot_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_services_DATA = chalkscreenshot.desktop
 
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
index eec36972..5757c06d 100644
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@@ -20,9 +20,11 @@ chalkscripting_la_SOURCES = scripting.cc
 kde_module_LTLIBRARIES = chalkscripting.la
 noinst_HEADERS = scripting.h
 
-chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkscripting_la_LIBADD =  $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la
+chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkscripting_la_LIBADD = $(LIB_KOFFICEUI) $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
 
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
index ac4a959b..e3eee892 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am
@@ -11,15 +11,18 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp
 	krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \
 	krs_wavelet.cpp
 
-krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../../chalk/ui/.libs -lchalkui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore
+krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
 krosschalkcore_la_LIBADD = \
+    $(LIB_KOFFICE_CORE) $(LIB_KOFFICEUI) \
     $(LIB_QT) \
     $(LIB_TDECORE) \
     $(top_builddir)/lib/kross/api/libkrossapi.la \
     $(top_builddir)/lib/kross/main/libkrossmain.la \
     $(top_builddir)/chalk/libchalkcommon.la \
-    $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la
+    $(top_builddir)/chalk/plugins/viewplugins/scripting/chalkscripting/libchalkscripting.la \
+    ../../../../../chalk/chalkcolor/libchalkcolor.la \
+    ../../../../../chalk/core/libchalkimage.la \
+    ../../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
 SUBDIRS = .
diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
index 06823114..80ef3928 100644
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@@ -10,9 +10,11 @@ kde_module_LTLIBRARIES = chalkselectopaque.la
 chalkselectopaque_la_SOURCES = selectopaque.cc 
 noinst_HEADERS = selectopaque.h
 
-chalkselectopaque_la_LIBADD =  ../../../libchalkcommon.la
-chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
+chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
+chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
 
 chalkrcdir = $(kde_datadir)/chalkplugins
 chalkrc_DATA = selectopaque.rc
diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am
index 130a5ff5..ce279a13 100644
--- a/chalk/plugins/viewplugins/separate_channels/Makefile.am
+++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am
@@ -20,8 +20,10 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \
 
 kde_services_DATA = chalkseparatechannels.desktop
 
-chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -L../../../../lib/kofficecore/.libs -lkofficecore
-chalkseparatechannels_la_LIBADD =  ../../../libchalkcommon.la 
+chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkseparatechannels_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkseparatechannels_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am
index 937088bb..5d3bd01a 100644
--- a/chalk/plugins/viewplugins/shearimage/Makefile.am
+++ b/chalk/plugins/viewplugins/shearimage/Makefile.am
@@ -18,8 +18,10 @@ kde_services_DATA = chalkshearimage.desktop
 chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc
 noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h
 
-chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkshearimage_la_LIBADD =  ../../../libchalkcommon.la
+chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkshearimage_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkshearimage_la_METASOURCES = AUTO
diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am
index 5e0fe4c7..0d5e2758 100644
--- a/chalk/plugins/viewplugins/substrate/Makefile.am
+++ b/chalk/plugins/viewplugins/substrate/Makefile.am
@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalksubstrate.la
 chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc
 noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h
 
-chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalksubstrate_la_LIBADD =  ../../../libchalkcommon.la
+chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalksubstrate_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_services_DATA = chalksubstrate.desktop
 
diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am
index df07a2a5..26b01aa8 100644
--- a/chalk/plugins/viewplugins/variations/Makefile.am
+++ b/chalk/plugins/viewplugins/variations/Makefile.am
@@ -17,9 +17,11 @@ kde_module_LTLIBRARIES = chalkvariations.la
 chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui 
 noinst_HEADERS = wdg_variations.h
 
-chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \
-        -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui
-chalkvariations_la_LIBADD =  ../../../libchalkcommon.la
+chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkvariations_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_services_DATA = chalkvariations.desktop