diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-06-13 08:37:52 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-13 08:37:52 +0200 |
| commit | 5c69fcd39111465de16c933763d3c918703048d8 (patch) | |
| tree | ccd0a0cf7e7d30a8ebe16a71e7e26ede6ee7a66c /filters/chalk/gmagick | |
| 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/gmagick')
| -rw-r--r-- | filters/chalk/gmagick/Makefile.am | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am index 99f468e6..dc567042 100644 --- a/filters/chalk/gmagick/Makefile.am +++ b/filters/chalk/gmagick/Makefile.am @@ -1,20 +1,24 @@ kde_module_LTLIBRARIES = libchalkgmagickimport.la libchalkgmagickexport.la libchalkgmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -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 libchalkgmagickexport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBGMAGICK_LIBS) \ - $(top_builddir)/chalk/libchalkcommon.la + $(top_builddir)/chalk/libchalkcommon.la \ + ../../../chalk/core/libchalkimage.la \ + ../../../chalk/ui/libchalkui.la \ + ../../../chalk/chalkcolor/libchalkcolor.la libchalkgmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -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 libchalkgmagickimport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBGMAGICK_LIBS) \ - $(top_builddir)/chalk/libchalkcommon.la + $(top_builddir)/chalk/libchalkcommon.la \ + ../../../chalk/core/libchalkimage.la \ + ../../../chalk/ui/libchalkui.la \ + ../../../chalk/chalkcolor/libchalkcolor.la INCLUDES= \ -I$(srcdir) \ |