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 /kexi/plugins/forms | |
| 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 'kexi/plugins/forms')
| -rw-r--r-- | kexi/plugins/forms/Makefile.am | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am index 2cc9688f..7d6d0777 100644 --- a/kexi/plugins/forms/Makefile.am +++ b/kexi/plugins/forms/Makefile.am @@ -4,31 +4,45 @@ kde_module_LTLIBRARIES = kexihandler_form.la kformdesigner_kexidbwidgets.la kexihandler_form_la_SOURCES = kexiforms.cpp -kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils -kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ +kexihandler_form_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +kexihandler_form_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/lib/koproperty/libkoproperty.la \ - ./libkexiformutils.la + ./libkexiformutils.la \ + ../../../kexi/kexidb/libkexidb.la \ + ../../../kexi/kexiutils/libkexiutils.la \ + ../../../kexi/widget/libkexiextendedwidgets.la \ + ../../../kexi/widget/utils/libkexiguiutils.la -kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils + +kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kformdesigner_kexidbwidgets_la_SOURCES = kexidbfactory.cpp -kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ +kformdesigner_kexidbwidgets_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ - ./libkexiformutils.la + ./libkexiformutils.la \ + ../../../kexi/kexidb/libkexidb.la \ + ../../../kexi/kexiutils/libkexiutils.la \ + ../../../kexi/widget/libkexiextendedwidgets.la \ + ../../../kexi/widget/utils/libkexiguiutils.la + lib_LTLIBRARIES = libkexiformutils.la libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgetinfo.cpp \ kexidataprovider.cpp kexiformscrollview.cpp kexiformeventhandler.cpp \ kexidbtextwidgetinterface.cpp kexiactionselectiondialog.cpp kexiformmanager.cpp \ kexidatasourcepage.cpp kexiformpart.cpp kexiformview.cpp -libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../kexi/kexidb/.libs/ -lkexidb -L../../../kexi/kexiutils/.libs/ -lkexiutils -L../../../kexi/widget/.libs/ -lkexiextendedwidgets -L../../../kexi/widget/utils/.libs/ -lkexiguiutils -libkexiformutils_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ +libkexiformutils_la_LDFLAGS = $(all_libraries) $(VER_INFO) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts +libkexiformutils_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ - $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la + $(top_builddir)/kexi/plugins/forms/widgets/libkexiformutilswidgets.la \ + ../../../kexi/kexidb/libkexidb.la \ + ../../../kexi/kexiutils/libkexiutils.la \ + ../../../kexi/widget/libkexiextendedwidgets.la \ + ../../../kexi/widget/utils/libkexiguiutils.la kformdesignerservicesdir=$(kde_servicesdir)/kformdesigner kformdesignerservices_DATA=kformdesigner_kexidbfactory.desktop |