From 032c0701075eda0552f9539a4c9e7fec554399fd Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 10 Oct 2011 20:45:10 +0000
Subject: Link most Trinity DSOs against the most common kdelibs libraries to
 compensate for linking changes in modern distributions such as Ubuntu Oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 blinken/src/Makefile.am             | 2 +-
 kalzium/src/Makefile.am             | 2 +-
 kanagram/src/Makefile.am            | 2 +-
 kbruch/src/Makefile.am              | 2 +-
 kbruch/testcases/Makefile.am        | 2 +-
 keduca/keducabuilder/Makefile.am    | 2 +-
 keduca/libkeduca/Makefile.am        | 2 +-
 kgeography/src/Makefile.am          | 2 +-
 khangman/khangman/Makefile.am       | 2 +-
 kig/kig/Makefile.am                 | 2 +-
 kiten/Makefile.am                   | 4 ++--
 klatin/klatin/Makefile.am           | 2 +-
 klettres/klettres/Makefile.am       | 2 +-
 kpercentage/kpercentage/Makefile.am | 2 +-
 kstars/kstars/Makefile.am           | 2 +-
 ktouch/src/Makefile.am              | 2 +-
 kturtle/src/Makefile.am             | 4 ++--
 kverbos/kverbos/Makefile.am         | 2 +-
 kvoctrain/kvoctrain/Makefile.am     | 4 ++--
 kwordquiz/src/Makefile.am           | 2 +-
 libkdeedu/extdate/Makefile.am       | 4 ++--
 21 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/blinken/src/Makefile.am b/blinken/src/Makefile.am
index a980ac81..a9c5e6a7 100644
--- a/blinken/src/Makefile.am
+++ b/blinken/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = blinken
 
 INCLUDES = $(all_includes)
 
-blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+blinken_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 blinken_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(artslib)
 
 blinken_SOURCES = main.cpp blinken.cpp artsplayer.cpp blinkengame.cpp number.cpp highscoredialog.cpp counter.cpp fontutils.cpp fontchecker.cpp button.cpp settings.kcfgc
diff --git a/kalzium/src/Makefile.am b/kalzium/src/Makefile.am
index 7e5b3295..22c28ff0 100644
--- a/kalzium/src/Makefile.am
+++ b/kalzium/src/Makefile.am
@@ -79,7 +79,7 @@ rcui_DATA = kalziumui.rc
 KDE_ICON = AUTO
 
 # the library search path. 
-kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kalzium_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar
 messages-old: rc.cpp
diff --git a/kanagram/src/Makefile.am b/kanagram/src/Makefile.am
index 40096ec0..9b0dfa1c 100644
--- a/kanagram/src/Makefile.am
+++ b/kanagram/src/Makefile.am
@@ -28,7 +28,7 @@ bin_PROGRAMS = kanagram
 
 # the application source, library search path, and link libraries
 kanagram_SOURCES = main.cpp kanagram.cpp kanagramgame.cpp fontutils.cpp kanagramsettings.kcfgc mainsettingswidget.ui vocabsettingswidget.ui vocabeditwidget.ui mainsettings.cpp vocabsettings.cpp vocabedit.cpp keduvocdocument.cpp keduvocexpression.cpp keduvockvtmlreader.cpp keduvockvtmlwriter.cpp leitnerbox.cpp leitnersystem.cpp multiplechoice.cpp grammarmanager.cpp leitnersystemview.cpp newstuffwidget.ui newstuffdialog.cpp newstuff.cpp
-kanagram_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kanagram_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kanagram_LDADD =  $(LIB_KDEUI) $(LIB_KNEWSTUFF) $(LIB_KIO) $(artslib)
 
 kde_kcfg_DATA=kanagram.kcfg
diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am
index 7456866d..ea747942 100644
--- a/kbruch/src/Makefile.am
+++ b/kbruch/src/Makefile.am
@@ -4,7 +4,7 @@ kbruch_COMPILE_FIRST = version.h
 kbruch_SOURCES = exercisebase.cpp taskvieweroptionsbase.ui task.cpp ratio.cpp taskview.cpp statisticsview.cpp primenumber.cpp kbruch.cpp mainqtwidget.cpp taskwidget.cpp fractionbasewidget.cpp resultwidget.cpp exercisecompare.cpp ratiowidget.cpp rationalwidget.cpp exerciseconvert.cpp exercisefactorize.cpp factorizedwidget.cpp settingsclass.kcfgc
 kbruch_LDADD   =  $(LIB_KDEUI)
 # the library search path.
-kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kbruch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui
 
diff --git a/kbruch/testcases/Makefile.am b/kbruch/testcases/Makefile.am
index 5e9e8950..c6ee62b8 100644
--- a/kbruch/testcases/Makefile.am
+++ b/kbruch/testcases/Makefile.am
@@ -5,7 +5,7 @@ kbruch_test_SOURCES = task.cpp ratio.cpp ratio_test.cpp primenumber.cpp primenum
 kbruch_test_LDADD   = -lboost_unit_test_framework-gcc $(LIB_KDEUI)
 
 # the library search path.
-kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kbruch_test_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 EXTRA_DIST = primenumber.cpp primenumber.h ratio.cpp ratio.h task.cpp task.h primenumber_test.cpp ratio_test.cpp kbruch_test.cpp
 
diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am
index 39fcb8d6..f0573b9f 100644
--- a/keduca/keducabuilder/Makefile.am
+++ b/keduca/keducabuilder/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+keducabuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE´s XML GUI builing
diff --git a/keduca/libkeduca/Makefile.am b/keduca/libkeduca/Makefile.am
index f3424f00..007ab3cc 100644
--- a/keduca/libkeduca/Makefile.am
+++ b/keduca/libkeduca/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES=$(all_includes)
 
 noinst_LTLIBRARIES = libkeduca.la
 libkeduca_la_SOURCES = kgallerydialogbase.ui fileread.cpp kgallerydialog.cpp
-libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+libkeduca_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 libkeduca_la_LIBADD  = -lkdeprint
 noinst_HEADERS = fileread.h kgallerydialog.h kgallerydialogbase.h
 
diff --git a/kgeography/src/Makefile.am b/kgeography/src/Makefile.am
index e70ac19c..989b47ea 100644
--- a/kgeography/src/Makefile.am
+++ b/kgeography/src/Makefile.am
@@ -8,7 +8,7 @@ bin_PROGRAMS = kgeography
 INCLUDES         = $(all_includes)
 
 # the library search path.
-kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kgeography_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 kgeography_LDADD = $(LIB_KDEUI)
diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am
index 74934f4f..011453af 100644
--- a/khangman/khangman/Makefile.am
+++ b/khangman/khangman/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES= -I$(top_srcdir)/libkdeedu/kdeeducore $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+khangman_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 rc_DATA = khangmanui.rc
 rcdir = $(kde_datadir)/khangman
diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am
index 719886cc..84ab9708 100644
--- a/kig/kig/Makefile.am
+++ b/kig/kig/Makefile.am
@@ -23,7 +23,7 @@ bin_PROGRAMS = kig
 
 # the application source, library search path, and link libraries
 kig_SOURCES = main.cpp kig.cpp
-kig_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kig_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kig_LDADD   = $(LIB_KPARTS)
 
 # this is where the desktop file will go 
diff --git a/kiten/Makefile.am b/kiten/Makefile.am
index 656b7a49..4c18a8d0 100644
--- a/kiten/Makefile.am
+++ b/kiten/Makefile.am
@@ -6,7 +6,7 @@ kiten_SOURCES = main.cpp kiten.cpp learn.cpp kloader.cpp ksaver.cpp \
 	configsearching.ui configlearn.ui configfont.ui configdictionariesbase.ui \
 	configdictionaries.cpp optiondialog.cpp kitenconfig.kcfgc
 
-kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) 
+kiten_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kiten_LDADD = libkiten.la $(LIB_KIO)
 
 bin_PROGRAMS = kiten kitengen
@@ -23,7 +23,7 @@ libkiteninclude_HEADERS = \
 	asyndeta.h dict.h widgets.h kromajiedit.h rad.h deinf.h
 
 kitengen_SOURCES = xjdxgen.c
-kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) 
+kitengen_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am
index 048d3c7f..a086dbbd 100644
--- a/klatin/klatin/Makefile.am
+++ b/klatin/klatin/Makefile.am
@@ -12,7 +12,7 @@ bin_PROGRAMS = klatin
 INCLUDES         = $(all_includes)
 
 # the library search path.
-klatin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against.
 klatin_LDADD   = $(LIB_KFILE) $(top_builddir)/libkdeedu/kdeeducore/libkdeeducore.la
diff --git a/klettres/klettres/Makefile.am b/klettres/klettres/Makefile.am
index 46b1c832..9618e458 100644
--- a/klettres/klettres/Makefile.am
+++ b/klettres/klettres/Makefile.am
@@ -24,7 +24,7 @@ METASOURCES = AUTO
 KDE_ICON = AUTO
 
 # the library search path.
-klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+klettres_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp -o $(podir)/klettres.pot;
diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am
index c617e129..5aee63a0 100644
--- a/kpercentage/kpercentage/Makefile.am
+++ b/kpercentage/kpercentage/Makefile.am
@@ -30,7 +30,7 @@ METASOURCES = AUTO
 
 
 # the library search path.
-kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kpercentage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 stringstocpp:
diff --git a/kstars/kstars/Makefile.am b/kstars/kstars/Makefile.am
index a8051fd1..445388de 100644
--- a/kstars/kstars/Makefile.am
+++ b/kstars/kstars/Makefile.am
@@ -54,7 +54,7 @@ INCLUDES= -I$(top_srcdir) -Itools -I$(srcdir)/tools $(all_includes)
 METASOURCES = AUTO
 
 # the library search path.
-kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kstars_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # Uncomment the following two lines if you add a ui.rc file for your application to make use of
 # KDE
diff --git a/ktouch/src/Makefile.am b/ktouch/src/Makefile.am
index 2eda3b2e..b9eb4d82 100644
--- a/ktouch/src/Makefile.am
+++ b/ktouch/src/Makefile.am
@@ -50,7 +50,7 @@ ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \
 		ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp
 
 # the library search path.
-ktouch_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+ktouch_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/kturtle/src/Makefile.am b/kturtle/src/Makefile.am
index 7ed55e4d..c09c7e88 100644
--- a/kturtle/src/Makefile.am
+++ b/kturtle/src/Makefile.am
@@ -4,9 +4,9 @@ INCLUDES = $(all_includes)
 SUBDIRS = pics
 
 # added from kjots
-AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH)
+AM_LDFLAGS   = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
-kturtle_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kturtle_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kturtle_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT) $(LIB_KPARTS) -lkatepartinterfaces
 
 KDE_ICON = kturtle
diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am
index 9a3b3c97..84803f73 100644
--- a/kverbos/kverbos/Makefile.am
+++ b/kverbos/kverbos/Makefile.am
@@ -19,7 +19,7 @@ INCLUDES= $(all_includes)
 METASOURCES = AUTO
 
 # the library search path. 
-kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kverbos_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kverbos
 rc_DATA = kverbosui.rc
diff --git a/kvoctrain/kvoctrain/Makefile.am b/kvoctrain/kvoctrain/Makefile.am
index b8b4ed01..c3e43bef 100644
--- a/kvoctrain/kvoctrain/Makefile.am
+++ b/kvoctrain/kvoctrain/Makefile.am
@@ -40,8 +40,8 @@ INCLUDES = -I$(srcdir)/.. -I$(srcdir)/kvt-core -Icommon-dialogs \
 bin_PROGRAMS = kvoctrain spotlight2kvtml
 
 # the library search path.
-kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH)
-spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kvoctrain_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
+spotlight2kvtml_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 CLEANFILES = *.i.c
 
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index deb60c2c..3183d389 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -50,7 +50,7 @@ SUBDIRS = . pics examples
 METASOURCES = AUTO
 
 # the library search path.
-kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwordquiz_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 rcdir = $(kde_datadir)/kwordquiz
 rc_DATA = kwordquizui.rc eventsrc
diff --git a/libkdeedu/extdate/Makefile.am b/libkdeedu/extdate/Makefile.am
index d7b78860..66507fea 100644
--- a/libkdeedu/extdate/Makefile.am
+++ b/libkdeedu/extdate/Makefile.am
@@ -11,11 +11,11 @@ libextdate_la_LIBADD = $(LIB_KDEUI)
 
 test_extdate_SOURCES = test_extdate.cc
 test_extdate_LDADD = libextdate.la
-test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 test_extdatepicker_SOURCES = testwidget.cpp main.cpp
 test_extdatepicker_LDADD = libextdate.la
-test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+test_extdatepicker_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
-- 
cgit v1.2.1