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 | b69a4883748e967bfd7564a7a07c0f9d9832397b (patch) | |
| tree | 63c8b1dc5c7e759f101b941dbfcad3b352181679 /khelpcenter | |
| parent | e179f15ee723f9c4978b78a2c87cf1b0449d49b4 (diff) | |
| download | tdebase-b69a4883748e967bfd7564a7a07c0f9d9832397b.tar.gz tdebase-b69a4883748e967bfd7564a7a07c0f9d9832397b.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/kdebase@1258263 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'khelpcenter')
| -rw-r--r-- | khelpcenter/Makefile.am | 4 | ||||
| -rw-r--r-- | khelpcenter/htmlsearch/Makefile.am | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am index 24c1f3740..e258ba172 100644 --- a/khelpcenter/Makefile.am +++ b/khelpcenter/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO bin_PROGRAMS = khc_indexbuilder lib_LTLIBRARIES = -khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) +khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor khc_indexbuilder_LDADD = $(LIB_KDECORE) khc_indexbuilder_SOURCES = khc_indexbuilder.cpp @@ -34,7 +34,7 @@ khelpcenter_la_SOURCES = navigator.cpp \ EXTRA_PROGRAMS = testmetainfo -testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) +testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor testmetainfo_LDADD = $(LIB_KDECORE) docentry.lo docmetainfo.lo \ docentrytraverser.lo htmlsearch.lo testmetainfo_SOURCES = testmetainfo.cpp diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am index f287fa11e..04d6109c5 100644 --- a/khelpcenter/htmlsearch/Makefile.am +++ b/khelpcenter/htmlsearch/Makefile.am @@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/ wrapper_SCRIPTS = meinproc_wrapper khtmlindex_SOURCES = index.cpp -khtmlindex_LDFLAGS = $(KDE_RPATH) $(all_libraries) +khtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -lkdefx $(LIB_KIO) -lktexteditor khtmlindex_LDADD = libhtmlsearch.la $(LIB_KDEUI) xpm_DATA = unchecked.xpm checked.xpm |