From 57d6599bd064e02ea0a8295cbdf65d6fff87ac2c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 29 Jan 2013 23:28:27 -0600
Subject: [PATCH] Rename a few build variables for overall consistency

---
 acinclude.m4                        | 6 +++---
 kipi-plugins/gpssync/Makefile.am    | 2 +-
 kipi-plugins/htmlexport/Makefile.am | 2 +-
 3 files changed, 5 insertions(+), 5 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/kipi-plugins/gpssync/Makefile.am b/kipi-plugins/gpssync/Makefile.am
index 3e09a63..fa636ea 100644
--- a/kipi-plugins/gpssync/Makefile.am
+++ b/kipi-plugins/gpssync/Makefile.am
@@ -16,7 +16,7 @@ kipiplugin_gpssync_la_SOURCES = plugin_gpssync.cpp gpssyncdialog.cpp gpslistview
 # Libs needed by the plugin
 kipiplugin_gpssync_la_LIBADD = $(LIBKEXIV2_LIBS) -lkipiplugins $(LIBKIPI_LIBS) $(LIB_TDEHTML) \
 	                       $(LIB_KPARTS) $(LIB_KIO) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT) \
-	                       $(LIB_KFILE)
+	                       $(LIB_TDEFILE)
 
 # LD flags for the plugin
 kipiplugin_gpssync_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries)
diff --git a/kipi-plugins/htmlexport/Makefile.am b/kipi-plugins/htmlexport/Makefile.am
index 2b7f8cb..65dc6e3 100644
--- a/kipi-plugins/htmlexport/Makefile.am
+++ b/kipi-plugins/htmlexport/Makefile.am
@@ -27,7 +27,7 @@ kipiplugin_htmlexport_la_SOURCES = \
 kde_kcfg_DATA = \
 	htmlexportconfig.kcfg
 
-kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
+kipiplugin_htmlexport_la_LIBADD = -lexslt -lxml2 $(LIBXSLT_LIBS) $(LIBKIPI_LIBS) $(LIB_TDEFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_QT)
 kipiplugin_htmlexport_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins