From 8b44021a8864099221bd1f5f4cfc1d209fcf078b 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: [PATCH] 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/applications/koffice@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 filters/kformula/latex/Makefile.am            | 2 +-
 filters/kformula/png/Makefile.am              | 2 +-
 filters/kformula/svg/Makefile.am              | 2 +-
 filters/kspread/latex/export/Makefile.am      | 2 +-
 filters/kword/latex/export/Makefile.am        | 2 +-
 filters/kword/latex/import/Makefile.am        | 2 +-
 filters/kword/latex/import/parser/Makefile.am | 2 +-
 kexi/formeditor/test/Makefile.am              | 2 +-
 kexi/migration/Makefile.am                    | 2 +-
 kexi/plugins/macros/tests/Makefile.am         | 4 ++--
 kexi/tests/altertable/Makefile.am             | 2 +-
 kexi/tests/newapi/Makefile.am                 | 6 +++---
 kexi/tests/widgets/Makefile.am                | 2 +-
 lib/koproperty/test/Makefile.am               | 2 +-
 lib/kotext/kohyphen/Makefile.am               | 2 +-
 lib/kotext/tests/Makefile.am                  | 2 +-
 lib/kross/runner/Makefile.am                  | 2 +-
 lib/kross/test/Makefile.am                    | 2 +-
 tools/converter/Makefile.am                   | 2 +-
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/filters/kformula/latex/Makefile.am b/filters/kformula/latex/Makefile.am
index 5e022eec7..7e4738237 100644
--- a/filters/kformula/latex/Makefile.am
+++ b/filters/kformula/latex/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kformula/png/Makefile.am b/filters/kformula/png/Makefile.am
index 8b405c39c..a4cb5b379 100644
--- a/filters/kformula/png/Makefile.am
+++ b/filters/kformula/png/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kformula/svg/Makefile.am b/filters/kformula/svg/Makefile.am
index a369e7f03..4ec8c7d38 100644
--- a/filters/kformula/svg/Makefile.am
+++ b/filters/kformula/svg/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kspread/latex/export/Makefile.am b/filters/kspread/latex/export/Makefile.am
index a6bebb61f..8f83cb474 100644
--- a/filters/kspread/latex/export/Makefile.am
+++ b/filters/kspread/latex/export/Makefile.am
@@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am
index 90d339ead..b2da2f054 100644
--- a/filters/kword/latex/export/Makefile.am
+++ b/filters/kword/latex/export/Makefile.am
@@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am
index 48936587a..18d4307e8 100644
--- a/filters/kword/latex/import/Makefile.am
+++ b/filters/kword/latex/import/Makefile.am
@@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h
 #check_PROGRAMS = texlauncher
 #texlauncher_SOURCES = texlauncher.cc
 #texlauncher_LDADD = liblatexexport.la
-#texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am
index cd0c764e4..39773d178 100644
--- a/filters/kword/latex/import/parser/Makefile.am
+++ b/filters/kword/latex/import/parser/Makefile.am
@@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y
 check_PROGRAMS = texlauncher
 texlauncher_SOURCES = texlauncher.cc
 texlauncher_LDADD = liblatexexport.la
-texlauncher_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 
 METASOURCES = AUTO
diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am
index f039daeb3..5b8d41633 100644
--- a/kexi/formeditor/test/Makefile.am
+++ b/kexi/formeditor/test/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \
 	-I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \
 	-I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes)
 
-kformdesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la
 
diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am
index 75806ba5e..fa9fb0ac7 100644
--- a/kexi/migration/Makefile.am
+++ b/kexi/migration/Makefile.am
@@ -53,5 +53,5 @@ keximigratetest_LDADD = libkeximigrate.la \
 	$(top_builddir)/kexi/main/libkeximain.la \
 	$(LIB_QT) $(LIB_KDECORE)
 
-keximigratetest_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am
index 36dbd76fe..fe11db6db 100644
--- a/kexi/plugins/macros/tests/Makefile.am
+++ b/kexi/plugins/macros/tests/Makefile.am
@@ -7,12 +7,12 @@ endif
 bin_PROGRAMS = komacrotest $(GUIBINPROGRAM)
 
 komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-komacrotest_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS)
 
 if include_kunittestgui
   komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp
-  komacrotestgui_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+  komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
   komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS)
 endif
 
diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am
index a23890076..2953e752e 100644
--- a/kexi/tests/altertable/Makefile.am
+++ b/kexi/tests/altertable/Makefile.am
@@ -18,5 +18,5 @@ kexialtertabletest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/
  $(top_builddir)/kexi/main/libkeximain.la \
  $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am
index 3694806dc..a85ce8944 100644
--- a/kexi/tests/newapi/Makefile.am
+++ b/kexi/tests/newapi/Makefile.am
@@ -19,14 +19,14 @@ kexidbtest_SOURCES = main.cpp
 kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
  ../../kexidb/parser/libkexidbparser.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp
 #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \
 # ../../kexidb/parser/libkexidbparser.la
-#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 #kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp
 #kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la
-#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am
index 83fe29f8f..afedc4710 100644
--- a/kexi/tests/widgets/Makefile.am
+++ b/kexi/tests/widgets/Makefile.am
@@ -8,7 +8,7 @@ kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp
 kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_KDECORE) \
  $(top_builddir)/kexi/kexidb/libkexidb.la \
  $(top_builddir)/kexi/widget/libkexiextendedwidgets.la
-kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 METASOURCES = AUTO
 
diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am
index 2bcf79931..3529798ce 100644
--- a/lib/koproperty/test/Makefile.am
+++ b/lib/koproperty/test/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 noinst_PROGRAMS = propertytest
 
 propertytest_SOURCES = main.cpp test.cpp
-propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 propertytest_LDADD = $(LIB_KOPROPERTY)
 
 # this is where the shell's XML-GUI resource file goes
diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am
index 8e91bd602..e72b6a743 100644
--- a/lib/kotext/kohyphen/Makefile.am
+++ b/lib/kotext/kohyphen/Makefile.am
@@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest
 
 kohyphentest_SOURCES = kohyphentest.cpp
 kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE)
-kohyphentest_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am
index a505dce1f..826d7b93b 100644
--- a/lib/kotext/tests/Makefile.am
+++ b/lib/kotext/tests/Makefile.am
@@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest
 TESTS = kotextformattertest kovariabletest
 
 LDADD = ../libkotext.la
-AM_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kobordertest_SOURCES = kobordertest.cpp
 kotextformattertest_SOURCES = kotextformattertest.cpp
diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am
index 8c62b884b..a30494ccb 100644
--- a/lib/kross/runner/Makefile.am
+++ b/lib/kross/runner/Makefile.am
@@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner
 krossrunner_SOURCES = main.cpp
 krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 SUBDIRS = .
 METASOURCES = AUTO
diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am
index ddf235c37..6022adf7f 100644
--- a/lib/kross/test/Makefile.am
+++ b/lib/kross/test/Makefile.am
@@ -12,6 +12,6 @@ krosstest_LDADD = \
     ../main/libkrossmain.la
 
 INCLUDES = $(KROSS_INCLUDES) $(all_includes)
-krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 SUBDIRS = .
 METASOURCES = AUTO
diff --git a/tools/converter/Makefile.am b/tools/converter/Makefile.am
index ea0c56626..eef1da0a1 100644
--- a/tools/converter/Makefile.am
+++ b/tools/converter/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
 
 bin_PROGRAMS = koconverter
 koconverter_SOURCES = koconverter.cpp
-koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la
 
 METASOURCES = AUTO