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

6 files changed, 9 insertions, 9 deletions

diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am
index f039daeb..5b8d4163 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 75806ba5..fa9fb0ac 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 36dbd76f..fe11db6d 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 a2389007..2953e752 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 3694806d..a85ce894 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 83fe29f8..afedc471 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