Rename a few build variables for overall consistency

15 files changed, 19 insertions, 19 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index d8223de..38bbafe 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2111,14 +2111,14 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-ltdeio")
-   AC_SUBST(LIB_KFILE, "-ltdeio")
+   AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_TDECORE, "-ltdecore")
    AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-ltdefile")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2128,7 +2128,7 @@ else
    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, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
diff --git a/aclocal.m4 b/aclocal.m4
index 81259e8..d2cc5b7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2123,14 +2123,14 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
 # these are for backward compatibility
    AC_SUBST(LIB_KSYCOCA, "-ltdeio")
-   AC_SUBST(LIB_KFILE, "-ltdeio")
+   AC_SUBST(LIB_TDEFILE, "-ltdeio")
 elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KDECORE, "-lkdecore")
    AC_SUBST(LIB_KDEUI, "-lkdeui")
    AC_SUBST(LIB_KIO, "-ltdeio")
    AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
-   AC_SUBST(LIB_KFILE, "-ltdefile")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile")
    AC_SUBST(LIB_KAB, "-lkab")
    AC_SUBST(LIB_TDEHTML, "-ltdehtml")
    AC_SUBST(LIB_KSPELL, "-ltdespell")
@@ -2140,7 +2140,7 @@ else
    AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)")
    AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)")
    AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
+   AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_KDEUI)")
    AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
 fi
 ])
diff --git a/apps/ktcachecheck/Makefile.am b/apps/ktcachecheck/Makefile.am
index f6c2a80..fefaa28 100644
--- a/apps/ktcachecheck/Makefile.am
+++ b/apps/ktcachecheck/Makefile.am
@@ -7,6 +7,6 @@ ktcachecheck_SOURCES = cachecheck.cpp cachechecker.cpp singlecachechecker.cpp \
 	multicachechecker.cpp
 ktcachecheck_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 ktcachecheck_LDADD = $(LIB_KPARTS) ../../libktorrent/libktorrent.la \
-	$(LIB_KFILE) $(LIB_KIO)
+	$(LIB_TDEFILE) $(LIB_KIO)
 noinst_HEADERS = cachechecker.h singlecachechecker.h multicachechecker.h
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/apps/ktorrent/Makefile.am b/apps/ktorrent/Makefile.am
index 28c1073..80b5601 100644
--- a/apps/ktorrent/Makefile.am
+++ b/apps/ktorrent/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES = -I$(top_builddir)/ktorrent/libktorrent -I$(top_builddir)/libktorrent/
 ktorrent_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
-ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_KFILE) \
+ktorrent_LDADD = ../../apps/ktorrent/newui/libnewui.la $(LIB_TDEFILE) \
 	$(LIB_KIO) $(LIB_KPARTS) ../../apps/ktorrent/groups/libgroups.la \
 	../../libktorrent/libktorrent.la
 
diff --git a/apps/kttorinfo/Makefile.am b/apps/kttorinfo/Makefile.am
index d85426e..22b967e 100644
--- a/apps/kttorinfo/Makefile.am
+++ b/apps/kttorinfo/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 bin_PROGRAMS = kttorinfo
 kttorinfo_SOURCES = main.cpp
 kttorinfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_KFILE) \
+kttorinfo_LDADD = ../../libktorrent/libktorrent.la $(LIB_KPARTS) $(LIB_TDEFILE) \
 	$(LIB_KIO)
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/infowidget/Makefile.am b/plugins/infowidget/Makefile.am
index 10775f4..7497890 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_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
-			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
 # LD flags for the plugin
diff --git a/plugins/ipfilter/Makefile.am b/plugins/ipfilter/Makefile.am
index 4e78aba..715db5a 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_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la $(LIB_QT) \
-	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
 
diff --git a/plugins/logviewer/Makefile.am b/plugins/logviewer/Makefile.am
index 2c7f150..7a9638e 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_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la $(LIB_QT) \
-	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
 
diff --git a/plugins/partfileimport/Makefile.am b/plugins/partfileimport/Makefile.am
index ec902f3..37c1109 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_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la \
-	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/scanfolder/Makefile.am b/plugins/scanfolder/Makefile.am
index 191f623..4fd62b1 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_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+		       $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS) $(USE_RTTI)
diff --git a/plugins/scheduler/Makefile.am b/plugins/scheduler/Makefile.am
index 85d292d..4ceac0d 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_TDEHTML) $(LIB_KPARTS) \
 	../../libktorrent/libktorrent.la \
-	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+	$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # 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 1cbb3ef..97d4269 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_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
-			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # LD flags for the plugin
 # -module says: this is a module, i.e. something you're going to dlopen
diff --git a/plugins/upnp/Makefile.am b/plugins/upnp/Makefile.am
index 7bd7b74..83c503d 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_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+	$(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 
 
diff --git a/plugins/webinterface/Makefile.am b/plugins/webinterface/Makefile.am
index 0fee620..8067401 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_TDEHTML) $(LIB_KPARTS) $(LIB_QT) \
-			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE)
+			   $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE)
 
 # 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 006a6bf..22e9d67 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_TDECORE) $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI)\
+ktzeroconfplugin_la_LIBADD = $(LIB_TDECORE) $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_TDEUI)\
 	$(LIB_QT) ../../libktorrent/libktorrent.la
 
 noinst_HEADERS = zeroconfplugin.h