Rename a few build variables for overall consistency

21 files changed, 30 insertions, 30 deletions

diff --git a/atlantikdesigner/Makefile.am b/atlantikdesigner/Makefile.am
index 62c6f13..6b18880 100644
--- a/atlantikdesigner/Makefile.am
+++ b/atlantikdesigner/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES = $(all_includes)
 LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
-LDADD = $(LIB_KSYCOCA) $(LIB_KFILE)
+LDADD = $(LIB_KSYCOCA) $(LIB_TDEFILE)
 
 SUBDIRS = designer pics
 
diff --git a/konq-plugins/sidebar/mediaplayer/Makefile.am b/konq-plugins/sidebar/mediaplayer/Makefile.am
index 3a79209..fb5e13f 100644
--- a/konq-plugins/sidebar/mediaplayer/Makefile.am
+++ b/konq-plugins/sidebar/mediaplayer/Makefile.am
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = konqsidebar_mediaplayer.la
 # the Part's source, library search path, and link libraries
 konqsidebar_mediaplayer_la_SOURCES = mediawidget_skel.ui engine.cpp player.cpp mediawidget.cpp mediaplayer.cpp controls.cpp
 konqsidebar_mediaplayer_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konqsidebar_mediaplayer_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) -lkonqsidebarplugin -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde 
+konqsidebar_mediaplayer_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin -lqtmcop -lkmedia2_idl -lsoundserver_idl -lartskde 
 
 globaladddir   = $(kde_datadir)/konqsidebartng/add
 globaladd_DATA = mplayer_add.desktop
diff --git a/konq-plugins/sidebar/newsticker/Makefile.am b/konq-plugins/sidebar/newsticker/Makefile.am
index 4dc9fae..3b6ad90 100644
--- a/konq-plugins/sidebar/newsticker/Makefile.am
+++ b/konq-plugins/sidebar/newsticker/Makefile.am
@@ -17,7 +17,7 @@ konq_sidebarnews_la_SOURCES = sidebar_news.cpp sidebar_news.skel nsstacktabwidge
                               sidebarsettings.kcfgc \
 			      configfeedsbase.ui configfeeds.cpp
 konq_sidebarnews_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-konq_sidebarnews_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE) -lkonqsidebarplugin
+konq_sidebarnews_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE) -lkonqsidebarplugin
 
 
 globaladddir   = $(kde_datadir)/konqsidebartng/add
diff --git a/noatun-plugins/alarm/Makefile.am b/noatun-plugins/alarm/Makefile.am
index 182c307..95b46ac 100644
--- a/noatun-plugins/alarm/Makefile.am
+++ b/noatun-plugins/alarm/Makefile.am
@@ -6,7 +6,7 @@ noatunwakeup_la_SOURCES = wakeup.cpp \
 	kpercentspinbox.cpp
 
 noatunwakeup_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunwakeup_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+noatunwakeup_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 
 noatunwakeup_la_METASOURCES = AUTO
 
diff --git a/noatun-plugins/blurscope/Makefile.am b/noatun-plugins/blurscope/Makefile.am
index 440a2fc..cf2816f 100644
--- a/noatun-plugins/blurscope/Makefile.am
+++ b/noatun-plugins/blurscope/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= $(all_includes) $(SDL_CFLAGS) -I$(kde_includes)/tde
 kde_module_LTLIBRARIES = noatunblurscope.la
 noatunblurscope_la_SOURCES = sdlscope.cpp scopedisplayer.cpp
 noatunblurscope_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries)
-noatunblurscope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm $(SDL_LIBS)
+noatunblurscope_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm $(SDL_LIBS)
 noatunblurscope_la_METASOURCES = AUTO
 
 noatun_DATA = blurscope.plugin
diff --git a/noatun-plugins/ffrs/Makefile.am b/noatun-plugins/ffrs/Makefile.am
index 0364a32..4861ee5 100644
--- a/noatun-plugins/ffrs/Makefile.am
+++ b/noatun-plugins/ffrs/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatun_ffrs.la
 noatun_ffrs_la_SOURCES = ffrs.cpp
 
 noatun_ffrs_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatun_ffrs_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+noatun_ffrs_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 
 noatun_ffrs_la_METASOURCES = AUTO
 
diff --git a/noatun-plugins/luckytag/Makefile.am b/noatun-plugins/luckytag/Makefile.am
index 3d2cf05..079acb7 100644
--- a/noatun-plugins/luckytag/Makefile.am
+++ b/noatun-plugins/luckytag/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = noatunluckytag.la
 
 noatunluckytag_la_SOURCES = luckytag.cpp parsedmp3filename.cpp
 noatunluckytag_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunluckytag_la_LIBADD = $(LIB_KFILE) -lnoatun -lnoatuntags
+noatunluckytag_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuntags
 
 noatunluckytag_la_METASOURCES = AUTO
 
diff --git a/noatun-plugins/lyrics/Makefile.am b/noatun-plugins/lyrics/Makefile.am
index cb6d66d..540b4dc 100644
--- a/noatun-plugins/lyrics/Makefile.am
+++ b/noatun-plugins/lyrics/Makefile.am
@@ -4,7 +4,7 @@ kde_module_LTLIBRARIES = noatunlyrics.la
 noatunlyrics_la_SOURCES = lyrics.cpp historymanager.cpp cmodule.cpp
 
 noatunlyrics_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunlyrics_la_LIBADD = $(LIB_TDEHTML) $(LIB_KFILE) -lnoatun
+noatunlyrics_la_LIBADD = $(LIB_TDEHTML) $(LIB_TDEFILE) -lnoatun
 
 noatunlyrics_la_METASOURCES = AUTO
 
diff --git a/noatun-plugins/nexscope/Makefile.am b/noatun-plugins/nexscope/Makefile.am
index e81b022..ea05782 100644
--- a/noatun-plugins/nexscope/Makefile.am
+++ b/noatun-plugins/nexscope/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatunnexscope.la
 
 noatunnexscope_la_SOURCES = noatunplugin.cpp
 noatunnexscope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunnexscope_la_LIBADD = $(LIB_KFILE) -lnoatun
+noatunnexscope_la_LIBADD = $(LIB_TDEFILE) -lnoatun
 
 bin_PROGRAMS = nexscope.bin
 
diff --git a/noatun-plugins/noatunmadness/Makefile.am b/noatun-plugins/noatunmadness/Makefile.am
index 4e48f80..962d256 100644
--- a/noatun-plugins/noatunmadness/Makefile.am
+++ b/noatun-plugins/noatunmadness/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= $(all_includes) -I$(kde_includes)/tde
 kde_module_LTLIBRARIES = noatunmadness.la
 noatunmadness_la_SOURCES = madness.cpp
 noatunmadness_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunmadness_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+noatunmadness_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 noatunmadness_la_METASOURCES = AUTO
 
 noatun_DATA = madness.plugin
diff --git a/noatun-plugins/pitchablespeed/Makefile.am b/noatun-plugins/pitchablespeed/Makefile.am
index e77ab51..a7774cf 100644
--- a/noatun-plugins/pitchablespeed/Makefile.am
+++ b/noatun-plugins/pitchablespeed/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(kde_includes)/arts $(all_includes) -I$(kde_includes)/tde
 
 kde_module_LTLIBRARIES = noatunpitchablespeed.la
 noatunpitchablespeed_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunpitchablespeed_la_LIBADD = $(LIB_KFILE) -lnoatun -lm -lartsmodules
+noatunpitchablespeed_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm -lartsmodules
 
 noatunpitchablespeed_la_SOURCES = pitchablespeed.cpp speedtuner.ui
 noatunpitchablespeed_la_METASOURCES = AUTO
diff --git a/noatun-plugins/synaescope/Makefile.am b/noatun-plugins/synaescope/Makefile.am
index d1cb551..3978433 100644
--- a/noatun-plugins/synaescope/Makefile.am
+++ b/noatun-plugins/synaescope/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatunsynaescope.la
 
 noatunsynaescope_la_SOURCES = synaescope.cpp cmodule.cpp
 noatunsynaescope_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunsynaescope_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+noatunsynaescope_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 
 bin_PROGRAMS = noatunsynaescope.bin
 
diff --git a/noatun-plugins/tippercanoe/Makefile.am b/noatun-plugins/tippercanoe/Makefile.am
index 18a9e35..a325e1a 100644
--- a/noatun-plugins/tippercanoe/Makefile.am
+++ b/noatun-plugins/tippercanoe/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatuntippecanoe.la
 
 noatuntippecanoe_la_SOURCES = synaescope.cpp
 noatuntippecanoe_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatuntippecanoe_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+noatuntippecanoe_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 
 bin_PROGRAMS = noatuntippecanoe.bin
 
diff --git a/noatun-plugins/tyler/Makefile.am b/noatun-plugins/tyler/Makefile.am
index bbba726..7f24717 100644
--- a/noatun-plugins/tyler/Makefile.am
+++ b/noatun-plugins/tyler/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatuntyler.la
 
 noatuntyler_la_SOURCES = tyler.cpp
 noatuntyler_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatuntyler_la_LIBADD = $(LIB_KFILE) -lnoatun -lm
+noatuntyler_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm
 
 bin_PROGRAMS = noatuntyler.bin
 
diff --git a/noatun-plugins/wavecapture/Makefile.am b/noatun-plugins/wavecapture/Makefile.am
index 3b448ce..deebd0b 100644
--- a/noatun-plugins/wavecapture/Makefile.am
+++ b/noatun-plugins/wavecapture/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = noatunwavecapture.la
 
 
 noatunwavecapture_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-noatunwavecapture_la_LIBADD = $(LIB_KFILE) -lnoatun -lm -lartsmodules
+noatunwavecapture_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lm -lartsmodules
 
 noatunwavecapture_la_SOURCES = wavecapture.cpp
 noatunwavecapture_la_METASOURCES = AUTO
diff --git a/tdefile-plugins/cert/tdefile_cert.h b/tdefile-plugins/cert/tdefile_cert.h
index 4d3b93b..1a508aa 100644
--- a/tdefile-plugins/cert/tdefile_cert.h
+++ b/tdefile-plugins/cert/tdefile_cert.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef __KFILE_CERT_H__
-#define __KFILE_CERT_H__
+#ifndef __TDEFILE_CERT_H__
+#define __TDEFILE_CERT_H__
 
 /**
  * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@@ -39,5 +39,5 @@ public:
   virtual bool readInfo(KFileMetaInfo& info, uint what);
 };
 
-#endif // __KFILE_CERT_H__
+#endif // __TDEFILE_CERT_H__
 
diff --git a/tdefile-plugins/desktop/tdefile_desktop.h b/tdefile-plugins/desktop/tdefile_desktop.h
index b6d0104..1abd40a 100644
--- a/tdefile-plugins/desktop/tdefile_desktop.h
+++ b/tdefile-plugins/desktop/tdefile_desktop.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_DESKTOP_H__
-#define __KFILE_DESKTOP_H__
+#ifndef __TDEFILE_DESKTOP_H__
+#define __TDEFILE_DESKTOP_H__
 
 #include <tdefilemetainfo.h>
 #include <kurl.h>
diff --git a/tdefile-plugins/folder/tdefile_folder.h b/tdefile-plugins/folder/tdefile_folder.h
index 8fe7e94..f137f82 100644
--- a/tdefile-plugins/folder/tdefile_folder.h
+++ b/tdefile-plugins/folder/tdefile_folder.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_KFOLDER_H__
-#define __KFILE_KFOLDER_H__
+#ifndef __TDEFILE_KFOLDER_H__
+#define __TDEFILE_KFOLDER_H__
 
 #include <tdefilemetainfo.h>
 
diff --git a/tdefile-plugins/lnk/tdefile_lnk.h b/tdefile-plugins/lnk/tdefile_lnk.h
index 3d43dbc..77c37b9 100644
--- a/tdefile-plugins/lnk/tdefile_lnk.h
+++ b/tdefile-plugins/lnk/tdefile_lnk.h
@@ -22,8 +22,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef __KFILE_LNK_H__
-#define __KFILE_LNK_H__
+#ifndef __TDEFILE_LNK_H__
+#define __TDEFILE_LNK_H__
 
 /**
  * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@@ -43,5 +43,5 @@ public:
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
 
-#endif // __KFILE_LNK_H__
+#endif // __TDEFILE_LNK_H__
 
diff --git a/tdefile-plugins/mhtml/tdefile_mhtml.h b/tdefile-plugins/mhtml/tdefile_mhtml.h
index 50e1231..660bee9 100644
--- a/tdefile-plugins/mhtml/tdefile_mhtml.h
+++ b/tdefile-plugins/mhtml/tdefile_mhtml.h
@@ -19,8 +19,8 @@
  ***************************************************************************/
 
 
-#ifndef __KFILE_MHTML_H__
-#define __KFILE_MHTML_H__
+#ifndef __TDEFILE_MHTML_H__
+#define __TDEFILE_MHTML_H__
 
 /**
  * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@@ -42,5 +42,5 @@ private:
 	TQString decodeRFC2047String(const TQString &msg);
 };
 
-#endif // __KFILE_MHTML_H__
+#endif // __TDEFILE_MHTML_H__
 
diff --git a/tdefile-plugins/txt/tdefile_txt.h b/tdefile-plugins/txt/tdefile_txt.h
index 86e80cc..df97bec 100644
--- a/tdefile-plugins/txt/tdefile_txt.h
+++ b/tdefile-plugins/txt/tdefile_txt.h
@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef __KFILE_TXT_H_
-#define __KFILE_TXT_H_
+#ifndef __TDEFILE_TXT_H_
+#define __TDEFILE_TXT_H_
 
 #include <tdefilemetainfo.h>