From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 26 Jan 2013 13:16:20 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 tdm/kfrontend/CMakeLists.txt | 2 +-
 tdm/kfrontend/Makefile.am    | 4 ++--
 tdm/kfrontend/kgapp.cpp      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tdm/kfrontend')

diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index 4a069a3ae..bf2449fd6 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -58,7 +58,7 @@ tde_add_executable( tdm_config
 
 ##### tdm_greet (executable) ####################
 if( WITH_XRANDR )
-  set( TDMGREET_OPTIONAL_LINK "krandr-shared" )
+  set( TDMGREET_OPTIONAL_LINK "tderandr-shared" )
 endif ( )
 
 tde_add_executable( tdm_greet AUTOMOC
diff --git a/tdm/kfrontend/Makefile.am b/tdm/kfrontend/Makefile.am
index 7c58dc67f..c659ca62f 100644
--- a/tdm/kfrontend/Makefile.am
+++ b/tdm/kfrontend/Makefile.am
@@ -24,11 +24,11 @@ tdm_greet_SOURCES = \
     tdmadmindialog.cpp \
     kgreeter.cpp \
     kgapp.cpp
-tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+tdm_greet_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 tdm_greet_LDADD = themer/libtdmthemer.a $(LIB_TDEUI) $(XTESTLIB) $(LIBPOSIX4)
 
 krootimage_SOURCES = krootimage.cpp
-krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+krootimage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 krootimage_LDADD = $(top_builddir)/kcontrol/background/libbgnd.la $(LIB_KIO)
 
 METASOURCES = AUTO
diff --git a/tdm/kfrontend/kgapp.cpp b/tdm/kfrontend/kgapp.cpp
index d6fc4fc43..60a32c735 100644
--- a/tdm/kfrontend/kgapp.cpp
+++ b/tdm/kfrontend/kgapp.cpp
@@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <klocale.h>
 #include <kdebug.h>
 #ifdef WITH_XRANDR
-#include <libkrandr/libkrandr.h>
+#include <libtderandr/libtderandr.h>
 #endif
 
 #include <tqtimer.h>
-- 
cgit v1.2.3