Rename a few build variables for overall consistency

9 files changed, 11 insertions, 11 deletions

diff --git a/keduca/keduca/Makefile.am b/keduca/keduca/Makefile.am
index c83b52d7..ce6f1e89 100644
--- a/keduca/keduca/Makefile.am
+++ b/keduca/keduca/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I../libkeduca $(all_includes)
 # The binary program keduca
 bin_PROGRAMS   = keduca
 keduca_LDFLAGS = $(all_libraries)
-keduca_LDADD   = $(LIB_KFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) ../libkeduca/libkeduca.la
+keduca_LDADD   = $(LIB_TDEFILE) $(LIB_KPARTS) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) ../libkeduca/libkeduca.la
 keduca_SOURCES = main.cpp keduca.cpp 
 
 # Convenience library
diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am
index a6c1ecbb..84ae5186 100644
--- a/keduca/keducabuilder/Makefile.am
+++ b/keduca/keducabuilder/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = keducabuilder
 keducabuilder_SOURCES = kcontroladdeditbase.ui keducaeditorstartdialogbase.ui keducaeditorstartdialog.cpp ktagcombobox.cpp klangcombo.cpp kcontrolheader.cpp keducabuilder.cpp kcontroladdedit.cpp  main.cpp
-keducabuilder_LDADD   =  $(LIB_KFILE) ../libkeduca/libkeduca.la 
+keducabuilder_LDADD   =  $(LIB_TDEFILE) ../libkeduca/libkeduca.la 
 
 EXTRA_DIST = main.cpp kcontroladdedit.cpp kcontroladdedit.h keducabuilder.cpp keducabuilder.h kcontrolheader.cpp kcontrolheader.h keducabuilderui.rc klangcombo.cpp klangcombo.h ktagcombobox.cpp ktagcombobox.h keducaeditorstartdialog.cpp keducaeditorstartdialog.h 
 
diff --git a/kig/tdefile/tdefile_drgeo.h b/kig/tdefile/tdefile_drgeo.h
index b9f0b52a..1eca85fa 100644
--- a/kig/tdefile/tdefile_drgeo.h
+++ b/kig/tdefile/tdefile_drgeo.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef KIG_KFILE_KFILE_DRGEO_H
-#define KIG_KFILE_KFILE_DRGEO_H
+#ifndef KIG_TDEFILE_TDEFILE_DRGEO_H
+#define KIG_TDEFILE_TDEFILE_DRGEO_H
 
 #include <tdefilemetainfo.h>
 
diff --git a/kig/tdefile/tdefile_kig.h b/kig/tdefile/tdefile_kig.h
index c910b33b..087caf17 100644
--- a/kig/tdefile/tdefile_kig.h
+++ b/kig/tdefile/tdefile_kig.h
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#ifndef KIG_KFILE_KFILE_KIG_H
-#define KIG_KFILE_KFILE_KIG_H
+#ifndef KIG_TDEFILE_TDEFILE_KIG_H
+#define KIG_TDEFILE_TDEFILE_KIG_H
 
 #include <tdefilemetainfo.h>
 
diff --git a/klatin/klatin/Makefile.am b/klatin/klatin/Makefile.am
index a9fa0eac..0231f6e1 100644
--- a/klatin/klatin/Makefile.am
+++ b/klatin/klatin/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES         = $(all_includes)
 klatin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against.
-klatin_LDADD   = $(LIB_KFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la
+klatin_LDADD   = $(LIB_TDEFILE) $(top_builddir)/libtdeedu/tdeeducore/libtdeeducore.la
 
 # which sources should be compiled for klatin
 klatin_SOURCES =	main.cpp klatin.cpp klatingrammar.cpp klatinverbs.cpp klatinvocab.cpp \
diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
index 775861ed..6dc6fac4 100644
--- a/kmplot/kmplot/Makefile.am
+++ b/kmplot/kmplot/Makefile.am
@@ -45,7 +45,7 @@ kde_module_LTLIBRARIES = libkmplotpart.la
 # the Part's source, library search path, and link libraries
 libkmplotpart_la_SOURCES = FktDlgData.ui parser.cpp xparser.cpp  diagr.cpp View.cpp MainDlg.cpp FktDlg.cpp kprinterdlg.cpp settings.kcfgc settingspagecolor.ui kconstanteditor.cpp qparametereditor.ui kparametereditor.cpp settingspagecoords.ui settingspagefonts.ui settingspagescaling.ui settingspageprecision.ui qeditparametric.ui keditparametric.cpp qeditpolar.ui keditpolar.cpp editfunctionpage.ui editderivativespage.ui editintegralpage.ui editfunction.cpp qeditconstant.ui qminmax.ui kminmax.cpp qconstanteditor.ui keditconstant.cpp kmplotio.cpp sliderwindow.ui ksliderwindow.cpp MainDlgIface.skel parseriface.skel Viewiface.skel coordsconfigdialog.cpp
 libkmplotpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_KPARTS) -lDCOP
-libkmplotpart_la_LIBADD  = $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_TDEPRINT)
+libkmplotpart_la_LIBADD  = $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET) $(LIB_TDEPRINT)
 
 # this is where the desktop file will go
 partdesktopdir   = $(kde_servicesdir)
diff --git a/kstars/kstars.kdevprj b/kstars/kstars.kdevprj
index 098a8870..50c4a484 100644
--- a/kstars/kstars.kdevprj
+++ b/kstars/kstars.kdevprj
@@ -22,7 +22,7 @@ bin_program=kstars
 cflags=
 cppflags=
 cxxflags=\s-O0 -g3 -Wall
-ldadd=-ltdeio -ltdeprint -lm $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+ldadd=-ltdeio -ltdeprint -lm $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 ldflags=\s\s
 
 [General]
diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am
index 622553a4..6f8436f2 100644
--- a/kverbos/kverbos/Makefile.am
+++ b/kverbos/kverbos/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = icons data
 
 bin_PROGRAMS = kverbos
 kverbos_SOURCES = kfeedercontrol.cpp kresult.cpp qresult.ui verbspanish.cpp kverbosuser.cpp kerfassen.cpp qerfassen.ui kverbedit.cpp qverbedit.ui qverbosoptions.ui kverbosoptions.cpp qlernen.ui kstartuplogo.cpp kverbosview.cpp kverbosdoc.cpp kverbos.cpp main.cpp prefs.kcfgc
-kverbos_LDADD   =  $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
+kverbos_LDADD   =  $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) $(LIBSOCKET)
 
 
 EXTRA_DIST = kfeedercontrol.cpp kfeedercontrol.h main.cpp kverbos.cpp kverbos.h kverbosdoc.cpp kverbosdoc.h kverbosview.cpp kverbosview.h kverbosui.rc kverbos.desktop kstartuplogo.cpp kstartuplogo.h startuplogo.png qlernen.ui kverbosoptions.cpp kverbosoptions.h qverbosoptions.ui qverbedit.ui kverbedit.cpp kverbedit.h qerfassen.ui kerfassen.cpp kerfassen.h deu16.png span16.png kverbosuser.cpp kverbosuser.h verbspanish.cpp verbspanish.h qresult.ui kverbosuser.png kresult.cpp kresult.h
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index d8f49002..ade013c6 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -11,7 +11,7 @@ kwordquiz_SOURCES = kwordquizprefs.cpp kwordquizview.cpp kwordquizdoc.cpp \
 			kvtmlwriter.cpp dlglanguage.cpp wqprintdialogpage.cpp prefcharacter.cpp \
 			prefcharacterbase.ui paukerreader.cpp wqlreader.cpp wqlwriter.cpp wqundo.cpp prefs.kcfgc \
 		prefcardappearance.cpp prefcardappearancebase.ui kwqnewstuff.cpp kwqnewstuff.h
-kwordquiz_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KFILE) \
+kwordquiz_LDADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEFILE) \
 	$(LIBSOCKET) $(LIB_TDEPRINT) -lknewstuff