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 --- kabc/frontend/Makefile.am | 2 +- kabc/kabc2mutt/Makefile.am | 2 +- kabc/kabcdistlistupdater/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kabc') diff --git a/kabc/frontend/Makefile.am b/kabc/frontend/Makefile.am index c7a413fcc..dabde6533 100644 --- a/kabc/frontend/Makefile.am +++ b/kabc/frontend/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcfrontend -kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kabcfrontend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kabcfrontend_LDADD = -lkabc $(LIB_KDECORE) kabcfrontend_SOURCES = main.cpp mainWindow.ui diff --git a/kabc/kabc2mutt/Makefile.am b/kabc/kabc2mutt/Makefile.am index f8a201cfd..7e99528cf 100644 --- a/kabc/kabc2mutt/Makefile.am +++ b/kabc/kabc2mutt/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabc2mutt -kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kabc2mutt_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kabc2mutt_LDADD = -lkabc $(LIB_KDECORE) kabc2mutt_SOURCES = kabc2mutt.cpp main.cpp diff --git a/kabc/kabcdistlistupdater/Makefile.am b/kabc/kabcdistlistupdater/Makefile.am index 6de9a5c01..c5c4e685a 100644 --- a/kabc/kabcdistlistupdater/Makefile.am +++ b/kabc/kabcdistlistupdater/Makefile.am @@ -4,7 +4,7 @@ METASOURCES = AUTO bin_PROGRAMS = kabcdistlistupdater -kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kabcdistlistupdater_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kabcdistlistupdater_LDADD = $(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la kabcdistlistupdater_SOURCES = kabcdistlistupdater.cpp -- cgit v1.2.1