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

---
 src/piklab-test/generators/Makefile.am       | 6 +++---
 src/piklab-test/misc/Makefile.am             | 2 +-
 src/piklab-test/save_load_memory/Makefile.am | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/piklab-test')

diff --git a/src/piklab-test/generators/Makefile.am b/src/piklab-test/generators/Makefile.am
index bea15b6..382ec5e 100644
--- a/src/piklab-test/generators/Makefile.am
+++ b/src/piklab-test/generators/Makefile.am
@@ -17,15 +17,15 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
 
 gputils_config_generator_check_DEPENDENCIES = $(OBJ)
 gputils_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
-gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+gputils_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 gputils_config_generator_check_SOURCES = gputils_config_generator_check.cpp
 
 gputils_template_generator_check_DEPENDENCIES = $(OBJ)
 gputils_template_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
-gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+gputils_template_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 gputils_template_generator_check_SOURCES = gputils_template_generator_check.cpp
 
 sdcc_config_generator_check_DEPENDENCIES = $(OBJ)
 sdcc_config_generator_check_LDADD = $(OBJ) $(LIB_KIO) $(LIB_QT)
-sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+sdcc_config_generator_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 sdcc_config_generator_check_SOURCES = sdcc_config_generator_check.cpp
diff --git a/src/piklab-test/misc/Makefile.am b/src/piklab-test/misc/Makefile.am
index d6d6b6c..7453bc3 100644
--- a/src/piklab-test/misc/Makefile.am
+++ b/src/piklab-test/misc/Makefile.am
@@ -6,5 +6,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la $(top_builddir)/src/common
       $(top_builddir)/src/common/global/libglobal.la $(top_builddir)/src/common/common/libcommon.la
 misc_check_DEPENDENCIES = $(OBJ)
 misc_check_LDADD = $(OBJ) $(LIB_KIO)
-misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+misc_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 misc_check_SOURCES = misc_check.cpp
diff --git a/src/piklab-test/save_load_memory/Makefile.am b/src/piklab-test/save_load_memory/Makefile.am
index 4c9375a..1f5fffb 100644
--- a/src/piklab-test/save_load_memory/Makefile.am
+++ b/src/piklab-test/save_load_memory/Makefile.am
@@ -14,5 +14,5 @@ OBJ = $(top_builddir)/src/piklab-test/base/libtest.la \
       $(top_builddir)/src/devices/base/libdevicebase.la $(top_builddir)/src/common/common/libcommon.la
 save_load_memory_check_DEPENDENCIES = $(OBJ)
 save_load_memory_check_LDADD = $(OBJ) $(LIB_KIO)
-save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+save_load_memory_check_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 save_load_memory_check_SOURCES = save_load_memory_check.cpp
-- 
cgit v1.2.1