Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiric

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/digikam@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

19 files changed, 22 insertions, 22 deletions

diff --git a/digikam/libs/curves/Makefile.am b/digikam/libs/curves/Makefile.am
index a1647bb..d72cf26 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)
+libcurves_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 c232883..b056245 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)
+libdialogshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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)
+libdialog_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 dc66fdc..c0b114e 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) 
+libdimg_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 6bbb813..dc00011 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)
+libdimgfilters_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 c9767c5..d42a8eb 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)
+libdmetadata_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 48620d9..c2a152b 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)
+libgreycstoration_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 e452832..2af206b 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)
+libhistogram_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 a766aef..68f3e8a 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) 
+libimagepropertiescamgui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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)
+libimagepropertiesshowfoto_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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)
+libimagepropertiesdigikam_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 445ef0b..527c311 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)
+libjpegutils_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 libjpegutils_la_LIBADD  = $(LIBJPEG) 
diff --git a/digikam/libs/levels/Makefile.am b/digikam/libs/levels/Makefile.am
index 2e4f62d..010a934 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)
+liblevels_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 65b2376..0b9f18d 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)
+libthemeengine_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 16d31fa..afa145b 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)
+libthreadimageio_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 374eb55..27d18f6 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)
+libthumbbar_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 03d8299..64d4c4d 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)
+libwhitebalance_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 282bd36..c7116ff 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)
+libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 d969d44..7032e18 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)
+libcommonwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 a55f1a3..71fdbbe 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)
+libiccprofileswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 2909dc9..c51e05d 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)
+libimagepluginswidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 3ae468f..e14c778 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)
+libmetadatawidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 INCLUDES = -I$(top_srcdir)/digikam/libs/dmetadata \
 	       -I$(top_srcdir)/digikam/libs/dimg \