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

---
 twin/clients/keramik/Makefile.am                | 2 +-
 twin/clients/kwmtheme/cli_installer/Makefile.am | 2 +-
 twin/killer/Makefile.am                         | 2 +-
 twin/tools/Makefile.am                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'twin')

diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am
index 4c7c6e10c..a1525f1e2 100644
--- a/twin/clients/keramik/Makefile.am
+++ b/twin/clients/keramik/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS            = tiles.h
 
 embedtool_SOURCES         = embedtool.cpp
 embedtool_LDADD           = $(LIB_QT)
-embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+embedtool_LDFLAGS         = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 kde_module_LTLIBRARIES    = twin3_keramik.la
 
diff --git a/twin/clients/kwmtheme/cli_installer/Makefile.am b/twin/clients/kwmtheme/cli_installer/Makefile.am
index 1541c1742..d311639e8 100644
--- a/twin/clients/kwmtheme/cli_installer/Makefile.am
+++ b/twin/clients/kwmtheme/cli_installer/Makefile.am
@@ -10,7 +10,7 @@ bin_PROGRAMS = 	kwmtheme
 kwmtheme_SOURCES = main.cpp 
 
 # the library search path. 
-kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kwmtheme_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 # the libraries to link against. Be aware of the order. First the libraries,
 # that depend on the following ones.
diff --git a/twin/killer/Makefile.am b/twin/killer/Makefile.am
index cd396bde7..74e8858aa 100644
--- a/twin/killer/Makefile.am
+++ b/twin/killer/Makefile.am
@@ -4,6 +4,6 @@ bin_PROGRAMS = twin_killer_helper
 
 twin_killer_helper_SOURCES = killer.cpp
 twin_killer_helper_LDADD = $(LIB_TDEUI)
-twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+twin_killer_helper_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 METASOURCES = AUTO
diff --git a/twin/tools/Makefile.am b/twin/tools/Makefile.am
index 7bc1284a5..555b576c5 100644
--- a/twin/tools/Makefile.am
+++ b/twin/tools/Makefile.am
@@ -5,7 +5,7 @@ SUBDIRS = decobenchmark
 INCLUDES = $(all_includes)
 
 test_gravity_SOURCES = test_gravity.cpp
-test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+test_gravity_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 test_gravity_LDADD = $(LIB_X11)
 
 METASOURCES = AUTO
-- 
cgit v1.2.1