diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:21:29 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-06 02:21:29 -0600 |
| commit | e5c4347deaf8b35481178a3e8af00ea1c60e184e (patch) | |
| tree | 76c9e5a18705af0b71e5550986bdafb46c108253 | |
| parent | d12331d1ff7a29a4c1c297ea46504352430e85b7 (diff) | |
| download | koffice-e5c4347deaf8b35481178a3e8af00ea1c60e184e.tar.gz koffice-e5c4347deaf8b35481178a3e8af00ea1c60e184e.zip | |
Additional kde to tde renaming
206 files changed, 291 insertions, 291 deletions
diff --git a/Doxyfile.temp b/Doxyfile.temp index 48dd9b317..11c30f00c 100644 --- a/Doxyfile.temp +++ b/Doxyfile.temp @@ -66,8 +66,8 @@ INPUT = example \ FILE_PATTERNS = *.h RECURSIVE = YES #EXCLUDE = \ -#arts/tests kdeprint/tests khtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests kwallet/backend/tests \ -#kdecore/tests kdeui/tests kinit/tests kio/tests kparts/tests libkmid/tests +#arts/tests tdeprint/tests khtml/java/tests kio/kfile/tests kioslave/http/kcookiejar/tests kwallet/backend/tests \ +#tdecore/tests tdeui/tests kinit/tests kio/tests kparts/tests libkmid/tests # */tests doesn't seem to work :( # If the value of the INPUT tag contains directories, you can use the diff --git a/acinclude.m4 b/acinclude.m4 index 48e5d70cd..a41853cf3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -371,7 +371,7 @@ AC_DEFUN([KDE_1_CHECK_PATHS], fi AC_MSG_CHECKING([for KDE libraries installed]) -ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' +ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5' if AC_TRY_EVAL(ac_link) && test -s conftest; then AC_MSG_RESULT(yes) @@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir) AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_moduledir) -AC_SUBST(kdeinitdir, '$(kde_moduledir)') +AC_SUBST(tdeinitdir, '$(kde_moduledir)') AC_SUBST(kde_styledir) AC_SUBST(kde_widgetdir) if test "$kde_qtver" = 1; then @@ -2055,12 +2055,12 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES], if test $kde_qtver = 3; then case $host in - *cygwin*) lib_kded="-lkdeinit_kded" ;; + *cygwin*) lib_kded="-ltdeinit_kded" ;; *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") + AC_SUBST(LIB_KDECORE, "-ltdecore") + AC_SUBST(LIB_KDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2069,9 +2069,9 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KDEPRINT, "-ltdeprint") AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-lkdepim") + AC_SUBST(LIB_KDEPIM, "-ltdepim") AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") @@ -2080,8 +2080,8 @@ if test $kde_qtver = 3; then AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KFILE, "-lkio") elif test $kde_qtver = 2; then - AC_SUBST(LIB_KDECORE, "-lkdecore") - AC_SUBST(LIB_KDEUI, "-lkdeui") + AC_SUBST(LIB_KDECORE, "-ltdecore") + AC_SUBST(LIB_KDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -2090,10 +2090,10 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KPARTS, "-lkparts") - AC_SUBST(LIB_KDEPRINT, "-lkdeprint") + AC_SUBST(LIB_KDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") - AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") + AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") @@ -2477,7 +2477,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) else - AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) + AC_MSG_ERROR(You need giflib30. Please install the tdesupport package) fi ]) diff --git a/chalk/Makefile.am b/chalk/Makefile.am index 246c5bb10..e06e15529 100644 --- a/chalk/Makefile.am +++ b/chalk/Makefile.am @@ -14,8 +14,8 @@ libchalkpart_la_LIBADD = libchalkcommon.la METASOURCES = AUTO -## The kdeinit loadable module and executable -kdeinit_LTLIBRARIES = chalk.la +## The tdeinit loadable module and executable +tdeinit_LTLIBRARIES = chalk.la bin_PROGRAMS = chalk_la_SOURCES = main.cc chalk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) diff --git a/chalk/colorspaces/cmyk_u16/Makefile.am b/chalk/colorspaces/cmyk_u16/Makefile.am index a43d685f1..e84347a0f 100644 --- a/chalk/colorspaces/cmyk_u16/Makefile.am +++ b/chalk/colorspaces/cmyk_u16/Makefile.am @@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalk_cmyk_u16_plugin.la chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cc noinst_HEADERS = cmyk_u16_plugin.h kis_cmyk_u16_colorspace.h -chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_cmyk_u16_plugin_la_LIBADD = libchalk_cmyk_u16.la ../../chalkcolor/libchalkcolor.la chalk_cmyk_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/cmyk_u8/Makefile.am b/chalk/colorspaces/cmyk_u8/Makefile.am index 623add37d..dad6d3fe0 100644 --- a/chalk/colorspaces/cmyk_u8/Makefile.am +++ b/chalk/colorspaces/cmyk_u8/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = chalkcmykplugin.la chalkcmykplugin_la_SOURCES = cmyk_plugin.cc kis_cmyk_colorspace.cc noinst_HEADERS = cmyk_plugin.h kis_cmyk_colorspace.h -chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalkcmykplugin_la_LIBADD = ../../chalkcolor/libchalkcolor.la chalkcmykplugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/gray_u16/Makefile.am b/chalk/colorspaces/gray_u16/Makefile.am index 5b756bceb..eca6db2de 100644 --- a/chalk/colorspaces/gray_u16/Makefile.am +++ b/chalk/colorspaces/gray_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_gray_u16_plugin.la chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cc noinst_HEADERS = gray_u16_plugin.h kis_gray_u16_colorspace.h -chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_gray_u16_plugin_la_LIBADD = libchalk_gray_u16.la ../../chalkcolor/libchalkcolor.la chalk_gray_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/gray_u8/Makefile.am b/chalk/colorspaces/gray_u8/Makefile.am index adce3031b..1488b5495 100644 --- a/chalk/colorspaces/gray_u8/Makefile.am +++ b/chalk/colorspaces/gray_u8/Makefile.am @@ -18,7 +18,7 @@ kde_module_LTLIBRARIES = chalkgrayplugin.la chalkgrayplugin_la_SOURCES = gray_plugin.cc noinst_HEADERS = gray_plugin.h kis_gray_colorspace.h -chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalkgrayplugin_la_LIBADD = libchalkgrayscale.la ../../chalkcolor/libchalkcolor.la chalkgrayplugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/lms_f32/Makefile.am b/chalk/colorspaces/lms_f32/Makefile.am index 537ba370d..db835606f 100644 --- a/chalk/colorspaces/lms_f32/Makefile.am +++ b/chalk/colorspaces/lms_f32/Makefile.am @@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_lms_f32_plugin.la chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cc noinst_HEADERS = lms_f32_plugin.h kis_lms_f32_colorspace.h -chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_lms_f32_plugin_la_LIBADD = libchalk_lms_f32.la ../../chalkcolor/libchalkcolor.la chalk_lms_f32_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/rgb_f16half/Makefile.am b/chalk/colorspaces/rgb_f16half/Makefile.am index 2c3bbfa17..2419bb8ce 100644 --- a/chalk/colorspaces/rgb_f16half/Makefile.am +++ b/chalk/colorspaces/rgb_f16half/Makefile.am @@ -22,7 +22,7 @@ kde_module_LTLIBRARIES = chalk_rgb_f16half_plugin.la chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cc noinst_HEADERS = rgb_f16half_plugin.h kis_rgb_f16half_colorspace.h -chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_rgb_f16half_plugin_la_LIBADD = libchalk_rgb_f16half.la ../../chalkcolor/libchalkcolor.la chalk_rgb_f16half_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/rgb_f32/Makefile.am b/chalk/colorspaces/rgb_f32/Makefile.am index edcf26a9e..cb20ad1f3 100644 --- a/chalk/colorspaces/rgb_f32/Makefile.am +++ b/chalk/colorspaces/rgb_f32/Makefile.am @@ -21,7 +21,7 @@ kde_module_LTLIBRARIES = chalk_rgb_f32_plugin.la chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cc noinst_HEADERS = rgb_f32_plugin.h kis_rgb_f32_colorspace.h -chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_rgb_f32_plugin_la_LIBADD = libchalk_rgb_f32.la ../../chalkcolor/libchalkcolor.la chalk_rgb_f32_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/rgb_u16/Makefile.am b/chalk/colorspaces/rgb_u16/Makefile.am index 28ef3e620..7c4277f7d 100644 --- a/chalk/colorspaces/rgb_u16/Makefile.am +++ b/chalk/colorspaces/rgb_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_rgb_u16_plugin.la chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cc noinst_HEADERS = rgb_u16_plugin.h kis_rgb_u16_colorspace.h -chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_rgb_u16_plugin_la_LIBADD = libchalk_rgb_u16.la ../../chalkcolor/libchalkcolor.la chalk_rgb_u16_plugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/rgb_u8/Makefile.am b/chalk/colorspaces/rgb_u8/Makefile.am index 0b692fdfe..6938f85c9 100644 --- a/chalk/colorspaces/rgb_u8/Makefile.am +++ b/chalk/colorspaces/rgb_u8/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalkrgbplugin.la chalkrgbplugin_la_SOURCES = rgb_plugin.cc noinst_HEADERS = rgb_plugin.h kis_rgb_colorspace.h -chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalkrgbplugin_la_LIBADD = libchalkrgb.la ../../chalkcolor/libchalkcolor.la chalkrgbplugin_la_METASOURCES = AUTO diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am index a5500db55..b12d3f336 100644 --- a/chalk/colorspaces/wet/Makefile.am +++ b/chalk/colorspaces/wet/Makefile.am @@ -20,7 +20,7 @@ kde_module_LTLIBRARIES = chalkwetplugin.la chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h -chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms -L../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../chalk/core/.libs -lchalkimage \ +chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms -L../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../chalk/core/.libs -lchalkimage \ -L../../../chalk/ui/.libs -lchalkui chalkwetplugin_la_LIBADD = ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) diff --git a/chalk/colorspaces/ycbcr_u16/Makefile.am b/chalk/colorspaces/ycbcr_u16/Makefile.am index d2e0aca39..0174a9b35 100644 --- a/chalk/colorspaces/ycbcr_u16/Makefile.am +++ b/chalk/colorspaces/ycbcr_u16/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u16_plugin.la chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cc noinst_HEADERS = ycbcr_u16_plugin.h kis_ycbcr_u16_colorspace.h -chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_ycbcr_u16_plugin_la_LIBADD = libchalk_ycbcr_u16.la ../../chalkcolor/libchalkcolor.la METASOURCES = AUTO diff --git a/chalk/colorspaces/ycbcr_u8/Makefile.am b/chalk/colorspaces/ycbcr_u8/Makefile.am index 67f7933a8..b8d4bcf2f 100644 --- a/chalk/colorspaces/ycbcr_u8/Makefile.am +++ b/chalk/colorspaces/ycbcr_u8/Makefile.am @@ -19,7 +19,7 @@ kde_module_LTLIBRARIES = chalk_ycbcr_u8_plugin.la chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cc noinst_HEADERS = ycbcr_u8_plugin.h kis_ycbcr_u8_colorspace.h -chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -llcms +chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -llcms chalk_ycbcr_u8_plugin_la_LIBADD = libchalk_ycbcr_u8.la ../../chalkcolor/libchalkcolor.la METASOURCES = AUTO diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am index 8ccfbe5f1..ac622d7c8 100644 --- a/chalk/plugins/filters/blur/Makefile.am +++ b/chalk/plugins/filters/blur/Makefile.am @@ -14,7 +14,7 @@ chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur. kde_module_LTLIBRARIES = chalkblurfilter.la noinst_HEADERS = blur.h kis_blur_filter.h -chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkblurfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am index ae6530ae7..c783157d0 100644 --- a/chalk/plugins/filters/bumpmap/Makefile.am +++ b/chalk/plugins/filters/bumpmap/Makefile.am @@ -12,7 +12,7 @@ chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui kde_module_LTLIBRARIES = chalkbumpmap.la noinst_HEADERS = bumpmap.h -chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkbumpmap_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkbumpmap_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am index 5bedb23b0..19e58bd23 100644 --- a/chalk/plugins/filters/cimg/Makefile.am +++ b/chalk/plugins/filters/cimg/Makefile.am @@ -25,7 +25,7 @@ noinst_HEADERS = \ kis_cimg_plugin.h\ kis_cimgconfig_widget.h -chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkcimg_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkcimg_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/colorify/Makefile.am b/chalk/plugins/filters/colorify/Makefile.am index d3e348e9c..d69de3398 100644 --- a/chalk/plugins/filters/colorify/Makefile.am +++ b/chalk/plugins/filters/colorify/Makefile.am @@ -14,7 +14,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \ kde_module_LTLIBRARIES = chalkcolorify.la -chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkcolorify_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkcolorify_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am index 70121166e..523915c3f 100644 --- a/chalk/plugins/filters/colors/Makefile.am +++ b/chalk/plugins/filters/colors/Makefile.am @@ -14,7 +14,7 @@ chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_col kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la noinst_HEADERS = colors.h -chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkextensioncolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkextensioncolorsfilters_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am index 843402a38..cd4745eb3 100644 --- a/chalk/plugins/filters/colorsfilters/Makefile.am +++ b/chalk/plugins/filters/colorsfilters/Makefile.am @@ -17,7 +17,7 @@ noinst_HEADERS = colorsfilters.h \ kis_perchannel_filter.h \ kis_brightness_contrast_filter.h -chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkcolorsfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkcolorsfilters_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am index 069ff51fd..133a684f4 100644 --- a/chalk/plugins/filters/convolutionfilters/Makefile.am +++ b/chalk/plugins/filters/convolutionfilters/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = convolutionfilters.h \ kis_custom_convolution_filter_configuration_widget.h \ kis_convolution_filter.h -chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkconvolutionfilters_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkconvolutionfilters_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am index eaf403f4b..d0116fe4a 100644 --- a/chalk/plugins/filters/embossfilter/Makefile.am +++ b/chalk/plugins/filters/embossfilter/Makefile.am @@ -17,7 +17,7 @@ chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \ noinst_HEADERS = kis_emboss_filter_plugin.h \ kis_emboss_filter.h -chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkembossfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkembossfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am index f2f39c3a8..33b55da50 100644 --- a/chalk/plugins/filters/example/Makefile.am +++ b/chalk/plugins/filters/example/Makefile.am @@ -15,7 +15,7 @@ chalkexample_la_SOURCES = example.cc kde_module_LTLIBRARIES = chalkexample.la noinst_HEADERS = example.h -chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkexample_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkexample_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am index f29b7a3b3..424231d2e 100644 --- a/chalk/plugins/filters/fastcolortransfer/Makefile.am +++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am @@ -16,7 +16,7 @@ chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc kde_module_LTLIBRARIES = chalkfastcolortransfer.la noinst_HEADERS = fastcolortransfer.h kis_wdg_fastcolortransfer.h -chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkfastcolortransfer_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficecore/.libs -lkofficecore chalkfastcolortransfer_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/imageenhancement/Makefile.am b/chalk/plugins/filters/imageenhancement/Makefile.am index c6a884cd8..d2477ebf0 100644 --- a/chalk/plugins/filters/imageenhancement/Makefile.am +++ b/chalk/plugins/filters/imageenhancement/Makefile.am @@ -15,7 +15,7 @@ chalkimageenhancement_la_SOURCES = imageenhancement.cpp \ kde_module_LTLIBRARIES = chalkimageenhancement.la -chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkimageenhancement_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui noinst_HEADERS = imageenhancement.h kis_wavelet_noise_reduction.h diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am index c074bd65f..b85328134 100644 --- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am +++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am @@ -16,7 +16,7 @@ chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \ kde_module_LTLIBRARIES = chalklenscorrectionfilter.la noinst_HEADERS = lenscorrectionfilter.h -chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalklenscorrectionfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalklenscorrectionfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am index 2f6fb4597..5c04e697f 100644 --- a/chalk/plugins/filters/levelfilter/Makefile.am +++ b/chalk/plugins/filters/levelfilter/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = levelfilter.h \ kis_level_filter.h \ kgradientslider.h -chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalklevelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalklevelfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am index c3db54d0f..3a085fc7d 100644 --- a/chalk/plugins/filters/noisefilter/Makefile.am +++ b/chalk/plugins/filters/noisefilter/Makefile.am @@ -16,7 +16,7 @@ chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \ kde_module_LTLIBRARIES = chalknoisefilter.la noinst_HEADERS = noisefilter.h kis_wdg_noise.h -chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalknoisefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalknoisefilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am index d67aab54f..cef212593 100644 --- a/chalk/plugins/filters/oilpaintfilter/Makefile.am +++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am @@ -17,7 +17,7 @@ chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \ noinst_HEADERS = kis_oilpaint_filter_plugin.h \ kis_oilpaint_filter.h -chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkoilpaintfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkoilpaintfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am index 9a8771a67..cc12358de 100644 --- a/chalk/plugins/filters/pixelizefilter/Makefile.am +++ b/chalk/plugins/filters/pixelizefilter/Makefile.am @@ -17,7 +17,7 @@ chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \ noinst_HEADERS = kis_pixelize_filter_plugin.h \ kis_pixelize_filter.h -chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkpixelizefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkpixelizefilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am index d4e5632d5..ba88e62c8 100644 --- a/chalk/plugins/filters/raindropsfilter/Makefile.am +++ b/chalk/plugins/filters/raindropsfilter/Makefile.am @@ -17,7 +17,7 @@ chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \ noinst_HEADERS = kis_raindrops_filter_plugin.h \ kis_raindrops_filter.h -chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkraindropsfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkraindropsfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am index 0757704c6..e46dc642b 100644 --- a/chalk/plugins/filters/randompickfilter/Makefile.am +++ b/chalk/plugins/filters/randompickfilter/Makefile.am @@ -16,7 +16,7 @@ chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \ kde_module_LTLIBRARIES = chalkrandompickfilter.la noinst_HEADERS = randompickfilter.h -chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkrandompickfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkrandompickfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am index 1e8845606..0b74580ec 100644 --- a/chalk/plugins/filters/roundcorners/Makefile.am +++ b/chalk/plugins/filters/roundcorners/Makefile.am @@ -16,7 +16,7 @@ chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \ noinst_HEADERS = kis_round_corners_filter_plugin.h \ kis_round_corners_filter.h -chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkroundcornersfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkroundcornersfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am index 87a173325..f139c2980 100644 --- a/chalk/plugins/filters/smalltilesfilter/Makefile.am +++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am @@ -16,7 +16,7 @@ chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \ noinst_HEADERS = kis_small_tiles_filter_plugin.h \ kis_small_tiles_filter.h -chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalksmalltilesfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalksmalltilesfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am index c7853223b..9726f4d3a 100644 --- a/chalk/plugins/filters/sobelfilter/Makefile.am +++ b/chalk/plugins/filters/sobelfilter/Makefile.am @@ -16,7 +16,7 @@ chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \ noinst_HEADERS = kis_sobel_filter_plugin.h \ kis_sobel_filter.h -chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalksobelfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalksobelfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am index fb34c63e9..5c6eda766 100644 --- a/chalk/plugins/filters/unsharp/Makefile.am +++ b/chalk/plugins/filters/unsharp/Makefile.am @@ -13,7 +13,7 @@ chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_ kde_module_LTLIBRARIES = chalkunsharpfilter.la -chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkunsharpfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkunsharpfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am index 0e4aacf99..6d2fec5c1 100644 --- a/chalk/plugins/filters/wavefilter/Makefile.am +++ b/chalk/plugins/filters/wavefilter/Makefile.am @@ -16,7 +16,7 @@ chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \ kde_module_LTLIBRARIES = chalkwavefilter.la noinst_HEADERS = wavefilter.h kis_wdg_wave.h -chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkwavefilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkwavefilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am index 120368c6f..ce91e8384 100644 --- a/chalk/plugins/paintops/defaultpaintops/Makefile.am +++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = defaultpaintops_plugin.h kis_airbrushop.h kis_brushop.h \ kde_module_LTLIBRARIES = chalkdefaultpaintops.la -chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkdefaultpaintops_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkdefaultpaintops_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am index b89986047..16c4be51e 100644 --- a/chalk/plugins/tools/defaulttools/Makefile.am +++ b/chalk/plugins/tools/defaulttools/Makefile.am @@ -44,7 +44,7 @@ noinst_HEADERS = \ kis_tool_pan.h -chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkdefaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkdefaulttools_la_LIBADD = ../../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am index dc0ad90e0..cfaa8f36b 100644 --- a/chalk/plugins/tools/selectiontools/Makefile.am +++ b/chalk/plugins/tools/selectiontools/Makefile.am @@ -28,7 +28,7 @@ noinst_HEADERS = \ kis_tool_select_elliptical.h -chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am index 661573329..d1d73a754 100644 --- a/chalk/plugins/tools/tool_crop/Makefile.am +++ b/chalk/plugins/tools/tool_crop/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_crop.h \ kis_tool_crop.h -chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am index 5233106a3..1f847fe50 100644 --- a/chalk/plugins/tools/tool_curves/Makefile.am +++ b/chalk/plugins/tools/tool_curves/Makefile.am @@ -33,7 +33,7 @@ noinst_HEADERS = \ kis_tool_bezier_select.h \ kis_tool_moutline.h -chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am index e1f6d5b46..0f14b7097 100644 --- a/chalk/plugins/tools/tool_filter/Makefile.am +++ b/chalk/plugins/tools/tool_filter/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = \ kis_tool_filter.h \ tool_filter.h -chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am index b3b0f74f7..80b6d351d 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_perspectivegrid.h \ kis_tool_perspectivegrid.h -chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am index 416bdcc3e..9f6dfb24f 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_perspectivetransform.h \ kis_tool_perspectivetransform.h -chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am index 66f4d403c..ef2d230f7 100644 --- a/chalk/plugins/tools/tool_polygon/Makefile.am +++ b/chalk/plugins/tools/tool_polygon/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_polygon.h \ kis_tool_polygon.h -chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am index 39b9ebf66..acbe8e6c5 100644 --- a/chalk/plugins/tools/tool_polyline/Makefile.am +++ b/chalk/plugins/tools/tool_polyline/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = \ tool_polyline.h \ kis_tool_polyline.h -chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am index f57296baa..416c9a685 100644 --- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am +++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h kde_module_LTLIBRARIES = chalktoolselectsimilar.la -chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am index 11cab8a38..e068a6283 100644 --- a/chalk/plugins/tools/tool_star/Makefile.am +++ b/chalk/plugins/tools/tool_star/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_star.h \ kis_tool_star.h -chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktoolstar_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am index 7b0883837..bb6873795 100644 --- a/chalk/plugins/tools/tool_transform/Makefile.am +++ b/chalk/plugins/tools/tool_transform/Makefile.am @@ -21,7 +21,7 @@ noinst_HEADERS = \ tool_transform.h \ kis_tool_transform.h -chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui chalktooltransform_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am index fc29a370c..19fb51eff 100644 --- a/chalk/plugins/viewplugins/colorrange/Makefile.am +++ b/chalk/plugins/viewplugins/colorrange/Makefile.am @@ -11,7 +11,7 @@ chalkcolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h chalkcolorrange_la_LIBADD = ../../../libchalkcommon.la -chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkcolorrange_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkrcdir = $(kde_datadir)/chalkplugins diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am index cfc849f91..5469f41a5 100644 --- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am +++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkcolorspaceconversion.la chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h -chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkcolorspaceconversion_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am index 98ba35504..a09b78e88 100644 --- a/chalk/plugins/viewplugins/dropshadow/Makefile.am +++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am @@ -20,7 +20,7 @@ chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \ noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \ kis_dropshadow.h dlg_dropshadow.h -chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkdropshadow_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkdropshadow_la_LIBADD = ../../../libchalkcommon.la ../../../colorspaces/rgb_u8/libchalkrgb.la diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am index 90ddcfc6a..b326ddbca 100644 --- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am +++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h kde_services_DATA = chalkfiltersgallery.desktop -chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkfiltersgallery_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkfiltersgallery_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am index 149a523b7..4b372cf27 100644 --- a/chalk/plugins/viewplugins/histogram/Makefile.am +++ b/chalk/plugins/viewplugins/histogram/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget kde_services_DATA = chalkhistogram.desktop -chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkhistogram_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkhistogram_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am index 643417559..02864fcb4 100644 --- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am +++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am @@ -15,7 +15,7 @@ chalkhistogramdocker_la_SOURCES = histogramdocker.cc kis_imagerasteredcache.cc kde_module_LTLIBRARIES = chalkhistogramdocker.la noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h -chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkhistogramdocker_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkhistogramdocker_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am index cf863888d..11da5c9b7 100644 --- a/chalk/plugins/viewplugins/imagesize/Makefile.am +++ b/chalk/plugins/viewplugins/imagesize/Makefile.am @@ -18,7 +18,7 @@ noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h kde_module_LTLIBRARIES = chalkimagesize.la -chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkimagesize_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkimagesize_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am index 6e0f14c56..03467683b 100644 --- a/chalk/plugins/viewplugins/modify_selection/Makefile.am +++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am @@ -20,7 +20,7 @@ dlg_shrink_selection.h dlg_border_selection.h modify_selection.h kde_module_LTLIBRARIES = chalkmodifyselection.la -chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkmodifyselection_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkmodifyselection_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am index e2d7dfac8..52cafd70e 100644 --- a/chalk/plugins/viewplugins/performancetest/Makefile.am +++ b/chalk/plugins/viewplugins/performancetest/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkperftest.la chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h -chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkperftest_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am index d4ff4e635..25d48e395 100644 --- a/chalk/plugins/viewplugins/rotateimage/Makefile.am +++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am @@ -16,7 +16,7 @@ kde_module_LTLIBRARIES = chalkrotateimage.la chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h -chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkrotateimage_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/screenshot/Makefile.am b/chalk/plugins/viewplugins/screenshot/Makefile.am index 9887b7a25..7bde05657 100644 --- a/chalk/plugins/viewplugins/screenshot/Makefile.am +++ b/chalk/plugins/viewplugins/screenshot/Makefile.am @@ -15,8 +15,8 @@ kde_module_LTLIBRARIES = chalkscreenshot.la chalkscreenshot_la_SOURCES = screenshot.cpp ksnapshot.cpp regiongrabber.cpp ksnapshotwidget.ui noinst_HEADERS = screenshot.h ksnapshot.h regiongrabber.h ksnapshotwidget.h ksnapshotwidget.ui.h -chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ - -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -lkdeprint +chalkscreenshot_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ + -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -ltdeprint chalkscreenshot_la_LIBADD = ../../../libchalkcommon.la kde_services_DATA = chalkscreenshot.desktop diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am index 2bc6c1fd6..eec369721 100644 --- a/chalk/plugins/viewplugins/scripting/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/Makefile.am @@ -20,7 +20,7 @@ chalkscripting_la_SOURCES = scripting.cc kde_module_LTLIBRARIES = chalkscripting.la noinst_HEADERS = scripting.h -chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkscripting_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la ./chalkscripting/libchalkscripting.la diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am index 448c7c595..177546944 100644 --- a/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am +++ b/chalk/plugins/viewplugins/scripting/chalkcore/Makefile.am @@ -11,7 +11,7 @@ krosschalkcore_la_SOURCES = chalkcoremodule.cpp krs_doc.cpp krs_paint_layer.cpp krs_brush.cpp krs_pattern.cpp krs_filter.cpp krs_filter_configuration.cpp \ krs_wavelet.cpp -krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../../chalk/core/.libs -lchalkimage \ +krosschalkcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../../chalk/core/.libs -lchalkimage \ -L../../../../../chalk/ui/.libs -lchalkui -L../../../../../lib/kofficeui/.libs -lkofficeui -L../../../../../lib/kofficecore/.libs -lkofficecore krosschalkcore_la_LIBADD = \ $(LIB_QT) \ diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am index 7f83e3c6a..06823114b 100644 --- a/chalk/plugins/viewplugins/selectopaque/Makefile.am +++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am @@ -11,7 +11,7 @@ chalkselectopaque_la_SOURCES = selectopaque.cc noinst_HEADERS = selectopaque.h chalkselectopaque_la_LIBADD = ../../../libchalkcommon.la -chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkrcdir = $(kde_datadir)/chalkplugins diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am index 9b28a89d8..130a5ff51 100644 --- a/chalk/plugins/viewplugins/separate_channels/Makefile.am +++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am @@ -20,7 +20,7 @@ noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \ kde_services_DATA = chalkseparatechannels.desktop -chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkseparatechannels_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui -L../../../../lib/kofficecore/.libs -lkofficecore chalkseparatechannels_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am index 5f8efe55a..937088bbe 100644 --- a/chalk/plugins/viewplugins/shearimage/Makefile.am +++ b/chalk/plugins/viewplugins/shearimage/Makefile.am @@ -18,7 +18,7 @@ kde_services_DATA = chalkshearimage.desktop chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h -chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkshearimage_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am index 5331a04e1..5e0fe4c75 100644 --- a/chalk/plugins/viewplugins/substrate/Makefile.am +++ b/chalk/plugins/viewplugins/substrate/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalksubstrate.la chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h -chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalksubstrate_la_LIBADD = ../../../libchalkcommon.la diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am index 5a3fafc93..df07a2a55 100644 --- a/chalk/plugins/viewplugins/variations/Makefile.am +++ b/chalk/plugins/viewplugins/variations/Makefile.am @@ -17,7 +17,7 @@ kde_module_LTLIBRARIES = chalkvariations.la chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui noinst_HEADERS = wdg_variations.h -chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -lkdecore -lkdeui -lkjs -lkdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ +chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -lkio -lkparts -L../../../../chalk/chalkcolor/.libs -lchalkcolor -L../../../../chalk/core/.libs -lchalkimage \ -L../../../../chalk/ui/.libs -lchalkui -L../../../../lib/kofficeui/.libs -lkofficeui chalkvariations_la_LIBADD = ../../../libchalkcommon.la diff --git a/configure.in b/configure.in index aa8e38f7f..e5804415f 100644 --- a/configure.in +++ b/configure.in @@ -566,7 +566,7 @@ dnl ======================================================= KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)]) + AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in tdesupport for CVS users' convience)]) HELP_SUBDIR= ]) @@ -595,7 +595,7 @@ if test -n "$XML_CONFIG"; then fi KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)]) + AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in tdesupport for CVS users' convience)]) HELP_SUBDIR= ]) diff --git a/doc/chalk/installation.docbook b/doc/chalk/installation.docbook index 88b94e47e..4ec595d48 100644 --- a/doc/chalk/installation.docbook +++ b/doc/chalk/installation.docbook @@ -17,7 +17,7 @@ application --> <!-- List any special requirements for your application here. This should include: -.Libraries or other software that is not included in kdesupport, +.Libraries or other software that is not included in tdesupport, kdelibs, or kdebase. .Hardware requirements like amount of RAM, disk space, graphics card capabilities, screen resolution, special expansion cards, etc. diff --git a/example/Makefile.am b/example/Makefile.am index 55b98290f..4b7474645 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -8,8 +8,8 @@ libexamplepart_la_SOURCES = example_part.cc \ libexamplepart_la_LDFLAGS = $(KDE_PLUGIN) libexamplepart_la_LIBADD = $(LIB_KOFFICEUI) -## The kdeinit loadable module and executable -kdeinit_LTLIBRARIES = example.la +## The tdeinit loadable module and executable +tdeinit_LTLIBRARIES = example.la lib_LTLIBRARIES = bin_PROGRAMS = example_la_SOURCES = main.cc diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am index 4d74db2ab..99f468e68 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -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 libchalkgmagickexport_la_LIBADD = \ @@ -8,7 +8,7 @@ libchalkgmagickexport_la_LIBADD = \ $(LIBGMAGICK_LIBS) \ $(top_builddir)/chalk/libchalkcommon.la -libchalkgmagickimport_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 \ +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 libchalkgmagickimport_la_LIBADD = \ diff --git a/filters/chalk/jpeg/Makefile.am b/filters/chalk/jpeg/Makefile.am index 40a47d81f..780a3e274 100644 --- a/filters/chalk/jpeg/Makefile.am +++ b/filters/chalk/jpeg/Makefile.am @@ -1,21 +1,21 @@ noinst_LTLIBRARIES = libchalkconverter.la kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la -libchalkconverter_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ +libchalkconverter_la_LDFLAGS = $(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 libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c libchalkconverter_la_LIBADD = $(top_builddir)/filters/chalk/libkisexif/libkisexif.la libchalkjpegexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + $(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 libchalkjpegexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ libchalkconverter.la $(KOFFICE_LIBS) -ljpeg -lexif libchalkjpegimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + $(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 libchalkjpegimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ diff --git a/filters/chalk/libkisexif/Makefile.am b/filters/chalk/libkisexif/Makefile.am index 96ccd5b58..d46bf3f97 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) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ +libkisexif_la_LDFLAGS = $(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 noinst_LTLIBRARIES = libkisexif.la diff --git a/filters/chalk/magick/Makefile.am b/filters/chalk/magick/Makefile.am index b64ea1ce8..129f69ab3 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -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 libchalkmagickexport_la_LIBADD = \ @@ -8,7 +8,7 @@ libchalkmagickexport_la_LIBADD = \ $(LIBMAGICK_LIBS) \ $(top_builddir)/chalk/libchalkcommon.la -libchalkmagickimport_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 \ +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 \ -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 libchalkmagickimport_la_LIBADD = \ diff --git a/filters/chalk/openexr/Makefile.am b/filters/chalk/openexr/Makefile.am index 264708900..e1860361c 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) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -lkparts \ -L../../../lib/kofficecore/.libs/ -lkofficecore \ -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 libchalk_openexr_export_la_LIBADD = \ @@ -26,7 +26,7 @@ libchalk_openexr_export_la_LIBADD = \ $(top_builddir)/chalk/colorspaces/rgb_f16half/libchalk_rgb_f16half.la -libchalk_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 \ +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 -L../../../lib/kofficecore/.libs/ -lkofficecore \ -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 libchalk_openexr_import_la_LIBADD = \ $(KOFFICE_LIBS) \ diff --git a/filters/chalk/pdf/Makefile.am b/filters/chalk/pdf/Makefile.am index cb5376f71..d19f8cd17 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) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ +libchalkpdfimport_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 libchalkpdfimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ diff --git a/filters/chalk/png/Makefile.am b/filters/chalk/png/Makefile.am index fbee16383..929fbc779 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ +libchalkpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_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 libchalkpngexport_la_LIBADD = \ @@ -8,7 +8,7 @@ libchalkpngexport_la_LIBADD = \ $(top_builddir)/chalk/libchalkcommon.la \ -lpng -libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -module -avoid-version -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ +libchalkpngimport_la_LDFLAGS = $(KDE_PLUGIN) $(KDE_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 libchalkpngimport_la_LIBADD = \ diff --git a/filters/chalk/raw/Makefile.am b/filters/chalk/raw/Makefile.am index 2a814a569..dffd88cec 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -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 libchalk_raw_import_la_LIBADD = \ diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am index 2e1205763..32750558c 100644 --- a/filters/chalk/tiff/Makefile.am +++ b/filters/chalk/tiff/Makefile.am @@ -1,14 +1,14 @@ kde_module_LTLIBRARIES = libchalktiffimport.la libchalktiffexport.la libchalktiffexport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + $(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 libchalktiffexport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ libchalktiffconverter.la $(KOFFICE_LIBS) -ltiff libchalktiffimport_la_LDFLAGS = -avoid-version -module -no-undefined \ - $(KDE_PLUGIN) $(KDE_RPATH) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ + $(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 libchalktiffimport_la_LIBADD = $(top_builddir)/chalk/libchalkcommon.la \ @@ -47,7 +47,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) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts \ +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 noinst_LTLIBRARIES = libchalktiffconverter.la diff --git a/filters/chalk/xcf/Makefile.am b/filters/chalk/xcf/Makefile.am index 88822a234..6f163b40b 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -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 libchalkxcfexport_la_LIBADD = \ @@ -8,7 +8,7 @@ libchalkxcfexport_la_LIBADD = \ $(LIBMAGICK_LIBS) \ $(top_builddir)/chalk/libchalkcommon.la -libchalkxcfimport_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 \ +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 \ -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 libchalkxcfimport_la_LIBADD = \ diff --git a/filters/karbon/eps/Makefile.am b/filters/karbon/eps/Makefile.am index 50dce2955..b0ad08c54 100644 --- a/filters/karbon/eps/Makefile.am +++ b/filters/karbon/eps/Makefile.am @@ -6,11 +6,11 @@ libkarbonepsexport_la_SOURCES = \ epsexport.cc \ epsexportdlg.cc -libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(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 +libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonepsexport_la_LIBADD = $(LIB_KOFFICEUI) ../../../karbon/libkarboncommon.la libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc -libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(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 +libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonepsimport_la_LIBADD = $(LIB_KOFFICEUI) INCLUDES = \ diff --git a/filters/karbon/kontour/Makefile.am b/filters/karbon/kontour/Makefile.am index 4ba373dc2..ff2449542 100644 --- a/filters/karbon/kontour/Makefile.am +++ b/filters/karbon/kontour/Makefile.am @@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/ kde_module_LTLIBRARIES = libkarbonkontourimport.la libkarbonkontourimport_la_SOURCES = kontourimport.cpp -libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libkarbonkontourimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonkontourimport_la_LIBADD = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la METASOURCES = AUTO diff --git a/filters/karbon/png/Makefile.am b/filters/karbon/png/Makefile.am index a4a0891a0..3439b1263 100644 --- a/filters/karbon/png/Makefile.am +++ b/filters/karbon/png/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libkarbonpngexport.la -libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(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 +libkarbonpngexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonpngexport_la_LIBADD = \ $(LIB_KOFFICEUI) \ ../../../karbon/libkarboncommon.la diff --git a/filters/karbon/svg/Makefile.am b/filters/karbon/svg/Makefile.am index 087b6bc43..0f2e80f59 100644 --- a/filters/karbon/svg/Makefile.am +++ b/filters/karbon/svg/Makefile.am @@ -1,11 +1,11 @@ kde_module_LTLIBRARIES = libkarbonsvgexport.la libkarbonsvgimport.la -libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(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 +libkarbonsvgexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonsvgexport_la_LIBADD = \ $(LIB_KOFFICEUI) \ ../../../karbon/libkarboncommon.la -libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(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 +libkarbonsvgimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonsvgimport_la_LIBADD = \ $(LIB_KOFFICEUI) \ ../../../karbon/libkarboncommon.la diff --git a/filters/karbon/wmf/Makefile.am b/filters/karbon/wmf/Makefile.am index 6aae72df0..df310c4bc 100644 --- a/filters/karbon/wmf/Makefile.am +++ b/filters/karbon/wmf/Makefile.am @@ -11,11 +11,11 @@ INCLUDES= \ kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la -libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc -libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la libwmfexport_la_SOURCES = wmfexport.cc diff --git a/filters/karbon/xcf/Makefile.am b/filters/karbon/xcf/Makefile.am index b6e04d8d2..cd35667e3 100644 --- a/filters/karbon/xcf/Makefile.am +++ b/filters/karbon/xcf/Makefile.am @@ -1,6 +1,6 @@ kde_module_LTLIBRARIES = libkarbonxcfexport.la -libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(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 +libkarbonxcfexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkarbonxcfexport_la_LIBADD = \ $(LIB_KOFFICEUI) \ ../../../karbon/libkarboncommon.la diff --git a/filters/kchart/bmp/Makefile.am b/filters/kchart/bmp/Makefile.am index 05cb996c2..63e6ff2e8 100644 --- a/filters/kchart/bmp/Makefile.am +++ b/filters/kchart/bmp/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartbmpexport.la libkchartbmpexport_la_SOURCES = bmpexport.cpp -libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartbmpexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ bmpexport.h diff --git a/filters/kchart/jpeg/Makefile.am b/filters/kchart/jpeg/Makefile.am index 9a6ed008f..f00a9ba54 100644 --- a/filters/kchart/jpeg/Makefile.am +++ b/filters/kchart/jpeg/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartjpegexport.la libkchartjpegexport_la_SOURCES = jpegexport.cpp -libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartjpegexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ diff --git a/filters/kchart/mng/Makefile.am b/filters/kchart/mng/Makefile.am index 56a37efec..d46a9e06c 100644 --- a/filters/kchart/mng/Makefile.am +++ b/filters/kchart/mng/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartmngexport.la libkchartmngexport_la_SOURCES = mngexport.cpp -libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartmngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartmngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ mngexport.h diff --git a/filters/kchart/png/Makefile.am b/filters/kchart/png/Makefile.am index bf41ecc5c..a2455ef08 100644 --- a/filters/kchart/png/Makefile.am +++ b/filters/kchart/png/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartpngexport.la libkchartpngexport_la_SOURCES = pngexport.cpp -libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartpngexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ pngexport.h diff --git a/filters/kchart/svg/Makefile.am b/filters/kchart/svg/Makefile.am index 79393b987..a85cfd07c 100644 --- a/filters/kchart/svg/Makefile.am +++ b/filters/kchart/svg/Makefile.am @@ -10,7 +10,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartsvgexport.la libkchartsvgexport_la_SOURCES = svgexport.cc -libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS) noinst_HEADERS = \ svgexport.h diff --git a/filters/kchart/xbm/Makefile.am b/filters/kchart/xbm/Makefile.am index 0aab8eca2..5c21b89c4 100644 --- a/filters/kchart/xbm/Makefile.am +++ b/filters/kchart/xbm/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartxbmexport.la libkchartxbmexport_la_SOURCES = xbmexport.cpp -libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartxbmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ xbmexport.h diff --git a/filters/kchart/xpm/Makefile.am b/filters/kchart/xpm/Makefile.am index a99dbb50b..387dbeeb8 100644 --- a/filters/kchart/xpm/Makefile.am +++ b/filters/kchart/xpm/Makefile.am @@ -13,7 +13,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkchartxpmexport.la libkchartxpmexport_la_SOURCES = xpmexport.cpp -libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkchartxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkchartxpmexport_la_LIBADD = ../../../kchart/libkchartcommon.la ../libimageexport/libkchartimageexport.la ../../../filters/libdialogfilter/libdialogfilter.la $(KOFFICE_LIBS) noinst_HEADERS = \ xpmexport.h diff --git a/filters/kformula/latex/Makefile.am b/filters/kformula/latex/Makefile.am index 7e4738237..241e1e8f5 100644 --- a/filters/kformula/latex/Makefile.am +++ b/filters/kformula/latex/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = latexexport.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kformula/png/Makefile.am b/filters/kformula/png/Makefile.am index a4cb5b379..580df1ca5 100644 --- a/filters/kformula/png/Makefile.am +++ b/filters/kformula/png/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = pngexport.h pngexportdia.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kformula/svg/Makefile.am b/filters/kformula/svg/Makefile.am index 4ec8c7d38..1c6a3c0ed 100644 --- a/filters/kformula/svg/Makefile.am +++ b/filters/kformula/svg/Makefile.am @@ -16,7 +16,7 @@ noinst_HEADERS = svgexport.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kivio/imageexport/Makefile.am b/filters/kivio/imageexport/Makefile.am index f7264ec48..9e5fae9d0 100644 --- a/filters/kivio/imageexport/Makefile.am +++ b/filters/kivio/imageexport/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = libkivioimageexport.la libkivioimageexport_la_SOURCES = kivio_imageexport.cpp \ kivio_imageexportwidget.ui kivio_imageexportdialog.cpp -libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkivioimageexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkivioimageexport_la_LIBADD = $(top_builddir)/kivio/kiviopart/libkiviocommon.la $(KOFFICE_LIBS) service_DATA = kivio_image_export.desktop diff --git a/filters/kpresenter/bmp/Makefile.am b/filters/kpresenter/bmp/Makefile.am index 3276240b0..9574baac8 100644 --- a/filters/kpresenter/bmp/Makefile.am +++ b/filters/kpresenter/bmp/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterbmpexport.la libkpresenterbmpexport_la_SOURCES = bmpexport.cpp -libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresenterbmpexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresenterbmpexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ bmpexport.h diff --git a/filters/kpresenter/jpeg/Makefile.am b/filters/kpresenter/jpeg/Makefile.am index 35297dc1f..34540bb81 100644 --- a/filters/kpresenter/jpeg/Makefile.am +++ b/filters/kpresenter/jpeg/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterjpegexport.la libkpresenterjpegexport_la_SOURCES = jpegexport.cpp -libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresenterjpegexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresenterjpegexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ jpegexport.h diff --git a/filters/kpresenter/mng/Makefile.am b/filters/kpresenter/mng/Makefile.am index 866f6b54f..966197c5d 100644 --- a/filters/kpresenter/mng/Makefile.am +++ b/filters/kpresenter/mng/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresentermngexport.la libkpresentermngexport_la_SOURCES = mngexport.cpp -libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresentermngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresentermngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ mngexport.h diff --git a/filters/kpresenter/png/Makefile.am b/filters/kpresenter/png/Makefile.am index 5da543a2c..9a05d53e0 100644 --- a/filters/kpresenter/png/Makefile.am +++ b/filters/kpresenter/png/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterpngexport.la libkpresenterpngexport_la_SOURCES = pngexport.cpp -libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresenterpngexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresenterpngexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ pngexport.h diff --git a/filters/kpresenter/svg/Makefile.am b/filters/kpresenter/svg/Makefile.am index ccdd67a22..764bd3008 100644 --- a/filters/kpresenter/svg/Makefile.am +++ b/filters/kpresenter/svg/Makefile.am @@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresentersvgexport.la libkpresentersvgexport_la_SOURCES = svgexport.cc -libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS) noinst_HEADERS = \ svgexport.h diff --git a/filters/kpresenter/xbm/Makefile.am b/filters/kpresenter/xbm/Makefile.am index cdc7a4fda..7cdb0e871 100644 --- a/filters/kpresenter/xbm/Makefile.am +++ b/filters/kpresenter/xbm/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterxbmexport.la libkpresenterxbmexport_la_SOURCES = xbmexport.cpp -libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresenterxbmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresenterxbmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ xbmexport.h diff --git a/filters/kpresenter/xpm/Makefile.am b/filters/kpresenter/xpm/Makefile.am index 9b9066595..188027bd9 100644 --- a/filters/kpresenter/xpm/Makefile.am +++ b/filters/kpresenter/xpm/Makefile.am @@ -12,7 +12,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \ kde_module_LTLIBRARIES = libkpresenterxpmexport.la libkpresenterxpmexport_la_SOURCES = xpmexport.cpp -libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -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 +libkpresenterxpmexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkpresenterxpmexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la ../../../filters/libdialogfilter/libdialogfilter.la ../libimageexport/libkpresenterimageexport.la $(KOFFICE_LIBS) noinst_HEADERS = \ xpmexport.h diff --git a/filters/kspread/applixspread/Makefile.am b/filters/kspread/applixspread/Makefile.am index bfe3d15c1..eac8fb40f 100644 --- a/filters/kspread/applixspread/Makefile.am +++ b/filters/kspread/applixspread/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libapplixspreadimport.la libapplixspreadimport_la_SOURCES = applixspreadimport.cc libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS) -libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore noinst_HEADERS = applixspreadimport.h METASOURCES = AUTO diff --git a/filters/kspread/dbase/Makefile.am b/filters/kspread/dbase/Makefile.am index 3131410df..c1e604939 100644 --- a/filters/kspread/dbase/Makefile.am +++ b/filters/kspread/dbase/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libdbaseimport.la libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp libdbaseimport_la_LIBADD = $(KOFFICE_LIBS) -libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore noinst_HEADERS = dbaseimport.h dbase.h METASOURCES = AUTO diff --git a/filters/kspread/excel/import/Makefile.am b/filters/kspread/excel/import/Makefile.am index 4565f6752..34adf0c51 100644 --- a/filters/kspread/excel/import/Makefile.am +++ b/filters/kspread/excel/import/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libexcelimport.la libexcelimport_la_SOURCES = excelimport.cc libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la -libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore noinst_HEADERS = excelimport.h METASOURCES = AUTO diff --git a/filters/kspread/latex/export/Makefile.am b/filters/kspread/latex/export/Makefile.am index 8f83cb474..3a73d1c0c 100644 --- a/filters/kspread/latex/export/Makefile.am +++ b/filters/kspread/latex/export/Makefile.am @@ -22,7 +22,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \ #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kugar/kugarnop/Makefile.am b/filters/kugar/kugarnop/Makefile.am index 03a025c25..fa2e3d45a 100644 --- a/filters/kugar/kugarnop/Makefile.am +++ b/filters/kugar/kugarnop/Makefile.am @@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = libkugarnopimport.la libkugarnopimport_la_SOURCES = kugarnopimport.cpp -libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libkugarnopimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libkugarnopimport_la_LIBADD = $(KOFFICE_LIBS) noinst_HEADERS = kugarnopimport.h diff --git a/filters/kword/hancomword/Makefile.am b/filters/kword/hancomword/Makefile.am index d24690d06..55f6a99d3 100644 --- a/filters/kword/hancomword/Makefile.am +++ b/filters/kword/hancomword/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libhancomwordimport.la libhancomwordimport_la_SOURCES = pole.cpp hancomwordimport.cpp libhancomwordimport_la_LIBADD = $(KOFFICE_LIBS) -libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libhancomwordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore noinst_HEADERS = pole.h hancomwordimport.h METASOURCES = AUTO diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am index b2da2f054..ffb4efb03 100644 --- a/filters/kword/latex/export/Makefile.am +++ b/filters/kword/latex/export/Makefile.am @@ -20,7 +20,7 @@ libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc file #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am index 18d4307e8..f295865f2 100644 --- a/filters/kword/latex/import/Makefile.am +++ b/filters/kword/latex/import/Makefile.am @@ -19,7 +19,7 @@ noinst_HEADERS = config.h lateximport.h lateximportdia.h #check_PROGRAMS = texlauncher #texlauncher_SOURCES = texlauncher.cc #texlauncher_LDADD = liblatexexport.la -#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am index 39773d178..380db4d9c 100644 --- a/filters/kword/latex/import/parser/Makefile.am +++ b/filters/kword/latex/import/parser/Makefile.am @@ -25,7 +25,7 @@ texscaner.cc: $(srcdir)/texscaner.y check_PROGRAMS = texlauncher texlauncher_SOURCES = texlauncher.cc texlauncher_LDADD = liblatexexport.la -texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/filters/kword/msword/Makefile.am b/filters/kword/msword/Makefile.am index e9ede1910..7de039c24 100644 --- a/filters/kword/msword/Makefile.am +++ b/filters/kword/msword/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = libmswordimport.la libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \ texthandler.cpp tablehandler.cpp graphicshandler.cpp -libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS) METASOURCES = AUTO diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am index 39f1ecbee..423261eb5 100644 --- a/filters/kword/mswrite/Makefile.am +++ b/filters/kword/mswrite/Makefile.am @@ -9,12 +9,12 @@ kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la libmswriteimport_la_SOURCES = mswriteimport.cc \ libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc -libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libmswriteimport_la_LIBADD = $(KOFFICE_LIBS) libmswriteexport_la_SOURCES = mswriteexport.cc \ libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp -libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(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 +libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la noinst_HEADERS = mswriteimport.h mswriteexport.h \ diff --git a/filters/kword/pdf/Makefile.am b/filters/kword/pdf/Makefile.am index a8ccc9751..2a063f05c 100644 --- a/filters/kword/pdf/Makefile.am +++ b/filters/kword/pdf/Makefile.am @@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libpdfimport.la libpdfimport_la_SOURCES = misc.cpp transform.cpp data.cpp fstring.cpp \ FilterPage.cpp FilterDevice.cpp \ pdfdocument.cpp dialog.cpp pdfimport.cpp -libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(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 +libpdfimport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libpdfimport_la_LIBADD = $(LIB_KOFFICECORE) $(LIBPAPER) ./xpdf/xpdf/libxpdf.la ./xpdf/goo/libgoo.la METASOURCES = dialog.moc pdfimport.moc diff --git a/filters/xsltfilter/configure.in.in b/filters/xsltfilter/configure.in.in index 592c1fb3c..af357a3cf 100644 --- a/filters/xsltfilter/configure.in.in +++ b/filters/xsltfilter/configure.in.in @@ -1,6 +1,6 @@ KDE_FIND_PATH(xml2-config, XML_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in kdesupport for CVS users' convience)]) + AC_MSG_WARN([Could not find libxml2 anywhere, check ftp://xmlsoft.org/ for libxml >= 2.4.8. (we also keep a version of it in tdesupport for CVS users' convience)]) HELP_SUBDIR= ]) @@ -29,7 +29,7 @@ if test -n "$XML_CONFIG"; then fi KDE_FIND_PATH(xslt-config, XSLT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [ - AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in kdesupport for CVS users' convience)]) + AC_MSG_WARN([Could not find libxslt anywhere, check ftp://xmlsoft.org/ for libxslt >= 1.0.7. (we also keep a version of it in tdesupport for CVS users' convience)]) HELP_SUBDIR= ]) diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am index 1051a0095..fdf74667c 100644 --- a/filters/xsltfilter/export/Makefile.am +++ b/filters/xsltfilter/export/Makefile.am @@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LIB kde_module_LTLIBRARIES = libxsltexport.la libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui -libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(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 +libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libxsltexport_la_LIBADD = $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am index 78f9a8408..e72b85aab 100644 --- a/filters/xsltfilter/import/Makefile.am +++ b/filters/xsltfilter/import/Makefile.am @@ -7,7 +7,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes) $(LIBXML_CFLAGS) $(LI kde_module_LTLIBRARIES = libxsltimport.la libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui -libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(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 +libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore libxsltimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS) noinst_HEADERS = xsltimport.h xsltimportdia.h xsltproc.h diff --git a/karbon/Makefile.am b/karbon/Makefile.am index 84b177174..556b49523 100644 --- a/karbon/Makefile.am +++ b/karbon/Makefile.am @@ -37,7 +37,7 @@ libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_QT) libkarbonpart_la_LIBADD = libkarboncommon.la bin_PROGRAMS = -kdeinit_LTLIBRARIES = karbon.la +tdeinit_LTLIBRARIES = karbon.la karbon_la_SOURCES = main.cc karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT) karbon_la_LIBADD = libkarboncommon.la $(LIB_QT) $(LIB_KOFFICECORE) diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am index 266bba8df..a61e0e6ea 100644 --- a/karbon/plugins/flattenpath/Makefile.am +++ b/karbon/plugins/flattenpath/Makefile.am @@ -6,7 +6,7 @@ karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc karbon_flattenpathplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_flattenpathplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_flattenpathplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = flattenpathplugin.rc diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am index 440cae4ba..f476cc2f8 100644 --- a/karbon/plugins/imagetool/Makefile.am +++ b/karbon/plugins/imagetool/Makefile.am @@ -8,7 +8,7 @@ karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc karbon_imagetoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_imagetoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_imagetoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am index 4ba5d7204..1e0148191 100644 --- a/karbon/plugins/insertknots/Makefile.am +++ b/karbon/plugins/insertknots/Makefile.am @@ -6,7 +6,7 @@ karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc karbon_insertknotsplugin_la_LIBADD = $(LIB_KPARTS) \ ../../libkarboncommon.la -karbon_insertknotsplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_insertknotsplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = insertknotsplugin.rc diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am index d257e98ee..7a3ee556a 100644 --- a/karbon/plugins/roundcorners/Makefile.am +++ b/karbon/plugins/roundcorners/Makefile.am @@ -6,7 +6,7 @@ karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc karbon_roundcornersplugin_la_LIBADD = $(LIB_KPARTS) \ ../../libkarboncommon.la -karbon_roundcornersplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_roundcornersplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = roundcornersplugin.rc diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am index d703b2a41..8a534c8e1 100644 --- a/karbon/plugins/shadoweffect/Makefile.am +++ b/karbon/plugins/shadoweffect/Makefile.am @@ -6,7 +6,7 @@ karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc karbon_shadoweffectplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_shadoweffectplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_shadoweffectplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = shadoweffectplugin.rc diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am index 4bc18c77f..600ccc6ed 100644 --- a/karbon/plugins/whirlpinch/Makefile.am +++ b/karbon/plugins/whirlpinch/Makefile.am @@ -7,7 +7,7 @@ karbon_whirlpinchplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOPAINTER) \ ../../libkarboncommon.la -karbon_whirlpinchplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_whirlpinchplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) partpluginsdir = $(kde_datadir)/karbon/kpartplugins partplugins_DATA = whirlpinchplugin.rc diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am index 7dcd76e5d..ef50f24ae 100644 --- a/karbon/plugins/zoomtool/Makefile.am +++ b/karbon/plugins/zoomtool/Makefile.am @@ -8,7 +8,7 @@ karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc karbon_zoomtoolplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) \ ../../libkarboncommon.la -karbon_zoomtoolplugin_la_LDFLAGS = -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) +karbon_zoomtoolplugin_la_LDFLAGS = -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kopainter/.libs/ -lkopainter $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO diff --git a/karbon/tools/Makefile.am b/karbon/tools/Makefile.am index 4147d6e8a..ef666c18c 100644 --- a/karbon/tools/Makefile.am +++ b/karbon/tools/Makefile.am @@ -57,7 +57,7 @@ karbon_defaulttools_la_SOURCES = \ vdefaulttools.cc karbon_defaulttools_la_LIBADD = $(LIB_KPARTS) $(LIB_KOFFICEUI) ../libkarboncommon.la -karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kopainter/.libs/ -lkopainter +karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kopainter/.libs/ -lkopainter karbon_defaulttools_la_METASOURCES = \ AUTO diff --git a/kchart/Makefile.am b/kchart/Makefile.am index 2708152a2..a6d79b86c 100644 --- a/kchart/Makefile.am +++ b/kchart/Makefile.am @@ -43,8 +43,8 @@ libkchartpart_la_SOURCES = kchart_factory_init.cc libkchartpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT) libkchartpart_la_LIBADD = libkchartcommon.la -## The kdeinit loadable module and executable -kdeinit_LTLIBRARIES = kchart.la +## The tdeinit loadable module and executable +tdeinit_LTLIBRARIES = kchart.la bin_PROGRAMS = kchart_la_SOURCES = main.cc kchart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) diff --git a/kchart/kchartPrinterDlg.h b/kchart/kchartPrinterDlg.h index 40d03c221..6853028ab 100644 --- a/kchart/kchartPrinterDlg.h +++ b/kchart/kchartPrinterDlg.h @@ -23,7 +23,7 @@ #ifndef kchartprintdlg_included #define kchartprintdlg_included -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> #include <knuminput.h> #include <tqlabel.h> namespace KChart diff --git a/kexi/Makefile.am b/kexi/Makefile.am index 7eca1d836..4b1a22b6e 100644 --- a/kexi/Makefile.am +++ b/kexi/Makefile.am @@ -1,7 +1,7 @@ include $(top_srcdir)/kexi/Makefile.global lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kexi.la +tdeinit_LTLIBRARIES = kexi.la bin_PROGRAMS = kexi_la_SOURCES = main.cpp kexi_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) $(LIB_QT) diff --git a/kexi/doc/dev/CHANGELOG-Kexi-js b/kexi/doc/dev/CHANGELOG-Kexi-js index 6f90dc610..faa8076ab 100755 --- a/kexi/doc/dev/CHANGELOG-Kexi-js +++ b/kexi/doc/dev/CHANGELOG-Kexi-js @@ -3260,7 +3260,7 @@ KexiDB Parser, KexiDB Kexi - more debug areas added - KexiStartupFileDialog wrapped for win32 again -TODO: move some things to kdeui/win32 +TODO: move some things to tdeui/win32 KexiDB Parser, KexiDB - WHERE expression is supported - operators like "IS SIMILAR TO" and "IS NOT NULL" better supported @@ -5621,7 +5621,7 @@ TODO: add drag from browser area to smallest possible size - field that we drag over now is highlighted TODO: fix KListView::viewportPaintEvent() like in KexiRelationViewTable::drawItemHighlighter() - and commit to cvs (kdeui) + and commit to cvs (tdeui) - KexiRelationViewTableContainer got now focus/unfocus/z-order functionality. Colors of table headers are consistent with focusing and OS settings TODO: fix connection lines painting @@ -5657,7 +5657,7 @@ TODO: like above: "Print" and "Print to" TODO: maybe optionally use KDateWidget (this needs to extend and improve this class)? QDateEdit is good enough (but this need to follow date format for locale or settings using QDateEdit::Order, etc.). -TODO: fix KDatePicker (in kdeui): accepting with Return key or dblclick, and setting focus. +TODO: fix KDatePicker (in tdeui): accepting with Return key or dblclick, and setting focus. - KexiTableEdit has now QColorGroup::Base (usually: white) background - KexiInputTableEdit has now some space on the left, so strings look better. TODO: add default hint for columns widths, based on type of field diff --git a/kexi/doc/dev/auto_update_service.txt b/kexi/doc/dev/auto_update_service.txt index eb9d67348..d832a5cf8 100644 --- a/kexi/doc/dev/auto_update_service.txt +++ b/kexi/doc/dev/auto_update_service.txt @@ -3,7 +3,7 @@ Installation / Update Service for QKW / KDE and apps Jaroslaw Staniek started: 2003-07-22 -OOPL-only: Create Update Service using kdecore/KMD5 and bzip2 lib. This would be used to automatic +OOPL-only: Create Update Service using tdecore/KMD5 and bzip2 lib. This would be used to automatic updates for QKW and Kexi packages at the end-user side. Two options: - offline update from local archives - online update from the company ftp resources diff --git a/kexi/formeditor/factories/Makefile.am b/kexi/formeditor/factories/Makefile.am index df5855540..72571e4cc 100644 --- a/kexi/formeditor/factories/Makefile.am +++ b/kexi/formeditor/factories/Makefile.am @@ -4,11 +4,11 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \ -I$(top_srcdir)/kexi/core \ -I$(top_srcdir)/lib -I$(top_srcdir)/lib/koproperty -I$(top_srcdir)/lib/kofficecore $(all_includes) kde_module_LTLIBRARIES = kformdesigner_containers.la kformdesigner_stdwidgets.la -kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty +kformdesigner_containers_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty kformdesigner_containers_la_SOURCES = containerfactory.cpp kformdesigner_containers_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la -kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty +kformdesigner_stdwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore -L../../../lib/koproperty/.libs/ -lkoproperty kformdesigner_stdwidgets_la_SOURCES = stdwidgetfactory.cpp kformdesigner_stdwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la diff --git a/kexi/formeditor/test/Makefile.am b/kexi/formeditor/test/Makefile.am index 5b8d41633..f2e602879 100644 --- a/kexi/formeditor/test/Makefile.am +++ b/kexi/formeditor/test/Makefile.am @@ -11,7 +11,7 @@ INCLUDES = -I$(top_srcdir)/kexi -I$(top_srcdir)/kexi/formeditor \ -I$(top_srcdir)/kexi/widget -I$(top_srcdir)/kexi/core \ -I$(top_srcdir)/lib -I$(top_srcdir)/lib/kofficecore $(all_includes) -kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kformdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kformdesigner_LDADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la diff --git a/kexi/kexidb/drivers/mySQL/Makefile.am b/kexi/kexidb/drivers/mySQL/Makefile.am index e7965bcba..2892bedb8 100644 --- a/kexi/kexidb/drivers/mySQL/Makefile.am +++ b/kexi/kexidb/drivers/mySQL/Makefile.am @@ -22,7 +22,7 @@ kexidb_mysqldriver_la_LIBADD = $(LIB_KPARTS) \ -lmysqlclient \ ../../libkexidb.la -kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore +kexidb_mysqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(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 kde_services_DATA = kexidb_mysqldriver.desktop diff --git a/kexi/kexidb/drivers/pqxx/Makefile.am b/kexi/kexidb/drivers/pqxx/Makefile.am index 4e964bd81..03dccbcd8 100644 --- a/kexi/kexidb/drivers/pqxx/Makefile.am +++ b/kexi/kexidb/drivers/pqxx/Makefile.am @@ -13,7 +13,7 @@ kexidb_pqxxsqldriver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../../libkexidb. kexidb_pqxxsqldriver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) \ -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined \ - -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore + -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore kde_services_DATA = kexidb_pqxxsqldriver.desktop diff --git a/kexi/kexidb/drivers/sqlite/Makefile.am b/kexi/kexidb/drivers/sqlite/Makefile.am index 28fddb988..9d124bc7f 100644 --- a/kexi/kexidb/drivers/sqlite/Makefile.am +++ b/kexi/kexidb/drivers/sqlite/Makefile.am @@ -16,7 +16,7 @@ kexidb_sqlite3driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la -kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils +kexidb_sqlite3driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -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/kexiutils/.libs/ -lkexiutils kde_services_DATA = kexidb_sqlite3driver.desktop diff --git a/kexi/kexidb/drivers/sqlite2/Makefile.am b/kexi/kexidb/drivers/sqlite2/Makefile.am index 55ead1182..bd07f2825 100644 --- a/kexi/kexidb/drivers/sqlite2/Makefile.am +++ b/kexi/kexidb/drivers/sqlite2/Makefile.am @@ -20,7 +20,7 @@ kexidb_sqlite2driver_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la -kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui -L../../../../lib/store/.libs/ -lkstore -L../../../../kexi/kexiutils/.libs/ -lkexiutils +kexidb_sqlite2driver_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -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/kexiutils/.libs/ -lkexiutils kde_services_DATA = kexidb_sqlite2driver.desktop diff --git a/kexi/migration/Makefile.am b/kexi/migration/Makefile.am index fa9fb0ac7..92002661e 100644 --- a/kexi/migration/Makefile.am +++ b/kexi/migration/Makefile.am @@ -53,5 +53,5 @@ keximigratetest_LDADD = libkeximigrate.la \ $(top_builddir)/kexi/main/libkeximain.la \ $(LIB_QT) $(LIB_KDECORE) -keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +keximigratetest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kexi/migration/mysql/Makefile.am b/kexi/migration/mysql/Makefile.am index af7e47ae0..94239311a 100644 --- a/kexi/migration/mysql/Makefile.am +++ b/kexi/migration/mysql/Makefile.am @@ -10,7 +10,7 @@ keximigrate_mysql_la_SOURCES = mysqlmigrate.cpp keximigrate_mysql_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) ../libkeximigrate.la $(MYSQL_LIBS) -lmysqlclient -keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 +keximigrate_mysql_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(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 kde_services_DATA = keximigrate_mysql.desktop diff --git a/kexi/migration/pqxx/Makefile.am b/kexi/migration/pqxx/Makefile.am index 2e773cc21..8405de9f5 100644 --- a/kexi/migration/pqxx/Makefile.am +++ b/kexi/migration/pqxx/Makefile.am @@ -12,7 +12,7 @@ keximigrate_pqxx_la_SOURCES = pqxxmigrate.cpp #keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lcom_err -lkrb5 -lssl -lcrypto -lcrypt -lpqxx ../libkeximigrate.la keximigrate_pqxx_la_LIBADD = $(LIB_KPARTS) $(LIB_QT) -lpqxx ../libkeximigrate.la -keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(VER_INFO) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 +keximigrate_pqxx_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -L$(PQXX_LIBDIR) -L$(PG_LIBDIR) $(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 kde_services_DATA = keximigrate_pqxx.desktop diff --git a/kexi/plugins/forms/Makefile.am b/kexi/plugins/forms/Makefile.am index 096a28182..2cc9688fa 100644 --- a/kexi/plugins/forms/Makefile.am +++ b/kexi/plugins/forms/Makefile.am @@ -4,7 +4,7 @@ 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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_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 \ $(top_builddir)/kexi/widget/utils/libkexiguiutils.la \ $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ @@ -13,7 +13,7 @@ kexihandler_form_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/lib/koproperty/libkoproperty.la \ ./libkexiformutils.la -kformdesigner_kexidbwidgets_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -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_SOURCES = kexidbfactory.cpp kformdesigner_kexidbwidgets_la_LIBADD = $(top_builddir)/kexi/formeditor/libkformdesigner.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ @@ -24,7 +24,7 @@ libkexiformutils_la_SOURCES = kexiformdataiteminterface.cpp kexidataawarewidgeti 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 -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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_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 \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ $(top_builddir)/kexi/formeditor/libkformdesigner.la \ diff --git a/kexi/plugins/importexport/csv/Makefile.am b/kexi/plugins/importexport/csv/Makefile.am index 3d0a15e98..5249d93a6 100644 --- a/kexi/plugins/importexport/csv/Makefile.am +++ b/kexi/plugins/importexport/csv/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_csv_importexport.la kexihandler_csv_importexport_la_SOURCES = kexicsv_importexportpart.cpp kexicsvimportdialog.cpp \ kexicsvimportoptionsdlg.cpp kexicsvwidgets.cpp kexicsvexport.cpp kexicsvexportwizard.cpp -kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 \ +kexihandler_csv_importexport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -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/main/.libs/ -lkeximain -L../../../../kexi/widget/.libs/ -lkexiextendedwidgets kexihandler_csv_importexport_la_LIBADD = ../../../core/libkexicore.la \ ../../../migration/libkeximigrate.la diff --git a/kexi/plugins/macros/tests/Makefile.am b/kexi/plugins/macros/tests/Makefile.am index fe11db6db..fb556f0ba 100644 --- a/kexi/plugins/macros/tests/Makefile.am +++ b/kexi/plugins/macros/tests/Makefile.am @@ -7,12 +7,12 @@ endif bin_PROGRAMS = komacrotest $(GUIBINPROGRAM) komacrotest_SOURCES = komacrotest.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp -komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +komacrotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor komacrotest_LDADD = -lkunittest ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS) if include_kunittestgui komacrotestgui_SOURCES = komacrotestgui.cpp testobject.cpp testaction.cpp actiontests.cpp macrotests.cpp macroitemtests.cpp variabletests.cpp xmlhandlertests.cpp xmlhandlertests2.cpp - komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor + komacrotestgui_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor komacrotestgui_LDADD = -lkunittestgui ../lib/libkomacro.la $(LIB_KDEUI) $(LIB_KPARTS) endif diff --git a/kexi/plugins/migration/Makefile.am b/kexi/plugins/migration/Makefile.am index b3046a4fe..3c15d3757 100644 --- a/kexi/plugins/migration/Makefile.am +++ b/kexi/plugins/migration/Makefile.am @@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = kexihandler_migration.la kexihandler_migration_la_SOURCES = keximigrationpart.cpp -kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 +kexihandler_migration_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -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 kexihandler_migration_la_LIBADD = ../../core/libkexicore.la \ ../../migration/libkeximigrate.la diff --git a/kexi/plugins/queries/Makefile.am b/kexi/plugins/queries/Makefile.am index 8359ebb36..1b1052de2 100644 --- a/kexi/plugins/queries/Makefile.am +++ b/kexi/plugins/queries/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_query.la kexihandler_query_la_SOURCES = kexiquerypart.cpp kexiquerydesignersql.cpp \ kexiquerydesignersqlhistory.cpp kexiquerydesignerguieditor.cpp \ kexiqueryview.cpp -kexihandler_query_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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/kexidb/parser/.libs/ -lkexidbparser +kexihandler_query_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/kexidb/parser/.libs/ -lkexidbparser kexihandler_query_la_LIBADD = ../../core/libkexicore.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la \ diff --git a/kexi/plugins/relations/Makefile.am b/kexi/plugins/relations/Makefile.am index 7b191cd64..47a263a58 100644 --- a/kexi/plugins/relations/Makefile.am +++ b/kexi/plugins/relations/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kexihandler_relation.la kexihandler_relation_la_SOURCES = kexirelationpartimpl.cpp \ kexirelationmaindlg.cpp -kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 +kexihandler_relation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -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 kexihandler_relation_la_LIBADD = ../../core/libkexicore.la \ ../../widget/relations/libkexirelationsview.la diff --git a/kexi/plugins/scripting/kexiscripting/Makefile.am b/kexi/plugins/scripting/kexiscripting/Makefile.am index 91067cb09..e9d0889b0 100644 --- a/kexi/plugins/scripting/kexiscripting/Makefile.am +++ b/kexi/plugins/scripting/kexiscripting/Makefile.am @@ -7,7 +7,7 @@ kexihandler_script_la_SOURCES = \ kexihandler_script_la_LDFLAGS = \ $(KDE_PLUGIN) -module -no-undefined -Wnounresolved $(all_libraries) $(VER_INFO) \ - -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 \ + -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../../../../lib/kross/api/.libs/ -lkrossapi kexihandler_script_la_LIBADD = \ diff --git a/kexi/plugins/tables/Makefile.am b/kexi/plugins/tables/Makefile.am index bc7639414..2ee5a4ab3 100644 --- a/kexi/plugins/tables/Makefile.am +++ b/kexi/plugins/tables/Makefile.am @@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = kexihandler_table.la kexihandler_table_la_SOURCES = kexitablepart.cpp kexitabledesignerview.cpp kexitabledesignerview_p.cpp \ kexitabledesigner_dataview.cpp kexitabledesignercommands.cpp kexilookupcolumnpage.cpp -kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -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 -lkmdi +kexihandler_table_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(VER_INFO) -module -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 -lkmdi kexihandler_table_la_LIBADD = $(top_builddir)/kexi/core/libkexicore.la \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/widget/tableview/libkexidatatable.la \ diff --git a/kexi/tests/altertable/Makefile.am b/kexi/tests/altertable/Makefile.am index 2953e752e..0dd606558 100644 --- a/kexi/tests/altertable/Makefile.am +++ b/kexi/tests/altertable/Makefile.am @@ -18,5 +18,5 @@ kexialtertabletest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/ $(top_builddir)/kexi/main/libkeximain.la \ $(top_builddir)/kexi/kexidb/parser/libkexidbparser.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la -kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kexialtertabletest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kexi/tests/newapi/Makefile.am b/kexi/tests/newapi/Makefile.am index 2fac080a7..98c6a1685 100644 --- a/kexi/tests/newapi/Makefile.am +++ b/kexi/tests/newapi/Makefile.am @@ -19,14 +19,14 @@ kexidbtest_SOURCES = main.cpp kexidbtest_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ ../../kexidb/parser/libkexidbparser.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la -kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable +kexidbtest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor -L../../widget/tableview/.libs/ -lkexidatatable #kexidbmysqlcursor_SOURCES = mysqlcursor.cpp #kexidbmysqlcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la \ # ../../kexidb/parser/libkexidbparser.la -#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#kexidbmysqlcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor #kexidbfirebirdcursor_SOURCES = firebirdcursor.cpp #kexidbfirebirdcursor_LDADD = $(LIB_QT) $(LIB_KDECORE) $(top_builddir)/kexi/kexidb/libkexidb.la -#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +#kexidbfirebirdcursor_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/kexi/tests/widgets/Makefile.am b/kexi/tests/widgets/Makefile.am index afedc4710..815873a48 100644 --- a/kexi/tests/widgets/Makefile.am +++ b/kexi/tests/widgets/Makefile.am @@ -8,7 +8,7 @@ kexidbdrivercombotest_SOURCES = kexidbdrivercombotest.cpp kexidbdrivercombotest_LDADD = $(LIB_QT) $(LIB_KDECORE) \ $(top_builddir)/kexi/kexidb/libkexidb.la \ $(top_builddir)/kexi/widget/libkexiextendedwidgets.la -kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kexidbdrivercombotest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor METASOURCES = AUTO diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 8f4d0b96b..8ea7ddacd 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -46,7 +46,7 @@ KexiDateFormatter::KexiDateFormatter() int yearpos, monthpos, daypos; //result of df.find() if (ok) {//look at % variables //! @todo more variables are possible here, see void KLocale::setDateFormatShort() docs -//! http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/kdecore/html/classKLocale.html#a59 +//! http://developer.kde.org/documentation/library/3.5-api/kdelibs-apidocs/tdecore/html/classKLocale.html#a59 yearpos = df.find("%y", 0, false); //&y or %y m_longYear = !(yearpos>=0 && df.mid(yearpos+1, 1)=="y"); if (!m_longYear) { diff --git a/kformula/Makefile.am b/kformula/Makefile.am index 7cf029247..e5b882af0 100644 --- a/kformula/Makefile.am +++ b/kformula/Makefile.am @@ -6,12 +6,12 @@ kde_module_LTLIBRARIES = libkformulapart.la libkformulapart_la_SOURCES = kformula_doc.cc \ kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \ kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc -libkformulapart_la_LDFLAGS = $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore +libkformulapart_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio $(KDE_PLUGIN) -lDCOP -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore libkformulapart_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KFORMULA) $(LIB_KOTEXT) libkformulapart_la_METASOURCES = AUTO -## The kdeinit loadable module -kdeinit_LTLIBRARIES = kformula.la +## The tdeinit loadable module +tdeinit_LTLIBRARIES = kformula.la kformula_la_SOURCES = main.cc kformula_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) kformula_la_LIBADD = $(LIB_KOFFICECORE) diff --git a/kivio/kiviopart/Makefile.am b/kivio/kiviopart/Makefile.am index fe0f920ad..a2958be32 100644 --- a/kivio/kiviopart/Makefile.am +++ b/kivio/kiviopart/Makefile.am @@ -45,7 +45,7 @@ libkiviopart_la_SOURCES = kivio_part_init.cc dummy.cpp: echo > dummy.cpp -kdeinit_LTLIBRARIES = kivio.la +tdeinit_LTLIBRARIES = kivio.la bin_PROGRAMS = kivio_la_SOURCES = main.cpp diff --git a/kivio/plugins/kivioconnectortool/Makefile.am b/kivio/plugins/kivioconnectortool/Makefile.am index 7858309a4..45af1cbd2 100644 --- a/kivio/plugins/kivioconnectortool/Makefile.am +++ b/kivio/plugins/kivioconnectortool/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = \ kivio_connector_cursor2.xpm\ kivio_connector_cursor1.xpm -libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui +libkivioconnectortool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui libkivioconnectortool_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kivioconnectortool.rc diff --git a/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am b/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am index 9b43ea82e..47c180b2a 100644 --- a/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am +++ b/kivio/plugins/kivioconnectortool/straight_connector/Makefile.am @@ -3,7 +3,7 @@ stencil_DATA = straight_connector.xpm kde_module_LTLIBRARIES =straight_connector.la -straight_connector_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio +straight_connector_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio # Hack to make it work (dave m) straight_connector_la_LIBADD = $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la diff --git a/kivio/plugins/kivioselecttool/Makefile.am b/kivio/plugins/kivioselecttool/Makefile.am index 3325e8838..56bddbc55 100644 --- a/kivio/plugins/kivioselecttool/Makefile.am +++ b/kivio/plugins/kivioselecttool/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ tool_select.cpp\ tool_select.h\ kivioselecttool.rc -libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui +libkivioselecttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui libkivioselecttool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kivioselecttool.rc diff --git a/kivio/plugins/kiviotargettool/Makefile.am b/kivio/plugins/kiviotargettool/Makefile.am index e22ac5cd7..c3335a16c 100644 --- a/kivio/plugins/kiviotargettool/Makefile.am +++ b/kivio/plugins/kiviotargettool/Makefile.am @@ -8,7 +8,7 @@ INCLUDES = -I$(top_srcdir)/kivio/kiviopart/config \ METASOURCES = AUTO kde_module_LTLIBRARIES = libkiviotargettool.la -libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui +libkiviotargettool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui libkiviotargettool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la libkiviotargettool_la_SOURCES = kiviotargettool.cpp kiviotargettoolfactory.cpp diff --git a/kivio/plugins/kiviotexttool/Makefile.am b/kivio/plugins/kiviotexttool/Makefile.am index 6f3ba6302..d2504669c 100644 --- a/kivio/plugins/kiviotexttool/Makefile.am +++ b/kivio/plugins/kiviotexttool/Makefile.am @@ -22,7 +22,7 @@ EXTRA_DIST = \ kivio_text_cursor.xpm\ Text.sml\ Text.xpm -libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui +libkiviotexttool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficeui/.libs/ -lkofficeui libkiviotexttool_la_LIBADD =$(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kiviotexttool.rc diff --git a/kivio/plugins/kiviozoomtool/Makefile.am b/kivio/plugins/kiviozoomtool/Makefile.am index ef74cfb28..bcb513c5d 100644 --- a/kivio/plugins/kiviozoomtool/Makefile.am +++ b/kivio/plugins/kiviozoomtool/Makefile.am @@ -18,7 +18,7 @@ EXTRA_DIST = \ kiviozoomtool.rc\ tool_zoom.cpp\ tool_zoom.h -libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui +libkiviozoomtool_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui libkiviozoomtool_la_LIBADD = $(LIB_KOTEXT) $(LIB_KOPAINTER) $(top_builddir)/kivio/kiviopart/libkiviocommon.la rc_DATA = kiviozoomtool.rc diff --git a/koshell/Makefile.am b/koshell/Makefile.am index 56d71a31d..47f41aeb6 100644 --- a/koshell/Makefile.am +++ b/koshell/Makefile.am @@ -1,9 +1,9 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) -## The kdeinit loadable module and executable +## The tdeinit loadable module and executable lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = koshell.la +tdeinit_LTLIBRARIES = koshell.la bin_PROGRAMS = koshell_la_SOURCES = koshell_main.cc koshell_shell.cc iconsidepane.cpp koshellsettings.kcfgc koshell_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) diff --git a/kounavail/Makefile.am b/kounavail/Makefile.am index 84d816f57..d79392ec8 100644 --- a/kounavail/Makefile.am +++ b/kounavail/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) ## The part kde_module_LTLIBRARIES = libkounavailpart.la libkounavailpart_la_SOURCES = kounavail.cc -libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkounavailpart_la_LIBADD = $(LIB_KOFFICECORE) METASOURCES = AUTO diff --git a/kplato/Makefile.am b/kplato/Makefile.am index 214a23f17..6ccd31984 100644 --- a/kplato/Makefile.am +++ b/kplato/Makefile.am @@ -102,18 +102,18 @@ noinst_HEADERS = \ ## The part lib_LTLIBRARIES = kde_module_LTLIBRARIES = libkplatopart.la -libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint +libkplatopart_la_LDFLAGS = $(KDE_LDFLAGS) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -ltdeprint libkplatopart_la_LIBADD = $(LIB_KABC) $(LIB_KOFFICEUI) -lDCOP \ $(top_builddir)/kdgantt/libkdgantt.la ## $(top_builddir)/kugar/lib/libkugarlib.la libkplatopart_la_METASOURCES = AUTO -## The kdeinit loadable module and executable -kdeinit_LTLIBRARIES = kplato.la +## The tdeinit loadable module and executable +tdeinit_LTLIBRARIES = kplato.la bin_PROGRAMS = kplato_la_SOURCES = main.cc -kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -lkdeprint +kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore -ltdeprint kplato_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kplato.desktop diff --git a/kplato/TODO b/kplato/TODO index c895308b8..746a4a272 100644 --- a/kplato/TODO +++ b/kplato/TODO @@ -51,7 +51,7 @@ Taken User manual (contact: raphael.langerhorst@kdemail.net) Calendars: - Timezone handling - Default calendar (See also Bug 123682) - - Localized holiday files (as in kdepim) + - Localized holiday files (as in tdepim) Improve Progress info dialog/presentation. Make it stand-alone, add to task context menu. diff --git a/kpresenter/KPrPrinterDlg.h b/kpresenter/KPrPrinterDlg.h index 7a881e38c..39129af7b 100644 --- a/kpresenter/KPrPrinterDlg.h +++ b/kpresenter/KPrPrinterDlg.h @@ -23,7 +23,7 @@ #ifndef kpresenterprintdlg_included #define kpresenterprintdlg_included -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> #include <knuminput.h> #include <tqcheckbox.h> diff --git a/kpresenter/Makefile.am b/kpresenter/Makefile.am index e954702b5..401160cb7 100644 --- a/kpresenter/Makefile.am +++ b/kpresenter/Makefile.am @@ -68,7 +68,7 @@ libkpresenterprivate_la_SOURCES = KoPointArray.cpp KPrCanvas.cpp \ slidetransitionwidget.ui KPrSlideTransitionDia.cpp \ KPrPrinterDlg.cpp -libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkpresenterprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts if include_ARTS ARTSKDE = -lartskde endif @@ -77,14 +77,14 @@ libkpresenterprivate_la_LIBADD = autoformEdit/libaf.la $(LIB_KOFFICEUI) $(LIB_KO ## The part kde_module_LTLIBRARIES = libkpresenterpart.la libkpresenterpart_la_SOURCES = KPrFactoryInit.cpp -libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkpresenterpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkpresenterpart_la_LIBADD = libkpresenterprivate.la -## The kdeinit loadable module and the executable -kdeinit_LTLIBRARIES = kpresenter.la +## The tdeinit loadable module and the executable +tdeinit_LTLIBRARIES = kpresenter.la bin_PROGRAMS = kpresenter_la_SOURCES = main.cpp -kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kpresenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kpresenter_la_LIBADD = $(LIB_KOFFICECORE) METASOURCES = AUTO diff --git a/kspread/Makefile.am b/kspread/Makefile.am index 29d44045a..63bc28acb 100644 --- a/kspread/Makefile.am +++ b/kspread/Makefile.am @@ -28,23 +28,23 @@ libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \ kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \ kspread_generalProperty.cpp kspread_propertyEditor.cpp -libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \ dialogs/libdialogs.la tests/libtests.la \ $(LIB_KOFFICEUI) $(LIB_KOTEXT) -lkspell -libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkspreadpart_la_LIBADD = libkspreadcommon.la libkspreadpart_la_SOURCES = kspread_factory_init.cc METASOURCES = AUTO -## The kdeinit loadable module and the executable -kdeinit_LTLIBRARIES = kspread.la +## The tdeinit loadable module and the executable +tdeinit_LTLIBRARIES = kspread.la bin_PROGRAMS = kspread_la_SOURCES = main.cc -kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kspread_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kspread.desktop diff --git a/kspread/kspread_view.h b/kspread/kspread_view.h index 727638007..2dfecfa54 100644 --- a/kspread/kspread_view.h +++ b/kspread/kspread_view.h @@ -34,7 +34,7 @@ #include <tqvaluelist.h> #include <kprinter.h> -#include <kdeprint/kprintdialogpage.h> +#include <tdeprint/kprintdialogpage.h> #include <KoPoint.h> #include <KoView.h> diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am index ee1573d5d..dc1e7ff20 100644 --- a/kspread/plugins/scripting/Makefile.am +++ b/kspread/plugins/scripting/Makefile.am @@ -14,7 +14,7 @@ noinst_HEADERS = scripting.h kspreadscripting_la_METASOURCES = AUTO -kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kspreadscripting_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kspreadscripting_la_LIBADD = $(top_builddir)/kspread/libkspreadcommon.la $(top_builddir)/lib/kross/main/libkrossmain.la kde_services_DATA = kspreadscripting.desktop diff --git a/kspread/plugins/scripting/kspreadcore/Makefile.am b/kspread/plugins/scripting/kspreadcore/Makefile.am index 2e74c258b..86bcded91 100644 --- a/kspread/plugins/scripting/kspreadcore/Makefile.am +++ b/kspread/plugins/scripting/kspreadcore/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = krosskspreadcore.la krosskspreadcore_la_SOURCES = kspreadcoremodule.cpp krs_doc.cpp krs_sheet.cpp krs_cell.cpp -krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui +krosskspreadcore_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../../lib/kofficecore/.libs/ -lkofficecore -L../../../../lib/kofficeui/.libs/ -lkofficeui krosskspreadcore_la_LIBADD = \ $(LIB_QT) \ $(LIB_KDECORE) \ diff --git a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py index 7afde8b96..e3d6237c0 100755 --- a/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py +++ b/kspread/plugins/scripting/scripts/scripteditor/ScriptEditor.py @@ -651,13 +651,13 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'import qt, tdecore, dcop, dcopext', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("klipper") ]', 'd = dcopext.DCOPApp(apps[0], dcopclient)', 'result,typename,data = d.appclient.call(apps[0],"klipper","getClipboardContents()","")', 'ds = qt.QDataStream(data, qt.IO_ReadOnly)', - 'print "Clipboard content:\\n%s" % kdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING)', + 'print "Clipboard content:\\n%s" % tdecore.dcop_next(ds, TQSTRING_OBJECT_NAME_STRING)', ) class AmarokCollectionInfos: @@ -668,17 +668,17 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', + 'import qt, tdecore, dcop, dcopext', '', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("amarok") ]', 'app = apps[0]', 'd = dcopext.DCOPApp(app, dcopclient)', '', 'def dataToList(data, types = []):', - ' import qt, kdecore', + ' import qt, tdecore', ' ds = qt.QDataStream(data, qt.IO_ReadOnly)', - ' return [ kdecore.dcop_next(ds, t) for t in types ]', + ' return [ tdecore.dcop_next(ds, t) for t in types ]', '', 'for funcname in ["totalAlbums","totalArtists","totalCompilations","totalGenres","totalTracks"]:', ' result,replytype,replydata = d.appclient.call("amarok", "collection", "%s()" % funcname,"")', @@ -693,9 +693,9 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', + 'import qt, tdecore, dcop, dcopext', '', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kopete") ]', 'app = apps[0]', 'd = dcopext.DCOPApp(app, dcopclient)', @@ -704,7 +704,7 @@ class Samples: 'if not state: raise "Failed to call the kopete contacts-function"', '', 'ds = qt.QDataStream(rdata.data(), qt.IO_ReadOnly)', - 'sl = kdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)', + 'sl = tdecore.dcop_next (ds, TQSTRINGLIST_OBJECT_NAME_STRING)', 'print "contacts=%s" % [ str(s) for s in sl ]', ) @@ -716,22 +716,22 @@ class Samples: } def getCode(self): return ( - 'import qt, kdecore, dcop, dcopext', + 'import qt, tdecore, dcop, dcopext', '', 'def dataToList(data, types = []):', - ' import qt, kdecore', + ' import qt, tdecore', ' ds = qt.QDataStream(data, qt.IO_ReadOnly)', - ' return [ kdecore.dcop_next(ds, t) for t in types ]', + ' return [ tdecore.dcop_next(ds, t) for t in types ]', 'def listToData(listdict):', - ' import qt, kdecore', + ' import qt, tdecore', ' ba= qt.QByteArray()', ' ds = qt.QDataStream(ba, qt.IO_WriteOnly)', ' for (typename,value) in listdict:', - ' kdecore.dcop_add (ds, value, typename)', + ' tdecore.dcop_add (ds, value, typename)', ' return ba', '', '# Get the KWord DCOP client.', - 'dcopclient = kdecore.KApplication.dcopClient()', + 'dcopclient = tdecore.KApplication.dcopClient()', 'apps = [ app for app in dcopclient.registeredApplications() if str(app).startswith("kword") ]', 'if len(apps) < 1: raise "No KWord instance is running. Please start KWord before!"', 'appname = apps[0]', diff --git a/kugar/kudesigner/Makefile.am b/kugar/kudesigner/Makefile.am index 281f8a2e7..7db5b31ac 100644 --- a/kugar/kudesigner/Makefile.am +++ b/kugar/kudesigner/Makefile.am @@ -8,19 +8,19 @@ bin_PROGRAMS = lib_LTLIBRARIES = libkudesignercore.la libkudesignercore_la_SOURCES = kudesigner_view.cpp kudesigner_factory.cpp \ kudesigner_doc.cpp -libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkudesignercore_la_LDFLAGS = -avoid-version $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkudesignercore_la_LIBADD = ../kudesigner_lib/libkudesignercommon.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) $(LIB_KOPROPERTY) $(LIB_KIO) $(LIB_KDEPRINT) ## The part kde_module_LTLIBRARIES = libkudesignerpart.la libkudesignerpart_la_SOURCES = kudesigner_part.cpp -libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +libkudesignerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(KDE_RPATH) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts libkudesignerpart_la_LIBADD = libkudesignercore.la $(LIB_KOFFICEUI) $(LIB_KPARTS) $(LIB_KOFFICECORE) -## The kdeinit loadable module -kdeinit_LTLIBRARIES = kudesigner.la +## The tdeinit loadable module +tdeinit_LTLIBRARIES = kudesigner.la kudesigner_la_SOURCES = main.cpp -kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kudesigner_la_LDFLAGS = $(all_libraries) -module -avoid-version -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kudesigner_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kudesigner.desktop diff --git a/kugar/lib/Makefile.am b/kugar/lib/Makefile.am index e6c2af0f6..0544d6562 100644 --- a/kugar/lib/Makefile.am +++ b/kugar/lib/Makefile.am @@ -6,7 +6,7 @@ libkugarlib_la_LIBADD = $(LIB_QT) $(LIB_KDEPRINT) libkugarlib_la_LDFLAGS = $(all_libraries) -version-info 1:2 -no-undefined -# libkugar.la is already reserved for the kdeinit module for kugar (on some platforms), +# libkugar.la is already reserved for the tdeinit module for kugar (on some platforms), # so we have to call the lib differently, e.g. libkugarlib lib_LTLIBRARIES = libkugarlib.la diff --git a/kugar/part/Makefile.am b/kugar/part/Makefile.am index 9d2045535..7c06e335e 100644 --- a/kugar/part/Makefile.am +++ b/kugar/part/Makefile.am @@ -25,8 +25,8 @@ EXTRA_DIST = \ CLEANFILES = kugarpart_meta_unload.cpp -## The kdeinit loadable module and executable -kdeinit_LTLIBRARIES = kugar.la +## The tdeinit loadable module and executable +tdeinit_LTLIBRARIES = kugar.la bin_PROGRAMS = kugar_la_SOURCES = main.cpp kugar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) diff --git a/kword/HACKING b/kword/HACKING index 85363e4ca..6d39a0856 100644 --- a/kword/HACKING +++ b/kword/HACKING @@ -208,7 +208,7 @@ FILES: kwstyle.h - Forwarder to kostyle.h, - they're the same thing now. dummy.cc - empty file to compile as a - - "kdeinit loadable module" + - "tdeinit loadable module" MISC FILES: Docs, hints, etc.: diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp index 65aa9e14d..4f541e541 100644 --- a/kword/KWCanvas.cpp +++ b/kword/KWCanvas.cpp @@ -216,7 +216,7 @@ void KWCanvas::print( TQPainter *painter, KPrinter *printer ) m_currentFrameSetEdit->focusOutEvent(); m_printing = true; KWViewMode *viewMode = new KWViewModePrint( m_doc, this ); - // Use page list specified in kdeprint dialogbox + // Use page list specified in tdeprint dialogbox TQValueList<int> pageList = printer->pageList(); TQProgressDialog progress( i18n( "Printing..." ), i18n( "Cancel" ), pageList.count() + 1, this ); diff --git a/kword/Makefile.am b/kword/Makefile.am index bcf3caa46..e85a214c7 100644 --- a/kword/Makefile.am +++ b/kword/Makefile.am @@ -9,7 +9,7 @@ lib_LTLIBRARIES = libkwmailmerge_interface.la libkwordprivate.la ## The part libkwordpart_la_SOURCES = KWFactoryInit.cpp -libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore +libkwordpart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore libkwordpart_la_LIBADD = libkwordprivate.la ## A lib with all the code @@ -54,14 +54,14 @@ libkwordprivate_la_SOURCES = KWTableFrameSet.cpp KWCanvas.cpp KWFrame.cpp KWForm KWLoadingInfo.cpp -libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore +libkwordprivate_la_LDFLAGS = $(all_libraries) -version-info 4:0 -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 libkwordprivate_la_LIBADD = $(LIB_KOFFICEUI) $(LIB_KOTEXT) ../lib/kformula/libkformulalib.la ./libkwmailmerge_interface.la METASOURCES = AUTO ## The mailmerge interface library libkwmailmerge_interface_la_SOURCES = KWMailMergeDataSource.cpp KWMailMergeDataSource.skel -libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore +libkwmailmerge_interface_la_LDFLAGS = $(all_libraries) -version-info 4:0 -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 libkwmailmerge_interface_la_LIBADD = $(LIB_QT) -lDCOP kwincludedir = $(includedir)/kword kwinclude_HEADERS = KWMailMergeDataSource.h @@ -69,11 +69,11 @@ kwinclude_HEADERS = KWMailMergeDataSource.h kwmailmerge_servicetype_DATA=kwmailmerge.desktop kwmailmerge_servicetypedir=$(kde_servicetypesdir) -## The kdeinit loadable module and the kword binary -kdeinit_LTLIBRARIES = kword.la +## The tdeinit loadable module and the kword binary +tdeinit_LTLIBRARIES = kword.la bin_PROGRAMS = kword_la_SOURCES = main.cpp -kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore +kword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../lib/kofficecore/.libs/ -lkofficecore -L../lib/kofficeui/.libs/ -lkofficeui -L../lib/store/.libs/ -lkstore kword_la_LIBADD = $(LIB_KOFFICECORE) xdg_apps_DATA = kword.desktop diff --git a/kword/mailmerge/Makefile.am b/kword/mailmerge/Makefile.am index e17270090..2239437e7 100644 --- a/kword/mailmerge/Makefile.am +++ b/kword/mailmerge/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kwmailmerge_classic.la ## Plugin encapsulating the (old) internally stored style kwmailmerge_classic_la_SOURCES = KWClassicSerialDataSource.cpp -kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore +kwmailmerge_classic_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore kwmailmerge_classic_la_LIBADD = ../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KOTEXT) METASOURCES = AUTO diff --git a/kword/mailmerge/kabc/Makefile.am b/kword/mailmerge/kabc/Makefile.am index a32c8d3b5..4e49b615c 100644 --- a/kword/mailmerge/kabc/Makefile.am +++ b/kword/mailmerge/kabc/Makefile.am @@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = kwmailmerge_kabc.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_kabc_la_SOURCES = KWMailMergeKABC.cpp KWMailMergeKABCConfig.cpp addresspicker.ui -kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kwmailmerge_kabc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_kabc_la_LIBADD = ../../libkwmailmerge_interface.la $(LIB_KDEUI) $(LIB_KABC) METASOURCES = AUTO diff --git a/kword/mailmerge/kspread/Makefile.am b/kword/mailmerge/kspread/Makefile.am index c1c80fabf..5596cc859 100644 --- a/kword/mailmerge/kspread/Makefile.am +++ b/kword/mailmerge/kspread/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \ kde_module_LTLIBRARIES = kwmailmerge_kspread.la kwmailmerge_kspread_la_SOURCES = kwmailmerge_kspread.cpp kwmailmerge_kspread_config.cpp -kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kwmailmerge_kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_kspread_la_LIBADD = ../../libkwmailmerge_interface.la \ $(top_builddir)/kspread/libkspreadcommon.la $(LIB_KDEUI) diff --git a/kword/mailmerge/sql/Makefile.am b/kword/mailmerge/sql/Makefile.am index 2a5d4aebb..77afd9620 100644 --- a/kword/mailmerge/sql/Makefile.am +++ b/kword/mailmerge/sql/Makefile.am @@ -6,13 +6,13 @@ kde_module_LTLIBRARIES = kwmailmerge_qtsqldb.la kwmailmerge_qtsqldb_power.la ## Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_la_SOURCES = KWQtSqlSerialDataSource.cpp qtsqldatasourceeditor.ui \ KWQtSqlEasyFilter.cpp -kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kwmailmerge_qtsqldb_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_qtsqldb_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) kwmailmerge_qtsqldb_la_COMPILE_FIRST = qtsqlopenwidget.h ## 2. Plugin encapsulating the QT SQL database interface kwmailmerge_qtsqldb_power_la_SOURCES = KWQtSqlPowerSerialDataSource.cpp kwqtsqlpower.ui KWQtSqlPowerSerialDataSource.skel -kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kwmailmerge_qtsqldb_power_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lDCOP -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kwmailmerge_qtsqldb_power_la_LIBADD = libmailmergesqlcommon.la ../../libkwmailmerge_interface.la $(LIB_KDEUI) kwmailmerge_qtsqldb_power_la_COMPILE_FIRST = qtsqlopenwidget.h diff --git a/kword/tests/oasis-kword.sh b/kword/tests/oasis-kword.sh index d68de47c2..e0e46700b 100644 --- a/kword/tests/oasis-kword.sh +++ b/kword/tests/oasis-kword.sh @@ -16,7 +16,7 @@ oldextension=kwd oasisextension=odt oasismimetype=application/vnd.oasis.opendocument.text -# dcopstart won't handle a relative path (kdeinit has a different cwd) +# dcopstart won't handle a relative path (tdeinit has a different cwd) # so make it absolute if echo "$input" | grep -v '^/' >/dev/null 2>&1; then input="$PWD/$input" diff --git a/lib/Makefile.am b/lib/Makefile.am index 35fc91505..4907df59e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,5 +24,5 @@ messages: # $(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot # rm -f kformula/symbolnames.cc -DOXYGEN_REFERENCES = dcop kprint kdeui kparts +DOXYGEN_REFERENCES = dcop kprint tdeui kparts include ../admin/Doxyfile.am diff --git a/lib/kdoc.rules b/lib/kdoc.rules index 818da2dce..e70b58a0b 100644 --- a/lib/kdoc.rules +++ b/lib/kdoc.rules @@ -7,14 +7,14 @@ kde_MODULES = store kofficecore kofficeui kotext store_FILES = *.h -store_LIBS = -lkdecore -lqt +store_LIBS = -ltdecore -lqt kofficecore_FILES = *.h -kofficecore_LIBS = -lkparts -lkdecore -lqt +kofficecore_LIBS = -lkparts -ltdecore -lqt kofficeui_FILES = *.h -kofficeui_LIBS = -lkofficecore -lkdeui -lkdecore -lqt +kofficeui_LIBS = -lkofficecore -ltdeui -ltdecore -lqt kotext_FILES = *.h -kotext_LIBS = -lkofficecore -lkdeui -lkdecore -lqt +kotext_LIBS = -lkofficecore -ltdeui -ltdecore -lqt diff --git a/lib/kformula/Makefile.am b/lib/kformula/Makefile.am index 83ba71984..eb795cc38 100644 --- a/lib/kformula/Makefile.am +++ b/lib/kformula/Makefile.am @@ -4,7 +4,7 @@ INCLUDES= $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) $(all_includes) SUBDIRS = pics fonts dtd ####### -# We have to name it kformulalib, not just kformula, since that's the name of the kdeinit module for kformula. +# We have to name it kformulalib, not just kformula, since that's the name of the tdeinit module for kformula. lib_LTLIBRARIES = libkformulalib.la libkformulalib_la_SOURCES = basicelement.cc contextstyle.cc formulacursor.cc \ diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index 5e4567de9..94bc9bbbe 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -1253,7 +1253,7 @@ void KoMainWindow::slotFilePrintPreview() printer.setOutputFileName( tmpFile.name() ); int oldNumCopies = printer.numCopies(); printer.setNumCopies( 1 ); - // Disable kdeprint's own preview, we'd get two. This shows that KPrinter needs + // Disable tdeprint's own preview, we'd get two. This shows that KPrinter needs // a "don't use the previous settings" mode. The current way is really too much of a hack. TQString oldKDEPreview = printer.option( "kde-preview" ); printer.setOption( "kde-preview", "0" ); diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am index 564611150..2312578df 100644 --- a/lib/kofficecore/Makefile.am +++ b/lib/kofficecore/Makefile.am @@ -34,7 +34,7 @@ libkofficecore_la_SOURCES = KoDocument.cpp \ KoSpeaker.cpp KoOasisLoadingContext.cpp \ KoRect.cpp -libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio +libkofficecore_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio include_HEADERS = KoContainerHandler.h \ KoFilter.h KoFilterChain.h \ @@ -59,7 +59,7 @@ noinst_HEADERS = KoDocument_p.h KoFilterManager_p.h \ kodocinfopropspage_la_SOURCES = KoDocInfoPropsFactory.cpp kodocinfopropspage_la_LIBADD = ./libkofficecore.la -kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio +kodocinfopropspage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio METASOURCES = AUTO diff --git a/lib/kopainter/svgpathparser.cc b/lib/kopainter/svgpathparser.cc index 9295cdd29..8d9375fea 100644 --- a/lib/kopainter/svgpathparser.cc +++ b/lib/kopainter/svgpathparser.cc @@ -405,7 +405,7 @@ SVGPathParser::parseSVG( const TQString &s, bool process ) // This works by converting the SVG arc to "simple" beziers. // For each bezier found a svgToCurve call is done. -// Adapted from Niko's code in kdelibs/kdecore/svgicons. +// Adapted from Niko's code in kdelibs/tdecore/svgicons. // Maybe this can serve in some shared lib? (Rob) void SVGPathParser::calculateArc(bool relative, double &curx, double &cury, double angle, double x, double y, double r1, double r2, bool largeArcFlag, bool sweepFlag) diff --git a/lib/koproperty/test/Makefile.am b/lib/koproperty/test/Makefile.am index 3529798ce..edd3885b1 100644 --- a/lib/koproperty/test/Makefile.am +++ b/lib/koproperty/test/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO noinst_PROGRAMS = propertytest propertytest_SOURCES = main.cpp test.cpp -propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +propertytest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor propertytest_LDADD = $(LIB_KOPROPERTY) # this is where the shell's XML-GUI resource file goes diff --git a/lib/kotext/kohyphen/Makefile.am b/lib/kotext/kohyphen/Makefile.am index e72b6a743..915423c27 100644 --- a/lib/kotext/kohyphen/Makefile.am +++ b/lib/kotext/kohyphen/Makefile.am @@ -18,4 +18,4 @@ check_PROGRAMS = kohyphentest kohyphentest_SOURCES = kohyphentest.cpp kohyphentest_LDADD = ./libkohyphen.la $(LIB_QT) $(LIB_KDECORE) -kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +kohyphentest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/lib/kotext/tests/Makefile.am b/lib/kotext/tests/Makefile.am index 826d7b93b..14c6f7a04 100644 --- a/lib/kotext/tests/Makefile.am +++ b/lib/kotext/tests/Makefile.am @@ -8,7 +8,7 @@ check_PROGRAMS = kotextformattertest kobordertest kovariabletest TESTS = kotextformattertest kovariabletest LDADD = ../libkotext.la -AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor kobordertest_SOURCES = kobordertest.cpp kotextformattertest_SOURCES = kotextformattertest.cpp diff --git a/lib/kross/runner/Makefile.am b/lib/kross/runner/Makefile.am index a30494ccb..4de9bed71 100644 --- a/lib/kross/runner/Makefile.am +++ b/lib/kross/runner/Makefile.am @@ -6,6 +6,6 @@ bin_PROGRAMS = krossrunner krossrunner_SOURCES = main.cpp krossrunner_LDADD = $(LIB_QT) $(LIB_KDECORE) ../api/libkrossapi.la ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +krossrunner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kross/test/Makefile.am b/lib/kross/test/Makefile.am index 6022adf7f..04fa1c711 100644 --- a/lib/kross/test/Makefile.am +++ b/lib/kross/test/Makefile.am @@ -12,6 +12,6 @@ krosstest_LDADD = \ ../main/libkrossmain.la INCLUDES = $(KROSS_INCLUDES) $(all_includes) -krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +krosstest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor SUBDIRS = . METASOURCES = AUTO diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am index b257f4352..a7af75d4d 100644 --- a/lib/kwmf/Makefile.am +++ b/lib/kwmf/Makefile.am @@ -2,7 +2,7 @@ INCLUDES= $(KOFFICECORE_INCLUDES) -I$(srcdir) $(all_includes) libkwmf_la_LDFLAGS = $(all_libraries) -version-info 3:0:0 -no-undefined -# We use kdecore for kdDebug :) +# We use tdecore for kdDebug :) libkwmf_la_LIBADD = $(LIB_KDECORE) ####### Files diff --git a/plugins/scan/Makefile.am b/plugins/scan/Makefile.am index cf50d5170..0af404c96 100644 --- a/plugins/scan/Makefile.am +++ b/plugins/scan/Makefile.am @@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = kofficescan.la kofficescan_la_SOURCES = scan.cpp noinst_HEADERS = scan.h -kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts +kofficescan_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts kofficescan_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KOFFICECORE) kofficescan_la_METASOURCES = AUTO diff --git a/tools/converter/Makefile.am b/tools/converter/Makefile.am index eef1da0a1..14153c3ea 100644 --- a/tools/converter/Makefile.am +++ b/tools/converter/Makefile.am @@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(all_includes) bin_PROGRAMS = koconverter koconverter_SOURCES = koconverter.cpp -koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor +koconverter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor koconverter_LDADD = $(top_builddir)/lib/kofficecore/libkofficecore.la METASOURCES = AUTO diff --git a/tools/kfile-plugins/abiword/Makefile.am b/tools/kfile-plugins/abiword/Makefile.am index d55350c0a..efeee86fd 100644 --- a/tools/kfile-plugins/abiword/Makefile.am +++ b/tools/kfile-plugins/abiword/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_abiword.h kde_module_LTLIBRARIES = kfile_abiword.la kfile_abiword_la_SOURCES = kfile_abiword.cpp -kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kfile_abiword_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_abiword_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/gnumeric/Makefile.am b/tools/kfile-plugins/gnumeric/Makefile.am index 1f7c52bd5..94c90e977 100644 --- a/tools/kfile-plugins/gnumeric/Makefile.am +++ b/tools/kfile-plugins/gnumeric/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_gnumeric.h kde_module_LTLIBRARIES = kfile_gnumeric.la kfile_gnumeric_la_SOURCES = kfile_gnumeric.cpp -kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kfile_gnumeric_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_gnumeric_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/koffice/Makefile.am b/tools/kfile-plugins/koffice/Makefile.am index 68d288840..a4770ced3 100644 --- a/tools/kfile-plugins/koffice/Makefile.am +++ b/tools/kfile-plugins/koffice/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_koffice.h kde_module_LTLIBRARIES = kfile_koffice.la kfile_koffice_la_SOURCES = kfile_koffice.cpp -kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kfile_koffice_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_koffice_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kfile-plugins/ooo/Makefile.am b/tools/kfile-plugins/ooo/Makefile.am index 47be5cd08..8c785ef50 100644 --- a/tools/kfile-plugins/ooo/Makefile.am +++ b/tools/kfile-plugins/ooo/Makefile.am @@ -9,7 +9,7 @@ noinst_HEADERS = kfile_ooo.h kde_module_LTLIBRARIES = kfile_ooo.la kfile_ooo_la_SOURCES = kfile_ooo.cpp -kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore +kfile_ooo_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../../lib/kofficecore/.libs/ -lkofficecore -L../../../lib/kofficeui/.libs/ -lkofficeui -L../../../lib/store/.libs/ -lkstore kfile_ooo_la_LIBADD = $(LIB_KOFFICECORE) # let automoc handle all of the meta source files (moc) diff --git a/tools/kthesaurus/Makefile.am b/tools/kthesaurus/Makefile.am index 97d312fe9..00fa65200 100644 --- a/tools/kthesaurus/Makefile.am +++ b/tools/kthesaurus/Makefile.am @@ -3,7 +3,7 @@ INCLUDES = $(KOFFICECORE_INCLUDES) $(all_includes) bin_PROGRAMS = lib_LTLIBRARIES = -kdeinit_LTLIBRARIES = kthesaurus.la +tdeinit_LTLIBRARIES = kthesaurus.la kthesaurus_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version kthesaurus_la_SOURCES = main.cc diff --git a/tools/thumbnail/Makefile.am b/tools/thumbnail/Makefile.am index f9f08ac6f..f63fd83cf 100644 --- a/tools/thumbnail/Makefile.am +++ b/tools/thumbnail/Makefile.am @@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = clipartthumbnail.la kofficethumbnail.la clipartthumbnail_la_SOURCES = clipartcreator.cpp clipartthumbnail_la_LIBADD = $(LIB_KOFFICECORE) # for KoClipartCollection -clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore +clipartthumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore kofficethumbnail_la_SOURCES = kofficecreator.cpp kofficethumbnail_la_LIBADD = $(LIB_KOFFICECORE) -kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -lkdecore -lkdeui $(LIB_QT) -lkjs -lkdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore +kofficethumbnail_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -lkio -lkparts -L../../lib/kofficecore/.libs/ -lkofficecore -L../../lib/kofficeui/.libs/ -lkofficeui -L../../lib/store/.libs/ -lkstore # otherofficethumbnail.desktop is currently not installed, as it gives too many problems kde_services_DATA = clipartthumbnail.desktop kofficethumbnail.desktop |