59 files changed, 7 insertions, 24 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fb8204..6c9f7bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -63,9 +63,10 @@ set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
 set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 
 
-##### @TDE_MODULE_NAME@  directories
+##### directories
 
-add_subdirectory( kcpuload )
+add_subdirectory( src )
+add_subdirectory( icons )
 tde_conditional_add_subdirectory( BUILD_DOC doc )
 
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7817001..6d0aa9f 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,2 +1 @@
-add_subdirectory( kcpuload )
-add_subdirectory( man )
+tde_auto_add_subdirectories( )
diff --git a/doc/kcpuload/CMakeLists.txt b/doc/en/CMakeLists.txt
index 5e33248..5e33248 100644
--- a/doc/kcpuload/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
diff --git a/doc/kcpuload/Makefile.am b/doc/en/Makefile.am
index 5da901b..5da901b 100644
--- a/doc/kcpuload/Makefile.am
+++ b/doc/en/Makefile.am
diff --git a/doc/kcpuload/index.docbook b/doc/en/index.docbook
index 0cdcf0d..0cdcf0d 100644
--- a/doc/kcpuload/index.docbook
+++ b/doc/en/index.docbook
diff --git a/kcpuload/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 54083a0..54083a0 100644
--- a/kcpuload/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
diff --git a/kcpuload/icons/Makefile.am b/icons/Makefile.am
index 416046e..416046e 100644
--- a/kcpuload/icons/Makefile.am
+++ b/icons/Makefile.am
diff --git a/kcpuload/icons/hi16-action-bars.png b/icons/hi16-action-bars.png
index 618e5be..618e5be 100644
--- a/kcpuload/icons/hi16-action-bars.png
+++ b/icons/hi16-action-bars.png
diff --git a/kcpuload/icons/hi16-action-barson.png b/icons/hi16-action-barson.png
index 4e5561a..4e5561a 100644
--- a/kcpuload/icons/hi16-action-barson.png
+++ b/icons/hi16-action-barson.png
diff --git a/kcpuload/icons/hi16-action-color.png b/icons/hi16-action-color.png
index 8a3a9e7..8a3a9e7 100644
--- a/kcpuload/icons/hi16-action-color.png
+++ b/icons/hi16-action-color.png
diff --git a/kcpuload/icons/hi16-action-color0.png b/icons/hi16-action-color0.png
index 4ef62b4..4ef62b4 100644
--- a/kcpuload/icons/hi16-action-color0.png
+++ b/icons/hi16-action-color0.png
diff --git a/kcpuload/icons/hi16-action-color1.png b/icons/hi16-action-color1.png
index 8c1a7a6..8c1a7a6 100644
--- a/kcpuload/icons/hi16-action-color1.png
+++ b/icons/hi16-action-color1.png
diff --git a/kcpuload/icons/hi16-action-grid.png b/icons/hi16-action-grid.png
index f7765d8..f7765d8 100644
--- a/kcpuload/icons/hi16-action-grid.png
+++ b/icons/hi16-action-grid.png
diff --git a/kcpuload/icons/hi16-action-gridon.png b/icons/hi16-action-gridon.png
index e6a3191..e6a3191 100644
--- a/kcpuload/icons/hi16-action-gridon.png
+++ b/icons/hi16-action-gridon.png
diff --git a/kcpuload/icons/hi16-action-labels.png b/icons/hi16-action-labels.png
index f7765d8..f7765d8 100644
--- a/kcpuload/icons/hi16-action-labels.png
+++ b/icons/hi16-action-labels.png
diff --git a/kcpuload/icons/hi16-action-labelson.png b/icons/hi16-action-labelson.png
index ed1fb4c..ed1fb4c 100644
--- a/kcpuload/icons/hi16-action-labelson.png
+++ b/icons/hi16-action-labelson.png
diff --git a/kcpuload/icons/hi16-action-lines.png b/icons/hi16-action-lines.png
index 5181cac..5181cac 100644
--- a/kcpuload/icons/hi16-action-lines.png
+++ b/icons/hi16-action-lines.png
diff --git a/kcpuload/icons/hi16-action-lineson.png b/icons/hi16-action-lineson.png
index a0321bd..a0321bd 100644
--- a/kcpuload/icons/hi16-action-lineson.png
+++ b/icons/hi16-action-lineson.png
diff --git a/kcpuload/icons/hi16-action-shaded.png b/icons/hi16-action-shaded.png
index 3ac634c..3ac634c 100644
--- a/kcpuload/icons/hi16-action-shaded.png
+++ b/icons/hi16-action-shaded.png
diff --git a/kcpuload/icons/hi16-action-shadedon.png b/icons/hi16-action-shadedon.png
index 75549a9..75549a9 100644
--- a/kcpuload/icons/hi16-action-shadedon.png
+++ b/icons/hi16-action-shadedon.png
diff --git a/kcpuload/icons/hi16-action-smp.png b/icons/hi16-action-smp.png
index 1d8e6c1..1d8e6c1 100644
--- a/kcpuload/icons/hi16-action-smp.png
+++ b/icons/hi16-action-smp.png
diff --git a/kcpuload/icons/hi16-action-smpon.png b/icons/hi16-action-smpon.png
index bf15af4..bf15af4 100644
--- a/kcpuload/icons/hi16-action-smpon.png
+++ b/icons/hi16-action-smpon.png
diff --git a/kcpuload/icons/hi16-action-soft.png b/icons/hi16-action-soft.png
index 3a729b8..3a729b8 100644
--- a/kcpuload/icons/hi16-action-soft.png
+++ b/icons/hi16-action-soft.png
diff --git a/kcpuload/icons/hi16-action-softon.png b/icons/hi16-action-softon.png
index 1dea191..1dea191 100644
--- a/kcpuload/icons/hi16-action-softon.png
+++ b/icons/hi16-action-softon.png
diff --git a/kcpuload/icons/hi16-action-speedarrow.png b/icons/hi16-action-speedarrow.png
index a126af2..a126af2 100644
--- a/kcpuload/icons/hi16-action-speedarrow.png
+++ b/icons/hi16-action-speedarrow.png
diff --git a/kcpuload/icons/hi16-action-split.png b/icons/hi16-action-split.png
index d956dee..d956dee 100644
--- a/kcpuload/icons/hi16-action-split.png
+++ b/icons/hi16-action-split.png
diff --git a/kcpuload/icons/hi16-action-spliton.png b/icons/hi16-action-spliton.png
index be42efc..be42efc 100644
--- a/kcpuload/icons/hi16-action-spliton.png
+++ b/icons/hi16-action-spliton.png
diff --git a/kcpuload/CMakeLists.txt b/kcpuload/CMakeLists.txt
deleted file mode 100644
index 5fa7dc7..0000000
--- a/kcpuload/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-add_subdirectory( kcpuload )
-add_subdirectory( icons )
diff --git a/kcpuload/Makefile.am b/kcpuload/Makefile.am
deleted file mode 100644
index f93ba97..0000000
--- a/kcpuload/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-
-############################################################################
-#                                                                          #
-#   KCPULoad is copyright (c) 1999-2000, Markus Gustavsson                 #
-#                         (c) 2002, Ben Burton                             #
-#                                                                          #
-#   This program is free software; you can redistribute it and/or modify   #
-#   it under the terms of the GNU General Public License as published by   #
-#   the Free Software Foundation; either version 2 of the License, or      #
-#   (at your option) any later version.                                    #
-#                                                                          #
-############################################################################
-
-SUBDIRS = kcpuload icons
-
-EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO
-
diff --git a/kcpuload/AUTHORS b/src/AUTHORS
index 4af821b..4af821b 100644
--- a/kcpuload/AUTHORS
+++ b/src/AUTHORS
diff --git a/kcpuload/kcpuload/CMakeLists.txt b/src/CMakeLists.txt
index f9d21c0..2166732 100644
--- a/kcpuload/kcpuload/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -28,7 +28,7 @@ tde_add_executable( kcpuload AUTOMOC
   LINK
      tdecore-shared
      tdeui-shared
-     
+
   DESTINATION ${BIN_INSTALL_DIR}
 )
 
diff --git a/kcpuload/COPYING b/src/COPYING
index c7aea18..c7aea18 100644
--- a/kcpuload/COPYING
+++ b/src/COPYING
diff --git a/kcpuload/ChangeLog b/src/ChangeLog
index c9ce0a5..c9ce0a5 100644
--- a/kcpuload/ChangeLog
+++ b/src/ChangeLog
diff --git a/kcpuload/INSTALL b/src/INSTALL
index 02a4a07..02a4a07 100644
--- a/kcpuload/INSTALL
+++ b/src/INSTALL
diff --git a/kcpuload/kcpuload/Makefile.am b/src/Makefile.am
index f4d9dbc..2d2de37 100644
--- a/kcpuload/kcpuload/Makefile.am
+++ b/src/Makefile.am
@@ -47,3 +47,4 @@ apps_DATA = kcpuload.desktop
 
 KDE_ICON = kcpuload
 
+EXTRA_DIST = AUTHORS COPYING ChangeLog INSTALL README TODO
diff --git a/kcpuload/README b/src/README
index ff5d0b6..ff5d0b6 100644
--- a/kcpuload/README
+++ b/src/README
diff --git a/kcpuload/TODO b/src/TODO
index a3f1ba2..a3f1ba2 100644
--- a/kcpuload/TODO
+++ b/src/TODO
diff --git a/kcpuload/kcpuload/cr16-app-kcpuload.png b/src/cr16-app-kcpuload.png
index aa2ad05..aa2ad05 100644
--- a/kcpuload/kcpuload/cr16-app-kcpuload.png
+++ b/src/cr16-app-kcpuload.png
diff --git a/kcpuload/kcpuload/cr32-app-kcpuload.png b/src/cr32-app-kcpuload.png
index 03e97bf..03e97bf 100644
--- a/kcpuload/kcpuload/cr32-app-kcpuload.png
+++ b/src/cr32-app-kcpuload.png
diff --git a/kcpuload/kcpuload/cr48-app-kcpuload.png b/src/cr48-app-kcpuload.png
index 59aedb3..59aedb3 100644
--- a/kcpuload/kcpuload/cr48-app-kcpuload.png
+++ b/src/cr48-app-kcpuload.png
diff --git a/kcpuload/kcpuload/icontoggleaction.cpp b/src/icontoggleaction.cpp
index 3e73d98..3e73d98 100644
--- a/kcpuload/kcpuload/icontoggleaction.cpp
+++ b/src/icontoggleaction.cpp
diff --git a/kcpuload/kcpuload/icontoggleaction.h b/src/icontoggleaction.h
index c54f120..c54f120 100644
--- a/kcpuload/kcpuload/icontoggleaction.h
+++ b/src/icontoggleaction.h
diff --git a/kcpuload/kcpuload/kcpudock.cpp b/src/kcpudock.cpp
index 998cc30..998cc30 100644
--- a/kcpuload/kcpuload/kcpudock.cpp
+++ b/src/kcpudock.cpp
diff --git a/kcpuload/kcpuload/kcpudock.h b/src/kcpudock.h
index f96e411..f96e411 100644
--- a/kcpuload/kcpuload/kcpudock.h
+++ b/src/kcpudock.h
diff --git a/kcpuload/kcpuload/kcpuload.cpp b/src/kcpuload.cpp
index 6005313..6005313 100644
--- a/kcpuload/kcpuload/kcpuload.cpp
+++ b/src/kcpuload.cpp
diff --git a/kcpuload/kcpuload/kcpuload.desktop b/src/kcpuload.desktop
index 8182af4..8182af4 100644
--- a/kcpuload/kcpuload/kcpuload.desktop
+++ b/src/kcpuload.desktop
diff --git a/kcpuload/kcpuload/kcpuload.h b/src/kcpuload.h
index 892d7db..892d7db 100644
--- a/kcpuload/kcpuload/kcpuload.h
+++ b/src/kcpuload.h
diff --git a/kcpuload/kcpuload/kcpuproc.cpp b/src/kcpuproc.cpp
index f7fbe4f..f7fbe4f 100644
--- a/kcpuload/kcpuload/kcpuproc.cpp
+++ b/src/kcpuproc.cpp
diff --git a/kcpuload/kcpuload/kcpuproc.h b/src/kcpuproc.h
index 8b844f5..8b844f5 100644
--- a/kcpuload/kcpuload/kcpuproc.h
+++ b/src/kcpuproc.h
diff --git a/kcpuload/kcpuload/lo16-app-kcpuload.png b/src/lo16-app-kcpuload.png
index 278a3f5..278a3f5 100644
--- a/kcpuload/kcpuload/lo16-app-kcpuload.png
+++ b/src/lo16-app-kcpuload.png
diff --git a/kcpuload/kcpuload/lo32-app-kcpuload.png b/src/lo32-app-kcpuload.png
index 34606e5..34606e5 100644
--- a/kcpuload/kcpuload/lo32-app-kcpuload.png
+++ b/src/lo32-app-kcpuload.png
diff --git a/kcpuload/kcpuload/main.cpp b/src/main.cpp
index 6b587e5..6b587e5 100644
--- a/kcpuload/kcpuload/main.cpp
+++ b/src/main.cpp
diff --git a/kcpuload/kcpuload/speeddialog.cpp b/src/speeddialog.cpp
index 845bb2a..845bb2a 100644
--- a/kcpuload/kcpuload/speeddialog.cpp
+++ b/src/speeddialog.cpp
diff --git a/kcpuload/kcpuload/speeddialog.h b/src/speeddialog.h
index 66b4380..66b4380 100644
--- a/kcpuload/kcpuload/speeddialog.h
+++ b/src/speeddialog.h
diff --git a/kcpuload/kcpuload/statdock.cpp b/src/statdock.cpp
index 36d33cc..36d33cc 100644
--- a/kcpuload/kcpuload/statdock.cpp
+++ b/src/statdock.cpp
diff --git a/kcpuload/kcpuload/statdock.h b/src/statdock.h
index 1fb0552..1fb0552 100644
--- a/kcpuload/kcpuload/statdock.h
+++ b/src/statdock.h
diff --git a/kcpuload/kcpuload/statpopup.cpp b/src/statpopup.cpp
index e8c3c8f..e8c3c8f 100644
--- a/kcpuload/kcpuload/statpopup.cpp
+++ b/src/statpopup.cpp
diff --git a/kcpuload/kcpuload/statpopup.h b/src/statpopup.h
index 1b158a6..1b158a6 100644
--- a/kcpuload/kcpuload/statpopup.h
+++ b/src/statpopup.h
diff --git a/subdirs b/subdirs
index b45335c..2d613ae 100644
--- a/subdirs
+++ b/subdirs
@@ -1,2 +1,3 @@
 doc
+icons
 kcpuload