From 865f314dd5ed55508f45a32973b709b79a541e36 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 11 Dec 2009 03:46:01 +0000
Subject: kdelibs update to Trinity v3.5.11

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1061230 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kspell2/Makefile.am                | 1 -
 kspell2/plugins/aspell/Makefile.am | 2 +-
 kspell2/plugins/hspell/Makefile.am | 2 +-
 kspell2/plugins/ispell/Makefile.am | 2 +-
 kspell2/tests/Makefile.am          | 4 ++--
 kspell2/ui/Makefile.am             | 2 +-
 6 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'kspell2')

diff --git a/kspell2/Makefile.am b/kspell2/Makefile.am
index 18b03daed..a3ef1b807 100644
--- a/kspell2/Makefile.am
+++ b/kspell2/Makefile.am
@@ -17,7 +17,6 @@ libkspell2base_la_SOURCES = settings.cpp broker.cpp \
 	defaultdictionary.cpp 
 
 libkspell2base_la_LDFLAGS = -no-undefined $(all_libraries)
-libkspell2base_la_LIBADD  = $(LIB_KPARTS) ../kutils/libkutils.la 
 
 servicetype_DATA = kspellclient.desktop
 servicetypedir = $(kde_servicetypesdir)
diff --git a/kspell2/plugins/aspell/Makefile.am b/kspell2/plugins/aspell/Makefile.am
index 69f560ec1..dca63b51d 100644
--- a/kspell2/plugins/aspell/Makefile.am
+++ b/kspell2/plugins/aspell/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kspell_aspell.la
 kspell_aspell_la_SOURCES = kspell_aspellclient.cpp kspell_aspelldict.cpp
 
 kspell_aspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell
+kspell_aspell_la_LIBADD = ../../ui/libkspell2.la -laspell $(LIB_QT) $(LIB_KDECORE)
 
 service_DATA = kspell_aspell.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/hspell/Makefile.am b/kspell2/plugins/hspell/Makefile.am
index 8f9b4e982..e45ae1aae 100644
--- a/kspell2/plugins/hspell/Makefile.am
+++ b/kspell2/plugins/hspell/Makefile.am
@@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kspell_hspell.la
 kspell_hspell_la_SOURCES = kspell_hspellclient.cpp kspell_hspelldict.cpp
 
 kspell_hspell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz
+kspell_hspell_la_LIBADD = ../../ui/libkspell2.la -lhspell -lz $(LIB_QT) $(LIB_KDECORE)
 
 service_DATA = kspell_hspell.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kspell2/plugins/ispell/Makefile.am b/kspell2/plugins/ispell/Makefile.am
index b74f48753..6bbaab94a 100644
--- a/kspell2/plugins/ispell/Makefile.am
+++ b/kspell2/plugins/ispell/Makefile.am
@@ -18,7 +18,7 @@ kspell_ispell_la_SOURCES = kspell_ispellclient.cpp kspell_ispelldict.cpp \
 	ispell_checker.cpp
 
 kspell_ispell_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN)
-kspell_ispell_la_LIBADD = ../../ui/libkspell2.la 
+kspell_ispell_la_LIBADD = ../../ui/libkspell2.la  $(LIB_QT) $(LIB_KDECORE)
 
 service_DATA = kspell_ispell.desktop
 servicedir = $(kde_servicesdir)
diff --git a/kspell2/tests/Makefile.am b/kspell2/tests/Makefile.am
index 88a0d03b6..7ab5943d3 100644
--- a/kspell2/tests/Makefile.am
+++ b/kspell2/tests/Makefile.am
@@ -18,7 +18,7 @@ test_dialog_SOURCES = test_dialog.cpp
 test_dialog_LDADD = ../ui/libkspell2.la $(LIB_KDECORE)
 
 test_highlighter_SOURCES = test_highlighter.cpp
-test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
+test_highlighter_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
 
 test_configdialog_SOURCES = test_configdialog.cpp
-test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE)
+test_configdialog_LDADD = ../ui/libkspell2_noinst.la ../libkspell2base.la $(LIB_KDECORE) $(LIB_KPARTS) ../../kutils/libkutils.la
diff --git a/kspell2/ui/Makefile.am b/kspell2/ui/Makefile.am
index e5995a0aa..4fa9a4cf3 100644
--- a/kspell2/ui/Makefile.am
+++ b/kspell2/ui/Makefile.am
@@ -18,4 +18,4 @@ dialog.lo: kspell2ui.h
 
 libkspell2_la_SOURCES = dialog.cpp
 libkspell2_la_LDFLAGS = -no-undefined -version-info 1:0:0 $(all_libraries)
-libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la
+libkspell2_la_LIBADD = libkspell2_noinst.la ../libkspell2base.la ../../kutils/libkutils.la  $(LIB_QT) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KFILE)
-- 
cgit v1.2.1