Rename a few build variables for overall consistency

8 files changed, 10 insertions, 10 deletions

diff --git a/languages/cpp/app_templates/kapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am
index 4d4dda6a..9ed90e5d 100644
--- a/languages/cpp/app_templates/kapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kapp/src-Makefile.am
@@ -11,7 +11,7 @@ INCLUDES         = $(all_includes)
 %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
 
 # the libraries to link against.
-%{APPNAMELC}_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+%{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
 
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \
diff --git a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
index d17518c2..2e87715e 100644
--- a/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
+++ b/languages/cpp/app_templates/konqnavpanel/src-Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES=konqsidebar_%{APPNAMELC}.la
 
 konqsidebar_%{APPNAMELC}_la_SOURCES = %{APPNAMELC}.cpp
 konqsidebar_%{APPNAMELC}_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) -lkonqsidebarplugin
-konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE)
+konqsidebar_%{APPNAMELC}_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE)
 
 %{APPNAMELC}_entry_DATA = %{APPNAMELC}.desktop
 %{APPNAMELC}_entrydir = $(kde_datadir)/konqsidebartng/entries
diff --git a/languages/cpp/app_templates/kpartapp/src-Makefile.am b/languages/cpp/app_templates/kpartapp/src-Makefile.am
index 97b007a1..3864442d 100644
--- a/languages/cpp/app_templates/kpartapp/src-Makefile.am
+++ b/languages/cpp/app_templates/kpartapp/src-Makefile.am
@@ -42,7 +42,7 @@ kde_module_LTLIBRARIES = lib%{APPNAMELC}part.la
 # the Part's source, library search path, and link libraries
 lib%{APPNAMELC}part_la_SOURCES = %{APPNAMELC}_part.cpp
 lib%{APPNAMELC}part_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) $(LIB_KIO)
-lib%{APPNAMELC}part_la_LIBADD  = $(LIB_KPARTS) $(LIB_KFILE)
+lib%{APPNAMELC}part_la_LIBADD  = $(LIB_KPARTS) $(LIB_TDEFILE)
 
 # this is where the desktop file will go 
 partdesktopdir   = $(kde_servicesdir)
diff --git a/languages/cpp/app_templates/kxt/src-Makefile.am b/languages/cpp/app_templates/kxt/src-Makefile.am
index 42da5058..64436465 100644
--- a/languages/cpp/app_templates/kxt/src-Makefile.am
+++ b/languages/cpp/app_templates/kxt/src-Makefile.am
@@ -14,7 +14,7 @@ METASOURCES = AUTO
 %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 
 # the libraries to link against.
-%{APPNAMELC}_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+%{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
 
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = settings.kcfgc main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \
diff --git a/languages/cpp/app_templates/noatunui/src-Makefile.am b/languages/cpp/app_templates/noatunui/src-Makefile.am
index 3fb810d0..5086cbe5 100644
--- a/languages/cpp/app_templates/noatunui/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunui/src-Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
 
 noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
 noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
-noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_KFILE) -lnoatun -lnoatuncontrols \
+noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) -lnoatun -lnoatuncontrols \
                                     -lqtmcop -lkmedia2_idl -lsoundserver_idl
 
 noinst_HEADERS = plugin_%{APPNAMELC}_impl.h
diff --git a/languages/cpp/app_templates/noatunvisual/src-Makefile.am b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
index cd557e60..9820cd35 100644
--- a/languages/cpp/app_templates/noatunvisual/src-Makefile.am
+++ b/languages/cpp/app_templates/noatunvisual/src-Makefile.am
@@ -7,7 +7,7 @@ kde_module_LTLIBRARIES = noatun_%{APPNAMELC}plugin.la
 noatun_%{APPNAMELC}plugin_la_SOURCES = plugin_%{APPNAMELC}.cpp plugin_%{APPNAMELC}_impl.cpp
 noatun_%{APPNAMELC}plugin_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIBSDL_RPATH) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS)
 noatun_%{APPNAMELC}plugin_la_CXXFLAGS = $(LIBSDL_CFLAGS)
-noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_KFILE) $(LIBSDL_LIBS) -lnoatun -lm
+noatun_%{APPNAMELC}plugin_la_LIBADD = $(LIB_TDEFILE) $(LIBSDL_LIBS) -lnoatun -lm
 
 pluginsdir = $(kde_datadir)/noatun
 plugins_DATA = %{APPNAMELC}.plugin
diff --git a/languages/cpp/app_templates/tdeconfig35/src-Makefile.am b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
index 53cf2c75..e36f7d13 100644
--- a/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
+++ b/languages/cpp/app_templates/tdeconfig35/src-Makefile.am
@@ -14,7 +14,7 @@ METASOURCES = AUTO
 %{APPNAMELC}_LDFLAGS = $(KDE_RPATH) $(all_libraries)
 
 # the libraries to link against.
-%{APPNAMELC}_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT)
+%{APPNAMELC}_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT)
 
 # which sources should be compiled for %{APPNAMELC}
 %{APPNAMELC}_SOURCES = settings.kcfgc main.cpp %{APPNAMELC}.cpp %{APPNAMELC}view.cpp \
diff --git a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
index 96fcaf0d..7397dafc 100644
--- a/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
+++ b/languages/cpp/app_templates/tdefileplugin/tdefile_plugin.h
@@ -1,7 +1,7 @@
 %{H_TEMPLATE}
 
-#ifndef __KFILE_%{APPNAMEUC}_H__
-#define __KFILE_%{APPNAMEUC}_H__
+#ifndef __TDEFILE_%{APPNAMEUC}_H__
+#define __TDEFILE_%{APPNAMEUC}_H__
 
 /**
  * Note: For further information look into <$TDEDIR/include/tdefilemetainfo.h>
@@ -21,5 +21,5 @@ public:
     virtual bool readInfo( KFileMetaInfo& info, uint what);
 };
 
-#endif // __KFILE_%{APPNAMEUC}_H__
+#endif // __TDEFILE_%{APPNAMEUC}_H__