diff -urN katapult-0.3.1.4r.orig/katapult/common/Makefile.am katapult-0.3.1.4r/katapult/common/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/common/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/common/Makefile.am	2007-02-11 00:39:23 +0300

@@ -13,6 +13,7 @@

 # common library

 libkatapult_la_SOURCES = katapultitem.cpp katapultaction.cpp actionregistry.cpp katapultcatalog.cpp cachedcatalog.cpp match.cpp katapultdisplay.cpp imagedisplay.cpp imagedisplaysettings.ui

 libkatapult_la_LDFLAGS = $(all_libraries) -version-info 2:0:0

+libkatapult_la_LIBADD = $(LIB_KDEUI) $(LIB_QT) $(LIB_KDECORE)

 # this is where the service type files will go

 kde_servicetypes_DATA = katapultdisplay.desktop katapultcatalog.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/katapult/Makefile.am katapult-0.3.1.4r/katapult/katapult/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/katapult/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/katapult/Makefile.am	2007-02-11 00:39:10 +0300

@@ -17,7 +17,7 @@

 katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \

 	katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel

 katapult_LDFLAGS = $(KDE_RPATH) $(all_libraries)

-katapult_LDADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

 # this is where the desktop file will go 

 xdg_apps_DATA = katapult.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/catalogs/amarokcatalog/Makefile.am katapult-0.3.1.4r/katapult/plugins/catalogs/amarokcatalog/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/catalogs/amarokcatalog/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/catalogs/amarokcatalog/Makefile.am	2007-02-11 00:39:10 +0300

@@ -11,5 +11,5 @@

 kde_module_LTLIBRARIES = katapult_amarokcatalog.la

 katapult_amarokcatalog_la_SOURCES = settings.ui amarokcatalog.cpp coverimage.cpp song.cpp actionplaysong.cpp

 katapult_amarokcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_amarokcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_amarokcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE) -lDCOP

 kde_services_DATA = katapult_amarokcatalog.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am katapult-0.3.1.4r/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am	2007-02-11 00:39:10 +0300

@@ -13,5 +13,5 @@

 katapult_bookmarkcatalog_la_SOURCES = settings.ui bookmarkcatalog.cpp \

 	bookmark.cpp actionopenbookmark.cpp mozillabookmark.cpp

 katapult_bookmarkcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_bookmarkcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_bookmarkcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_bookmarkcatalog.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/catalogs/calculatorcatalog/Makefile.am katapult-0.3.1.4r/katapult/plugins/catalogs/calculatorcatalog/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/catalogs/calculatorcatalog/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/catalogs/calculatorcatalog/Makefile.am	2007-02-11 00:39:10 +0300

@@ -16,5 +16,5 @@

 kde_module_LTLIBRARIES =  katapult_calculatorcatalog.la

 katapult_calculatorcatalog_la_SOURCES = settings.ui calculatorcatalog.cpp expression.cpp actionevalexpr.cpp parser.cpp

 katapult_calculatorcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_calculatorcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_calculatorcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_calculatorcatalog.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/catalogs/documentcatalog/Makefile.am katapult-0.3.1.4r/katapult/plugins/catalogs/documentcatalog/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/catalogs/documentcatalog/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/catalogs/documentcatalog/Makefile.am	2007-02-11 00:39:10 +0300

@@ -12,5 +12,5 @@

 katapult_documentcatalog_la_SOURCES = settings.ui documentcatalog.cpp \

 		directory.cpp document.cpp actionopendocument.cpp

 katapult_documentcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_documentcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_documentcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_documentcatalog.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/catalogs/programcatalog/Makefile.am katapult-0.3.1.4r/katapult/plugins/catalogs/programcatalog/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/catalogs/programcatalog/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/catalogs/programcatalog/Makefile.am	2007-02-11 00:39:10 +0300

@@ -8,7 +8,7 @@

 kde_module_LTLIBRARIES =  katapult_programcatalog.la

 katapult_programcatalog_la_SOURCES = settings.ui programcatalog.cpp program.cpp actionrunprogram.cpp

 katapult_programcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_programcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_programcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_programcatalog.desktop

 # use automoc

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/catalogs/spellcatalog/Makefile.am katapult-0.3.1.4r/katapult/plugins/catalogs/spellcatalog/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/catalogs/spellcatalog/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/catalogs/spellcatalog/Makefile.am	2007-02-11 00:39:10 +0300

@@ -15,5 +15,5 @@

 kde_module_LTLIBRARIES =  katapult_spellcatalog.la

 katapult_spellcatalog_la_SOURCES = settings.ui spellcatalog.cpp spelling.cpp actioncopyspelling.cpp

 katapult_spellcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_spellcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la

+katapult_spellcatalog_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_spellcatalog.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/display/glassdisplay/Makefile.am katapult-0.3.1.4r/katapult/plugins/display/glassdisplay/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/display/glassdisplay/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/display/glassdisplay/Makefile.am	2007-02-11 00:39:15 +0300

@@ -11,5 +11,5 @@

 kde_module_LTLIBRARIES =  katapult_glassdisplay.la

 katapult_glassdisplay_la_SOURCES = glassdisplay.cpp

 katapult_glassdisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_glassdisplay_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la

+katapult_glassdisplay_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_glassdisplay.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/display/o2display/Makefile.am katapult-0.3.1.4r/katapult/plugins/display/o2display/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/display/o2display/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/display/o2display/Makefile.am	2007-02-11 00:39:20 +0300

@@ -11,5 +11,5 @@

 kde_module_LTLIBRARIES =  katapult_o2display.la

 katapult_o2display_la_SOURCES = o2display.cpp

 katapult_o2display_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_o2display_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la

+katapult_o2display_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_o2display.desktop

diff -urN katapult-0.3.1.4r.orig/katapult/plugins/display/puredisplay/Makefile.am katapult-0.3.1.4r/katapult/plugins/display/puredisplay/Makefile.am

--- katapult-0.3.1.4r.orig/katapult/plugins/display/puredisplay/Makefile.am	2007-02-11 00:38:21 +0300

+++ katapult-0.3.1.4r/katapult/plugins/display/puredisplay/Makefile.am	2007-02-11 00:39:18 +0300

@@ -11,5 +11,5 @@

 kde_module_LTLIBRARIES =  katapult_puredisplay.la

 katapult_puredisplay_la_SOURCES = puredisplay.cpp

 katapult_puredisplay_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries)

-katapult_puredisplay_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la

+katapult_puredisplay_la_LIBADD = $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la $(LIB_QT) $(LIB_KDECORE)

 kde_services_DATA = katapult_puredisplay.desktop