Rename a few build variables for overall consistency

kjsembed/Makefile.am

@@ -55,7 +55,7 @@ libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
 			qtbindings/libkjsembedqtbindings.la \
 			-ltqui \
 			$(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
-			$(LIB_KFILE) $(LIB_TDEHTML) -lkjs $(LIBSOCKET)
+			$(LIB_TDEFILE) $(LIB_TDEHTML) -lkjs $(LIBSOCKET)
 
 kjscmd_SOURCES =	kjscmd.cpp
 kjscmd_LDFLAGS =	$(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KJS)

kjsembed/bindings/Makefile.am

@@ -22,7 +22,7 @@ libkjsembedbindings_la_SOURCES =	image_imp.cpp \
 
 libkjsembedbindings_la_LDFLAGS =  $(all_libraries) $(KDE_RPATH)
 libkjsembedbindings_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
-				$(LIB_KFILE)  $(LIBSOCKET)
+				$(LIB_TDEFILE)  $(LIBSOCKET)
 
 libkjsembedbindings_la_METASOURCES = AUTO
 

kjsembed/builtins/Makefile.am

@@ -13,6 +13,6 @@ libkjsembedbuiltins_la_SOURCES =	stdaction_imp.cpp \
 
 libkjsembedbuiltins_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 libkjsembedbuiltins_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KPARTS) \
-				$(LIB_KFILE) -lkjs $(LIBSOCKET)
+				$(LIB_TDEFILE) -lkjs $(LIBSOCKET)
 
 libkjsembedbuiltins_la_METASOURCES = AUTO

kjsembed/docs/embedding/simple-embed/Makefile.am

@@ -11,7 +11,7 @@ INCLUDES         = -I$(top_srcdir) $(all_includes)
 embedjs_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
-embedjs_LDADD   = $(LIB_KFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la
+embedjs_LDADD   = $(LIB_TDEFILE) $(LIB_TDEPRINT) -lkjs $(top_builddir)/kjsembed/libkjsembed.la
 
 # which sources should be compiled for embedjs
 embedjs_SOURCES = main.cpp embedview.ui embedviewimp.cpp

kjsembed/plugins/Makefile.am

@@ -8,27 +8,27 @@ METASOURCES = AUTO
 # the Plugin's source, library search path, and link libraries
 libcustomobjectplugin_la_SOURCES = customobject_plugin.cpp
 libcustomobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libcustomobjectplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la
+libcustomobjectplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libcustomqobjectplugin_la_SOURCES = customqobject_plugin.cpp
 libcustomqobjectplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libcustomqobjectplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la
+libcustomqobjectplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libimagefxplugin_la_SOURCES = imagefx_plugin.cpp
 libimagefxplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libimagefxplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la
+libimagefxplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libqprocessplugin_la_SOURCES = qprocess_plugin.cpp
 libqprocessplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(KDE_RPATH) $(all_libraries)
-libqprocessplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_KFILE) ../libkjsembed.la
+libqprocessplugin_la_LIBADD  = $(LIB_QT) $(LIB_KPARTS) $(LIB_TDECORE) $(LIB_TDEFILE) ../libkjsembed.la
 
 # the Plugin's source, library search path, and link libraries
 libfileitemplugin_la_SOURCES = tdefileitemloader.cpp
 libfileitemplugin_la_LDFLAGS = -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx $(all_libraries)
-libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) ../libkjsembed.la
+libfileitemplugin_la_LIBADD = $(LIB_KPARTS) $(LIB_TDEFILE) ../libkjsembed.la
 
 
 # this is where the desktop file will go

kjsembed/plugins/tdefileitemloader.h

@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
-#ifndef KFILEITEMLOADER_H
-#define KFILEITEMLOADER_H
+#ifndef TDEFILEITEMLOADER_H
+#define TDEFILEITEMLOADER_H
 
 #include <kjsembed/jsbindingplugin.h>
 #include <kjsembed/jsproxy_imp.h>