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

23 files changed, 115 insertions, 69 deletions

diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am
index ac622d7c8..d54d65be7 100644
--- a/chalk/plugins/filters/blur/Makefile.am
+++ b/chalk/plugins/filters/blur/Makefile.am
@@ -14,9 +14,11 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.
 kde_module_LTLIBRARIES = chalkblurfilter.la
 noinst_HEADERS = blur.h kis_blur_filter.h
 
-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
-chalkblurfilter_la_LIBADD = ../../../libchalkcommon.la
+chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkblurfilter_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
 
diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am
index c783157d0..156a60a3a 100644
--- a/chalk/plugins/filters/bumpmap/Makefile.am
+++ b/chalk/plugins/filters/bumpmap/Makefile.am
@@ -12,8 +12,10 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
 kde_module_LTLIBRARIES = chalkbumpmap.la
 noinst_HEADERS = bumpmap.h
 
-chalkbumpmap_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
-chalkbumpmap_la_LIBADD =  ../../../libchalkcommon.la 
+chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkbumpmap_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkbumpmap_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am
index 19e58bd23..25537737f 100644
--- a/chalk/plugins/filters/cimg/Makefile.am
+++ b/chalk/plugins/filters/cimg/Makefile.am
@@ -25,9 +25,11 @@ noinst_HEADERS = \
 	kis_cimg_plugin.h\
 	kis_cimgconfig_widget.h
 
-chalkcimg_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
-chalkcimg_la_LIBADD =  ../../../libchalkcommon.la
+chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkcimg_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkcimg_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/filters/colorify/Makefile.am b/chalk/plugins/filters/colorify/Makefile.am
index d69de3398..65e7243ec 100644
--- a/chalk/plugins/filters/colorify/Makefile.am
+++ b/chalk/plugins/filters/colorify/Makefile.am
@@ -14,9 +14,11 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = chalkcolorify.la
 
 
-chalkcolorify_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
-chalkcolorify_la_LIBADD =  ../../../libchalkcommon.la
+chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkcolorify_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
 chalkcolorify_la_SOURCES = Colorify.cpp KisWdgColorify.cpp\
diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am
index 523915c3f..0da38c002 100644
--- a/chalk/plugins/filters/colors/Makefile.am
+++ b/chalk/plugins/filters/colors/Makefile.am
@@ -14,8 +14,10 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col
 kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la
 noinst_HEADERS = colors.h
 
-chalkextensioncolorsfilters_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
-chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la
+chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am
index cd4745eb3..6aeaaee50 100644
--- a/chalk/plugins/filters/colorsfilters/Makefile.am
+++ b/chalk/plugins/filters/colorsfilters/Makefile.am
@@ -17,9 +17,11 @@ noinst_HEADERS = colorsfilters.h \
 	kis_perchannel_filter.h \
 	kis_brightness_contrast_filter.h
 
-chalkcolorsfilters_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
-chalkcolorsfilters_la_LIBADD =  ../../../libchalkcommon.la 
+chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkcolorsfilters_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_module_LTLIBRARIES = chalkcolorsfilters.la
 
diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am
index 133a684f4..32f5cbd12 100644
--- a/chalk/plugins/filters/convolutionfilters/Makefile.am
+++ b/chalk/plugins/filters/convolutionfilters/Makefile.am
@@ -21,8 +21,10 @@ noinst_HEADERS = convolutionfilters.h \
 	kis_custom_convolution_filter_configuration_widget.h \
 	kis_convolution_filter.h
 
-chalkconvolutionfilters_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
-chalkconvolutionfilters_la_LIBADD =  ../../../libchalkcommon.la
+chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkconvolutionfilters_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkconvolutionfilters_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am
index d0116fe4a..19b54e40d 100644
--- a/chalk/plugins/filters/embossfilter/Makefile.am
+++ b/chalk/plugins/filters/embossfilter/Makefile.am
@@ -17,8 +17,10 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \
 noinst_HEADERS = kis_emboss_filter_plugin.h \
         kis_emboss_filter.h
 
-chalkembossfilter_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
-chalkembossfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkembossfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkembossfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am
index 33b55da50..5dcd34911 100644
--- a/chalk/plugins/filters/example/Makefile.am
+++ b/chalk/plugins/filters/example/Makefile.am
@@ -15,8 +15,10 @@ chalkexample_la_SOURCES = example.cc
 kde_module_LTLIBRARIES = chalkexample.la
 noinst_HEADERS = example.h
 
-chalkexample_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
-chalkexample_la_LIBADD =  ../../../libchalkcommon.la
+chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkexample_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkexample_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am
index 424231d2e..24b9f381c 100644
--- a/chalk/plugins/filters/fastcolortransfer/Makefile.am
+++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am
@@ -16,8 +16,10 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc
 kde_module_LTLIBRARIES = chalkfastcolortransfer.la
 noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h
 
-chalkfastcolortransfer_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/kofficecore/.libs -lkofficecore
-chalkfastcolortransfer_la_LIBADD = ../../../libchalkcommon.la
+chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkfastcolortransfer_la_LIBADD = $(LIB_KOFFICECORE) ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
diff --git a/chalk/plugins/filters/imageenhancement/Makefile.am b/chalk/plugins/filters/imageenhancement/Makefile.am
index d2477ebf0..32b9bd701 100644
--- a/chalk/plugins/filters/imageenhancement/Makefile.am
+++ b/chalk/plugins/filters/imageenhancement/Makefile.am
@@ -15,12 +15,14 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \
 
 kde_module_LTLIBRARIES = chalkimageenhancement.la
 
-chalkimageenhancement_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
+chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
 
 noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h
 
-chalkimageenhancement_la_LIBADD =  ../../../libchalkcommon.la 
+chalkimageenhancement_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkimageenhencement_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
index b85328134..c794fee33 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
+++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
@@ -16,8 +16,10 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \
 kde_module_LTLIBRARIES = chalklenscorrectionfilter.la
 noinst_HEADERS = lenscorrectionfilter.h
 
-chalklenscorrectionfilter_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
-chalklenscorrectionfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalklenscorrectionfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am
index 5c04e697f..314c44256 100644
--- a/chalk/plugins/filters/levelfilter/Makefile.am
+++ b/chalk/plugins/filters/levelfilter/Makefile.am
@@ -16,9 +16,11 @@ noinst_HEADERS = levelfilter.h \
 	kis_level_filter.h \
 	kgradientslider.h
 
-chalklevelfilter_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
-chalklevelfilter_la_LIBADD =  ../../../libchalkcommon.la 
+chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalklevelfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 kde_module_LTLIBRARIES = chalklevelfilter.la
 
diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am
index 3a085fc7d..aea0c059c 100644
--- a/chalk/plugins/filters/noisefilter/Makefile.am
+++ b/chalk/plugins/filters/noisefilter/Makefile.am
@@ -16,8 +16,10 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \
 kde_module_LTLIBRARIES = chalknoisefilter.la
 noinst_HEADERS = noisefilter.h kis_wdg_noise.h
 
-chalknoisefilter_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
-chalknoisefilter_la_LIBADD =  ../../../libchalkcommon.la
+chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalknoisefilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalknoisefilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am
index cef212593..60878f64d 100644
--- a/chalk/plugins/filters/oilpaintfilter/Makefile.am
+++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am
@@ -17,8 +17,10 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \
 noinst_HEADERS = kis_oilpaint_filter_plugin.h \
 	kis_oilpaint_filter.h
 
-chalkoilpaintfilter_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
-chalkoilpaintfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkoilpaintfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkoilpaintfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am
index cc12358de..e46e0ead6 100644
--- a/chalk/plugins/filters/pixelizefilter/Makefile.am
+++ b/chalk/plugins/filters/pixelizefilter/Makefile.am
@@ -17,8 +17,10 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \
 noinst_HEADERS = kis_pixelize_filter_plugin.h \
 	kis_pixelize_filter.h
 
-chalkpixelizefilter_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
-chalkpixelizefilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkpixelizefilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkpixelizefilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am
index ba88e62c8..584ef9602 100644
--- a/chalk/plugins/filters/raindropsfilter/Makefile.am
+++ b/chalk/plugins/filters/raindropsfilter/Makefile.am
@@ -17,8 +17,10 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \
 noinst_HEADERS = kis_raindrops_filter_plugin.h \
 	kis_raindrops_filter.h
 
-chalkraindropsfilter_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
-chalkraindropsfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkraindropsfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkraindropsfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am
index e46dc642b..b7a16572f 100644
--- a/chalk/plugins/filters/randompickfilter/Makefile.am
+++ b/chalk/plugins/filters/randompickfilter/Makefile.am
@@ -16,8 +16,10 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \
 kde_module_LTLIBRARIES = chalkrandompickfilter.la
 noinst_HEADERS = randompickfilter.h
 
-chalkrandompickfilter_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
-chalkrandompickfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkrandompickfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkrandompickfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am
index 0b74580ec..ee9f141e0 100644
--- a/chalk/plugins/filters/roundcorners/Makefile.am
+++ b/chalk/plugins/filters/roundcorners/Makefile.am
@@ -16,8 +16,10 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \
 noinst_HEADERS = kis_round_corners_filter_plugin.h \
 	kis_round_corners_filter.h
 
-chalkroundcornersfilter_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
-chalkroundcornersfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkroundcornersfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkroundcornersfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am
index f139c2980..ae28ed1d5 100644
--- a/chalk/plugins/filters/smalltilesfilter/Makefile.am
+++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am
@@ -16,8 +16,10 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \
 noinst_HEADERS = kis_small_tiles_filter_plugin.h \
 	kis_small_tiles_filter.h
 
-chalksmalltilesfilter_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
-chalksmalltilesfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalksmalltilesfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalksmalltilesfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am
index 9726f4d3a..da3fd164f 100644
--- a/chalk/plugins/filters/sobelfilter/Makefile.am
+++ b/chalk/plugins/filters/sobelfilter/Makefile.am
@@ -16,8 +16,10 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \
 noinst_HEADERS = kis_sobel_filter_plugin.h \
 	kis_sobel_filter.h
 
-chalksobelfilter_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
-chalksobelfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalksobelfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalksobelfilter_la_METASOURCES = AUTO
diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am
index 5c6eda766..1c1289ff4 100644
--- a/chalk/plugins/filters/unsharp/Makefile.am
+++ b/chalk/plugins/filters/unsharp/Makefile.am
@@ -13,8 +13,10 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_
 
 kde_module_LTLIBRARIES = chalkunsharpfilter.la
 
-chalkunsharpfilter_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
-chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la
+chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am
index 6d2fec5c1..65b047c4b 100644
--- a/chalk/plugins/filters/wavefilter/Makefile.am
+++ b/chalk/plugins/filters/wavefilter/Makefile.am
@@ -16,8 +16,10 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \
 kde_module_LTLIBRARIES = chalkwavefilter.la
 noinst_HEADERS = wavefilter.h kis_wdg_wave.h
 
-chalkwavefilter_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
-chalkwavefilter_la_LIBADD =  ../../../libchalkcommon.la
+chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkwavefilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO