summaryrefslogtreecommitdiffstats
path: root/digikam/utilities
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-10-10 20:45:10 +0000
commit89954f5466dfa2afeaafc18c4e460e0c506ec91a (patch)
tree06a40fe082b8ac19a41ae8c513558f9a50ecfaae /digikam/utilities
parent2add4e006d3c01e58e147b16bb41b9088eb076b2 (diff)
downloaddigikam-89954f5466dfa2afeaafc18c4e460e0c506ec91a.tar.gz
digikam-89954f5466dfa2afeaafc18c4e460e0c506ec91a.zip
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
Diffstat (limited to 'digikam/utilities')
-rw-r--r--digikam/utilities/batch/Makefile.am2
-rw-r--r--digikam/utilities/cameragui/Makefile.am2
-rw-r--r--digikam/utilities/lighttable/Makefile.am2
-rw-r--r--digikam/utilities/setup/Makefile.am2
-rw-r--r--digikam/utilities/slideshow/Makefile.am2
5 files changed, 5 insertions, 5 deletions
diff --git a/digikam/utilities/batch/Makefile.am b/digikam/utilities/batch/Makefile.am
index 72cb18d..cd348f9 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)
+libbatch_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
diff --git a/digikam/utilities/cameragui/Makefile.am b/digikam/utilities/cameragui/Makefile.am
index cb99f9b..239a47f 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)
+libcameragui_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
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 ca117d1..f2d59d3 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)
+liblighttable_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(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 249819d..be63afe 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)
+libshowfotosetup_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
diff --git a/digikam/utilities/slideshow/Makefile.am b/digikam/utilities/slideshow/Makefile.am
index 29f8992..437457d 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)
+libslideshow_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor