From fee97d5c9d264431bffaba0ef77979ab166ec9a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Mon, 6 Aug 2012 20:49:31 +0200
Subject: [PATCH] Update autotools for new DSO linkage style Thanks to Francois
 Andriot for the patch (cherry picked from commit
 2b25aaa07faf2c2959f89188d3972663c1aa6ba4)

---
 kiten/Makefile.am                        | 2 +-
 kvoctrain/kvoctrain/kvt-core/Makefile.am | 2 +-
 libkdeedu/extdate/Makefile.am            | 2 +-
 libkdeedu/kdeeducore/Makefile.am         | 2 +-
 libkdeedu/kdeeduui/Makefile.am           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/kiten/Makefile.am b/kiten/Makefile.am
index 4c18a8d0..110389d8 100644
--- a/kiten/Makefile.am
+++ b/kiten/Makefile.am
@@ -13,7 +13,7 @@ bin_PROGRAMS = kiten kitengen
 lib_LTLIBRARIES = libkiten.la
 
 libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0
-libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT)
+libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) $(LIB_QT) $(LIB_KDECORE)
 
 libkiten_la_SOURCES = asyndeta.cpp dict.cpp widgets.cpp kromajiedit.cpp rad.cpp \
 	deinf.cpp kitenconfig.kcfgc
diff --git a/kvoctrain/kvoctrain/kvt-core/Makefile.am b/kvoctrain/kvoctrain/kvt-core/Makefile.am
index fe356907..67cb7144 100644
--- a/kvoctrain/kvoctrain/kvt-core/Makefile.am
+++ b/kvoctrain/kvoctrain/kvt-core/Makefile.am
@@ -12,6 +12,6 @@ libkvoctraincore_la_SOURCES = langset.cpp LineList.cpp kvoctrainexpr.cpp \
 
 SUBDIRS = kvt-xml
 
-libkvoctraincore_la_LIBADD= kvt-xml/libkvtxml.la
+libkvoctraincore_la_LIBADD= $(all_libraries) $(KDE_RPATH) kvt-xml/libkvtxml.la ../common-dialogs/libcommondlg.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) -lDCOP
 
 noinst_HEADERS = grammarmanager.h
diff --git a/libkdeedu/extdate/Makefile.am b/libkdeedu/extdate/Makefile.am
index 66507fea..0e02dd87 100644
--- a/libkdeedu/extdate/Makefile.am
+++ b/libkdeedu/extdate/Makefile.am
@@ -7,7 +7,7 @@ lib_LTLIBRARIES = libextdate.la
 libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemgregorian.cpp extdatetbl.cpp extdatepicker.cpp extdatetimeedit.cpp extdatewidget.cpp
 
 libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
-libextdate_la_LIBADD = $(LIB_KDEUI)
+libextdate_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)
 
 test_extdate_SOURCES = test_extdate.cc
 test_extdate_LDADD = libextdate.la
diff --git a/libkdeedu/kdeeducore/Makefile.am b/libkdeedu/kdeeducore/Makefile.am
index 57110b51..68da43e1 100644
--- a/libkdeedu/kdeeducore/Makefile.am
+++ b/libkdeedu/kdeeducore/Makefile.am
@@ -11,7 +11,7 @@ libkdeeducore_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 libkdeeducode_includedir = $(includedir)/libkdeedu
 libkdeeducode_include_HEADERS = keduvocdata.h
 
-libkdeeducore_la_LIBADD = $(LIB_KDECORE)
+libkdeeducore_la_LIBADD = $(LIB_KDECORE) $(LIB_QT)
 
 METASOURCES = AUTO
 
diff --git a/libkdeedu/kdeeduui/Makefile.am b/libkdeedu/kdeeduui/Makefile.am
index 52e27835..874c088a 100644
--- a/libkdeedu/kdeeduui/Makefile.am
+++ b/libkdeedu/kdeeduui/Makefile.am
@@ -10,7 +10,7 @@ libkdeeduuiincludedir = $(includedir)/libkdeedu
 libkdeeduuiinclude_HEADERS = kdeeduglossary.h
 
 libkdeeduui_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:5:0
-libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML)
+libkdeeduui_la_LIBADD = $(LIB_KDECORE) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_QT)
 
 METASOURCES = AUTO