summaryrefslogtreecommitdiffstats
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
commit19deb24b530d644ac0f0660d66192dff4e0c8ca4 (patch)
tree29fe16924492617311b3e831dcafd997fe141bf1
parentb6bbc61302695d00dec061f65d34ce3a5e98abe8 (diff)
downloadkdiff3-19deb24b530d644ac0f0660d66192dff4e0c8ca4.tar.gz
kdiff3-19deb24b530d644ac0f0660d66192dff4e0c8ca4.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/applications/kdiff3@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 58c0298..3da9b63 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -25,7 +25,7 @@ bin_PROGRAMS = kdiff3
# the application source, library search path, and link libraries
kdiff3_SOURCES = main.cpp kdiff3_shell.cpp
-kdiff3_LDFLAGS = $(KDE_RPATH) $(all_libraries)
+kdiff3_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor
kdiff3_LDADD = $(LIB_KPARTS)
# this is where the desktop file will go