From 30c1d72e5226555f76cb5fc4be857afa1a77a10e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 6 Nov 2011 21:33:18 -0600
Subject: [PATCH] Rename additional instances of KDE to TDE

---
 acinclude.m4          | 24 ++++++++++++------------
 keep/app/Makefile.am  |  4 ++--
 keep/kded/Makefile.am |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 29715e3..d95377d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2068,8 +2068,8 @@ if test $kde_qtver = 3; then
                *) lib_kded="" ;;
        esac
    AC_SUBST(LIB_KDED, $lib_kded)
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KJS, "-lkjs")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2078,9 +2078,9 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
    AC_SUBST(LIB_KUTILS, "-lkutils")
-   AC_SUBST(LIB_KDEPIM, "-ltdepim")
+   AC_SUBST(LIB_TDEPIM, "-ltdepim")
    AC_SUBST(LIB_KIMPROXY, "-lkimproxy")
    AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
    AC_SUBST(LIB_KDNSSD, "-lkdnssd")
@@ -2089,8 +2089,8 @@ if test $kde_qtver = 3; then
    AC_SUBST(LIB_KSYCOCA, "-lkio")
    AC_SUBST(LIB_KFILE, "-lkio")
 elif test $kde_qtver = 2; then
-   AC_SUBST(LIB_KDECORE, "-ltdecore")
-   AC_SUBST(LIB_KDEUI, "-ltdeui")
+   AC_SUBST(LIB_TDECORE, "-ltdecore")
+   AC_SUBST(LIB_TDEUI, "-ltdeui")
    AC_SUBST(LIB_KIO, "-lkio")
    AC_SUBST(LIB_KSYCOCA, "-lksycoca")
    AC_SUBST(LIB_SMB, "-lsmb")
@@ -2099,13 +2099,13 @@ elif test $kde_qtver = 2; then
    AC_SUBST(LIB_KHTML, "-lkhtml")
    AC_SUBST(LIB_KSPELL, "-lkspell")
    AC_SUBST(LIB_KPARTS, "-lkparts")
-   AC_SUBST(LIB_KDEPRINT, "-ltdeprint")
+   AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
 else
-   AC_SUBST(LIB_KDECORE, "-ltdecore -lXext $(LIB_QT)")
-   AC_SUBST(LIB_KDEUI, "-ltdeui $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)")
-   AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)")
-   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)")
+   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, "-lkfile $(LIB_KFM) $(LIB_TDEUI)")
+   AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
 fi
 ])
 
diff --git a/keep/app/Makefile.am b/keep/app/Makefile.am
index a8e1ca5..dd0b775 100644
--- a/keep/app/Makefile.am
+++ b/keep/app/Makefile.am
@@ -11,8 +11,8 @@ keep_SOURCES = main.cpp keepmainwindow.cpp backuplistwidget.cpp\
 		addbackupwizard1view.ui addbackupwizard2view.ui\
 		addbackupwizard3view.ui restorebackupwizard1view.ui\
 		restorebackupwizard2view.ui restorebackupwizard3view.ui backuplistview.ui
-keep_LDADD = $(top_builddir)/keep/common/libkeep.la $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KIO)
-keep_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_KDECORE) $(LIB_KDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+keep_LDADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_KIO)
+keep_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
 
 noinst_HEADERS = keepmainwindow.h addbackupwizard.h logdialog.h\
 		restorebackupwizard.h forcebackupdialog.h\
diff --git a/keep/kded/Makefile.am b/keep/kded/Makefile.am
index 6828b16..26f9cd4 100644
--- a/keep/kded/Makefile.am
+++ b/keep/kded/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(top_srcdir)/keep/common -I$(top_builddir)/keep/common $(all_inclu
 
 kde_module_LTLIBRARIES = kded_keep.la
 kded_keep_la_LDFLAGS = -module -avoid-version $(all_libraries)
-kded_keep_la_LIBADD = $(top_builddir)/keep/common/libkeep.la $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+kded_keep_la_LIBADD = $(top_builddir)/keep/common/libkeep.la $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO)
 kded_keep_la_SOURCES = keepkded.cpp keepkded.skel
 
 noinst_HEADERS = keepkded.h