summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m424
-rw-r--r--katapult/common/Makefile.am2
-rw-r--r--katapult/katapult/Makefile.am4
-rw-r--r--katapult/plugins/catalogs/amarokcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/bookmarkcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/calculatorcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/documentcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/execcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/googlecatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/programcatalog/Makefile.am2
-rw-r--r--katapult/plugins/catalogs/spellcatalog/Makefile.am2
-rw-r--r--katapult/plugins/display/glassdisplay/Makefile.am2
-rw-r--r--katapult/plugins/display/o2display/Makefile.am2
-rw-r--r--katapult/plugins/display/puredisplay/Makefile.am2
14 files changed, 26 insertions, 26 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 169d44d..1b25a15 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2059,8 +2059,8 @@ if test $kde_qtver = 3; then
*) lib_kded="" ;;
esac
AC_SUBST(LIB_KDED, $lib_kded)
- AC_SUBST(LIB_KDECORE, "-ltdecore")
- AC_SUBST(LIB_KDEUI, "-ltdeui")
+ AC_SUBST(LIB_TDECORE, "-ltdecore")
+ AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2069,9 +2069,9 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+ AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils")
- AC_SUBST(LIB_KDEPIM, "-ltdepim")
+ AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2080,8 +2080,8 @@ if test $kde_qtver = 3; then
AC_SUBST(LIB_KSYCOCA, "-lkio")
AC_SUBST(LIB_KFILE, "-lkio")
elif test $kde_qtver = 2; then
- AC_SUBST(LIB_KDECORE, "-ltdecore")
- AC_SUBST(LIB_KDEUI, "-ltdeui")
+ AC_SUBST(LIB_TDECORE, "-ltdecore")
+ AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca")
AC_SUBST(LIB_SMB, "-lsmb")
@@ -2090,13 +2090,13 @@ elif test $kde_qtver = 2; then
AC_SUBST(LIB_KHTML, "-lkhtml")
AC_SUBST(LIB_KSPELL, "-lkspell")
AC_SUBST(LIB_KPARTS, "-lkparts")
- AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+ AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else
- AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
- AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
- AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
- AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
- AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+ AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
+ AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
+ AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
+ AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+ AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi
])
diff --git a/katapult/common/Makefile.am b/katapult/common/Makefile.am
index a2d19b4..2096d11 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_KDECORE) -lDCOP -ltdefx $(LIB_KDEUI)
+libkatapult_la_LIBADD = $(LIB_QT) $(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 d4c3c9e..af3f9c5 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_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-katapult_LDADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+katapult_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 24de402..034f218 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_KDECORE) -lDCOP $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_amarokcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) -lDCOP $(LIB_TDEUI) $(LIB_KIO) $(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 ef289e3..e1f8e57 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_bookmarkcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 c0753c2..508b93f 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_calculatorcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 ddcad1a..fd66e7c 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_documentcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 ffc4753..9262c2f 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_execcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 a632da7..2c1e6be 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_googlecatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 1e0fdf6..8305787 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_programcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 eb07f58..ad837c3 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_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(top_builddir)/katapult/common/libkatapult.la
+katapult_spellcatalog_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(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 a7ff719..37dd7cd 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_KDECORE) $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la
+katapult_glassdisplay_la_LIBADD = $(LIB_QT) $(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 505bc09..742dd8f 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_KDECORE) $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la
+katapult_o2display_la_LIBADD = $(LIB_QT) $(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 2acb5f0..3ebe6ab 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_KDECORE) $(LIB_KDEUI) $(top_builddir)/katapult/common/libkatapult.la
+katapult_puredisplay_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(top_builddir)/katapult/common/libkatapult.la
kde_services_DATA = katapult_puredisplay.desktop
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-28 08:10:51 +0000