From 38cbdb5e6968ff32b9cf425fd5c876824512cd8f Mon Sep 17 00:00:00 2001 From: tpearson 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/kdeaccessibility@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kmag/Makefile.am | 2 +- kmousetool/kmousetool/Makefile.am | 2 +- ksayit/src/Makefile.am | 2 +- kttsd/filters/Makefile.am | 2 +- kttsd/kttsmgr/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kmag/Makefile.am b/kmag/Makefile.am index 29dd1a7..6f4cd45 100644 --- a/kmag/Makefile.am +++ b/kmag/Makefile.am @@ -27,7 +27,7 @@ METASOURCES = AUTO KDE_OPTIONS = nofinal # the library search path. -kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kmag_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor rcdir = $(kde_datadir)/kmag rc_DATA = kmagui.rc diff --git a/kmousetool/kmousetool/Makefile.am b/kmousetool/kmousetool/Makefile.am index 72c6a08..2f0b66f 100644 --- a/kmousetool/kmousetool/Makefile.am +++ b/kmousetool/kmousetool/Makefile.am @@ -19,7 +19,7 @@ INCLUDES= $(all_includes) METASOURCES = AUTO # the library search path. -kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kmousetool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor messages: rc.cpp LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ diff --git a/ksayit/src/Makefile.am b/ksayit/src/Makefile.am index 9fb2b84..f83073a 100644 --- a/ksayit/src/Makefile.am +++ b/ksayit/src/Makefile.am @@ -31,7 +31,7 @@ ksayit_SOURCES = doctreeviewimpl.cpp effectstack.cpp fxpluginhandler.cpp \ parasaxparser.cpp saxhandler.cpp ksayitbookmarkhandler.cpp contextmenuhandler.cpp docbookclasses.cpp \ docbookgenerator.cpp docbookparser.cpp -ksayit_LDFLAGS = $(KDE_RPATH) $(all_libraries) +ksayit_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor ksayit_LDADD = $(top_builddir)/ksayit/KTTSD_Lib/libKTTSD_Lib.la $(LIB_KIO) \ -lartskde -lsoundserver_idl -lartsflow diff --git a/kttsd/filters/Makefile.am b/kttsd/filters/Makefile.am index 8c068f0..d565d86 100644 --- a/kttsd/filters/Makefile.am +++ b/kttsd/filters/Makefile.am @@ -17,7 +17,7 @@ check_PROGRAMS = testfilter testfilter_SOURCES = main.cpp -testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testfilter_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testfilter_LDADD = \ $(top_builddir)/kttsd/libkttsd/libkttsd.la \ $(LIB_KDECORE) diff --git a/kttsd/kttsmgr/Makefile.am b/kttsd/kttsmgr/Makefile.am index 747408d..21ddf60 100644 --- a/kttsd/kttsmgr/Makefile.am +++ b/kttsd/kttsmgr/Makefile.am @@ -22,7 +22,7 @@ kttsmgr_SOURCES = \ kspeechsink.skel \ kttsmgr.cpp -kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) +kttsmgr_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor kttsmgr_LDADD = \ $(LIB_KUTILS) \ $(LIB_KDEUI) -- cgit v1.2.3