From 5c69fcd39111465de16c933763d3c918703048d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Wed, 13 Jun 2012 08:37:52 +0200
Subject: Fix FTBFS due to missing libraries Clean up lib paths in LDFLAGS -
 moved to LIBADD For KWord and and KPresenter added linking kspell2 For
 KSpread added linking kutils This closes Bug 657

---
 tools/kfile-plugins/abiword/Makefile.am  | 4 ++--
 tools/kfile-plugins/gnumeric/Makefile.am | 4 ++--
 tools/kfile-plugins/koffice/Makefile.am  | 4 ++--
 tools/kfile-plugins/ooo/Makefile.am      | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'tools/kfile-plugins')

diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am
index efeee86f..81e8a65c 100644
--- a/tools/kfile-plugins/abiword/Makefile.am
+++ b/tools/kfile-plugins/abiword/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_abiword.h
 kde_module_LTLIBRARIES = kfile_abiword.la
 
 kfile_abiword_la_SOURCES = kfile_abiword.cpp
-kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kfile_abiword_la_LIBADD = $(LIB_KOFFICECORE)
+kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_abiword_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am
index 94c90e97..c5d97042 100644
--- a/tools/kfile-plugins/gnumeric/Makefile.am
+++ b/tools/kfile-plugins/gnumeric/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_gnumeric.h
 kde_module_LTLIBRARIES = kfile_gnumeric.la
 
 kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp
-kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kfile_gnumeric_la_LIBADD = $(LIB_KOFFICECORE)
+kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_gnumeric_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am
index a4770ced..6d81afa9 100644
--- a/tools/kfile-plugins/koffice/Makefile.am
+++ b/tools/kfile-plugins/koffice/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_koffice.h
 kde_module_LTLIBRARIES = kfile_koffice.la
 
 kfile_koffice_la_SOURCES = kfile_koffice.cpp
-kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kfile_koffice_la_LIBADD = $(LIB_KOFFICECORE)
+kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_koffice_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am
index 8c785ef5..1e47978f 100644
--- a/tools/kfile-plugins/ooo/Makefile.am
+++ b/tools/kfile-plugins/ooo/Makefile.am
@@ -9,8 +9,8 @@ noinst_HEADERS   = kfile_ooo.h
 kde_module_LTLIBRARIES = kfile_ooo.la
 
 kfile_ooo_la_SOURCES = kfile_ooo.cpp
-kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore
-kfile_ooo_la_LIBADD = $(LIB_KOFFICECORE)
+kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+kfile_ooo_la_LIBADD = $(KOFFICE_LIBS)
 
 # let automoc handle all of the meta source files (moc)
 METASOURCES = AUTO
-- 
cgit v1.2.1