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

12 files changed, 60 insertions, 36 deletions

diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am
index 16c4be51..329e9bb7 100644
--- a/chalk/plugins/tools/defaulttools/Makefile.am
+++ b/chalk/plugins/tools/defaulttools/Makefile.am
@@ -44,9 +44,11 @@ noinst_HEADERS = \
 	kis_tool_pan.h 
 
 
-chalkdefaulttools_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
-chalkdefaulttools_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE)
+chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkdefaulttools_la_LIBADD =  ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkdefaulttools_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
index cfaa8f36..7f6c0899 100644
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@@ -28,9 +28,11 @@ noinst_HEADERS = \
 	kis_tool_select_elliptical.h 
 
 
-chalkselectiontools_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
-chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la
+chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalkselectiontools_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalkselectiontools_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index d1d73a75..9091a521 100644
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@@ -21,9 +21,11 @@ noinst_HEADERS = \
 	tool_crop.h \
 	kis_tool_crop.h 
 
-chalktoolcrop_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
-chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolcrop_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolcrop_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index 1f847fe5..03d3395b 100644
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@@ -33,9 +33,11 @@ noinst_HEADERS = \
 	kis_tool_bezier_select.h \
 	kis_tool_moutline.h
 
-chalktoolcurves_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
-chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolcurves_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolcurves_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index 0f14b709..35c23811 100644
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@@ -22,9 +22,11 @@ noinst_HEADERS = \
 	kis_tool_filter.h \
 	tool_filter.h
 
-chalktoolfilter_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
-chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolfilter_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolfilter_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index 80b6d351..ffa08320 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -20,9 +20,11 @@ noinst_HEADERS = \
 	tool_perspectivegrid.h \
 	kis_tool_perspectivegrid.h 
 
-chalktoolperspectivegrid_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
-chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolperspectivegrid_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index 9f6dfb24..24916188 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -20,9 +20,11 @@ noinst_HEADERS = \
 	tool_perspectivetransform.h \
 	kis_tool_perspectivetransform.h 
 
-chalktoolperspectivetransform_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
-chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolperspectivetransform_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolperspectivetransform_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index ef2d230f..2155322a 100644
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@@ -20,9 +20,11 @@ noinst_HEADERS = \
 	tool_polygon.h \
 	kis_tool_polygon.h 
 
-chalktoolpolygon_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
-chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolpolygon_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolpolygon_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index acbe8e6c..2beb6509 100644
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@@ -20,9 +20,11 @@ noinst_HEADERS = \
 	tool_polyline.h \
 	kis_tool_polyline.h 
 
-chalktoolpolyline_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
-chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la 
+chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolpolyline_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolpolyline_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index 416c9a68..70d58855 100644
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@@ -14,9 +14,11 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
 kde_module_LTLIBRARIES = chalktoolselectsimilar.la
 
-chalktoolselectsimilar_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
-chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolselectsimilar_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolselectsimilar_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
index e068a628..a6b9a47b 100644
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@@ -21,9 +21,11 @@ noinst_HEADERS = \
 	tool_star.h \
 	kis_tool_star.h 
 
-chalktoolstar_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
-chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la
+chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktoolstar_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktoolstar_la_METASOURCES = AUTO
 
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index bb687379..b606e177 100644
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@@ -21,9 +21,11 @@ noinst_HEADERS = \
 	tool_transform.h \
 	kis_tool_transform.h 
 
-chalktooltransform_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
-chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la
+chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts
+chalktooltransform_la_LIBADD =  ../../../libchalkcommon.la \
+	../../../../chalk/chalkcolor/libchalkcolor.la \
+	../../../../chalk/core/libchalkimage.la \
+	../../../../chalk/ui/libchalkui.la
 
 chalktooltransform_la_METASOURCES = AUTO