diff options
| author | Slávek Banko <[email protected]> | 2012-06-13 08:37:52 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-06-13 08:37:52 +0200 |
| commit | 5c69fcd39111465de16c933763d3c918703048d8 (patch) | |
| tree | ccd0a0cf7e7d30a8ebe16a71e7e26ede6ee7a66c /kspread | |
| parent | 17477649bd724528a78e6c772244dc1a63f38202 (diff) | |
| download | koffice-5c69fcd39111465de16c933763d3c918703048d8.tar.gz koffice-5c69fcd39111465de16c933763d3c918703048d8.zip | |
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
Diffstat (limited to 'kspread')
| -rw-r--r-- | kspread/Makefile.am | 2 | ||||
| -rw-r--r-- | kspread/plugins/scripting/kspreadcore/Makefile.am | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kspread/Makefile.am b/kspread/Makefile.am index 63bc28ac..d65764f9 100644 --- a/kspread/Makefile.am +++ b/kspread/Makefile.am @@ -28,7 +28,7 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \ kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \ kspread_generalProperty.cpp kspread_propertyEditor.cpp -libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -lkutils libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ dialogs/libdialogs.la tests/libtests.la \ $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am index 6bfe86f6..c9f1f55c 100644 --- a/kspread/plugins/scripting/kspreadcore/Makefile.am +++ b/kspread/plugins/scripting/kspreadcore/Makefile.am @@ -7,8 +7,9 @@ kde_module_LTLIBRARIES = krosskspreadcore.la krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp -krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui +krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts krosskspreadcore_la_LIBADD = \ + $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \ $(LIB_QT) \ $(LIB_TDECORE) \ $(top_builddir)/lib/kross/api/libkrossapi.la \ |