Conversion to the cmake building system.

Added several man pages taken from the Debian packaging.
Cleanup headers in ui files.
Add png icons for mono theme.

Signed-off-by: gregory guy <gregory-tde@laposte.net>

cmake:
- Use tde_add_check_executable instead of a combination
of separate calls to tde_add_executable and add_test.
- Simplify the detection of time.h and sys/time.h headers.
- Refactor phrasebook files install, kmouth.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

49 files changed, 1058 insertions, 178 deletions

diff --git a/kttsd/CMakeLists.txt b/kttsd/CMakeLists.txt
new file mode 100644
index 0000000..e6ee899
--- /dev/null
+++ b/kttsd/CMakeLists.txt
@@ -0,0 +1,10 @@
+add_subdirectory( app-plugins )
+add_subdirectory( libkttsd    )
+add_subdirectory( players     )
+add_subdirectory( plugins     )
+add_subdirectory( filters     )
+add_subdirectory( kttsmgr     )
+add_subdirectory( kttsd       )
+add_subdirectory( kttsjobmgr  )
+add_subdirectory( kcmkttsmgr  )
+add_subdirectory( icons       )
diff --git a/kttsd/app-plugins/CMakeLists.txt b/kttsd/app-plugins/CMakeLists.txt
new file mode 100644
index 0000000..fcf6746
--- /dev/null
+++ b/kttsd/app-plugins/CMakeLists.txt
@@ -0,0 +1 @@
+tde_conditional_add_subdirectory( BUILD_KTTSD_KATE kate )
diff --git a/kttsd/app-plugins/kate/CMakeLists.txt b/kttsd/app-plugins/kate/CMakeLists.txt
new file mode 100644
index 0000000..ac7f001
--- /dev/null
+++ b/kttsd/app-plugins/kate/CMakeLists.txt
@@ -0,0 +1,41 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### tdetexteditor_kttsd (kpart)
+
+tde_add_kpart( tdetexteditor_kttsd AUTOMOC
+
+  SOURCES
+        katekttsd.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdetexteditor-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES tdetexteditor_kttsdui.rc
+    DESTINATION ${DATA_INSTALL_DIR}/tdetexteditor_kttsd
+)
+
+tde_create_translated_desktop(
+    SOURCE tdetexteditor_kttsd.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/filters/CMakeLists.txt b/kttsd/filters/CMakeLists.txt
new file mode 100644
index 0000000..719a243
--- /dev/null
+++ b/kttsd/filters/CMakeLists.txt
@@ -0,0 +1,41 @@
+add_subdirectory( stringreplacer )
+add_subdirectory( xmltransformer )
+add_subdirectory( sbd            )
+add_subdirectory( talkerchooser  )
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### testfilter (test)
+
+tde_add_check_executable( testfilter AUTOMOC
+
+  SOURCES
+        main.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kttsd-shared
+  TEST
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_filterplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/filters/sbd/CMakeLists.txt b/kttsd/filters/sbd/CMakeLists.txt
new file mode 100644
index 0000000..d81162c
--- /dev/null
+++ b/kttsd/filters/sbd/CMakeLists.txt
@@ -0,0 +1,43 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_sbdplugin (kpart)
+
+tde_add_kpart( libkttsd_sbdplugin AUTOMOC
+
+  SOURCES
+        sbdconfwidget.ui
+        sbdproc.cpp
+        sbdconf.cpp
+        sbdplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_sbdplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES standard_sbdrc polish_festival_sbdrc
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/sbd
+)
diff --git a/kttsd/filters/sbd/sbdconfwidget.ui b/kttsd/filters/sbd/sbdconfwidget.ui
index 3c8bcff..8eada8a 100644
--- a/kttsd/filters/sbd/sbdconfwidget.ui
+++ b/kttsd/filters/sbd/sbdconfwidget.ui
@@ -348,16 +348,8 @@
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/stringreplacer/CMakeLists.txt b/kttsd/filters/stringreplacer/CMakeLists.txt
new file mode 100644
index 0000000..1b9d5f9
--- /dev/null
+++ b/kttsd/filters/stringreplacer/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_stringreplacerplugin (kpart)
+
+tde_add_kpart( libkttsd_stringreplacerplugin AUTOMOC
+
+  SOURCES
+        stringreplacerconfwidget.ui
+        editreplacementwidget.ui
+        stringreplacerconf.cpp
+        stringreplacerproc.cpp
+        stringreplacerplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_stringreplacerplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+
+file( GLOB _xmls RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.xml )
+
+install(
+    FILES ${_xmls}
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/stringreplacer
+)
diff --git a/kttsd/filters/stringreplacer/editreplacementwidget.ui b/kttsd/filters/stringreplacer/editreplacementwidget.ui
index 8c61932..2424f75 100644
--- a/kttsd/filters/stringreplacer/editreplacementwidget.ui
+++ b/kttsd/filters/stringreplacer/editreplacementwidget.ui
@@ -255,9 +255,8 @@
     <tabstop>substLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
index f1e58d7..50b8c35 100644
--- a/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
+++ b/kttsd/filters/stringreplacer/stringreplacerconfwidget.ui
@@ -458,17 +458,9 @@
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/talkerchooser/CMakeLists.txt b/kttsd/filters/talkerchooser/CMakeLists.txt
new file mode 100644
index 0000000..701efec
--- /dev/null
+++ b/kttsd/filters/talkerchooser/CMakeLists.txt
@@ -0,0 +1,44 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_talkerchooserplugin (kpart)
+
+tde_add_kpart( libkttsd_talkerchooserplugin AUTOMOC
+
+  SOURCES
+        talkerchooserconfwidget.ui
+        talkerchooserconf.cpp
+        talkerchooserproc.cpp
+        talkerchooserplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_talkerchooserplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES female_notifications_rc
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/talkerchooser
+)
diff --git a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
index a66c2bc..f163922 100644
--- a/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
+++ b/kttsd/filters/talkerchooser/talkerchooserconfwidget.ui
@@ -305,15 +305,8 @@
     <tabstop>appIdLineEdit</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+</includes>
 </UI>
diff --git a/kttsd/filters/xmltransformer/CMakeLists.txt b/kttsd/filters/xmltransformer/CMakeLists.txt
new file mode 100644
index 0000000..50eedce
--- /dev/null
+++ b/kttsd/filters/xmltransformer/CMakeLists.txt
@@ -0,0 +1,43 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_xmltransformerplugin (kpart)
+
+tde_add_kpart( libkttsd_xmltransformerplugin AUTOMOC
+
+  SOURCES
+        xmltransformerconfwidget.ui
+        xmltransformerconf.cpp
+        xmltransformerproc.cpp
+        xmltransformerplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_xmltransformerplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES xhtml2ssml.xsl xhtml2ssml_simple.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/xmltransformer
+)
diff --git a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
index 89d5c7c..ecb6d3b 100644
--- a/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
+++ b/kttsd/filters/xmltransformer/xmltransformerconfwidget.ui
@@ -234,16 +234,9 @@
     </grid>
 </widget>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>klineedit.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+</includes>
 </UI>
diff --git a/kttsd/icons/CMakeLists.txt b/kttsd/icons/CMakeLists.txt
new file mode 100644
index 0000000..643654c
--- /dev/null
+++ b/kttsd/icons/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons()
diff --git a/kttsd/kcmkttsmgr/CMakeLists.txt b/kttsd/kcmkttsmgr/CMakeLists.txt
new file mode 100644
index 0000000..bb2be6d
--- /dev/null
+++ b/kttsd/kcmkttsmgr/CMakeLists.txt
@@ -0,0 +1,46 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kcm_kttsd (kpart)
+
+tde_add_kpart( kcm_kttsd MODULE AUTOMOC
+
+  SOURCES
+        kcmkttsmgrwidget.ui
+        addtalkerwidget.ui
+        selecteventwidget.ui
+        kcmkttsmgr.cpp
+        addtalker.cpp
+        selectevent.cpp
+  LINK
+     tdeio-shared
+     kttsd-shared
+     DUMMY_kspeech_lib-static
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kcmkttsd_testmessage.desktop
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd
+)
+
+tde_create_translated_desktop( kcmkttsd.desktop )
diff --git a/kttsd/kcmkttsmgr/addtalkerwidget.ui b/kttsd/kcmkttsmgr/addtalkerwidget.ui
index ae48c61..4597a90 100644
--- a/kttsd/kcmkttsmgr/addtalkerwidget.ui
+++ b/kttsd/kcmkttsmgr/addtalkerwidget.ui
@@ -253,8 +253,7 @@
     <tabstop>languageRadioButton</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+</includes>
 </UI>
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
index 0a4307c..13114de 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
+++ b/kttsd/kcmkttsmgr/kcmkttsmgrwidget.ui
@@ -1884,9 +1884,15 @@
     <tabstop>keepAudioPath</tabstop>
 </tabstops>
 <includes>
-    <include location="global" impldecl="in declaration">tdelocale.h</include>
     <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="global" impldecl="in implementation">kdebug.h</include>
+    <include location="global" impldecl="in implementation">tdecmodule.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
 </includes>
 <Q_SIGNALS>
     <signal>configChanged()</signal>
@@ -1895,34 +1901,4 @@
     <slot access="private">slotConfigChanged()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="6"/>
-<includehints>
-    <includehint>tdecmodule.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/kcmkttsmgr/selecteventwidget.ui b/kttsd/kcmkttsmgr/selecteventwidget.ui
index 3d4281f..14df075 100644
--- a/kttsd/kcmkttsmgr/selecteventwidget.ui
+++ b/kttsd/kcmkttsmgr/selecteventwidget.ui
@@ -56,7 +56,7 @@
 <customwidgets>
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kttsd/kttsd/CMakeLists.txt b/kttsd/kttsd/CMakeLists.txt
new file mode 100644
index 0000000..78657f0
--- /dev/null
+++ b/kttsd/kttsd/CMakeLists.txt
@@ -0,0 +1,116 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### kttsd_kspeech
+
+set( KSPEECH_KIDL kspeech.kidl )
+set( KSPEECH_SKEL kspeech_skel )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeech.h > ${KSPEECH_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeech.h
+)
+add_custom_target( kttsd-kspeech-kidl DEPENDS ${KSPEECH_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECH_SKEL}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KSPEECH_KIDL}
+    DEPENDS kttsd-kspeech-kidl
+)
+add_custom_target( kttsd-kspeech-skel DEPENDS ${KSPEECH_SKEL}.cpp )
+
+
+###### kttsd_kspeechsink
+
+set( KSPEECHSINK_KIDL kspeechsink.kidl )
+set( KSPEECHSINK_STUB kspeechsink_stub )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${KTTS_KSPEECH_DIR}/kspeechsink.h > ${KSPEECHSINK_KIDL}
+    DEPENDS ${KTTS_KSPEECH_DIR}/kspeechsink.h
+)
+add_custom_target( kttsd-kspeechsink-kidl DEPENDS ${KSPEECHSINK_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KSPEECHSINK_STUB}.h
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-skel ${KSPEECHSINK_KIDL}
+    DEPENDS kttsd-kspeechsink-kidl
+)
+add_custom_target( kttsd-kspeechsink-stub DEPENDS ${KSPEECHSINK_STUB}.h )
+
+
+##### kttsd
+
+set( KTTSD_KIDL kttsd.kidl )
+set( KTTSD_SKEL kttsd_skel )
+
+add_custom_command(
+    OUTPUT  ${KTTSD_KIDL}
+    COMMAND ${KDE3_DCOPIDL_EXECUTABLE} ${CMAKE_SOURCE_DIR}/kttsd/kttsd/kttsd.h > ${KTTSD_KIDL}
+    DEPENDS ${CMAKE_SOURCE_DIR}/kttsd/kttsd/kttsd.h
+)
+add_custom_target( kttsd-kidl DEPENDS ${KTTSD_KIDL} )
+
+add_custom_command(
+    OUTPUT  ${KTTSD_SKEL}.cpp
+    COMMAND ${KDE3_DCOPIDL2CPP_EXECUTABLE} --c++-suffix cpp --no-signals --no-stub ${KTTSD_KIDL}
+    DEPENDS kttsd-kidl
+)
+add_custom_target( kttsd-skel DEPENDS ${KTTSD_SKEL}.cpp )
+
+
+##### kttsd (executable)
+
+tde_add_executable( kttsd AUTOMOC
+
+  SOURCES
+        ${CMAKE_CURRENT_BINARY_DIR}/${KSPEECH_SKEL}.cpp
+        ${CMAKE_CURRENT_BINARY_DIR}/${KTTSD_SKEL}.cpp
+        main.cpp
+        kttsd.cpp
+        speaker.cpp
+        speechdata.cpp
+        threadedplugin.cpp
+        ssmlconvert.cpp
+        filtermgr.cpp
+        talkermgr.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     kttsd-shared
+     
+  DEPENDENCIES
+     kttsd-kspeech-skel
+     kttsd-kspeechsink-stub
+     kttsd-skel
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+install(
+    FILES SSMLtoPlainText.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/xslt
+)
+
+tde_create_translated_desktop(
+    SOURCE kttsd.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/kttsjobmgr/CMakeLists.txt b/kttsd/kttsjobmgr/CMakeLists.txt
new file mode 100644
index 0000000..cc67a4a
--- /dev/null
+++ b/kttsd/kttsjobmgr/CMakeLists.txt
@@ -0,0 +1,40 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kttsd/libkttsd
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsjobmgrpart (kpart)
+
+tde_add_kpart( libkttsjobmgrpart MODULE AUTOMOC
+
+  SOURCES
+        kttsjobmgr.cpp
+  LINK
+     tdeio-shared
+     tdeparts-shared
+     kttsd-shared
+     DUMMY_kspeech_lib-static
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsjobmgr.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/kttsmgr/CMakeLists.txt b/kttsd/kttsmgr/CMakeLists.txt
new file mode 100644
index 0000000..c5010ab
--- /dev/null
+++ b/kttsd/kttsmgr/CMakeLists.txt
@@ -0,0 +1,36 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_BINARY_DIR}/kspeechsink
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### kttsmgr (executable)
+
+tde_add_executable( kttsmgr AUTOMOC
+
+  SOURCES
+        kttsmgr.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeutils-shared
+     DUMMY_kspeech_lib-static
+
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop( kttsmgr.desktop )
diff --git a/kttsd/libkttsd/CMakeLists.txt b/kttsd/libkttsd/CMakeLists.txt
new file mode 100644
index 0000000..106e2fd
--- /dev/null
+++ b/kttsd/libkttsd/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+##### kttsd (shared)
+
+tde_add_library( kttsd SHARED AUTOMOC
+
+  SOURCES
+        selecttalkerwidget.ui
+        pluginproc.cpp
+        pluginconf.cpp
+        testplayer.cpp
+        stretcher.cpp
+        talkercode.cpp
+        filterproc.cpp
+        filterconf.cpp
+        utils.cpp
+        selecttalkerdlg.cpp
+        notify.cpp
+  LINK
+     tdecore-shared
+     tdeio-shared
+     tdeui-shared
+
+  VERSION 1.0.0
+     
+  DESTINATION ${LIB_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_synthplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index f2b8f00..b250f4a 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -560,13 +560,10 @@
     <tabstop>talkersListView</tabstop>
 </tabstops>
 <layoutdefaults spacing="6" margin="0"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>tdelistview.h</includehint>
-</includehints>
+<includes>
+	<include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">tdelistview.h</include>
+</includes>
 </UI>
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index b9aaecd..3688667 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -174,7 +174,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
                     offers[0]->library().latin1(), this, offers[0]->library().latin1());
         else
             kdDebug() << "TestPlayer::createPlayerObject: Could not create factory." << endl;
-    }
+    } 
     if (player == 0)
         kdDebug() << "TestPlayer::createPlayerObject: Could not load " + plugInName +
             ".  Is TDEDIRS set correctly?" << endl;
@@ -207,3 +207,4 @@ TQString TestPlayer::makeSuggestedFilename()
     return PlugInConf::realFilePath(waveFile);
 }
 
+#include "player.moc"
diff --git a/kttsd/players/CMakeLists.txt b/kttsd/players/CMakeLists.txt
new file mode 100644
index 0000000..12cabb0
--- /dev/null
+++ b/kttsd/players/CMakeLists.txt
@@ -0,0 +1,12 @@
+tde_conditional_add_subdirectory( WITH_ARTS      artsplayer  )
+tde_conditional_add_subdirectory( WITH_AKODE     akodeplayer )
+tde_conditional_add_subdirectory( WITH_ALSA      alsaplayer  )
+tde_conditional_add_subdirectory( WITH_GSTREAMER gstplayer   )
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_audioplugin.desktop
+    DESTINATION ${SERVICETYPES_INSTALL_DIR}
+)
diff --git a/kttsd/players/akodeplayer/CMakeLists.txt b/kttsd/players/akodeplayer/CMakeLists.txt
new file mode 100644
index 0000000..f8a03f7
--- /dev/null
+++ b/kttsd/players/akodeplayer/CMakeLists.txt
@@ -0,0 +1,37 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_akodeplugin (kpart)
+
+tde_add_kpart( libkttsd_akodeplugin AUTOMOC
+
+  SOURCES
+        akodeplugin.cpp
+        akodeplayer.cpp
+  LINK
+     kttsd-shared
+     ${AKODE_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_akodeplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/akodeplayer/akodeplayer.cpp b/kttsd/players/akodeplayer/akodeplayer.cpp
index 13f6cf3..955bf1b 100644
--- a/kttsd/players/akodeplayer/akodeplayer.cpp
+++ b/kttsd/players/akodeplayer/akodeplayer.cpp
@@ -12,7 +12,9 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <kdebug.h>
 
diff --git a/kttsd/players/akodeplayer/akodeplayer.h b/kttsd/players/akodeplayer/akodeplayer.h
index c4c7c1c..d51d7fb 100644
--- a/kttsd/players/akodeplayer/akodeplayer.h
+++ b/kttsd/players/akodeplayer/akodeplayer.h
@@ -16,7 +16,10 @@
 #ifndef AKODEPLAYER_H
 #define AKODEPLAYER_H
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "kdeexportfix.h"
 
 #include <tqstring.h>
diff --git a/kttsd/players/alsaplayer/CMakeLists.txt b/kttsd/players/alsaplayer/CMakeLists.txt
new file mode 100644
index 0000000..155024f
--- /dev/null
+++ b/kttsd/players/alsaplayer/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${ALSA_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_alsaplugin (kpart)
+
+tde_add_kpart( libkttsd_alsaplugin AUTOMOC
+
+  SOURCES
+        alsaplugin.cpp
+        alsaplayer.cpp
+  LINK
+     kttsd-shared
+     ${ALSA_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_alsaplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp
index a840c0b..c67564d 100644
--- a/kttsd/players/alsaplayer/alsaplayer.cpp
+++ b/kttsd/players/alsaplayer/alsaplayer.cpp
@@ -24,18 +24,16 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  ******************************************************************************/
 
+// AlsaPlayer includes.
+#include "alsaplayer.h"
+
 // #include <sys/wait.h>
 // System includes.
-#include <config.h>
-#if TIME_WITH_SYS_TIME
+#if defined(HAVE_SYS_TIME_H)
 # include <sys/time.h>
+#endif
+#if defined(TIME_WITH_SYS_TIME)
 # include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
 #endif
 
 // TQt includes.
@@ -50,8 +48,6 @@
 #include <tdemessagebox.h>
 #include <tdelocale.h>
 
-// AlsaPlayer includes.
-#include "alsaplayer.h"
 
 #if !defined(__GNUC__) || __GNUC__ >= 3
 #define ERR(...) do {\
diff --git a/kttsd/players/alsaplayer/alsaplayer.h b/kttsd/players/alsaplayer/alsaplayer.h
index deeff4b..73d2570 100644
--- a/kttsd/players/alsaplayer/alsaplayer.h
+++ b/kttsd/players/alsaplayer/alsaplayer.h
@@ -24,6 +24,10 @@
 #ifndef ALSAPLAYER_H
 #define ALSAPLAYER_H
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 // System includes.
 #include <alsa/asoundlib.h>
 #include <sys/poll.h>
@@ -36,7 +40,6 @@
 #include <tqmutex.h>
 
 // KDE includes.
-#include <config.h>
 #include <kdemacros.h>
 #include "kdeexportfix.h"
 #include <kurl.h>
diff --git a/kttsd/players/artsplayer/CMakeLists.txt b/kttsd/players/artsplayer/CMakeLists.txt
new file mode 100644
index 0000000..427f970
--- /dev/null
+++ b/kttsd/players/artsplayer/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${ARTS_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_artsplugin (kpart)
+
+tde_add_kpart( libkttsd_artsplugin AUTOMOC
+
+  SOURCES
+        artsplugin.cpp
+        artsplayer.cpp
+  LINK
+     kttsd-shared
+     ${ARTS_PLAYER_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_artsplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/artsplayer/artsplayer.h b/kttsd/players/artsplayer/artsplayer.h
index 99f3edc..edae1fc 100644
--- a/kttsd/players/artsplayer/artsplayer.h
+++ b/kttsd/players/artsplayer/artsplayer.h
@@ -19,7 +19,10 @@
 #ifndef ARTSPLAYER_H
 #define ARTSPLAYER_H
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <kdemacros.h>
 #include "kdeexportfix.h"
 
diff --git a/kttsd/players/gstplayer/CMakeLists.txt b/kttsd/players/gstplayer/CMakeLists.txt
new file mode 100644
index 0000000..1aa4e64
--- /dev/null
+++ b/kttsd/players/gstplayer/CMakeLists.txt
@@ -0,0 +1,39 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${GSTREAMER_INCLUDE_DIRS}
+  ${GLIB2_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_gstplugin (kpart)
+
+tde_add_kpart( libkttsd_gstplugin AUTOMOC
+
+  SOURCES
+        gstplugin.cpp
+        gstreamerplayer.cpp
+  LINK
+     kttsd-shared
+     ${GSTREAMER_LIBRARIES}
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_gstplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/players/gstplayer/gstreamerplayer.h b/kttsd/players/gstplayer/gstreamerplayer.h
index 27cd329..fd8baf7 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.h
+++ b/kttsd/players/gstplayer/gstreamerplayer.h
@@ -15,7 +15,9 @@
 #ifndef GSTREAMERPLAYER_H
 #define GSTREAMERPLAYER_H
 
+#ifdef HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <glib.h>
 extern "C" {
diff --git a/kttsd/plugins/CMakeLists.txt b/kttsd/plugins/CMakeLists.txt
new file mode 100644
index 0000000..dc615ab
--- /dev/null
+++ b/kttsd/plugins/CMakeLists.txt
@@ -0,0 +1,6 @@
+tde_conditional_add_subdirectory( BUILD_KTTSD_COMMAND  command     )
+tde_conditional_add_subdirectory( BUILD_KTTSD_EPOS     epos        )
+tde_conditional_add_subdirectory( BUILD_KTTSD_FESTIVAL festivalint )
+tde_conditional_add_subdirectory( BUILD_KTTSD_FREETTS  freetts     )
+tde_conditional_add_subdirectory( BUILD_KTTSD_FLITE    flite       )
+tde_conditional_add_subdirectory( BUILD_KTTSD_HADIFIX  hadifix     )
diff --git a/kttsd/plugins/command/CMakeLists.txt b/kttsd/plugins/command/CMakeLists.txt
new file mode 100644
index 0000000..bb16d23
--- /dev/null
+++ b/kttsd/plugins/command/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_commandplugin (kpart)
+
+tde_add_kpart( libkttsd_commandplugin AUTOMOC
+
+  SOURCES
+        commandconfwidget.ui
+        commandconf.cpp
+        commandproc.cpp
+        commandplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_commandplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/command/commandconfwidget.ui b/kttsd/plugins/command/commandconfwidget.ui
index 75ce080..64d804c 100644
--- a/kttsd/plugins/command/commandconfwidget.ui
+++ b/kttsd/plugins/command/commandconfwidget.ui
@@ -218,10 +218,4 @@
     <signal>configurationChanged()</signal>
 </Q_SIGNALS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/epos/CMakeLists.txt b/kttsd/plugins/epos/CMakeLists.txt
new file mode 100644
index 0000000..7111386
--- /dev/null
+++ b/kttsd/plugins/epos/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_eposplugin (kpart)
+
+tde_add_kpart( libkttsd_eposplugin AUTOMOC
+
+  SOURCES
+        eposconfwidget.ui
+        eposconf.cpp
+        eposproc.cpp
+        eposplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_eposplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/epos/eposconfwidget.ui b/kttsd/plugins/epos/eposconfwidget.ui
index c66a081..f93ed72 100644
--- a/kttsd/plugins/epos/eposconfwidget.ui
+++ b/kttsd/plugins/epos/eposconfwidget.ui
@@ -593,18 +593,10 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/festivalint/CMakeLists.txt b/kttsd/plugins/festivalint/CMakeLists.txt
new file mode 100644
index 0000000..3243c05
--- /dev/null
+++ b/kttsd/plugins/festivalint/CMakeLists.txt
@@ -0,0 +1,48 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_festivalintplugin (kpart)
+
+tde_add_kpart( libkttsd_festivalintplugin AUTOMOC
+
+  SOURCES
+        festivalintconfwidget.ui
+        festivalintconf.cpp
+        festivalintproc.cpp
+        festivalintplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_festivalintplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES SSMLtoSable.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/festivalint/xslt
+)
+
+install(
+    FILES voices sabletowave.scm
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/festivalint
+)
diff --git a/kttsd/plugins/festivalint/festivalintconfwidget.ui b/kttsd/plugins/festivalint/festivalintconfwidget.ui
index 76a570f..c740eaf 100644
--- a/kttsd/plugins/festivalint/festivalintconfwidget.ui
+++ b/kttsd/plugins/festivalint/festivalintconfwidget.ui
@@ -581,18 +581,10 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kcombobox.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/flite/CMakeLists.txt b/kttsd/plugins/flite/CMakeLists.txt
new file mode 100644
index 0000000..4c67af0
--- /dev/null
+++ b/kttsd/plugins/flite/CMakeLists.txt
@@ -0,0 +1,38 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_fliteplugin (kpart)
+
+tde_add_kpart( libkttsd_fliteplugin AUTOMOC
+
+  SOURCES
+        fliteconfwidget.ui
+        fliteconf.cpp
+        fliteproc.cpp
+        fliteplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_fliteplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/flite/fliteconfwidget.ui b/kttsd/plugins/flite/fliteconfwidget.ui
index 8efcbb1..ef90e54 100644
--- a/kttsd/plugins/flite/fliteconfwidget.ui
+++ b/kttsd/plugins/flite/fliteconfwidget.ui
@@ -175,12 +175,8 @@
 </customwidgets>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/freetts/CMakeLists.txt b/kttsd/plugins/freetts/CMakeLists.txt
new file mode 100644
index 0000000..c98f2ec
--- /dev/null
+++ b/kttsd/plugins/freetts/CMakeLists.txt
@@ -0,0 +1,37 @@
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_freettsplugin (kpart)
+
+tde_add_kpart( libkttsd_freettsplugin AUTOMOC
+
+  SOURCES
+        freettsconfigwidget.ui
+        freettsconf.cpp
+        freettsproc.cpp
+        freettsplugin.cpp
+  LINK
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_freettsplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
diff --git a/kttsd/plugins/freetts/freettsconfigwidget.ui b/kttsd/plugins/freetts/freettsconfigwidget.ui
index e93f3ba..91d9988 100644
--- a/kttsd/plugins/freetts/freettsconfigwidget.ui
+++ b/kttsd/plugins/freetts/freettsconfigwidget.ui
@@ -189,12 +189,8 @@
 </customwidgets>
 <includes>
     <include location="global" impldecl="in declaration">kurlrequester.h</include>
-    <include location="global" impldecl="in implementation">kurlrequester.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
 </includes>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/hadifix/CMakeLists.txt b/kttsd/plugins/hadifix/CMakeLists.txt
new file mode 100644
index 0000000..3372b5e
--- /dev/null
+++ b/kttsd/plugins/hadifix/CMakeLists.txt
@@ -0,0 +1,45 @@
+
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kttsd/libkttsd
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
+
+
+##### libkttsd_hadifixplugin (kpart)
+
+tde_add_kpart( libkttsd_hadifixplugin AUTOMOC
+
+  SOURCES
+        hadifixconfigui.ui
+        voicefileui.ui
+        hadifixconf.cpp
+        hadifixproc.cpp
+        hadifixplugin.cpp
+  LINK
+     tdecore-shared
+     kttsd-shared
+
+  DESTINATION ${PLUGIN_INSTALL_DIR}
+)
+
+
+##### other data
+
+tde_create_translated_desktop(
+    SOURCE kttsd_hadifixplugin.desktop
+    DESTINATION ${SERVICES_INSTALL_DIR}
+)
+
+install(
+    FILES SSMLtoTxt2pho.xsl
+    DESTINATION ${DATA_INSTALL_DIR}/kttsd/hadifix/xslt
+)
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui b/kttsd/plugins/hadifix/hadifixconfigui.ui
index 367200c..4baf158 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui
@@ -640,6 +640,11 @@
     <include location="global" impldecl="in implementation">tqstringlist.h</include>
     <include location="global" impldecl="in implementation">math.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
+    <include location="global" impldecl="in implementation">kcombobox.h</include>
+	<include location="global" impldecl="in implementation">klineedit.h</include>
+	<include location="global" impldecl="in implementation">kpushbutton.h</include>
+	<include location="global" impldecl="in implementation">knuminput.h</include>
+	<include location="global" impldecl="in implementation">kurlrequester.h</include>
 </includes>
 <forwards>
     <forward>class TQStringList;</forward>
@@ -674,19 +679,4 @@
     <function specifier="non virtual" returnType="bool">isMaleVoice()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>knuminput.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kcombobox.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>
diff --git a/kttsd/plugins/hadifix/voicefileui.ui b/kttsd/plugins/hadifix/voicefileui.ui
index c333670..19c63a4 100644
--- a/kttsd/plugins/hadifix/voicefileui.ui
+++ b/kttsd/plugins/hadifix/voicefileui.ui
@@ -100,6 +100,9 @@
 <includes>
     <include location="global" impldecl="in implementation">kurlrequesterdlg.h</include>
     <include location="global" impldecl="in implementation">tdemessagebox.h</include>
+    <include location="global" impldecl="in implementation">klineedit.h</include>
+    <include location="global" impldecl="in implementation">kpushbutton.h</include>
+    <include location="global" impldecl="in implementation">kurlrequester.h</include>
     <include location="local" impldecl="in implementation">hadifixproc.h</include>
     <include location="local" impldecl="in implementation">voicefileui.ui.h</include>
 </includes>
@@ -110,10 +113,4 @@
     <slot>genderButton_clicked()</slot>
 </Q_SLOTS>
 <layoutdefaults spacing="6" margin="11"/>
-<includehints>
-    <includehint>kurlrequester.h</includehint>
-    <includehint>klineedit.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-    <includehint>kpushbutton.h</includehint>
-</includehints>
 </UI>