diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-10-10 20:45:10 +0000 |
| commit | 80f78d20c3052824bdca130c00dec33756fc4387 (patch) | |
| tree | 49db6d52ab02a6f39257c56a4b69ffb03522ebf6 /interfaces | |
| parent | 2bbbd68fcb389173d213164e8b631293b8edf424 (diff) | |
| download | tdelibs-80f78d20c3052824bdca130c00dec33756fc4387.tar.gz tdelibs-80f78d20c3052824bdca130c00dec33756fc4387.zip | |
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/kdelibs@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'interfaces')
| -rw-r--r-- | interfaces/kscript/Makefile.am | 2 | ||||
| -rw-r--r-- | interfaces/ktexteditor/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/interfaces/kscript/Makefile.am b/interfaces/kscript/Makefile.am index 41cf60792..dbb2843bb 100644 --- a/interfaces/kscript/Makefile.am +++ b/interfaces/kscript/Makefile.am @@ -5,7 +5,7 @@ INCLUDES = -I$(top_srcdir)/kio -I$(top_srcdir) -I$(srcdir) -I$(srcdir)/.. $(all_ #lib_LTLIBRARIES = libkscriptloader.la libkscript.la lib_LTLIBRARIES = libkscript.la #libkscriptloader_la_SOURCES = scriptloader.cpp -#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +#libkscriptloader_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor #libkscriptloader_la_LIBADD = $(LIB_KPARTS) libkscript_la_SOURCES = scriptmanager.cpp diff --git a/interfaces/ktexteditor/Makefile.am b/interfaces/ktexteditor/Makefile.am index 97ae82e2d..d2095e780 100644 --- a/interfaces/ktexteditor/Makefile.am +++ b/interfaces/ktexteditor/Makefile.am @@ -22,7 +22,7 @@ libktexteditor_la_SOURCES = ktexteditor.cpp \ texthintinterface.cpp editinterfaceext.cpp variableinterface.cpp templateinterface.cpp -libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) +libktexteditor_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor libktexteditor_la_LIBADD = $(LIB_KPARTS) $(top_builddir)/dcop/libDCOP.la $(LIB_KABC) $(LIB_KDECORE) $(LIB_QT) $(LIB_KFILE) $(LIB_KDEUI) ktexteditorinclude_HEADERS = document.h view.h editor.h plugin.h editinterface.h undointerface.h \ |