From 32f87018b814ae05508e95601bda41a2f9e126a4 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 6 Nov 2011 21:32:14 -0600 Subject: Rename additional instances of KDE to TDE --- acinclude.m4 | 24 +++++++++++----------- digikam/digikam/Makefile.am | 4 ++-- digikam/libs/curves/Makefile.am | 2 +- digikam/libs/dialogs/Makefile.am | 4 ++-- digikam/libs/dimg/Makefile.am | 2 +- digikam/libs/dimg/filters/Makefile.am | 2 +- digikam/libs/dmetadata/Makefile.am | 2 +- digikam/libs/greycstoration/Makefile.am | 2 +- digikam/libs/histogram/Makefile.am | 2 +- digikam/libs/imageproperties/Makefile.am | 6 +++--- digikam/libs/jpegutils/Makefile.am | 2 +- digikam/libs/levels/Makefile.am | 2 +- digikam/libs/themeengine/Makefile.am | 2 +- digikam/libs/threadimageio/Makefile.am | 2 +- digikam/libs/thumbbar/Makefile.am | 2 +- digikam/libs/whitebalance/Makefile.am | 2 +- digikam/libs/widgets/Makefile.am | 2 +- digikam/libs/widgets/common/Makefile.am | 2 +- digikam/libs/widgets/iccprofiles/Makefile.am | 2 +- digikam/libs/widgets/imageplugins/Makefile.am | 2 +- digikam/libs/widgets/metadata/Makefile.am | 2 +- digikam/showfoto/setup/Makefile.am | 2 +- digikam/themedesigner/Makefile.am | 4 ++-- digikam/utilities/batch/Makefile.am | 2 +- digikam/utilities/cameragui/Makefile.am | 2 +- digikam/utilities/imageeditor/editor/Makefile.am | 4 ++-- .../utilities/imageeditor/rawimport/Makefile.am | 2 +- digikam/utilities/imageeditor/tools/Makefile.am | 2 +- digikam/utilities/lighttable/Makefile.am | 2 +- digikam/utilities/setup/Makefile.am | 2 +- digikam/utilities/slideshow/Makefile.am | 2 +- 31 files changed, 48 insertions(+), 48 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index 85f1606f..6e1794d1 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2092,8 +2092,8 @@ if test $kde_qtver = 3; then *) lib_kded="" ;; esac AC_SUBST(LIB_KDED, $lib_kded) - AC_SUBST(LIB_KDECORE, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_SMB, "-lsmb") @@ -2102,9 +2102,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, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_KUTILS, "-lkutils") - AC_SUBST(LIB_KDEPIM, "-ltdepim") + AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KDNSSD, "-lkdnssd") @@ -2113,8 +2113,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, "-ltdecore") - AC_SUBST(LIB_KDEUI, "-ltdeui") + AC_SUBST(LIB_TDECORE, "-ltdecore") + AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_SMB, "-lsmb") @@ -2123,13 +2123,13 @@ 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, "-ltdeprint") + AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - 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)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") + AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") + AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") + AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") fi ]) diff --git a/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am index de5dabbc..731ba5ab 100644 --- a/digikam/digikam/Makefile.am +++ b/digikam/digikam/Makefile.am @@ -144,8 +144,8 @@ bin_PROGRAMS = digikam digikam_SOURCES = main.cpp digikam_LDADD = $(LIB_QT) \ - $(LIB_KDECORE) \ - $(LIB_KDEUI) \ + $(LIB_TDECORE) \ + $(LIB_TDEUI) \ $(LIBSOCKET) \ $(LIB_KFILE) \ $(LIB_KPARTS) \ diff --git a/digikam/libs/curves/Makefile.am b/digikam/libs/curves/Makefile.am index 37d20c28..970460d2 100644 --- a/digikam/libs/curves/Makefile.am +++ b/digikam/libs/curves/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libcurves.la libcurves_la_SOURCES = imagecurves.cpp -libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/dialogs/Makefile.am b/digikam/libs/dialogs/Makefile.am index 48148fc2..83b36c76 100644 --- a/digikam/libs/dialogs/Makefile.am +++ b/digikam/libs/dialogs/Makefile.am @@ -6,14 +6,14 @@ noinst_LTLIBRARIES = libdialog.la libdialogshowfoto.la libdialogshowfoto_la_SOURCES = iccprofileinfodlg.cpp imagedialog.cpp rawcameradlg.cpp -libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # Dialogs collection used by digiKam. libdialog_la_SOURCES = deletedialogbase.ui imagedialog.cpp rawcameradlg.cpp \ iccprofileinfodlg.cpp deletedialog.cpp dprogressdlg.cpp -libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/digikam \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/dimg/Makefile.am b/digikam/libs/dimg/Makefile.am index 1faa826d..65c9eed2 100644 --- a/digikam/libs/dimg/Makefile.am +++ b/digikam/libs/dimg/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libdimg.la libdimg_la_SOURCES = dimg.cpp dimgscale.cpp dcolor.cpp dcolorcomposer.cpp ddebug.cpp -libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libdimg_la_LIBADD = $(top_builddir)/digikam/libs/histogram/libhistogram.la \ $(top_builddir)/digikam/libs/levels/liblevels.la \ diff --git a/digikam/libs/dimg/filters/Makefile.am b/digikam/libs/dimg/filters/Makefile.am index e7c2b4db..19820b44 100644 --- a/digikam/libs/dimg/filters/Makefile.am +++ b/digikam/libs/dimg/filters/Makefile.am @@ -6,7 +6,7 @@ libdimgfilters_la_SOURCES = bcgmodifier.cpp hslmodifier.cpp icctransform.cpp \ dimgimagefilters.cpp dimgthreadedfilter.cpp \ dimggaussianblur.cpp dimgsharpen.cpp colormodifier.cpp -libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/levels \ diff --git a/digikam/libs/dmetadata/Makefile.am b/digikam/libs/dmetadata/Makefile.am index 14e347ba..3faf1a47 100644 --- a/digikam/libs/dmetadata/Makefile.am +++ b/digikam/libs/dmetadata/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libdmetadata.la libdmetadata_la_SOURCES = dmetadata.cpp -libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libdmetadata_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) diff --git a/digikam/libs/greycstoration/Makefile.am b/digikam/libs/greycstoration/Makefile.am index f2e0e920..48a92629 100644 --- a/digikam/libs/greycstoration/Makefile.am +++ b/digikam/libs/greycstoration/Makefile.am @@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libgreycstoration.la libgreycstoration_la_SOURCES = greycstorationiface.cpp greycstorationwidget.cpp -libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/dimg/filters \ diff --git a/digikam/libs/histogram/Makefile.am b/digikam/libs/histogram/Makefile.am index f43ad9c0..86fdbec8 100644 --- a/digikam/libs/histogram/Makefile.am +++ b/digikam/libs/histogram/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libhistogram.la libhistogram_la_SOURCES = imagehistogram.cpp -libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/digikam \ diff --git a/digikam/libs/imageproperties/Makefile.am b/digikam/libs/imageproperties/Makefile.am index 6ce0dfa9..dc74ae60 100644 --- a/digikam/libs/imageproperties/Makefile.am +++ b/digikam/libs/imageproperties/Makefile.am @@ -7,7 +7,7 @@ noinst_LTLIBRARIES = libimagepropertiesshowfoto.la libimagepropertiesdigikam.la libimagepropertiescamgui_la_SOURCES = imagepropertiessidebarcamgui.cpp cameraitempropertiestab.cpp -libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # Image Properties SideBar for Showfoto (without digiKam database support). @@ -21,7 +21,7 @@ libimagepropertiesshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/widgets/libw $(top_builddir)/digikam/libs/threadimageio/libthreadimageio.la \ $(top_builddir)/digikam/libs/histogram/libhistogram.la -libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor # Image Properties SideBar for digiKam Main interface and Image Editor (digiKam database support). @@ -31,7 +31,7 @@ libimagepropertiesdigikam_la_SOURCES = imagedescedittab.cpp imagepropertiessideb imagepropertiescolorstab.cpp \ navigatebarwidget.cpp imagepropertiestab.cpp navigatebartab.cpp -libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/themeengine \ diff --git a/digikam/libs/jpegutils/Makefile.am b/digikam/libs/jpegutils/Makefile.am index 2b8ca349..7a9e8829 100644 --- a/digikam/libs/jpegutils/Makefile.am +++ b/digikam/libs/jpegutils/Makefile.am @@ -17,6 +17,6 @@ noinst_LTLIBRARIES = libjpegutils.la libjpegutils_la_SOURCES = jpegutils.cpp transupp.cpp -libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libjpegutils_la_LIBADD = $(LIBJPEG) diff --git a/digikam/libs/levels/Makefile.am b/digikam/libs/levels/Makefile.am index 612a6cd5..2d05679f 100644 --- a/digikam/libs/levels/Makefile.am +++ b/digikam/libs/levels/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = liblevels.la liblevels_la_SOURCES = imagelevels.cpp -liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/histogram \ diff --git a/digikam/libs/themeengine/Makefile.am b/digikam/libs/themeengine/Makefile.am index 4197f901..7bd1e959 100644 --- a/digikam/libs/themeengine/Makefile.am +++ b/digikam/libs/themeengine/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthemeengine.la libthemeengine_la_SOURCES = theme.cpp themeengine.cpp texture.cpp -libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/digikam \ diff --git a/digikam/libs/threadimageio/Makefile.am b/digikam/libs/threadimageio/Makefile.am index 9c75f68b..ec1f4635 100644 --- a/digikam/libs/threadimageio/Makefile.am +++ b/digikam/libs/threadimageio/Makefile.am @@ -12,7 +12,7 @@ libthreadimageio_la_SOURCES = loadsavethread.cpp \ loadingcache.cpp \ loadingcacheinterface.cpp -libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/dimg/loaders \ diff --git a/digikam/libs/thumbbar/Makefile.am b/digikam/libs/thumbbar/Makefile.am index 8894cccf..58da7073 100644 --- a/digikam/libs/thumbbar/Makefile.am +++ b/digikam/libs/thumbbar/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libthumbbar.la libthumbbar_la_SOURCES = thumbbar.cpp thumbnailjob.cpp -libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dimg \ -I$(top_srcdir)/digikam/libs/dmetadata \ diff --git a/digikam/libs/whitebalance/Makefile.am b/digikam/libs/whitebalance/Makefile.am index 025ff3b7..d1762bda 100644 --- a/digikam/libs/whitebalance/Makefile.am +++ b/digikam/libs/whitebalance/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwhitebalance.la libwhitebalance_la_SOURCES = whitebalance.cpp -libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/widgets/Makefile.am b/digikam/libs/widgets/Makefile.am index fe8d6c1b..8b4582b8 100644 --- a/digikam/libs/widgets/Makefile.am +++ b/digikam/libs/widgets/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libwidgets.la libwidgets_la_SOURCES = -libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libwidgets_la_LIBADD = $(top_builddir)/digikam/libs/widgets/metadata/libmetadatawidgets.la \ $(top_builddir)/digikam/libs/widgets/iccprofiles/libiccprofileswidgets.la \ diff --git a/digikam/libs/widgets/common/Makefile.am b/digikam/libs/widgets/common/Makefile.am index d516efb1..f7d6b6ee 100644 --- a/digikam/libs/widgets/common/Makefile.am +++ b/digikam/libs/widgets/common/Makefile.am @@ -7,7 +7,7 @@ libcommonwidgets_la_SOURCES = histogramwidget.cpp colorgradientwidget.cpp curves statuszoombar.cpp statusnavigatebar.cpp statusprogressbar.cpp searchtextbar.cpp \ dcursortracker.cpp paniconwidget.cpp previewwidget.cpp splashscreen.cpp statusled.cpp -libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/histogram \ -I$(top_srcdir)/digikam/libs/curves \ diff --git a/digikam/libs/widgets/iccprofiles/Makefile.am b/digikam/libs/widgets/iccprofiles/Makefile.am index 32ab7dbc..bda7635b 100644 --- a/digikam/libs/widgets/iccprofiles/Makefile.am +++ b/digikam/libs/widgets/iccprofiles/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libiccprofileswidgets.la libiccprofileswidgets_la_SOURCES = iccprofilewidget.cpp cietonguewidget.cpp iccpreviewwidget.cpp -libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libiccprofileswidgets_la_LIBADD = $(top_builddir)/digikam/libs/lprof/liblprof.la diff --git a/digikam/libs/widgets/imageplugins/Makefile.am b/digikam/libs/widgets/imageplugins/Makefile.am index 4b5390df..c203ed34 100644 --- a/digikam/libs/widgets/imageplugins/Makefile.am +++ b/digikam/libs/widgets/imageplugins/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libimagepluginswidgets.la libimagepluginswidgets_la_SOURCES = imageregionwidget.cpp imagepaniconwidget.cpp imageguidewidget.cpp \ imagewidget.cpp listboxpreviewitem.cpp imagepanelwidget.cpp -libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/libs/widgets/metadata/Makefile.am b/digikam/libs/widgets/metadata/Makefile.am index dfe0e33e..73740fbb 100644 --- a/digikam/libs/widgets/metadata/Makefile.am +++ b/digikam/libs/widgets/metadata/Makefile.am @@ -6,7 +6,7 @@ libmetadatawidgets_la_SOURCES = metadatalistview.cpp metadatalistviewitem.cpp me iptcwidget.cpp exifwidget.cpp mdkeylistviewitem.cpp \ makernotewidget.cpp gpswidget.cpp worldmapwidget.cpp -libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/showfoto/setup/Makefile.am b/digikam/showfoto/setup/Makefile.am index c6e5ada2..2f809fac 100644 --- a/digikam/showfoto/setup/Makefile.am +++ b/digikam/showfoto/setup/Makefile.am @@ -8,7 +8,7 @@ noinst_LTLIBRARIES = libsetup.la libsetup_la_SOURCES = setup.cpp setupeditor.cpp setuptooltip.cpp -libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libsetup_la_LIBADD = $(top_builddir)/digikam/utilities/setup/libshowfotosetup.la diff --git a/digikam/themedesigner/Makefile.am b/digikam/themedesigner/Makefile.am index dc12bdb6..1774c8ef 100644 --- a/digikam/themedesigner/Makefile.am +++ b/digikam/themedesigner/Makefile.am @@ -13,7 +13,7 @@ bin_PROGRAMS = digikamthemedesigner digikamthemedesigner_SOURCES = main.cpp mainwindow.cpp themedicongroupitem.cpp \ themediconitem.cpp themediconview.cpp -digikamthemedesigner_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) \ +digikamthemedesigner_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) +digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KUTILS) diff --git a/digikam/utilities/batch/Makefile.am b/digikam/utilities/batch/Makefile.am index 4fea6e48..df9dea25 100644 --- a/digikam/utilities/batch/Makefile.am +++ b/digikam/utilities/batch/Makefile.am @@ -15,6 +15,6 @@ noinst_LTLIBRARIES = libbatch.la libbatch_la_SOURCES = batchthumbsgenerator.cpp batchalbumssyncmetadata.cpp \ imageinfojob.cpp imageinfoalbumsjob.cpp batchsyncmetadata.cpp -libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/digikam/utilities/cameragui/Makefile.am b/digikam/utilities/cameragui/Makefile.am index 6eb35a64..c2a8e78f 100644 --- a/digikam/utilities/cameragui/Makefile.am +++ b/digikam/utilities/cameragui/Makefile.am @@ -13,7 +13,7 @@ libcameragui_la_SOURCES = gpcamera.cpp cameraui.cpp cameraiconview.cpp \ camerainfodialog.cpp albumselectdialog.cpp \ camerafolderdialog.cpp freespacewidget.cpp -libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor libcameragui_la_LIBADD = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \ $(LIB_GPHOTO) $(LIBJPEG) diff --git a/digikam/utilities/imageeditor/editor/Makefile.am b/digikam/utilities/imageeditor/editor/Makefile.am index b9fad070..d3d5bf78 100644 --- a/digikam/utilities/imageeditor/editor/Makefile.am +++ b/digikam/utilities/imageeditor/editor/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libdimgeditor.la libshowfoto.la libdimgeditor_la_SOURCES = editorwindow.cpp imageiface.cpp imagewindow.cpp editorstackview.cpp \ editortooliface.cpp editortool.cpp editortoolsettings.cpp -libdimgeditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) +libdimgeditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) libdimgeditor_la_LIBADD = $(top_builddir)/digikam/utilities/imageeditor/tools/libdimgeditortools.la \ $(top_builddir)/digikam/utilities/imageeditor/rawimport/librawimport.la @@ -13,7 +13,7 @@ libdimgeditor_la_LIBADD = $(top_builddir)/digikam/utilities/imageeditor/tools/li libshowfoto_la_SOURCES = editorwindow.cpp imageiface.cpp editorstackview.cpp \ editortooliface.cpp editortool.cpp editortoolsettings.cpp -libshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) +libshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) libshowfoto_la_LIBADD = $(top_builddir)/digikam/libs/dimg/libdimg.la \ $(top_builddir)/digikam/libs/dialogs/libdialogshowfoto.la \ diff --git a/digikam/utilities/imageeditor/rawimport/Makefile.am b/digikam/utilities/imageeditor/rawimport/Makefile.am index c3b19796..c80bd079 100644 --- a/digikam/utilities/imageeditor/rawimport/Makefile.am +++ b/digikam/utilities/imageeditor/rawimport/Makefile.am @@ -5,7 +5,7 @@ noinst_LTLIBRARIES = librawimport.la librawimport_la_SOURCES = rawpreview.cpp rawsettingsbox.cpp rawimport.cpp \ rawpostprocessing.cpp -librawimport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) +librawimport_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) INCLUDES= -I$(top_srcdir)/digikam/digikam \ -I$(top_srcdir)/digikam/utilities/imageeditor/editor \ diff --git a/digikam/utilities/imageeditor/tools/Makefile.am b/digikam/utilities/imageeditor/tools/Makefile.am index d49ced08..66196c41 100644 --- a/digikam/utilities/imageeditor/tools/Makefile.am +++ b/digikam/utilities/imageeditor/tools/Makefile.am @@ -4,7 +4,7 @@ noinst_LTLIBRARIES = libdimgeditortools.la libdimgeditortools_la_SOURCES = imageresize.cpp imageprint.cpp -libdimgeditortools_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KDEPRINT) +libdimgeditortools_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TDEPRINT) INCLUDES= -I$(top_srcdir)/digikam/digikam \ -I$(top_srcdir)/digikam/libs/dimg \ diff --git a/digikam/utilities/lighttable/Makefile.am b/digikam/utilities/lighttable/Makefile.am index 55cb8c6a..b8362324 100644 --- a/digikam/utilities/lighttable/Makefile.am +++ b/digikam/utilities/lighttable/Makefile.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES = liblighttable.la liblighttable_la_SOURCES = lighttablebar.cpp lighttablewindow.cpp lighttablepreview.cpp \ lighttableview.cpp -liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor rcdir = $(kde_datadir)/digikam rc_DATA = lighttablewindowui.rc diff --git a/digikam/utilities/setup/Makefile.am b/digikam/utilities/setup/Makefile.am index 2b07df97..cd7473ee 100644 --- a/digikam/utilities/setup/Makefile.am +++ b/digikam/utilities/setup/Makefile.am @@ -25,5 +25,5 @@ libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_GPHOTO) libshowfotosetup_la_SOURCES = setupiofiles.cpp setupdcraw.cpp \ setupicc.cpp setupslideshow.cpp -libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor diff --git a/digikam/utilities/slideshow/Makefile.am b/digikam/utilities/slideshow/Makefile.am index 411a240a..3875f020 100644 --- a/digikam/utilities/slideshow/Makefile.am +++ b/digikam/utilities/slideshow/Makefile.am @@ -12,6 +12,6 @@ noinst_LTLIBRARIES = libslideshow.la libslideshow_la_SOURCES = toolbar.cpp slideshow.cpp -libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -- cgit v1.2.3