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

---
 kpf/src/CMakeLists.txt | 4 ++--
 kpf/src/Makefile.am    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kpf')

diff --git a/kpf/src/CMakeLists.txt b/kpf/src/CMakeLists.txt
index 44c94d33..1de8db4c 100644
--- a/kpf/src/CMakeLists.txt
+++ b/kpf/src/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_add_kpart( kpf_panelapplet AUTOMOC
     ErrorMessageConfigDialog.cpp ActiveMonitor.cpp ActiveMonitorItem.cpp
     ActiveMonitorWindow.cpp BandwidthGraph.cpp ServerWizard.cpp
     AppletItem.cpp Applet.cpp Defaults.cpp Help.cpp
-  LINK kdnssd-shared kio-shared
+  LINK tdednssd-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
@@ -46,6 +46,6 @@ tde_add_kpart( kpfpropertiesdialog AUTOMOC
   SOURCES
     PropertiesDialogPlugin.cpp StartingKPFDialog.cpp WebServer.stub
     WebServerManager.stub Defaults.cpp Help.cpp
-  LINK kdnssd-shared kio-shared
+  LINK tdednssd-shared kio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kpf/src/Makefile.am b/kpf/src/Makefile.am
index 5bee48d7..58d47eef 100644
--- a/kpf/src/Makefile.am
+++ b/kpf/src/Makefile.am
@@ -37,9 +37,9 @@ kpf_panelapplet_la_SOURCES = \
   Defaults.cpp \
   Help.cpp
 
-kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kpf_panelapplet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
-kpf_panelapplet_la_LIBADD = $(LIB_KIO) -lkdnssd
+kpf_panelapplet_la_LIBADD = $(LIB_KIO) -ltdednssd
 
 kpfpropertiesdialog_la_SOURCES = \
   PropertiesDialogPlugin.cpp \
@@ -49,9 +49,9 @@ kpfpropertiesdialog_la_SOURCES = \
   Defaults.cpp \
   Help.cpp
 
-kpfpropertiesdialog_la_LIBADD = $(LIB_KIO) -lkdnssd
+kpfpropertiesdialog_la_LIBADD = $(LIB_KIO) -ltdednssd
 
-kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
+kpfpropertiesdialog_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
 
 noinst_HEADERS = \
   Utils.h \
-- 
cgit v1.2.1