Initial batch of Krita automake fixes

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

36 files changed, 72 insertions, 36 deletions

diff --git a/krita/plugins/filters/blur/Makefile.am b/krita/plugins/filters/blur/Makefile.am
index 5d89ac20..d6b31b0d 100644
--- a/krita/plugins/filters/blur/Makefile.am
+++ b/krita/plugins/filters/blur/Makefile.am
@@ -14,7 +14,8 @@ kritablurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.
 kde_module_LTLIBRARIES = kritablurfilter.la
 noinst_HEADERS = blur.h kis_blur_filter.h
 
-kritablurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritablurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficeui/.libs -lkofficeui
 kritablurfilter_la_LIBADD = ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/filters/bumpmap/Makefile.am b/krita/plugins/filters/bumpmap/Makefile.am
index 5018a4e3..c71ddae8 100644
--- a/krita/plugins/filters/bumpmap/Makefile.am
+++ b/krita/plugins/filters/bumpmap/Makefile.am
@@ -12,7 +12,8 @@ kritabumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
 kde_module_LTLIBRARIES = kritabumpmap.la
 noinst_HEADERS = bumpmap.h
 
-kritabumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritabumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+	-L../../../../krita/ui/.libs -lkritaui
 kritabumpmap_la_LIBADD =  ../../../libkritacommon.la 
 
 kritabumpmap_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/cimg/Makefile.am b/krita/plugins/filters/cimg/Makefile.am
index a359e5f2..980e8142 100644
--- a/krita/plugins/filters/cimg/Makefile.am
+++ b/krita/plugins/filters/cimg/Makefile.am
@@ -25,7 +25,8 @@ noinst_HEADERS = \
 	kis_cimg_plugin.h\
 	kis_cimgconfig_widget.h
 
-kritacimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritacimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritacimg_la_LIBADD =  ../../../libkritacommon.la
 
 kritacimg_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/colorify/Makefile.am b/krita/plugins/filters/colorify/Makefile.am
index 4fbd0479..533c141e 100644
--- a/krita/plugins/filters/colorify/Makefile.am
+++ b/krita/plugins/filters/colorify/Makefile.am
@@ -14,7 +14,8 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = kritacolorify.la
 
 
-kritacolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritacolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritacolorify_la_LIBADD =  ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/filters/colors/Makefile.am b/krita/plugins/filters/colors/Makefile.am
index bbac0895..11b48a39 100644
--- a/krita/plugins/filters/colors/Makefile.am
+++ b/krita/plugins/filters/colors/Makefile.am
@@ -14,7 +14,8 @@ kritaextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col
 kde_module_LTLIBRARIES = kritaextensioncolorsfilters.la
 noinst_HEADERS = colors.h
 
-kritaextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaextensioncolorsfilters_la_LIBADD = ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/filters/colorsfilters/Makefile.am b/krita/plugins/filters/colorsfilters/Makefile.am
index 28234235..ef4cc545 100644
--- a/krita/plugins/filters/colorsfilters/Makefile.am
+++ b/krita/plugins/filters/colorsfilters/Makefile.am
@@ -17,7 +17,8 @@ noinst_HEADERS = colorsfilters.h \
 	kis_perchannel_filter.h \
 	kis_brightness_contrast_filter.h
 
-kritacolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritacolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritacolorsfilters_la_LIBADD =  ../../../libkritacommon.la 
 
 kde_module_LTLIBRARIES = kritacolorsfilters.la
diff --git a/krita/plugins/filters/convolutionfilters/Makefile.am b/krita/plugins/filters/convolutionfilters/Makefile.am
index 0e55cfb4..73b6452f 100644
--- a/krita/plugins/filters/convolutionfilters/Makefile.am
+++ b/krita/plugins/filters/convolutionfilters/Makefile.am
@@ -21,7 +21,8 @@ noinst_HEADERS = convolutionfilters.h \
 	kis_custom_convolution_filter_configuration_widget.h \
 	kis_convolution_filter.h
 
-kritaconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaconvolutionfilters_la_LIBADD =  ../../../libkritacommon.la
 
 kritaconvolutionfilters_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/embossfilter/Makefile.am b/krita/plugins/filters/embossfilter/Makefile.am
index 18a3fed7..248162a0 100644
--- a/krita/plugins/filters/embossfilter/Makefile.am
+++ b/krita/plugins/filters/embossfilter/Makefile.am
@@ -17,7 +17,8 @@ kritaembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \
 noinst_HEADERS = kis_emboss_filter_plugin.h \
         kis_emboss_filter.h
 
-kritaembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaembossfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritaembossfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/example/Makefile.am b/krita/plugins/filters/example/Makefile.am
index 17be46ce..2d53d3f1 100644
--- a/krita/plugins/filters/example/Makefile.am
+++ b/krita/plugins/filters/example/Makefile.am
@@ -15,7 +15,8 @@ kritaexample_la_SOURCES = example.cc
 kde_module_LTLIBRARIES = kritaexample.la
 noinst_HEADERS = example.h
 
-kritaexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaexample_la_LIBADD =  ../../../libkritacommon.la
 
 kritaexample_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/fastcolortransfer/Makefile.am b/krita/plugins/filters/fastcolortransfer/Makefile.am
index 9c0d141c..acbd329a 100644
--- a/krita/plugins/filters/fastcolortransfer/Makefile.am
+++ b/krita/plugins/filters/fastcolortransfer/Makefile.am
@@ -16,7 +16,8 @@ kritafastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc
 kde_module_LTLIBRARIES = kritafastcolortransfer.la
 noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h
 
-kritafastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritafastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui -L../../../../lib/kofficecore/.libs -lkofficecore
 kritafastcolortransfer_la_LIBADD = ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/filters/imageenhancement/Makefile.am b/krita/plugins/filters/imageenhancement/Makefile.am
index ff08fa27..013decb4 100644
--- a/krita/plugins/filters/imageenhancement/Makefile.am
+++ b/krita/plugins/filters/imageenhancement/Makefile.am
@@ -15,7 +15,8 @@ kritaimageenhancement_la_SOURCES = imageenhancement.cpp \
 
 kde_module_LTLIBRARIES = kritaimageenhancement.la
 
-kritaimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 
 noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h
 
diff --git a/krita/plugins/filters/lenscorrectionfilter/Makefile.am b/krita/plugins/filters/lenscorrectionfilter/Makefile.am
index 77f47e89..0e5ee12e 100644
--- a/krita/plugins/filters/lenscorrectionfilter/Makefile.am
+++ b/krita/plugins/filters/lenscorrectionfilter/Makefile.am
@@ -16,7 +16,8 @@ kritalenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \
 kde_module_LTLIBRARIES = kritalenscorrectionfilter.la
 noinst_HEADERS = lenscorrectionfilter.h
 
-kritalenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritalenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritalenscorrectionfilter_la_LIBADD =  ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/filters/levelfilter/Makefile.am b/krita/plugins/filters/levelfilter/Makefile.am
index b72bc055..d3ec2173 100644
--- a/krita/plugins/filters/levelfilter/Makefile.am
+++ b/krita/plugins/filters/levelfilter/Makefile.am
@@ -16,7 +16,8 @@ noinst_HEADERS = levelfilter.h \
 	kis_level_filter.h \
 	kgradientslider.h
 
-kritalevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritalevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritalevelfilter_la_LIBADD =  ../../../libkritacommon.la 
 
 kde_module_LTLIBRARIES = kritalevelfilter.la
diff --git a/krita/plugins/filters/noisefilter/Makefile.am b/krita/plugins/filters/noisefilter/Makefile.am
index 761cc763..f09ef5c3 100644
--- a/krita/plugins/filters/noisefilter/Makefile.am
+++ b/krita/plugins/filters/noisefilter/Makefile.am
@@ -16,7 +16,8 @@ kritanoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \
 kde_module_LTLIBRARIES = kritanoisefilter.la
 noinst_HEADERS = noisefilter.h kis_wdg_noise.h
 
-kritanoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritanoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritanoisefilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritanoisefilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/oilpaintfilter/Makefile.am b/krita/plugins/filters/oilpaintfilter/Makefile.am
index 4f114841..98eabf99 100644
--- a/krita/plugins/filters/oilpaintfilter/Makefile.am
+++ b/krita/plugins/filters/oilpaintfilter/Makefile.am
@@ -17,7 +17,8 @@ kritaoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \
 noinst_HEADERS = kis_oilpaint_filter_plugin.h \
 	kis_oilpaint_filter.h
 
-kritaoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaoilpaintfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritaoilpaintfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/pixelizefilter/Makefile.am b/krita/plugins/filters/pixelizefilter/Makefile.am
index 61d3ddd8..736a24a4 100644
--- a/krita/plugins/filters/pixelizefilter/Makefile.am
+++ b/krita/plugins/filters/pixelizefilter/Makefile.am
@@ -17,7 +17,8 @@ kritapixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \
 noinst_HEADERS = kis_pixelize_filter_plugin.h \
 	kis_pixelize_filter.h
 
-kritapixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritapixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritapixelizefilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritapixelizefilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/raindropsfilter/Makefile.am b/krita/plugins/filters/raindropsfilter/Makefile.am
index 6cd42c40..36ce4856 100644
--- a/krita/plugins/filters/raindropsfilter/Makefile.am
+++ b/krita/plugins/filters/raindropsfilter/Makefile.am
@@ -17,7 +17,8 @@ kritaraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \
 noinst_HEADERS = kis_raindrops_filter_plugin.h \
 	kis_raindrops_filter.h
 
-kritaraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaraindropsfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritaraindropsfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/randompickfilter/Makefile.am b/krita/plugins/filters/randompickfilter/Makefile.am
index 9fb1bb90..894c7c48 100644
--- a/krita/plugins/filters/randompickfilter/Makefile.am
+++ b/krita/plugins/filters/randompickfilter/Makefile.am
@@ -16,7 +16,8 @@ kritarandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \
 kde_module_LTLIBRARIES = kritarandompickfilter.la
 noinst_HEADERS = randompickfilter.h
 
-kritarandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritarandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritarandompickfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritarandompickfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/roundcorners/Makefile.am b/krita/plugins/filters/roundcorners/Makefile.am
index 43e6163d..b1c251e4 100644
--- a/krita/plugins/filters/roundcorners/Makefile.am
+++ b/krita/plugins/filters/roundcorners/Makefile.am
@@ -16,7 +16,8 @@ kritaroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \
 noinst_HEADERS = kis_round_corners_filter_plugin.h \
 	kis_round_corners_filter.h
 
-kritaroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaroundcornersfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritaroundcornersfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/smalltilesfilter/Makefile.am b/krita/plugins/filters/smalltilesfilter/Makefile.am
index 7c62bb1d..3a76684a 100644
--- a/krita/plugins/filters/smalltilesfilter/Makefile.am
+++ b/krita/plugins/filters/smalltilesfilter/Makefile.am
@@ -16,7 +16,8 @@ kritasmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \
 noinst_HEADERS = kis_small_tiles_filter_plugin.h \
 	kis_small_tiles_filter.h
 
-kritasmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritasmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritasmalltilesfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritasmalltilesfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/sobelfilter/Makefile.am b/krita/plugins/filters/sobelfilter/Makefile.am
index c83e1c7d..82566051 100644
--- a/krita/plugins/filters/sobelfilter/Makefile.am
+++ b/krita/plugins/filters/sobelfilter/Makefile.am
@@ -16,7 +16,8 @@ kritasobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \
 noinst_HEADERS = kis_sobel_filter_plugin.h \
 	kis_sobel_filter.h
 
-kritasobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritasobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritasobelfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritasobelfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/filters/unsharp/Makefile.am b/krita/plugins/filters/unsharp/Makefile.am
index 5eabc3e8..83839d22 100644
--- a/krita/plugins/filters/unsharp/Makefile.am
+++ b/krita/plugins/filters/unsharp/Makefile.am
@@ -13,7 +13,8 @@ kritaunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_
 
 kde_module_LTLIBRARIES = kritaunsharpfilter.la
 
-kritaunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaunsharpfilter_la_LIBADD = ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/filters/wavefilter/Makefile.am b/krita/plugins/filters/wavefilter/Makefile.am
index 66f6bf54..7cda6e5c 100644
--- a/krita/plugins/filters/wavefilter/Makefile.am
+++ b/krita/plugins/filters/wavefilter/Makefile.am
@@ -16,7 +16,8 @@ kritawavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \
 kde_module_LTLIBRARIES = kritawavefilter.la
 noinst_HEADERS = wavefilter.h kis_wdg_wave.h
 
-kritawavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritawavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritawavefilter_la_LIBADD =  ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/paintops/defaultpaintops/Makefile.am b/krita/plugins/paintops/defaultpaintops/Makefile.am
index 5a52d651..510c4846 100644
--- a/krita/plugins/paintops/defaultpaintops/Makefile.am
+++ b/krita/plugins/paintops/defaultpaintops/Makefile.am
@@ -32,7 +32,8 @@ noinst_HEADERS = defaultpaintops_plugin.h 	kis_airbrushop.h 	kis_brushop.h \
 
 kde_module_LTLIBRARIES = kritadefaultpaintops.la
 
-kritadefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritadefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritadefaultpaintops_la_LIBADD =  ../../../libkritacommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
 
 kritadefaultpaintops_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/defaulttools/Makefile.am b/krita/plugins/tools/defaulttools/Makefile.am
index 6f28508a..f6bf3894 100644
--- a/krita/plugins/tools/defaulttools/Makefile.am
+++ b/krita/plugins/tools/defaulttools/Makefile.am
@@ -44,7 +44,8 @@ noinst_HEADERS = \
 	kis_tool_pan.h 
 
 
-kritadefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritadefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritadefaulttools_la_LIBADD =  ../../../libkritacommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
 
 kritadefaulttools_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/selectiontools/Makefile.am b/krita/plugins/tools/selectiontools/Makefile.am
index a3fc336f..fe451f69 100644
--- a/krita/plugins/tools/selectiontools/Makefile.am
+++ b/krita/plugins/tools/selectiontools/Makefile.am
@@ -28,7 +28,8 @@ noinst_HEADERS = \
 	kis_tool_select_elliptical.h 
 
 
-kritaselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritaselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritaselectiontools_la_LIBADD =  ../../../libkritacommon.la
 
 kritaselectiontools_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_crop/Makefile.am b/krita/plugins/tools/tool_crop/Makefile.am
index b9c2fad4..ced0fd67 100644
--- a/krita/plugins/tools/tool_crop/Makefile.am
+++ b/krita/plugins/tools/tool_crop/Makefile.am
@@ -21,7 +21,8 @@ noinst_HEADERS = \
 	tool_crop.h \
 	kis_tool_crop.h 
 
-kritatoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolcrop_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolcrop_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_curves/Makefile.am b/krita/plugins/tools/tool_curves/Makefile.am
index d809eaee..664b19b9 100644
--- a/krita/plugins/tools/tool_curves/Makefile.am
+++ b/krita/plugins/tools/tool_curves/Makefile.am
@@ -33,7 +33,8 @@ noinst_HEADERS = \
 	kis_tool_bezier_select.h \
 	kis_tool_moutline.h
 
-kritatoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolcurves_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolcurves_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_filter/Makefile.am b/krita/plugins/tools/tool_filter/Makefile.am
index d43f6b95..9b8c575e 100644
--- a/krita/plugins/tools/tool_filter/Makefile.am
+++ b/krita/plugins/tools/tool_filter/Makefile.am
@@ -22,7 +22,8 @@ noinst_HEADERS = \
 	kis_tool_filter.h \
 	tool_filter.h
 
-kritatoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolfilter_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolfilter_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_perspectivegrid/Makefile.am b/krita/plugins/tools/tool_perspectivegrid/Makefile.am
index f6182410..3446a536 100644
--- a/krita/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/krita/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -20,7 +20,8 @@ noinst_HEADERS = \
 	tool_perspectivegrid.h \
 	kis_tool_perspectivegrid.h 
 
-kritatoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolperspectivegrid_la_LIBADD =  ../../../libkritacommon.la
 
 METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_perspectivetransform/Makefile.am b/krita/plugins/tools/tool_perspectivetransform/Makefile.am
index 5a833521..6096af13 100644
--- a/krita/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/krita/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -20,7 +20,8 @@ noinst_HEADERS = \
 	tool_perspectivetransform.h \
 	kis_tool_perspectivetransform.h 
 
-kritatoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolperspectivetransform_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolperspectivetransform_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_polygon/Makefile.am b/krita/plugins/tools/tool_polygon/Makefile.am
index dec22b37..cb5b5e62 100644
--- a/krita/plugins/tools/tool_polygon/Makefile.am
+++ b/krita/plugins/tools/tool_polygon/Makefile.am
@@ -20,7 +20,8 @@ noinst_HEADERS = \
 	tool_polygon.h \
 	kis_tool_polygon.h 
 
-kritatoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolpolygon_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolpolygon_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_polyline/Makefile.am b/krita/plugins/tools/tool_polyline/Makefile.am
index 298119b5..1df08602 100644
--- a/krita/plugins/tools/tool_polyline/Makefile.am
+++ b/krita/plugins/tools/tool_polyline/Makefile.am
@@ -20,7 +20,8 @@ noinst_HEADERS = \
 	tool_polyline.h \
 	kis_tool_polyline.h 
 
-kritatoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolpolyline_la_LIBADD =  ../../../libkritacommon.la 
 
 kritatoolpolyline_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_selectsimilar/Makefile.am b/krita/plugins/tools/tool_selectsimilar/Makefile.am
index d92642c1..6c077ac3 100644
--- a/krita/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/krita/plugins/tools/tool_selectsimilar/Makefile.am
@@ -14,7 +14,8 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
 kde_module_LTLIBRARIES = kritatoolselectsimilar.la
 
-kritatoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolselectsimilar_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolselectsimilar_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_star/Makefile.am b/krita/plugins/tools/tool_star/Makefile.am
index 8efa1e58..422834cc 100644
--- a/krita/plugins/tools/tool_star/Makefile.am
+++ b/krita/plugins/tools/tool_star/Makefile.am
@@ -21,7 +21,8 @@ noinst_HEADERS = \
 	tool_star.h \
 	kis_tool_star.h 
 
-kritatoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatoolstar_la_LIBADD =  ../../../libkritacommon.la
 
 kritatoolstar_la_METASOURCES = AUTO
diff --git a/krita/plugins/tools/tool_transform/Makefile.am b/krita/plugins/tools/tool_transform/Makefile.am
index 8f77620e..85336f6b 100644
--- a/krita/plugins/tools/tool_transform/Makefile.am
+++ b/krita/plugins/tools/tool_transform/Makefile.am
@@ -21,7 +21,8 @@ noinst_HEADERS = \
 	tool_transform.h \
 	kis_tool_transform.h 
 
-kritatooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
+kritatooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../krita/kritacolor/.libs -lkritacolor -L../../../../krita/core/.libs -lkritaimage \
+        -L../../../../krita/ui/.libs -lkritaui
 kritatooltransform_la_LIBADD =  ../../../libkritacommon.la
 
 kritatooltransform_la_METASOURCES = AUTO