From 0557917aa98c792eb316ce176c97849f3e7bdb3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 13 Dec 2018 18:35:41 +0100 Subject: [PATCH] Fix structure of directories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- CMakeLists.txt | 5 +++-- doc/CMakeLists.txt | 3 +-- doc/{kcpuload => en}/CMakeLists.txt | 0 doc/{kcpuload => en}/Makefile.am | 0 doc/{kcpuload => en}/index.docbook | 0 {kcpuload/icons => icons}/CMakeLists.txt | 0 {kcpuload/icons => icons}/Makefile.am | 0 {kcpuload/icons => icons}/hi16-action-bars.png | Bin .../icons => icons}/hi16-action-barson.png | Bin .../icons => icons}/hi16-action-color.png | Bin .../icons => icons}/hi16-action-color0.png | Bin .../icons => icons}/hi16-action-color1.png | Bin {kcpuload/icons => icons}/hi16-action-grid.png | Bin .../icons => icons}/hi16-action-gridon.png | Bin .../icons => icons}/hi16-action-labels.png | Bin .../icons => icons}/hi16-action-labelson.png | Bin .../icons => icons}/hi16-action-lines.png | Bin .../icons => icons}/hi16-action-lineson.png | Bin .../icons => icons}/hi16-action-shaded.png | Bin .../icons => icons}/hi16-action-shadedon.png | Bin {kcpuload/icons => icons}/hi16-action-smp.png | Bin .../icons => icons}/hi16-action-smpon.png | Bin {kcpuload/icons => icons}/hi16-action-soft.png | Bin .../icons => icons}/hi16-action-softon.png | Bin .../icons => icons}/hi16-action-speedarrow.png | Bin .../icons => icons}/hi16-action-split.png | Bin .../icons => icons}/hi16-action-spliton.png | Bin kcpuload/CMakeLists.txt | 2 -- kcpuload/Makefile.am | 17 ----------------- {kcpuload => src}/AUTHORS | 0 {kcpuload/kcpuload => src}/CMakeLists.txt | 2 +- {kcpuload => src}/COPYING | 0 {kcpuload => src}/ChangeLog | 0 {kcpuload => src}/INSTALL | 0 {kcpuload/kcpuload => src}/Makefile.am | 1 + {kcpuload => src}/README | 0 {kcpuload => src}/TODO | 0 .../kcpuload => src}/cr16-app-kcpuload.png | Bin .../kcpuload => src}/cr32-app-kcpuload.png | Bin .../kcpuload => src}/cr48-app-kcpuload.png | Bin .../kcpuload => src}/icontoggleaction.cpp | 0 {kcpuload/kcpuload => src}/icontoggleaction.h | 0 {kcpuload/kcpuload => src}/kcpudock.cpp | 0 {kcpuload/kcpuload => src}/kcpudock.h | 0 {kcpuload/kcpuload => src}/kcpuload.cpp | 0 {kcpuload/kcpuload => src}/kcpuload.desktop | 0 {kcpuload/kcpuload => src}/kcpuload.h | 0 {kcpuload/kcpuload => src}/kcpuproc.cpp | 0 {kcpuload/kcpuload => src}/kcpuproc.h | 0 .../kcpuload => src}/lo16-app-kcpuload.png | Bin .../kcpuload => src}/lo32-app-kcpuload.png | Bin {kcpuload/kcpuload => src}/main.cpp | 0 {kcpuload/kcpuload => src}/speeddialog.cpp | 0 {kcpuload/kcpuload => src}/speeddialog.h | 0 {kcpuload/kcpuload => src}/statdock.cpp | 0 {kcpuload/kcpuload => src}/statdock.h | 0 {kcpuload/kcpuload => src}/statpopup.cpp | 0 {kcpuload/kcpuload => src}/statpopup.h | 0 subdirs | 1 + 59 files changed, 7 insertions(+), 24 deletions(-) rename doc/{kcpuload => en}/CMakeLists.txt (100%) rename doc/{kcpuload => en}/Makefile.am (100%) rename doc/{kcpuload => en}/index.docbook (100%) rename {kcpuload/icons => icons}/CMakeLists.txt (100%) rename {kcpuload/icons => icons}/Makefile.am (100%) rename {kcpuload/icons => icons}/hi16-action-bars.png (100%) rename {kcpuload/icons => icons}/hi16-action-barson.png (100%) rename {kcpuload/icons => icons}/hi16-action-color.png (100%) rename {kcpuload/icons => icons}/hi16-action-color0.png (100%) rename {kcpuload/icons => icons}/hi16-action-color1.png (100%) rename {kcpuload/icons => icons}/hi16-action-grid.png (100%) rename {kcpuload/icons => icons}/hi16-action-gridon.png (100%) rename {kcpuload/icons => icons}/hi16-action-labels.png (100%) rename {kcpuload/icons => icons}/hi16-action-labelson.png (100%) rename {kcpuload/icons => icons}/hi16-action-lines.png (100%) rename {kcpuload/icons => icons}/hi16-action-lineson.png (100%) rename {kcpuload/icons => icons}/hi16-action-shaded.png (100%) rename {kcpuload/icons => icons}/hi16-action-shadedon.png (100%) rename {kcpuload/icons => icons}/hi16-action-smp.png (100%) rename {kcpuload/icons => icons}/hi16-action-smpon.png (100%) rename {kcpuload/icons => icons}/hi16-action-soft.png (100%) rename {kcpuload/icons => icons}/hi16-action-softon.png (100%) rename {kcpuload/icons => icons}/hi16-action-speedarrow.png (100%) rename {kcpuload/icons => icons}/hi16-action-split.png (100%) rename {kcpuload/icons => icons}/hi16-action-spliton.png (100%) delete mode 100644 kcpuload/CMakeLists.txt delete mode 100644 kcpuload/Makefile.am rename {kcpuload => src}/AUTHORS (100%) rename {kcpuload/kcpuload => src}/CMakeLists.txt (99%) rename {kcpuload => src}/COPYING (100%) rename {kcpuload => src}/ChangeLog (100%) rename {kcpuload => src}/INSTALL (100%) rename {kcpuload/kcpuload => src}/Makefile.am (96%) rename {kcpuload => src}/README (100%) rename {kcpuload => src}/TODO (100%) rename {kcpuload/kcpuload => src}/cr16-app-kcpuload.png (100%) rename {kcpuload/kcpuload => src}/cr32-app-kcpuload.png (100%) rename {kcpuload/kcpuload => src}/cr48-app-kcpuload.png (100%) rename {kcpuload/kcpuload => src}/icontoggleaction.cpp (100%) rename {kcpuload/kcpuload => src}/icontoggleaction.h (100%) rename {kcpuload/kcpuload => src}/kcpudock.cpp (100%) rename {kcpuload/kcpuload => src}/kcpudock.h (100%) rename {kcpuload/kcpuload => src}/kcpuload.cpp (100%) rename {kcpuload/kcpuload => src}/kcpuload.desktop (100%) rename {kcpuload/kcpuload => src}/kcpuload.h (100%) rename {kcpuload/kcpuload => src}/kcpuproc.cpp (100%) rename {kcpuload/kcpuload => src}/kcpuproc.h (100%) rename {kcpuload/kcpuload => src}/lo16-app-kcpuload.png (100%) rename {kcpuload/kcpuload => src}/lo32-app-kcpuload.png (100%) rename {kcpuload/kcpuload => src}/main.cpp (100%) rename {kcpuload/kcpuload => src}/speeddialog.cpp (100%) rename {kcpuload/kcpuload => src}/speeddialog.h (100%) rename {kcpuload/kcpuload => src}/statdock.cpp (100%) rename {kcpuload/kcpuload => src}/statdock.h (100%) rename {kcpuload/kcpuload => src}/statpopup.cpp (100%) rename {kcpuload/kcpuload => src}/statpopup.h (100%) 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 similarity index 100% rename from doc/kcpuload/CMakeLists.txt rename to doc/en/CMakeLists.txt diff --git a/doc/kcpuload/Makefile.am b/doc/en/Makefile.am similarity index 100% rename from doc/kcpuload/Makefile.am rename to doc/en/Makefile.am diff --git a/doc/kcpuload/index.docbook b/doc/en/index.docbook similarity index 100% rename from doc/kcpuload/index.docbook rename to doc/en/index.docbook diff --git a/kcpuload/icons/CMakeLists.txt b/icons/CMakeLists.txt similarity index 100% rename from kcpuload/icons/CMakeLists.txt rename to icons/CMakeLists.txt diff --git a/kcpuload/icons/Makefile.am b/icons/Makefile.am similarity index 100% rename from kcpuload/icons/Makefile.am rename to icons/Makefile.am diff --git a/kcpuload/icons/hi16-action-bars.png b/icons/hi16-action-bars.png similarity index 100% rename from kcpuload/icons/hi16-action-bars.png rename to icons/hi16-action-bars.png diff --git a/kcpuload/icons/hi16-action-barson.png b/icons/hi16-action-barson.png similarity index 100% rename from kcpuload/icons/hi16-action-barson.png rename to icons/hi16-action-barson.png diff --git a/kcpuload/icons/hi16-action-color.png b/icons/hi16-action-color.png similarity index 100% rename from kcpuload/icons/hi16-action-color.png rename to icons/hi16-action-color.png diff --git a/kcpuload/icons/hi16-action-color0.png b/icons/hi16-action-color0.png similarity index 100% rename from kcpuload/icons/hi16-action-color0.png rename to icons/hi16-action-color0.png diff --git a/kcpuload/icons/hi16-action-color1.png b/icons/hi16-action-color1.png similarity index 100% rename from kcpuload/icons/hi16-action-color1.png rename to icons/hi16-action-color1.png diff --git a/kcpuload/icons/hi16-action-grid.png b/icons/hi16-action-grid.png similarity index 100% rename from kcpuload/icons/hi16-action-grid.png rename to icons/hi16-action-grid.png diff --git a/kcpuload/icons/hi16-action-gridon.png b/icons/hi16-action-gridon.png similarity index 100% rename from kcpuload/icons/hi16-action-gridon.png rename to icons/hi16-action-gridon.png diff --git a/kcpuload/icons/hi16-action-labels.png b/icons/hi16-action-labels.png similarity index 100% rename from kcpuload/icons/hi16-action-labels.png rename to icons/hi16-action-labels.png diff --git a/kcpuload/icons/hi16-action-labelson.png b/icons/hi16-action-labelson.png similarity index 100% rename from kcpuload/icons/hi16-action-labelson.png rename to icons/hi16-action-labelson.png diff --git a/kcpuload/icons/hi16-action-lines.png b/icons/hi16-action-lines.png similarity index 100% rename from kcpuload/icons/hi16-action-lines.png rename to icons/hi16-action-lines.png diff --git a/kcpuload/icons/hi16-action-lineson.png b/icons/hi16-action-lineson.png similarity index 100% rename from kcpuload/icons/hi16-action-lineson.png rename to icons/hi16-action-lineson.png diff --git a/kcpuload/icons/hi16-action-shaded.png b/icons/hi16-action-shaded.png similarity index 100% rename from kcpuload/icons/hi16-action-shaded.png rename to icons/hi16-action-shaded.png diff --git a/kcpuload/icons/hi16-action-shadedon.png b/icons/hi16-action-shadedon.png similarity index 100% rename from kcpuload/icons/hi16-action-shadedon.png rename to icons/hi16-action-shadedon.png diff --git a/kcpuload/icons/hi16-action-smp.png b/icons/hi16-action-smp.png similarity index 100% rename from kcpuload/icons/hi16-action-smp.png rename to icons/hi16-action-smp.png diff --git a/kcpuload/icons/hi16-action-smpon.png b/icons/hi16-action-smpon.png similarity index 100% rename from kcpuload/icons/hi16-action-smpon.png rename to icons/hi16-action-smpon.png diff --git a/kcpuload/icons/hi16-action-soft.png b/icons/hi16-action-soft.png similarity index 100% rename from kcpuload/icons/hi16-action-soft.png rename to icons/hi16-action-soft.png diff --git a/kcpuload/icons/hi16-action-softon.png b/icons/hi16-action-softon.png similarity index 100% rename from kcpuload/icons/hi16-action-softon.png rename to icons/hi16-action-softon.png diff --git a/kcpuload/icons/hi16-action-speedarrow.png b/icons/hi16-action-speedarrow.png similarity index 100% rename from kcpuload/icons/hi16-action-speedarrow.png rename to icons/hi16-action-speedarrow.png diff --git a/kcpuload/icons/hi16-action-split.png b/icons/hi16-action-split.png similarity index 100% rename from kcpuload/icons/hi16-action-split.png rename to icons/hi16-action-split.png diff --git a/kcpuload/icons/hi16-action-spliton.png b/icons/hi16-action-spliton.png similarity index 100% rename from kcpuload/icons/hi16-action-spliton.png rename to 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 similarity index 100% rename from kcpuload/AUTHORS rename to src/AUTHORS diff --git a/kcpuload/kcpuload/CMakeLists.txt b/src/CMakeLists.txt similarity index 99% rename from kcpuload/kcpuload/CMakeLists.txt rename to 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 similarity index 100% rename from kcpuload/COPYING rename to src/COPYING diff --git a/kcpuload/ChangeLog b/src/ChangeLog similarity index 100% rename from kcpuload/ChangeLog rename to src/ChangeLog diff --git a/kcpuload/INSTALL b/src/INSTALL similarity index 100% rename from kcpuload/INSTALL rename to src/INSTALL diff --git a/kcpuload/kcpuload/Makefile.am b/src/Makefile.am similarity index 96% rename from kcpuload/kcpuload/Makefile.am rename to src/Makefile.am index 893a51d..b2b0e42 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 similarity index 100% rename from kcpuload/README rename to src/README diff --git a/kcpuload/TODO b/src/TODO similarity index 100% rename from kcpuload/TODO rename to src/TODO diff --git a/kcpuload/kcpuload/cr16-app-kcpuload.png b/src/cr16-app-kcpuload.png similarity index 100% rename from kcpuload/kcpuload/cr16-app-kcpuload.png rename to src/cr16-app-kcpuload.png diff --git a/kcpuload/kcpuload/cr32-app-kcpuload.png b/src/cr32-app-kcpuload.png similarity index 100% rename from kcpuload/kcpuload/cr32-app-kcpuload.png rename to src/cr32-app-kcpuload.png diff --git a/kcpuload/kcpuload/cr48-app-kcpuload.png b/src/cr48-app-kcpuload.png similarity index 100% rename from kcpuload/kcpuload/cr48-app-kcpuload.png rename to src/cr48-app-kcpuload.png diff --git a/kcpuload/kcpuload/icontoggleaction.cpp b/src/icontoggleaction.cpp similarity index 100% rename from kcpuload/kcpuload/icontoggleaction.cpp rename to src/icontoggleaction.cpp diff --git a/kcpuload/kcpuload/icontoggleaction.h b/src/icontoggleaction.h similarity index 100% rename from kcpuload/kcpuload/icontoggleaction.h rename to src/icontoggleaction.h diff --git a/kcpuload/kcpuload/kcpudock.cpp b/src/kcpudock.cpp similarity index 100% rename from kcpuload/kcpuload/kcpudock.cpp rename to src/kcpudock.cpp diff --git a/kcpuload/kcpuload/kcpudock.h b/src/kcpudock.h similarity index 100% rename from kcpuload/kcpuload/kcpudock.h rename to src/kcpudock.h diff --git a/kcpuload/kcpuload/kcpuload.cpp b/src/kcpuload.cpp similarity index 100% rename from kcpuload/kcpuload/kcpuload.cpp rename to src/kcpuload.cpp diff --git a/kcpuload/kcpuload/kcpuload.desktop b/src/kcpuload.desktop similarity index 100% rename from kcpuload/kcpuload/kcpuload.desktop rename to src/kcpuload.desktop diff --git a/kcpuload/kcpuload/kcpuload.h b/src/kcpuload.h similarity index 100% rename from kcpuload/kcpuload/kcpuload.h rename to src/kcpuload.h diff --git a/kcpuload/kcpuload/kcpuproc.cpp b/src/kcpuproc.cpp similarity index 100% rename from kcpuload/kcpuload/kcpuproc.cpp rename to src/kcpuproc.cpp diff --git a/kcpuload/kcpuload/kcpuproc.h b/src/kcpuproc.h similarity index 100% rename from kcpuload/kcpuload/kcpuproc.h rename to src/kcpuproc.h diff --git a/kcpuload/kcpuload/lo16-app-kcpuload.png b/src/lo16-app-kcpuload.png similarity index 100% rename from kcpuload/kcpuload/lo16-app-kcpuload.png rename to src/lo16-app-kcpuload.png diff --git a/kcpuload/kcpuload/lo32-app-kcpuload.png b/src/lo32-app-kcpuload.png similarity index 100% rename from kcpuload/kcpuload/lo32-app-kcpuload.png rename to src/lo32-app-kcpuload.png diff --git a/kcpuload/kcpuload/main.cpp b/src/main.cpp similarity index 100% rename from kcpuload/kcpuload/main.cpp rename to src/main.cpp diff --git a/kcpuload/kcpuload/speeddialog.cpp b/src/speeddialog.cpp similarity index 100% rename from kcpuload/kcpuload/speeddialog.cpp rename to src/speeddialog.cpp diff --git a/kcpuload/kcpuload/speeddialog.h b/src/speeddialog.h similarity index 100% rename from kcpuload/kcpuload/speeddialog.h rename to src/speeddialog.h diff --git a/kcpuload/kcpuload/statdock.cpp b/src/statdock.cpp similarity index 100% rename from kcpuload/kcpuload/statdock.cpp rename to src/statdock.cpp diff --git a/kcpuload/kcpuload/statdock.h b/src/statdock.h similarity index 100% rename from kcpuload/kcpuload/statdock.h rename to src/statdock.h diff --git a/kcpuload/kcpuload/statpopup.cpp b/src/statpopup.cpp similarity index 100% rename from kcpuload/kcpuload/statpopup.cpp rename to src/statpopup.cpp diff --git a/kcpuload/kcpuload/statpopup.h b/src/statpopup.h similarity index 100% rename from kcpuload/kcpuload/statpopup.h rename to src/statpopup.h diff --git a/subdirs b/subdirs index b45335c..2d613ae 100644 --- a/subdirs +++ b/subdirs @@ -1,2 +1,3 @@ doc +icons kcpuload