From 97614ba4ad9bf5acfe0417eead952718b46ed71d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 6 Nov 2011 21:32:30 -0600
Subject: Rename additional instances of KDE to TDE

---
 acinclude.m4                | 24 ++++++++++++------------
 src/app/Makefile.am         |  2 +-
 src/gvcore/Makefile.am      |  2 +-
 src/gvdirpart/Makefile.am   |  2 +-
 src/gvimagepart/Makefile.am |  2 +-
 src/imageutils/Makefile.am  |  2 +-
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index a41853c..ffaf0b1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2059,8 +2059,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")
@@ -2069,9 +2069,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")
@@ -2080,8 +2080,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")
@@ -2090,13 +2090,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/src/app/Makefile.am b/src/app/Makefile.am
index 45ec945..c6bb33a 100644
--- a/src/app/Makefile.am
+++ b/src/app/Makefile.am
@@ -51,6 +51,6 @@ check_PROGRAMS = testvtabwidget
 testvtabwidget_SOURCES = testvtabwidget.cpp
 testvtabwidget_LDADD = \
 	libgwenshared.la \
-	$(LIB_KUTILS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
+	$(LIB_KUTILS) $(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \
 	$(LIBJPEG)
 testvtabwidget_LDFLAGS = $(all_libraries) $(LIB_QT)
diff --git a/src/gvcore/Makefile.am b/src/gvcore/Makefile.am
index 1bec46b..d34d923 100644
--- a/src/gvcore/Makefile.am
+++ b/src/gvcore/Makefile.am
@@ -5,7 +5,7 @@ lib_LTLIBRARIES = libgwenviewcore.la
 libgwenviewcore_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 
 libgwenviewcore_la_LIBADD   = \
-	$(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_KDEPRINT) $(LIB_QT) \
+	$(LIB_KFILE) $(LIB_TDEUI) $(LIB_TDECORE) $(LIB_TDEPRINT) $(LIB_QT) \
 	$(LIBJPEG) $(LIBPNG) $(LIBMNG) $(GV_LIB_XCURSOR) $(LIB_EXIV2)\
 	-lkmediaplayer ../imageutils/libgvimageutils.la \
 	../tsthread/libtsthread.la
diff --git a/src/gvdirpart/Makefile.am b/src/gvdirpart/Makefile.am
index da2fcad..767ddc4 100644
--- a/src/gvdirpart/Makefile.am
+++ b/src/gvdirpart/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libgvdirpart.la
 
 libgvdirpart_la_SOURCES = gvdirpart.cpp gvdirpartconfig.kcfgc
 libgvdirpart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la
-libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT)
+libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT)
 
 # Automatically generate moc files
 METASOURCES = AUTO
diff --git a/src/gvimagepart/Makefile.am b/src/gvimagepart/Makefile.am
index 2fed737..9596eac 100644
--- a/src/gvimagepart/Makefile.am
+++ b/src/gvimagepart/Makefile.am
@@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = libgvimagepart.la
 
 libgvimagepart_la_SOURCES = gvimagepart.cpp
 libgvimagepart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la
-libgvimagepart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO) $(LIB_KDEPRINT)
+libgvimagepart_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_KIO) $(LIB_TDEPRINT)
 
 # Automatically generate moc files
 METASOURCES = AUTO
diff --git a/src/imageutils/Makefile.am b/src/imageutils/Makefile.am
index 33c83b3..9fba7c9 100644
--- a/src/imageutils/Makefile.am
+++ b/src/imageutils/Makefile.am
@@ -16,7 +16,7 @@ libgvimageutils_la_SOURCES = \
 	asm_scale.S \
 	croppedqimage.cpp
 
-libgvimageutils_la_LIBADD = $(LIB_KDECORE) $(LIBQT) $(LIBJPEG) $(LIB_EXIV2)
+libgvimageutils_la_LIBADD = $(LIB_TDECORE) $(LIBQT) $(LIBJPEG) $(LIB_EXIV2)
 
 noinst_HEADERS = \
 	orientation.h \
-- 
cgit v1.2.1