diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:06 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-17 23:20:06 +0900 |
| commit | f73b4ec3b6fec1705fda86abf5ffa62a1ecbfc02 (patch) | |
| tree | 2c130447545d74639365173451ea5a3a3b2428ac | |
| parent | 62eb0b505a47f1078508ab338e07e812721e54d7 (diff) | |
| download | digikam-f73b4ec3b6fec1705fda86abf5ffa62a1ecbfc02.tar.gz digikam-f73b4ec3b6fec1705fda86abf5ffa62a1ecbfc02.zip | |
LIB_QT -> LIB_TQT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
56 files changed, 73 insertions, 73 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index aa314d0..8fca7a0 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1601,19 +1601,19 @@ AC_PATH_QT_MOC_UIC KDE_CHECK_QT_JPEG if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG) -lXext $(LIB_X11) $(LIBSM)' else -LIB_QT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' +LIB_TQT="$kde_int_qt $LIBJPEG_QT "'$(LIBZ) $(LIBPNG)' fi -test -z "$KDE_MT_LIBS" || LIB_QT="$LIB_QT $KDE_MT_LIBS" +test -z "$KDE_MT_LIBS" || LIB_TQT="$LIB_TQT $KDE_MT_LIBS" for a in $qt_libdir/lib`echo ${kde_int_qt} | sed 's,^-l,,'`_incremental.*; do if test -e "$a"; then - LIB_QT="$LIB_QT ${kde_int_qt}_incremental" + LIB_TQT="$LIB_TQT ${kde_int_qt}_incremental" break fi done -AC_SUBST(LIB_QT) +AC_SUBST(LIB_TQT) AC_SUBST(LIB_QPE) AC_SUBST(kde_qtver) @@ -2125,7 +2125,7 @@ elif test $kde_qtver = 2; then AC_SUBST(LIB_TDEPARTS, "-ltdeparts") AC_SUBST(LIB_TDEPRINT, "-ltdeprint") else - AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") + AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_TQT)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)") @@ -5470,8 +5470,8 @@ AC_DEFUN([AC_PATH_QTOPIA], AC_MSG_CHECKING([for Qtopia]) - LIB_QTOPIA="-lqpe" - AC_SUBST(LIB_QTOPIA) + LIB_TQTOPIA="-lqpe" + AC_SUBST(LIB_TQTOPIA) kde_qtopia_dirs="$QPEDIR /opt/Qtopia" @@ -5518,7 +5518,7 @@ is required.]) CXXFLAGS="$CXXFLAGS -I$qtopia_incdir $all_includes" LDFLAGS="$LDFLAGS $QT_LDFLAGS $all_libraries $USER_LDFLAGS $KDE_MT_LDFLAGS" - LIBS="$LIBS $LIB_QTOPIA $LIBQT" + LIBS="$LIBS $LIB_TQTOPIA $LIBQT" cat > conftest.$ac_ext <<EOF #include "confdefs.h" diff --git a/digikam/digikam/Makefile.am b/digikam/digikam/Makefile.am index 94eff16..6705dcb 100644 --- a/digikam/digikam/Makefile.am +++ b/digikam/digikam/Makefile.am @@ -111,7 +111,7 @@ libdigikam_la_SOURCES = kdateedit.cpp \ # if shared libsqlite3 is used LIB_SQLITE3_LOCAL is null. libdigikam_la_LIBADD = $(LIB_SQLITE3) \ $(LIB_SQLITE3_LOCAL) \ - $(LIB_QT) \ + $(LIB_TQT) \ $(LIB_TDEPARTS) \ $(LIB_TDEIO) \ $(LIB_TDEABC) \ @@ -145,7 +145,7 @@ bin_PROGRAMS = digikam digikam_SOURCES = main.cpp -digikam_LDADD = $(LIB_QT) \ +digikam_LDADD = $(LIB_TQT) \ $(LIB_TDECORE) \ $(LIB_TDEUI) \ $(LIBSOCKET) \ diff --git a/digikam/imageplugins/adjustcurves/Makefile.am b/digikam/imageplugins/adjustcurves/Makefile.am index a14dcec..94cb29e 100644 --- a/digikam/imageplugins/adjustcurves/Makefile.am +++ b/digikam/imageplugins/adjustcurves/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_adjustcurves_la_SOURCES = imageplugin_adjustcurves.cpp \ digikamimageplugin_adjustcurves_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_adjustcurves_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_adjustcurves.desktop diff --git a/digikam/imageplugins/adjustlevels/Makefile.am b/digikam/imageplugins/adjustlevels/Makefile.am index b830f61..09b192e 100644 --- a/digikam/imageplugins/adjustlevels/Makefile.am +++ b/digikam/imageplugins/adjustlevels/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_adjustlevels_la_SOURCES = imageplugin_adjustlevels.cpp \ digikamimageplugin_adjustlevels_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_adjustlevels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_adjustlevels.desktop diff --git a/digikam/imageplugins/antivignetting/Makefile.am b/digikam/imageplugins/antivignetting/Makefile.am index 22b17ce..b08eac9 100644 --- a/digikam/imageplugins/antivignetting/Makefile.am +++ b/digikam/imageplugins/antivignetting/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_antivignetting_la_SOURCES = imageplugin_antivignetting.cpp \ digikamimageplugin_antivignetting_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_antivignetting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_antivignetting.desktop diff --git a/digikam/imageplugins/blurfx/Makefile.am b/digikam/imageplugins/blurfx/Makefile.am index cfdae27..c60d7c8 100644 --- a/digikam/imageplugins/blurfx/Makefile.am +++ b/digikam/imageplugins/blurfx/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_blurfx_la_SOURCES = imageplugin_blurfx.cpp \ digikamimageplugin_blurfx_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_blurfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_blurfx.desktop diff --git a/digikam/imageplugins/border/Makefile.am b/digikam/imageplugins/border/Makefile.am index 2a34356..1ca2dbd 100644 --- a/digikam/imageplugins/border/Makefile.am +++ b/digikam/imageplugins/border/Makefile.am @@ -24,7 +24,7 @@ digikamimageplugin_border_la_SOURCES = imageplugin_border.cpp \ digikamimageplugin_border_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_border_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_border.desktop diff --git a/digikam/imageplugins/channelmixer/Makefile.am b/digikam/imageplugins/channelmixer/Makefile.am index 3aee144..caa69f6 100644 --- a/digikam/imageplugins/channelmixer/Makefile.am +++ b/digikam/imageplugins/channelmixer/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_channelmixer_la_SOURCES = imageplugin_channelmixer.cpp \ digikamimageplugin_channelmixer_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_channelmixer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_channelmixer.desktop diff --git a/digikam/imageplugins/charcoal/Makefile.am b/digikam/imageplugins/charcoal/Makefile.am index bc91b35..f6300e6 100644 --- a/digikam/imageplugins/charcoal/Makefile.am +++ b/digikam/imageplugins/charcoal/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_charcoal_la_SOURCES = imageplugin_charcoal.cpp \ digikamimageplugin_charcoal_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_charcoal_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_charcoal.desktop diff --git a/digikam/imageplugins/colorfx/Makefile.am b/digikam/imageplugins/colorfx/Makefile.am index 3888a82..41a605c 100644 --- a/digikam/imageplugins/colorfx/Makefile.am +++ b/digikam/imageplugins/colorfx/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_colorfx_la_SOURCES = imageplugin_colorfx.cpp \ digikamimageplugin_colorfx_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_colorfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_colorfx.desktop diff --git a/digikam/imageplugins/coreplugin/Makefile.am b/digikam/imageplugins/coreplugin/Makefile.am index 28c3ed5..1e0db6f 100644 --- a/digikam/imageplugins/coreplugin/Makefile.am +++ b/digikam/imageplugins/coreplugin/Makefile.am @@ -42,7 +42,7 @@ digikamimageplugin_core_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/libs/widgets/common/libcommonwidgets.la \ $(top_builddir)/digikam/libs/widgets/imageplugins/libimagepluginswidgets.la -digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio -lkexiv2 -ltdeutils +digikamimageplugin_core_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio -lkexiv2 -ltdeutils kde_services_DATA = digikamimageplugin_core.desktop diff --git a/digikam/imageplugins/distortionfx/Makefile.am b/digikam/imageplugins/distortionfx/Makefile.am index af33d4c..2beedd7 100644 --- a/digikam/imageplugins/distortionfx/Makefile.am +++ b/digikam/imageplugins/distortionfx/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_distortionfx_la_SOURCES = imageplugin_distortionfx.cpp \ digikamimageplugin_distortionfx_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_distortionfx_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_distortionfx.desktop diff --git a/digikam/imageplugins/emboss/Makefile.am b/digikam/imageplugins/emboss/Makefile.am index 7eb2d70..dcb15c5 100644 --- a/digikam/imageplugins/emboss/Makefile.am +++ b/digikam/imageplugins/emboss/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_emboss_la_SOURCES = imageplugin_emboss.cpp \ digikamimageplugin_emboss_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_emboss_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_emboss.desktop diff --git a/digikam/imageplugins/filmgrain/Makefile.am b/digikam/imageplugins/filmgrain/Makefile.am index cd4bd31..1b64454 100644 --- a/digikam/imageplugins/filmgrain/Makefile.am +++ b/digikam/imageplugins/filmgrain/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_filmgrain_la_SOURCES = imageplugin_filmgrain.cpp \ digikamimageplugin_filmgrain_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_filmgrain_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_filmgrain.desktop diff --git a/digikam/imageplugins/freerotation/Makefile.am b/digikam/imageplugins/freerotation/Makefile.am index d5dee68..5f6fe56 100644 --- a/digikam/imageplugins/freerotation/Makefile.am +++ b/digikam/imageplugins/freerotation/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_freerotation_la_SOURCES = imageplugin_freerotation.cpp \ digikamimageplugin_freerotation_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_freerotation_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_freerotation.desktop diff --git a/digikam/imageplugins/hotpixels/Makefile.am b/digikam/imageplugins/hotpixels/Makefile.am index 8ea649f..5df75bb 100644 --- a/digikam/imageplugins/hotpixels/Makefile.am +++ b/digikam/imageplugins/hotpixels/Makefile.am @@ -25,7 +25,7 @@ digikamimageplugin_hotpixels_la_SOURCES = blackframeparser.cpp weights.cpp \ digikamimageplugin_hotpixels_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_hotpixels_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_hotpixels.desktop diff --git a/digikam/imageplugins/infrared/Makefile.am b/digikam/imageplugins/infrared/Makefile.am index 6086b97..d4641e6 100644 --- a/digikam/imageplugins/infrared/Makefile.am +++ b/digikam/imageplugins/infrared/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_infrared_la_SOURCES = imageplugin_infrared.cpp \ digikamimageplugin_infrared_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_infrared_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_infrared.desktop diff --git a/digikam/imageplugins/inpainting/Makefile.am b/digikam/imageplugins/inpainting/Makefile.am index 7b09e8a..61a4db3 100644 --- a/digikam/imageplugins/inpainting/Makefile.am +++ b/digikam/imageplugins/inpainting/Makefile.am @@ -24,7 +24,7 @@ digikamimageplugin_inpainting_la_SOURCES = imageplugin_inpainting.cpp \ digikamimageplugin_inpainting_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_inpainting_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_inpainting.desktop diff --git a/digikam/imageplugins/inserttext/Makefile.am b/digikam/imageplugins/inserttext/Makefile.am index 86605e6..dd3cd41 100644 --- a/digikam/imageplugins/inserttext/Makefile.am +++ b/digikam/imageplugins/inserttext/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_inserttext_la_SOURCES = imageplugin_inserttext.cpp inserttext digikamimageplugin_inserttext_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_inserttext_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_inserttext.desktop diff --git a/digikam/imageplugins/lensdistortion/Makefile.am b/digikam/imageplugins/lensdistortion/Makefile.am index 7343763..37f5485 100644 --- a/digikam/imageplugins/lensdistortion/Makefile.am +++ b/digikam/imageplugins/lensdistortion/Makefile.am @@ -24,7 +24,7 @@ digikamimageplugin_lensdistortion_la_SOURCES = imageplugin_lensdistortion.cpp \ digikamimageplugin_lensdistortion_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_lensdistortion_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_lensdistortion.desktop diff --git a/digikam/imageplugins/noisereduction/Makefile.am b/digikam/imageplugins/noisereduction/Makefile.am index ccbc264..bea97b6 100644 --- a/digikam/imageplugins/noisereduction/Makefile.am +++ b/digikam/imageplugins/noisereduction/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_noisereduction_la_SOURCES = imageplugin_noisereduction.cpp \ digikamimageplugin_noisereduction_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_noisereduction_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_noisereduction.desktop diff --git a/digikam/imageplugins/oilpaint/Makefile.am b/digikam/imageplugins/oilpaint/Makefile.am index 604425a..e8bf8e3 100644 --- a/digikam/imageplugins/oilpaint/Makefile.am +++ b/digikam/imageplugins/oilpaint/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_oilpaint_la_SOURCES = imageplugin_oilpaint.cpp \ digikamimageplugin_oilpaint_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_oilpaint_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_oilpaint.desktop diff --git a/digikam/imageplugins/perspective/Makefile.am b/digikam/imageplugins/perspective/Makefile.am index 0523fa8..ead24ff 100644 --- a/digikam/imageplugins/perspective/Makefile.am +++ b/digikam/imageplugins/perspective/Makefile.am @@ -24,7 +24,7 @@ digikamimageplugin_perspective_la_SOURCES = imageplugin_perspective.cpp \ digikamimageplugin_perspective_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_perspective_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_perspective.desktop diff --git a/digikam/imageplugins/raindrop/Makefile.am b/digikam/imageplugins/raindrop/Makefile.am index 463c58f..61c7e5e 100644 --- a/digikam/imageplugins/raindrop/Makefile.am +++ b/digikam/imageplugins/raindrop/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_raindrop_la_SOURCES = imageplugin_raindrop.cpp \ digikamimageplugin_raindrop_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_raindrop_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_raindrop.desktop diff --git a/digikam/imageplugins/restoration/Makefile.am b/digikam/imageplugins/restoration/Makefile.am index 14d7ddf..993f1d9 100644 --- a/digikam/imageplugins/restoration/Makefile.am +++ b/digikam/imageplugins/restoration/Makefile.am @@ -24,7 +24,7 @@ digikamimageplugin_restoration_la_SOURCES = imageplugin_restoration.cpp \ digikamimageplugin_restoration_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_restoration_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -no-undefined -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_restoration.desktop diff --git a/digikam/imageplugins/sheartool/Makefile.am b/digikam/imageplugins/sheartool/Makefile.am index 7176cf1..12ae89b 100644 --- a/digikam/imageplugins/sheartool/Makefile.am +++ b/digikam/imageplugins/sheartool/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_sheartool_la_SOURCES = imageplugin_sheartool.cpp shear.cpp \ digikamimageplugin_sheartool_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_sheartool_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_sheartool.desktop diff --git a/digikam/imageplugins/superimpose/Makefile.am b/digikam/imageplugins/superimpose/Makefile.am index 7f1a647..b7dcf06 100644 --- a/digikam/imageplugins/superimpose/Makefile.am +++ b/digikam/imageplugins/superimpose/Makefile.am @@ -25,7 +25,7 @@ digikamimageplugin_superimpose_la_SOURCES = superimposewidget.cpp superimpose.cp digikamimageplugin_superimpose_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_superimpose_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_superimpose.desktop diff --git a/digikam/imageplugins/texture/Makefile.am b/digikam/imageplugins/texture/Makefile.am index 453da08..f510fc9 100644 --- a/digikam/imageplugins/texture/Makefile.am +++ b/digikam/imageplugins/texture/Makefile.am @@ -24,7 +24,7 @@ digikamimageplugin_texture_la_SOURCES = imageplugin_texture.cpp \ digikamimageplugin_texture_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_texture_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_texture.desktop diff --git a/digikam/imageplugins/whitebalance/Makefile.am b/digikam/imageplugins/whitebalance/Makefile.am index 5d66d73..69d5e81 100644 --- a/digikam/imageplugins/whitebalance/Makefile.am +++ b/digikam/imageplugins/whitebalance/Makefile.am @@ -23,7 +23,7 @@ digikamimageplugin_whitebalance_la_SOURCES = imageplugin_whitebalance.cpp \ digikamimageplugin_whitebalance_la_LIBADD = $(LIB_TDEPARTS) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx -lkdcraw -ltdeio +digikamimageplugin_whitebalance_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx -lkdcraw -ltdeio kde_services_DATA = digikamimageplugin_whitebalance.desktop diff --git a/digikam/libs/curves/Makefile.am b/digikam/libs/curves/Makefile.am index 91f2987..2fbb438 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 3621a45..9ac1109 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 6addac9..bebb34b 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 6f0b3a8..cea3669 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 df15523..f0a8e63 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libdmetadata_la_LIBADD = $(LIBKEXIV2_LIBS) $(LIBKDCRAW_LIBS) diff --git a/digikam/libs/greycstoration/Makefile.am b/digikam/libs/greycstoration/Makefile.am index 419e0b5..0ff4daf 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 e20b0a0..b3b9f5d 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 688dea4..05e01e4 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor # 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 c6b8493..f1d86ed 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libjpegutils_la_LIBADD = $(LIBJPEG) diff --git a/digikam/libs/levels/Makefile.am b/digikam/libs/levels/Makefile.am index 11a7740..5d01e1b 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 488bb6c..5612898 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 325184e..0cb7378 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 123286c..1e6991a 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 22efd33..97cad15 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 6b2edaf..0eee7b4 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 78ffea1..da5f6ae 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 2c2c42a..875da81 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 06273c1..ec9006e 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 0a90389..99f386c 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor 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 e87bff7..7d5ee2b 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libsetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libsetup_la_LIBADD = $(top_builddir)/digikam/utilities/setup/libshowfotosetup.la diff --git a/digikam/tdeioslave/Makefile.am b/digikam/tdeioslave/Makefile.am index 843949d..0313605 100644 --- a/digikam/tdeioslave/Makefile.am +++ b/digikam/tdeioslave/Makefile.am @@ -34,7 +34,7 @@ tdeio_digikamthumbnail_la_LIBADD = $(LIB_TDEIO) $(LIBJPEG) $(LIBPNG) \ $(top_builddir)/digikam/libs/jpegutils/libjpegutils.la \ $(top_builddir)/digikam/libs/dimg/libdimg.la -tdeio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -ltdefx +tdeio_digikamthumbnail_la_LDFLAGS = -module -avoid-version $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_TQT) -ltdefx # -- digikam tags TDEIO -------------------------------------------------------------- @@ -42,7 +42,7 @@ tdeio_digikamtags_la_SOURCES = digikamtags.cpp sqlitedb.cpp tdeio_digikamtags_la_LIBADD = $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) -tdeio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx +tdeio_digikamtags_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -ltdefx # -- digikam albums TDEIO ------------------------------------------------------------ @@ -53,7 +53,7 @@ tdeio_digikamalbums_la_LIBADD = $(top_builddir)/digikam/libs/jpegutils/libjpegu $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) -tdeio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx +tdeio_digikamalbums_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -ltdefx # -- digikam dates TDEIO ------------------------------------------------------------- @@ -61,7 +61,7 @@ tdeio_digikamdates_la_SOURCES = digikamdates.cpp sqlitedb.cpp tdeio_digikamdates_la_LIBADD = $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) -tdeio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx +tdeio_digikamdates_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -ltdefx # -- digikam search TDEIO ------------------------------------------------------------ @@ -69,4 +69,4 @@ tdeio_digikamsearch_la_SOURCES = digikamsearch.cpp sqlitedb.cpp tdeio_digikamsearch_la_LIBADD = $(LIB_TDEIO) $(LIB_SQLITE3) $(LIB_SQLITE3_LOCAL) -tdeio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -ltdefx +tdeio_digikamsearch_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_TQT) -ltdefx diff --git a/digikam/themedesigner/Makefile.am b/digikam/themedesigner/Makefile.am index 1c05b81..3375c23 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_TDECORE) $(LIB_TDEUI) \ +digikamthemedesigner_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) \ $(top_builddir)/digikam/digikam/libdigikam.la -digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) +digikamthemedesigner_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEUTILS) diff --git a/digikam/utilities/batch/Makefile.am b/digikam/utilities/batch/Makefile.am index 014aeb1..c9bdb41 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/digikam/utilities/cameragui/Makefile.am b/digikam/utilities/cameragui/Makefile.am index af7b472..c407451 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor libcameragui_la_LIBADD = $(top_builddir)/digikam/libs/imageproperties/libimagepropertiescamgui.la \ $(LIB_GPHOTO) $(LIBJPEG) diff --git a/digikam/utilities/lighttable/Makefile.am b/digikam/utilities/lighttable/Makefile.am index b5f219f..ada5ddf 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor rcdir = $(kde_datadir)/digikam rc_DATA = lighttablewindowui.rc diff --git a/digikam/utilities/setup/Makefile.am b/digikam/utilities/setup/Makefile.am index 885187d..15c4bd7 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor diff --git a/digikam/utilities/slideshow/Makefile.am b/digikam/utilities/slideshow/Makefile.am index 4ae7578..c642d1b 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_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor |