From 0451bfa1dfdda10f7a0dc04277066f10648d37f8 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 10 Oct 2011 20:45:10 +0000
Subject: 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/kdepim@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kresources/featureplan/Makefile.am        | 4 ++--
 kresources/groupwise/soap/Makefile.am     | 2 +-
 kresources/scalix/scalixadmin/Makefile.am | 2 +-
 kresources/slox/Makefile.am               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kresources')

diff --git a/kresources/featureplan/Makefile.am b/kresources/featureplan/Makefile.am
index 3d36b3f9f..3e3d01a8b 100644
--- a/kresources/featureplan/Makefile.am
+++ b/kresources/featureplan/Makefile.am
@@ -28,12 +28,12 @@ kcal_service_DATA = kcal_resourcefeatureplan.desktop
 
 check_PROGRAMS = dumpfeaturelist benchmarkfeaturelist
 
-dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+dumpfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 dumpfeaturelist_LDADD   = libfeatureplancommon.la $(LIB_KDECORE)
 dumpfeaturelist_SOURCES = dumpfeaturelist.cpp
 dumpfeaturelist_COMPILE_FIRST = kde-features.h
 
-benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+benchmarkfeaturelist_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 benchmarkfeaturelist_LDADD   = libfeatureplancommon.la $(LIB_KDECORE)
 benchmarkfeaturelist_SOURCES = benchmarkfeaturelist.cpp
 benchmarkfeaturelist_COMPILE_FIRST = kde-features.h
diff --git a/kresources/groupwise/soap/Makefile.am b/kresources/groupwise/soap/Makefile.am
index d0793429c..638b0ba47 100644
--- a/kresources/groupwise/soap/Makefile.am
+++ b/kresources/groupwise/soap/Makefile.am
@@ -5,7 +5,7 @@ KDE_CXXFLAGS = -Wno-non-virtual-dtor
 
 check_PROGRAMS = soapdebug
 
-soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+soapdebug_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 soapdebug_LDADD   = libgwsoap.la -lkdecore \
                    $(top_builddir)/libkcal/libkcal.la \
                    $(top_builddir)/libkdepim/libkdepim.la
diff --git a/kresources/scalix/scalixadmin/Makefile.am b/kresources/scalix/scalixadmin/Makefile.am
index 7402ef281..fb748a0fb 100644
--- a/kresources/scalix/scalixadmin/Makefile.am
+++ b/kresources/scalix/scalixadmin/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = scalixadmin
 
 INCLUDES = $(all_includes)
 
-scalixadmin_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+scalixadmin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 scalixadmin_LDADD   = $(LIB_KABC)
 scalixadmin_SOURCES = main.cpp mainwindow.cpp passwordpage.cpp settings.cpp jobs.cpp \
                       otherusermanager.cpp otheruserview.cpp otheruserpage.cpp ldapview.cpp ldapdialog.cpp \
diff --git a/kresources/slox/Makefile.am b/kresources/slox/Makefile.am
index 6cc95f1eb..584a2f33b 100644
--- a/kresources/slox/Makefile.am
+++ b/kresources/slox/Makefile.am
@@ -34,7 +34,7 @@ kabc_slox_la_LIBADD  = libkabc_slox.la
 
 EXTRA_PROGRAMS = testsloxaccounts
 
-testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+testsloxaccounts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 testsloxaccounts_LDADD = libkslox.la
 testsloxaccounts_SOURCES = testsloxaccounts.cpp
 
-- 
cgit v1.2.1