From 298f81ac353c4d7c8afa490d7979d3883b355e44 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 25 Mar 2010 20:58:29 +0000 Subject: More automake fixes git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/koffice@1107506 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- filters/krita/gmagick/Makefile.am | 8 ++++++-- filters/krita/jpeg/Makefile.am | 12 +++++++++--- filters/krita/libkisexif/Makefile.am | 4 +++- filters/krita/magick/Makefile.am | 8 ++++++-- filters/krita/openexr/Makefile.am | 7 +++++-- filters/krita/pdf/Makefile.am | 4 +++- filters/krita/png/Makefile.am | 8 ++++++-- filters/krita/raw/Makefile.am | 4 +++- filters/krita/tiff/Makefile.am | 12 +++++++++--- filters/krita/xcf/Makefile.am | 8 ++++++-- 10 files changed, 56 insertions(+), 19 deletions(-) diff --git a/filters/krita/gmagick/Makefile.am b/filters/krita/gmagick/Makefile.am index 845ab503d..70d9cc1f5 100644 --- a/filters/krita/gmagick/Makefile.am +++ b/filters/krita/gmagick/Makefile.am @@ -1,12 +1,16 @@ kde_module_LTLIBRARIES = libkritagmagickimport.la libkritagmagickexport.la -libkritagmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritagmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritagmagickexport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBGMAGICK_LIBS) \ $(top_builddir)/krita/libkritacommon.la -libkritagmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritagmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBGMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBGMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritagmagickimport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBGMAGICK_LIBS) \ diff --git a/filters/krita/jpeg/Makefile.am b/filters/krita/jpeg/Makefile.am index 5795b1147..6f14dd866 100644 --- a/filters/krita/jpeg/Makefile.am +++ b/filters/krita/jpeg/Makefile.am @@ -1,17 +1,23 @@ noinst_LTLIBRARIES = libkritaconverter.la kde_module_LTLIBRARIES = libkritajpegimport.la libkritajpegexport.la -libkritaconverter_la_LDFLAGS = $(all_libraries) +libkritaconverter_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritaconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c libkritaconverter_la_LIBADD = $(top_builddir)/filters/krita/libkisexif/libkisexif.la libkritajpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritajpegexport_la_LIBADD = $(top_builddir)/krita/libkritacommon.la \ libkritaconverter.la $(KOFFICE_LIBS) -ljpeg -lexif libkritajpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritajpegimport_la_LIBADD = $(top_builddir)/krita/libkritacommon.la \ libkritaconverter.la $(KOFFICE_LIBS) -ljpeg -lexif diff --git a/filters/krita/libkisexif/Makefile.am b/filters/krita/libkisexif/Makefile.am index a7aa9b4bc..e8d41f267 100644 --- a/filters/krita/libkisexif/Makefile.am +++ b/filters/krita/libkisexif/Makefile.am @@ -11,7 +11,9 @@ INCLUDES = \ $(KOPAINTER_INCLUDES) \ $(all_includes) METASOURCES = AUTO -libkisexif_la_LDFLAGS = $(all_libraries) +libkisexif_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor noinst_LTLIBRARIES = libkisexif.la diff --git a/filters/krita/magick/Makefile.am b/filters/krita/magick/Makefile.am index f90c79e88..d0245127b 100644 --- a/filters/krita/magick/Makefile.am +++ b/filters/krita/magick/Makefile.am @@ -1,12 +1,16 @@ kde_module_LTLIBRARIES = libkritamagickimport.la libkritamagickexport.la -libkritamagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritamagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritamagickexport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBMAGICK_LIBS) \ $(top_builddir)/krita/libkritacommon.la -libkritamagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritamagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritamagickimport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBMAGICK_LIBS) \ diff --git a/filters/krita/openexr/Makefile.am b/filters/krita/openexr/Makefile.am index ffdce031a..75210f4f3 100644 --- a/filters/krita/openexr/Makefile.am +++ b/filters/krita/openexr/Makefile.am @@ -15,7 +15,9 @@ AM_CPPFLAGS= \ kde_module_LTLIBRARIES = libkrita_openexr_import.la libkrita_openexr_export.la -libkrita_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkrita_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkrita_openexr_export_la_LIBADD = \ $(KOFFICE_LIBS) \ $(OPENEXR_LIBS) \ @@ -24,7 +26,8 @@ libkrita_openexr_export_la_LIBADD = \ $(top_builddir)/krita/colorspaces/rgb_f16half/libkrita_rgb_f16half.la -libkrita_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkrita_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkrita_openexr_import_la_LIBADD = \ $(KOFFICE_LIBS) \ $(OPENEXR_LIBS) \ diff --git a/filters/krita/pdf/Makefile.am b/filters/krita/pdf/Makefile.am index 7f2366bcd..f6975ef34 100644 --- a/filters/krita/pdf/Makefile.am +++ b/filters/krita/pdf/Makefile.am @@ -17,7 +17,9 @@ kdelnkdir = $(kde_appsdir)/.hidden METASOURCES = AUTO kde_module_LTLIBRARIES = libkritapdfimport.la -libkritapdfimport_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) +libkritapdfimport_la_LDFLAGS = -avoid-version -module -no-undefined $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritapdfimport_la_LIBADD = $(top_builddir)/krita/libkritacommon.la \ -lpoppler-qt $(KOFFICE_LIBS) $(POPPLER_LIBS) diff --git a/filters/krita/png/Makefile.am b/filters/krita/png/Makefile.am index 881601562..75a2b5114 100644 --- a/filters/krita/png/Makefile.am +++ b/filters/krita/png/Makefile.am @@ -1,12 +1,16 @@ kde_module_LTLIBRARIES = libkritapngimport.la libkritapngexport.la -libkritapngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritapngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritapngexport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(top_builddir)/krita/libkritacommon.la \ -lpng -libkritapngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritapngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritapngimport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(top_builddir)/krita/libkritacommon.la \ diff --git a/filters/krita/raw/Makefile.am b/filters/krita/raw/Makefile.am index cd29902b7..5b53b3e72 100644 --- a/filters/krita/raw/Makefile.am +++ b/filters/krita/raw/Makefile.am @@ -11,7 +11,9 @@ AM_CPPFLAGS= \ kde_module_LTLIBRARIES = libkrita_raw_import.la -libkrita_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkrita_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkrita_raw_import_la_LIBADD = \ $(KOFFICE_LIBS) \ $(raw_LIBS) \ diff --git a/filters/krita/tiff/Makefile.am b/filters/krita/tiff/Makefile.am index 13eb58100..520547587 100644 --- a/filters/krita/tiff/Makefile.am +++ b/filters/krita/tiff/Makefile.am @@ -1,12 +1,16 @@ kde_module_LTLIBRARIES = libkritatiffimport.la libkritatiffexport.la libkritatiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritatiffexport_la_LIBADD = $(top_builddir)/krita/libkritacommon.la \ libkritatiffconverter.la $(KOFFICE_LIBS) -ltiff libkritatiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) + $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritatiffimport_la_LIBADD = $(top_builddir)/krita/libkritacommon.la \ libkritatiffconverter.la $(KOFFICE_LIBS) -ltiff @@ -43,7 +47,9 @@ service_DATA = krita_tiff_export.desktop krita_tiff_import.desktop kdelnk_DATA = krita_tiff.desktop noinst_HEADERS = kis_dlg_options_tiff.h kis_tiff_writer_visitor.h \ kis_tiff_ycbcr_reader.h -libkritatiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) +libkritatiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor noinst_LTLIBRARIES = libkritatiffconverter.la libkritatiffconverter_la_SOURCES = kis_tiff_converter.cc kis_tiff_stream.cc \ kis_tiff_writer_visitor.cpp kis_tiff_reader.cc kis_tiff_ycbcr_reader.cc diff --git a/filters/krita/xcf/Makefile.am b/filters/krita/xcf/Makefile.am index 7443abb3b..50e76130f 100644 --- a/filters/krita/xcf/Makefile.am +++ b/filters/krita/xcf/Makefile.am @@ -1,12 +1,16 @@ kde_module_LTLIBRARIES = libkritaxcfimport.la libkritaxcfexport.la -libkritaxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritaxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritaxcfexport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBMAGICK_LIBS) \ $(top_builddir)/krita/libkritacommon.la -libkritaxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined +libkritaxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + -L../../../lib/kofficecore/.libs/ -lkofficecore -llcms \ + -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../krita/core/.libs/ -lkritaimage -L../../../krita/ui/.libs/ -lkritaui -L../../../krita/kritacolor/.libs/ -lkritacolor libkritaxcfimport_la_LIBADD = \ $(KOFFICE_LIBS) \ $(LIBMAGICK_LIBS) \ -- cgit v1.2.3