summaryrefslogtreecommitdiffstats
path: root/karm
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
commit0451bfa1dfdda10f7a0dc04277066f10648d37f8 (patch)
treee372421b17ffb8ec9944e753c504a84873cf604c /karm
parentbd4d40e62f0ade42fbc594c1c87dfc93dfab8c99 (diff)
downloadtdepim-0451bfa1dfdda10f7a0dc04277066f10648d37f8.tar.gz
tdepim-0451bfa1dfdda10f7a0dc04277066f10648d37f8.zip
Link most Trinity DSOs against the most common kdelibs libraries to compensate for linking changes in modern distributions such as Ubuntu Oneiricv3.5.13
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'karm')
-rw-r--r--karm/Makefile.am2
-rw-r--r--karm/test/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/karm/Makefile.am b/karm/Makefile.am
index a16ac1ba..353d1fb6 100644
--- a/karm/Makefile.am
+++ b/karm/Makefile.am
@@ -23,7 +23,7 @@ libkarm_shared_la_LIBADD = $(top_builddir)/libkcal/libkcal.la \
$(top_builddir)/libkdepim/libkdepim.la $(LIBXSS) -lkdeprint
karm_SOURCES = main.cpp
karm_LDADD = libkarm_shared.la
-karm_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+karm_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = desktoptracker.h edittaskdialog.h printdialog.h \
idletimedetector.h kaccelmenuwatch.h timekard.h \
karmutility.h ktimewidget.h karmstorage.h mainwindow.h \
diff --git a/karm/test/Makefile.am b/karm/test/Makefile.am
index 7205a599..8fff3ee5 100644
--- a/karm/test/Makefile.am
+++ b/karm/test/Makefile.am
@@ -3,11 +3,11 @@ METASOURCES = AUTO
check_PROGRAMS = runscripts locking
runscripts_SOURCES = script.cpp runscripts.cpp
-runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+runscripts_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
runscripts_LDADD = $(LIB_QT) $(LIB_KDECORE)
locking_SOURCES = locking.cpp lockerthread.cpp
-locking_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+locking_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
locking_LDADD = $(LIB_QT) $(top_builddir)/libkcal/libkcal.la
KDE_CXXFLAGS = $(USE_EXCEPTIONS)