From b69a4883748e967bfd7564a7a07c0f9d9832397b 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/kdebase@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kdesktop/kwebdesktop/Makefile.am | 2 +-
 kdesktop/lock/Makefile.am        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kdesktop')

diff --git a/kdesktop/kwebdesktop/Makefile.am b/kdesktop/kwebdesktop/Makefile.am
index def6fa938..6d1d9fac2 100644
--- a/kdesktop/kwebdesktop/Makefile.am
+++ b/kdesktop/kwebdesktop/Makefile.am
@@ -7,7 +7,7 @@ bin_PROGRAMS = 	kwebdesktop
 METASOURCES = AUTO
 
 kwebdesktop_SOURCES = kwebdesktop.cpp kwebdesktopsettings.kcfgc 
-kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kwebdesktop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 
 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 00027506d..3b16ff479 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -1,7 +1,7 @@
 ## Makefile.am of kdebase/kdesktop/lock
 
 INCLUDES = -I.. -I$(top_srcdir)/kcheckpass -I$(top_srcdir)/kdmlib $(GLINC) $(all_includes)
-kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH)
+kdesktop_lock_LDFLAGS  = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
 kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../kdmlib/libdmctl.la $(LIB_KIO) $(LIB_XF86MISC) $(GLLIB)
 
 ####### Files
-- 
cgit v1.2.1