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

---
 kinit/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'kinit/CMakeLists.txt')

diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index fd1408918..834242bf1 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -39,7 +39,7 @@ set( ${target}_SRCS
 
 tde_add_executable( ${target}
   SOURCES ${${target}_SRCS}
-  LINK ltdlc-static kparts-shared
+  LINK ltdlc-static tdeparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
-- 
cgit v1.2.1


From 5159cd2beb2e87806a5b54e9991b7895285c9d3e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:04:16 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kinit/CMakeLists.txt | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'kinit/CMakeLists.txt')

diff --git a/kinit/CMakeLists.txt b/kinit/CMakeLists.txt
index 834242bf1..88be32621 100644
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
@@ -19,8 +19,8 @@ include_directories(
   ${CMAKE_SOURCE_DIR}/dcop
   ${CMAKE_SOURCE_DIR}/tdecore
   ${CMAKE_SOURCE_DIR}/tdeui
-  ${CMAKE_SOURCE_DIR}/kio
-  ${CMAKE_SOURCE_DIR}/kio/kio
+  ${CMAKE_SOURCE_DIR}/tdeio
+  ${CMAKE_SOURCE_DIR}/tdeio/tdeio
   ${FREETYPE_INCLUDE_DIRS}
 )
 
@@ -94,34 +94,34 @@ tde_add_executable( ${target}
 )
 
 
-#### kioslave ###################################
+#### tdeioslave ###################################
 
-set( target kioslave )
+set( target tdeioslave )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kioslave.cpp
-  LINK ltdlc-static kio-shared
+  SOURCES tdeioslave.cpp
+  LINK ltdlc-static tdeio-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kstartupconfig #############################
+#### tdestartupconfig #############################
 
-set( target kstartupconfig )
+set( target tdestartupconfig )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kstartupconfig.cpp
+  SOURCES tdestartupconfig.cpp
   LINK tdefakes-shared ${TQT_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
 
-#### kdostartupconfig ###########################
+#### tdedostartupconfig ###########################
 
-set( target kdostartupconfig )
+set( target tdedostartupconfig )
 
 tde_add_executable( ${target} AUTOMOC
-  SOURCES kdostartupconfig.cpp
+  SOURCES tdedostartupconfig.cpp
   LINK tdecore-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
@@ -153,15 +153,15 @@ tde_add_executable( ${target}
 )
 
 
-#### klauncher ##################################
+#### tdelauncher ##################################
 
-set( target klauncher )
+set( target tdelauncher )
 
 set( ${target}_SRCS
-  klauncher.cpp klauncher_main.cpp autostart.cpp
+  tdelauncher.cpp tdelauncher_main.cpp autostart.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
   SOURCES ${${target}_SRCS}
-  LINK kio-shared
+  LINK tdeio-shared
 )
-- 
cgit v1.2.1