From 964a326f0609dc205d832be9db2d9a8e903cc252 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Mon, 17 Sep 2018 23:20:10 +0900 Subject: LIB_QT -> LIB_TQT conversion to align to updated admin module Signed-off-by: Michele Calgaro --- katapult/common/Makefile.am | 2 +- katapult/katapult/Makefile.am | 4 ++-- katapult/plugins/catalogs/amarokcatalog/Makefile.am | 2 +- katapult/plugins/catalogs/bookmarkcatalog/Makefile.am | 2 +- katapult/plugins/catalogs/calculatorcatalog/Makefile.am | 2 +- katapult/plugins/catalogs/documentcatalog/Makefile.am | 2 +- katapult/plugins/catalogs/execcatalog/Makefile.am | 2 +- katapult/plugins/catalogs/googlecatalog/Makefile.am | 2 +- katapult/plugins/catalogs/programcatalog/Makefile.am | 2 +- katapult/plugins/catalogs/spellcatalog/Makefile.am | 2 +- katapult/plugins/display/glassdisplay/Makefile.am | 2 +- katapult/plugins/display/o2display/Makefile.am | 2 +- katapult/plugins/display/puredisplay/Makefile.am | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) (limited to 'katapult') diff --git a/katapult/common/Makefile.am b/katapult/common/Makefile.am index 2096d11..e93ce6d 100644 --- a/katapult/common/Makefile.am +++ b/katapult/common/Makefile.am @@ -13,7 +13,7 @@ lib_LTLIBRARIES = libkatapult.la # 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_QT) $(LIB_TDECORE) -lDCOP -ltdefx $(LIB_TDEUI) +libkatapult_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP -ltdefx $(LIB_TDEUI) # this is where the service type files will go kde_servicetypes_DATA = katapultdisplay.desktop katapultcatalog.desktop diff --git a/katapult/katapult/Makefile.am b/katapult/katapult/Makefile.am index 7f8ae50..f4b63e8 100644 --- a/katapult/katapult/Makefile.am +++ b/katapult/katapult/Makefile.am @@ -16,8 +16,8 @@ bin_PROGRAMS = katapult # the application source, library search path, and link libraries katapult_SOURCES = confgeneral.ui confcatalogs.ui confdisplay.ui main.cpp \ katapult.cpp katapultsettings.cpp katapultconfigdlg.cpp katapultiface.skel -katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +katapult_LDADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la # this is where the desktop file will go xdg_apps_DATA = katapult.desktop diff --git a/katapult/plugins/catalogs/amarokcatalog/Makefile.am b/katapult/plugins/catalogs/amarokcatalog/Makefile.am index 73fc545..f0d83b4 100644 --- a/katapult/plugins/catalogs/amarokcatalog/Makefile.am +++ b/katapult/plugins/catalogs/amarokcatalog/Makefile.am @@ -11,5 +11,5 @@ METASOURCES = AUTO 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_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_amarokcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_amarokcatalog.desktop diff --git a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am index 4b555bb..b05912a 100644 --- a/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am +++ b/katapult/plugins/catalogs/bookmarkcatalog/Makefile.am @@ -13,5 +13,5 @@ kde_module_LTLIBRARIES = katapult_bookmarkcatalog.la 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_bookmarkcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_bookmarkcatalog.desktop diff --git a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am index e8c46b8..2439bd2 100644 --- a/katapult/plugins/catalogs/calculatorcatalog/Makefile.am +++ b/katapult/plugins/catalogs/calculatorcatalog/Makefile.am @@ -16,5 +16,5 @@ KDE_ICON = xcalc checkmark no 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_calculatorcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_calculatorcatalog.desktop diff --git a/katapult/plugins/catalogs/documentcatalog/Makefile.am b/katapult/plugins/catalogs/documentcatalog/Makefile.am index e242742..93eafc1 100644 --- a/katapult/plugins/catalogs/documentcatalog/Makefile.am +++ b/katapult/plugins/catalogs/documentcatalog/Makefile.am @@ -12,5 +12,5 @@ kde_module_LTLIBRARIES = katapult_documentcatalog.la 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_documentcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_documentcatalog.desktop diff --git a/katapult/plugins/catalogs/execcatalog/Makefile.am b/katapult/plugins/catalogs/execcatalog/Makefile.am index 1c792ba..acfcf86 100644 --- a/katapult/plugins/catalogs/execcatalog/Makefile.am +++ b/katapult/plugins/catalogs/execcatalog/Makefile.am @@ -16,5 +16,5 @@ KDE_ICON = AUTO kde_module_LTLIBRARIES = katapult_execcatalog.la katapult_execcatalog_la_SOURCES = settings.ui execcatalog.cpp command.cpp actionrun.cpp katapult_execcatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) -katapult_execcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_execcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_execcatalog.desktop diff --git a/katapult/plugins/catalogs/googlecatalog/Makefile.am b/katapult/plugins/catalogs/googlecatalog/Makefile.am index 4a8e3d9..af34cb0 100644 --- a/katapult/plugins/catalogs/googlecatalog/Makefile.am +++ b/katapult/plugins/catalogs/googlecatalog/Makefile.am @@ -16,5 +16,5 @@ KDE_ICON = AUTO kde_module_LTLIBRARIES = katapult_googlecatalog.la katapult_googlecatalog_la_SOURCES = settings.ui googlecatalog.cpp query.cpp actionsearch.cpp katapult_googlecatalog_la_LDFLAGS = -module $(KDE_RPATH) $(KDE_PLUGIN) $(all_libraries) -katapult_googlecatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_googlecatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_googlecatalog.desktop diff --git a/katapult/plugins/catalogs/programcatalog/Makefile.am b/katapult/plugins/catalogs/programcatalog/Makefile.am index 19b5b0e..4ec9ab8 100644 --- a/katapult/plugins/catalogs/programcatalog/Makefile.am +++ b/katapult/plugins/catalogs/programcatalog/Makefile.am @@ -8,7 +8,7 @@ noinst_HEADERS = programcatalog.h program.h actionrunprogram.h 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_programcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_programcatalog.desktop # use automoc diff --git a/katapult/plugins/catalogs/spellcatalog/Makefile.am b/katapult/plugins/catalogs/spellcatalog/Makefile.am index 98cd5cd..7dc8aba 100644 --- a/katapult/plugins/catalogs/spellcatalog/Makefile.am +++ b/katapult/plugins/catalogs/spellcatalog/Makefile.am @@ -15,5 +15,5 @@ KDE_ICON = AUTO 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la +katapult_spellcatalog_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_spellcatalog.desktop diff --git a/katapult/plugins/display/glassdisplay/Makefile.am b/katapult/plugins/display/glassdisplay/Makefile.am index 37dd7cd..e26a971 100644 --- a/katapult/plugins/display/glassdisplay/Makefile.am +++ b/katapult/plugins/display/glassdisplay/Makefile.am @@ -11,5 +11,5 @@ METASOURCES = AUTO 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la +katapult_glassdisplay_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_glassdisplay.desktop diff --git a/katapult/plugins/display/o2display/Makefile.am b/katapult/plugins/display/o2display/Makefile.am index 742dd8f..93a67b7 100644 --- a/katapult/plugins/display/o2display/Makefile.am +++ b/katapult/plugins/display/o2display/Makefile.am @@ -11,5 +11,5 @@ METASOURCES = AUTO 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la +katapult_o2display_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_o2display.desktop diff --git a/katapult/plugins/display/puredisplay/Makefile.am b/katapult/plugins/display/puredisplay/Makefile.am index 3ebe6ab..019b810 100644 --- a/katapult/plugins/display/puredisplay/Makefile.am +++ b/katapult/plugins/display/puredisplay/Makefile.am @@ -11,5 +11,5 @@ METASOURCES = AUTO 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_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la +katapult_puredisplay_la_LIBADD = $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la kde_services_DATA = katapult_puredisplay.desktop -- cgit v1.2.3