Rename a number of libraries and executables to avoid conflicts with KDE4

10 files changed, 19 insertions, 19 deletions

diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am
index dc567042..d8867c1d 100644
--- a/filters/chalk/gmagick/Makefile.am
+++ b/filters/chalk/gmagick/Makefile.am
@@ -1,6 +1,6 @@
 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 \
+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 -ltdeparts \
         -llcms
 libchalkgmagickexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@@ -10,7 +10,7 @@ libchalkgmagickexport_la_LIBADD = \
 	../../../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 \
+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 -ltdeparts \
         -llcms
 libchalkgmagickimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
diff --git a/filters/chalk/jpeg/Makefile.am b/filters/chalk/jpeg/Makefile.am
index 7cefb8a2..3270eaa9 100644
--- a/filters/chalk/jpeg/Makefile.am
+++ b/filters/chalk/jpeg/Makefile.am
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libchalkconverter.la
 kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la
 
-libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c
 libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libkisexif/libkisexif.la \
@@ -10,7 +10,7 @@ libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libk
 	../../../chalk/chalkcolor/libchalkcolor.la
 
 libchalkjpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalkconverter.la $(KOFFICE_LIBS) \
@@ -20,7 +20,7 @@ libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	-ljpeg -lexif
 
 libchalkjpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkjpegimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalkconverter.la $(KOFFICE_LIBS) \
diff --git a/filters/chalk/libkisexif/Makefile.am b/filters/chalk/libkisexif/Makefile.am
index d8f40fa3..b248468b 100644
--- a/filters/chalk/libkisexif/Makefile.am
+++ b/filters/chalk/libkisexif/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = \
         $(KOPAINTER_INCLUDES) \
         $(all_includes) 
 METASOURCES = AUTO
-libkisexif_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libkisexif_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libkisexif_la_LIBADD = $(KOFFICE_LIBS) \
 	../../../chalk/core/libchalkimage.la \
diff --git a/filters/chalk/magick/Makefile.am b/filters/chalk/magick/Makefile.am
index 745ad6b1..8c03b55c 100644
--- a/filters/chalk/magick/Makefile.am
+++ b/filters/chalk/magick/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkmagickimport.la libchalkmagickexport.la
 
-libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkmagickexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkmagickexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@@ -10,7 +10,7 @@ libchalkmagickexport_la_LIBADD = \
 	../../../chalk/ui/libchalkui.la \
 	../../../chalk/chalkcolor/libchalkcolor.la
 
-libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkmagickimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkmagickimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
diff --git a/filters/chalk/openexr/Makefile.am b/filters/chalk/openexr/Makefile.am
index 4c3ff9e2..a73e64f9 100644
--- a/filters/chalk/openexr/Makefile.am
+++ b/filters/chalk/openexr/Makefile.am
@@ -15,7 +15,7 @@ AM_CPPFLAGS= \
 
 kde_module_LTLIBRARIES = libchalk_openexr_import.la libchalk_openexr_export.la
 
-libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libchalk_openexr_export_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 libchalk_openexr_export_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	$(OPENEXR_LIBS) \
@@ -27,7 +27,7 @@ libchalk_openexr_export_la_LIBADD = \
 	../../../chalk/chalkcolor/libchalkcolor.la
 
 
-libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts
+libchalk_openexr_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts
 libchalk_openexr_import_la_LIBADD = \
 	$(KOFFICE_LIBS) \
 	$(OPENEXR_LIBS) \
diff --git a/filters/chalk/pdf/Makefile.am b/filters/chalk/pdf/Makefile.am
index 89d02811..10a309dd 100644
--- a/filters/chalk/pdf/Makefile.am
+++ b/filters/chalk/pdf/Makefile.am
@@ -17,7 +17,7 @@ kdelnkdir = $(kde_appsdir)/.hidden
 
 METASOURCES = AUTO
 kde_module_LTLIBRARIES = libchalkpdfimport.la
-libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined  $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkpdfimport_la_LDFLAGS = -avoid-version -module -no-undefined  $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	-lpoppler-tqt $(KOFFICE_LIBS) $(POPPLER_LIBS) \
diff --git a/filters/chalk/png/Makefile.am b/filters/chalk/png/Makefile.am
index 857c368b..6a94f325 100644
--- a/filters/chalk/png/Makefile.am
+++ b/filters/chalk/png/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkpngimport.la libchalkpngexport.la
 
-libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkpngexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@@ -10,7 +10,7 @@ libchalkpngexport_la_LIBADD = \
 	../../../chalk/chalkcolor/libchalkcolor.la \
 	-lpng
 
-libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkpngimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
diff --git a/filters/chalk/raw/Makefile.am b/filters/chalk/raw/Makefile.am
index f48bb940..01b97189 100644
--- a/filters/chalk/raw/Makefile.am
+++ b/filters/chalk/raw/Makefile.am
@@ -11,7 +11,7 @@ AM_CPPFLAGS= \
 
 kde_module_LTLIBRARIES = libchalk_raw_import.la 
 
-libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalk_raw_import_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalk_raw_import_la_LIBADD = \
 	$(KOFFICE_LIBS) \
diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am
index c16e7f1e..553db2bd 100644
--- a/filters/chalk/tiff/Makefile.am
+++ b/filters/chalk/tiff/Makefile.am
@@ -1,7 +1,7 @@
 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 \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalktiffconverter.la $(KOFFICE_LIBS) \
@@ -11,7 +11,7 @@ libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	-ltiff
 
 libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \
-	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+	$(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \
 	libchalktiffconverter.la $(KOFFICE_LIBS) \
@@ -53,7 +53,7 @@ service_DATA = chalk_tiff_export.desktop chalk_tiff_import.desktop
 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 \
+libchalktiffconverter_la_LDFLAGS = -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \
 	../../../chalk/core/libchalkimage.la \
diff --git a/filters/chalk/xcf/Makefile.am b/filters/chalk/xcf/Makefile.am
index 5415f09f..9ee67fd0 100644
--- a/filters/chalk/xcf/Makefile.am
+++ b/filters/chalk/xcf/Makefile.am
@@ -1,6 +1,6 @@
 kde_module_LTLIBRARIES = libchalkxcfimport.la libchalkxcfexport.la
 
-libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkxcfexport_la_LIBADD = \
 	$(KOFFICE_LIBS) \
@@ -10,7 +10,7 @@ libchalkxcfexport_la_LIBADD = \
 	../../../chalk/ui/libchalkui.la \
 	../../../chalk/chalkcolor/libchalkcolor.la
 
-libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts \
+libchalkxcfimport_la_LDFLAGS = $(KDE_PLUGIN) $(LIBMAGICK_LDFLAGS) $(KDE_RPATH) $(LIBMAGICK_RPATH) $(all_libraries) -module -avoid-version -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -ltdeparts \
         -llcms
 libchalkxcfimport_la_LIBADD = \
 	$(KOFFICE_LIBS) \