summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--acinclude.m424
-rw-r--r--apps/ktcachecheck/Makefile.am2
-rw-r--r--apps/ktorrent/Makefile.am2
-rw-r--r--apps/kttorinfo/Makefile.am2
-rw-r--r--apps/ktupnptest/Makefile.am2
-rw-r--r--plugins/infowidget/Makefile.am2
-rw-r--r--plugins/ipfilter/Makefile.am2
-rw-r--r--plugins/logviewer/Makefile.am2
-rw-r--r--plugins/partfileimport/Makefile.am2
-rw-r--r--plugins/rssfeed/Makefile.am2
-rw-r--r--plugins/scanfolder/Makefile.am2
-rw-r--r--plugins/scheduler/Makefile.am2
-rw-r--r--plugins/search/Makefile.am2
-rw-r--r--plugins/stats/Makefile.am2
-rw-r--r--plugins/upnp/Makefile.am2
-rw-r--r--plugins/webinterface/Makefile.am2
-rw-r--r--plugins/zeroconf/Makefile.am2
-rw-r--r--utests/Makefile.am2
18 files changed, 29 insertions, 29 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 5861e34..c3d3129 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2092,8 +2092,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")
@@ -2102,9 +2102,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")
@@ -2113,8 +2113,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")
@@ -2123,13 +2123,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/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am
index 69933c8..45b8aaa 100644
--- a/apps/ktcachecheck/Makefile.am
+++ b/apps/ktcachecheck/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = ktcachecheck
ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \
multicachechecker.cpp
-ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_KFILE) $(LIB_KIO)
noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h
diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am
index 501a4e6..f3a904c 100644
--- a/apps/ktorrent/Makefile.am
+++ b/apps/ktorrent/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/
$(all_includes)
# the library search path.
-ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
# the libraries to link against.
ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \
diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am
index 42f12f7..dcb2cee 100644
--- a/apps/kttorinfo/Makefile.am
+++ b/apps/kttorinfo/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
bin_PROGRAMS = kttorinfo
kttorinfo_SOURCES = main.cpp
-kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \
$(LIB_KIO)
diff --git a/apps/ktupnptest/Makefile.am b/apps/ktupnptest/Makefile.am
index 566eaa4..08fb678 100644
--- a/apps/ktupnptest/Makefile.am
+++ b/apps/ktupnptest/Makefile.am
@@ -5,6 +5,6 @@ bin_PROGRAMS = ktupnptest
ktupnptest_SOURCES = main.cpp upnptestapp.cpp mainwidget.ui
ktupnptest_LDADD = ../../plugins/upnp/libktupnp.la \
../../libktorrent/libktorrent.la $(LIB_KIO)
-ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktupnptest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
noinst_HEADERS = upnptestapp.h
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/infowidget/Makefile.am b/plugins/infowidget/Makefile.am
index 66a5820..21c98bb 100644
--- a/plugins/infowidget/Makefile.am
+++ b/plugins/infowidget/Makefile.am
@@ -12,7 +12,7 @@ ktinfowidgetplugin_la_SOURCES = infowidgetplugin.cpp availabilitychunkbar.cpp \
# Libs needed by the plugin
ktinfowidgetplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
$(LIB_KHTML) $(LIB_KPARTS) $(LIB_QT) \
- $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
# LD flags for the plugin
diff --git a/plugins/ipfilter/Makefile.am b/plugins/ipfilter/Makefile.am
index 02b193a..e54fcfc 100644
--- a/plugins/ipfilter/Makefile.am
+++ b/plugins/ipfilter/Makefile.am
@@ -10,7 +10,7 @@ ktipfilterplugin_la_SOURCES = ipfilterplugin.cpp ipblockingpref.ui \
# Libs needed by the plugin
ktipfilterplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la $(LIB_QT) \
- $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
diff --git a/plugins/logviewer/Makefile.am b/plugins/logviewer/Makefile.am
index c925a12..3e59091 100644
--- a/plugins/logviewer/Makefile.am
+++ b/plugins/logviewer/Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = ktlogviewerplugin.la
# Libs needed by the plugin
ktlogviewerplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la $(LIB_QT) \
- $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
diff --git a/plugins/partfileimport/Makefile.am b/plugins/partfileimport/Makefile.am
index f5aca48..86d6248 100644
--- a/plugins/partfileimport/Makefile.am
+++ b/plugins/partfileimport/Makefile.am
@@ -8,7 +8,7 @@ ktpartfileimportplugin_la_SOURCES = partfileimportplugin.cpp importdlgbase.ui im
# Libs needed by the plugin
ktpartfileimportplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la \
- $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/rssfeed/Makefile.am b/plugins/rssfeed/Makefile.am
index c295db5..759af54 100644
--- a/plugins/rssfeed/Makefile.am
+++ b/plugins/rssfeed/Makefile.am
@@ -24,7 +24,7 @@ noinst_HEADERS = rssfeedplugin.h rssfeedmanager.h rssfeed.h rssfilter.h \
ktrssfeedplugin_la_SOURCES = rssfeedplugin.cpp rssfeedmanager.cpp \
rssfeedwidget.ui rssfeed.cpp rssfilter.cpp rssarticle.cpp rsslinkdownloader.cpp
ktrssfeedplugin_la_LIBADD = $(LIB_KIO) $(LIB_QT) rss/librsslocal.la \
- ../../libktorrent/libktorrent.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KHTML) $(LIB_KPARTS)
+ ../../libktorrent/libktorrent.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KHTML) $(LIB_KPARTS)
SUBDIRS = rss
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/scanfolder/Makefile.am b/plugins/scanfolder/Makefile.am
index eb8cc52..191f623 100644
--- a/plugins/scanfolder/Makefile.am
+++ b/plugins/scanfolder/Makefile.am
@@ -25,7 +25,7 @@ ktscanfolderplugin_la_SOURCES = scanfolderplugin.cpp \
scanfolderpluginsettings.kcfgc scanfolderprefpage.cpp sfprefwidgetbase.ui scanfolderprefpagewidget.cpp \
scanfolder.cpp
ktscanfolderplugin_la_LIBADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
- $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/scheduler/Makefile.am b/plugins/scheduler/Makefile.am
index b2c9760..b1d352a 100644
--- a/plugins/scheduler/Makefile.am
+++ b/plugins/scheduler/Makefile.am
@@ -10,7 +10,7 @@ ktschedulerplugin_la_SOURCES = schedulerplugin.cpp \
# Libs needed by the plugin
ktschedulerplugin_la_LIBADD = $(LIB_KHTML) $(LIB_KPARTS) \
../../libktorrent/libktorrent.la \
- $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/search/Makefile.am b/plugins/search/Makefile.am
index af57f30..396a196 100644
--- a/plugins/search/Makefile.am
+++ b/plugins/search/Makefile.am
@@ -9,7 +9,7 @@ ktsearchplugin_la_SOURCES = searchplugin.cpp htmlpart.cpp searchbar.ui \
# Libs needed by the plugin
ktsearchplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
$(LIB_KHTML) $(LIB_KPARTS) $(LIB_QT) \
- $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/stats/Makefile.am b/plugins/stats/Makefile.am
index e04f417..1e65627 100644
--- a/plugins/stats/Makefile.am
+++ b/plugins/stats/Makefile.am
@@ -5,7 +5,7 @@ METASOURCES = AUTO
kde_module_LTLIBRARIES = ktstatsplugin.la
-ktstatsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KPARTS) $(all_libraries)
+ktstatsplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(all_libraries)
ktstatsplugin_la_SOURCES = ChartDrawerData.cc ChartDrawer.cc statsspdwgt.ui statsconwgt.ui StatsSpd.cc StatsCon.cc sprefwgt.ui statspluginsettings.kcfgc \
StatsPluginPrefsPage.cc StatsPluginPrefs.cc statsplugin.cc
diff --git a/plugins/upnp/Makefile.am b/plugins/upnp/Makefile.am
index 8432f90..7bd7b74 100644
--- a/plugins/upnp/Makefile.am
+++ b/plugins/upnp/Makefile.am
@@ -16,7 +16,7 @@ ktupnpplugin_la_SOURCES = upnpplugin.cpp upnpprefpage.cpp upnpwidget.ui \
ktupnpplugin_la_LIBADD = libktupnp.la \
$(LIB_KPARTS) ../../libktorrent/libktorrent.la \
$(LIB_QT) \
- $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
diff --git a/plugins/webinterface/Makefile.am b/plugins/webinterface/Makefile.am
index 17a80d9..7243dcc 100644
--- a/plugins/webinterface/Makefile.am
+++ b/plugins/webinterface/Makefile.am
@@ -12,7 +12,7 @@ ktwebinterfaceplugin_la_SOURCES = webinterfaceplugin.cpp httpserver.cpp \
# Libs needed by the plugin
ktwebinterfaceplugin_la_LIBADD = ../../libktorrent/libktorrent.la \
$(LIB_KHTML) $(LIB_KPARTS) $(LIB_QT) \
- $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KFILE)
+ $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
# LD flags for the plugin
# -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/zeroconf/Makefile.am b/plugins/zeroconf/Makefile.am
index f8151e0..006a6bf 100644
--- a/plugins/zeroconf/Makefile.am
+++ b/plugins/zeroconf/Makefile.am
@@ -11,7 +11,7 @@ ktzeroconfplugin_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(AVAHI_LIB
ktzeroconfplugin_la_SOURCES = localbrowser.cpp avahiservice.cpp \
zeroconfplugin.cpp
-ktzeroconfplugin_la_LIBADD = $(LIB_KDECORE) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_KDEUI)\
+ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI)\
$(LIB_QT) ../../libktorrent/libktorrent.la
noinst_HEADERS = zeroconfplugin.h
diff --git a/utests/Makefile.am b/utests/Makefile.am
index ae01232..8af9fa1 100644
--- a/utests/Makefile.am
+++ b/utests/Makefile.am
@@ -3,7 +3,7 @@ METASOURCES = AUTO
noinst_HEADERS = unittest.h testrunner.h upnpparsedescriptiontest.h \
upnpparseresponsetest.h dhtmsgparsetest.h biginttest.h rc4test.h difflehellmantest.h
bin_PROGRAMS = ktutester
-ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+ktutester_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
ktutester_SOURCES = unittest.cpp testrunner.cpp main.cpp \
upnpparsedescriptiontest.cpp upnpparseresponsetest.cpp dhtmsgparsetest.cpp biginttest.cpp \
rc4test.cpp difflehellmantest.cpp
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-17 06:49:14 +0000