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 /filters/chalk/tiff | |
| 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 'filters/chalk/tiff')
| -rw-r--r-- | filters/chalk/tiff/Makefile.am | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am index 32750558..c16e7f1e 100644 --- a/filters/chalk/tiff/Makefile.am +++ b/filters/chalk/tiff/Makefile.am @@ -2,17 +2,23 @@ kde_module_LTLIBRARIES = libchalktiffimport.la libchalktiffexport.la libchalktiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \ $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ - -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ - -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor + -llcms libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ - libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff + libchalktiffconverter.la $(KOFFICE_LIBS) \ + ../../../chalk/core/libchalkimage.la \ + ../../../chalk/ui/libchalkui.la \ + ../../../chalk/chalkcolor/libchalkcolor.la \ + -ltiff libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \ $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ - -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ - -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor + -llcms libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ - libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff + libchalktiffconverter.la $(KOFFICE_LIBS) \ + ../../../chalk/core/libchalkimage.la \ + ../../../chalk/ui/libchalkui.la \ + ../../../chalk/chalkcolor/libchalkcolor.la \ + -ltiff INCLUDES= \ -I$(srcdir) \ @@ -48,8 +54,11 @@ kdelnk_DATA = chalk_tiff.desktop noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \ kis_tiff_ycbcr_reader.h libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \ - -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ - -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../chalk/core/.libs/ -lchalkimage -L../../../chalk/ui/.libs/ -lchalkui -L../../../chalk/chalkcolor/.libs/ -lchalkcolor + -llcms +libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \ + ../../../chalk/core/libchalkimage.la \ + ../../../chalk/ui/libchalkui.la \ + ../../../chalk/chalkcolor/libchalkcolor.la noinst_LTLIBRARIES = libchalktiffconverter.la libchalktiffconverter_la_SOURCES = kis_tiff_converter.cc kis_tiff_stream.cc \ kis_tiff_writer_visitor.cpp kis_tiff_reader.cc kis_tiff_ycbcr_reader.cc |