Fix structure of directories

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 06772a369f2beef80bb291ded30cbe125a24af56)

72 files changed, 75 insertions, 76 deletions

diff --git a/src/CHANGELOG b/CHANGELOG
index d5f0e02..d5f0e02 100644
--- a/src/CHANGELOG
+++ b/CHANGELOG
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00718bc..938bb69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,9 +68,19 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
 ##### directories
 
 add_subdirectory( src )
+add_subdirectory( icons )
+tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_TRANSLATIONS translations ) 
 
 
 ##### write configure files
 
 configure_file( config.h.cmake config.h @ONLY )
+
+
+##### other data
+
+install(
+    FILES ${PROJECT_NAME}.desktop
+    DESTINATION ${XDG_APPS_INSTALL_DIR}
+)
diff --git a/src/Doxyfile b/Doxyfile
index d7efd44..d7efd44 100644
--- a/src/Doxyfile
+++ b/Doxyfile
diff --git a/Makefile.am b/Makefile.am
index 2369f25..0aa05e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,4 +2,7 @@ AUTOMAKE_OPTIONS = foreign 1.6.1
 
 include admin/deps.am
 include admin/Doxyfile.am
+
+xdg_apps_DATA = knetstats.desktop
+
 SUBDIRS=$(TOPSUBDIRS)
diff --git a/Makefile.am.in b/Makefile.am.in
index e46b27c..628b551 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -2,3 +2,6 @@ AUTOMAKE_OPTIONS = foreign 1.6.1
 
 include admin/deps.am
 include admin/Doxyfile.am
+
+xdg_apps_DATA = knetstats.desktop
+
diff --git a/doc/.gitignore b/doc/.gitignore
deleted file mode 100644
index e69de29..0000000
--- a/doc/.gitignore
+++ /dev/null
diff --git a/src/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 6d0aa9f..6d0aa9f 100644
--- a/src/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
diff --git a/src/COPYING-DOCS b/doc/COPYING-DOCS
index 4a0fe1c..4a0fe1c 100644
--- a/src/COPYING-DOCS
+++ b/doc/COPYING-DOCS
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..8bd0272
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = en man
diff --git a/src/doc/en/CMakeLists.txt b/doc/en/CMakeLists.txt
index ba3ef3e..ba3ef3e 100644
--- a/src/doc/en/CMakeLists.txt
+++ b/doc/en/CMakeLists.txt
diff --git a/src/doc/en/Makefile.am b/doc/en/Makefile.am
index 8f050ec..8f050ec 100644
--- a/src/doc/en/Makefile.am
+++ b/doc/en/Makefile.am
diff --git a/src/doc/en/index.docbook b/doc/en/index.docbook
index 55b829b..55b829b 100644
--- a/src/doc/en/index.docbook
+++ b/doc/en/index.docbook
diff --git a/src/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
index 8512250..8512250 100644
--- a/src/doc/man/CMakeLists.txt
+++ b/doc/man/CMakeLists.txt
diff --git a/src/doc/man/Makefile.am b/doc/man/Makefile.am
index 514c585..5894f60 100644
--- a/src/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,4 +1,3 @@
-man_MANS = manpage.xml 
+man_MANS = knetstats.1
 
 EXTRA_DIST = $(man_MANS)
-
diff --git a/src/doc/man/knetstats.1 b/doc/man/knetstats.1
index 7197c48..7197c48 100644
--- a/src/doc/man/knetstats.1
+++ b/doc/man/knetstats.1
diff --git a/src/doc/man/manpage.xml b/doc/man/manpage.xml
index 52d305e..52d305e 100644
--- a/src/doc/man/manpage.xml
+++ b/doc/man/manpage.xml
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
new file mode 100644
index 0000000..33ca26f
--- /dev/null
+++ b/icons/CMakeLists.txt
@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )
diff --git a/icons/Makefile.am b/icons/Makefile.am
new file mode 100644
index 0000000..9860d39
--- /dev/null
+++ b/icons/Makefile.am
@@ -0,0 +1 @@
+KDE_ICON = knetstats
diff --git a/src/hi16-app-knetstats.png b/icons/hi16-app-knetstats.png
index cd48fb7..cd48fb7 100644
--- a/src/hi16-app-knetstats.png
+++ b/icons/hi16-app-knetstats.png
diff --git a/src/hi32-app-knetstats.png b/icons/hi32-app-knetstats.png
index 96e06d5..96e06d5 100644
--- a/src/hi32-app-knetstats.png
+++ b/icons/hi32-app-knetstats.png
diff --git a/src/hi48-app-knetstats.png b/icons/hi48-app-knetstats.png
index fdf0d47..fdf0d47 100644
--- a/src/hi48-app-knetstats.png
+++ b/icons/hi48-app-knetstats.png
diff --git a/src/knetstats.desktop b/knetstats.desktop
index d77f9c2..d77f9c2 100644
--- a/src/knetstats.desktop
+++ b/knetstats.desktop
diff --git a/src/.svnignore b/src/.svnignore
deleted file mode 100644
index 896d115..0000000
--- a/src/.svnignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-*Makefile.in
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93766be..4b74eac 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,15 +1,38 @@
-add_subdirectory( src )
-tde_conditional_add_subdirectory( BUILD_DOC doc )
+add_subdirectory( pics )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+)
 
-##### icons
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+  ${TDE_LIB_DIR}
+)
 
-tde_install_icons( ${PROJECT_NAME} )
 
+##### knetstats (executable)
 
-##### other data
+tde_add_executable( ${PROJECT_NAME} AUTOMOC
 
-install(
-    FILES ${PROJECT_NAME}.desktop
-    DESTINATION ${XDG_APPS_INSTALL_DIR}
+  SOURCES
+        configurebase.ui
+        configure.cpp
+        statisticsbase.ui
+        main.cpp
+        knetstats.cpp
+        knetstatsview.cpp
+        statistics.cpp
+        chart.cpp
+        interface.cpp
+  LINK
+     tdecore-shared
+     tdeui-shared
+     tdeio-shared
+     tdeui-shared
+     
+  DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/src/Makefile.am b/src/Makefile.am
index 66b3066..43dc752 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,22 @@
-SUBDIRS = src doc
+INCLUDES = $(all_includes)
 
-xdg_apps_DATA = knetstats.desktop
+SUBDIRS = pics
+
+bin_PROGRAMS = knetstats
+
+knetstats_SOURCES = configurebase.ui configure.cpp statisticsbase.ui main.cpp \
+	knetstats.cpp knetstatsview.cpp statistics.cpp chart.cpp interface.cpp
+knetstats_LDADD = $(LIB_TDEUI)
+knetstats_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
+METASOURCES = configure.moc knetstats.moc knetstatsview.moc statistics.moc
+
+# these are the headers for your project
+noinst_HEADERS = chart.h configure.h knetstats.h knetstatsview.h statistics.h \
+	interface.h
+
+messages: rc.cpp
+	$(EXTRACTRC) *.ui >> rc.cpp
+	$(XGETTEXT) *.cpp -o $(podir)/knetstats.pot
+
+KDE_OPTIONS = nofinal
 
-KDE_ICON = knetstats 
diff --git a/src/src/chart.cpp b/src/chart.cpp
index 8af9d1e..8af9d1e 100644
--- a/src/src/chart.cpp
+++ b/src/chart.cpp
diff --git a/src/src/chart.h b/src/chart.h
index 8bd8be8..8bd8be8 100644
--- a/src/src/chart.h
+++ b/src/chart.h
diff --git a/src/src/configure.cpp b/src/configure.cpp
index f3ffcff..f3ffcff 100644
--- a/src/src/configure.cpp
+++ b/src/configure.cpp
diff --git a/src/src/configure.h b/src/configure.h
index f214555..f214555 100644
--- a/src/src/configure.h
+++ b/src/configure.h
diff --git a/src/src/configurebase.ui b/src/configurebase.ui
index 7619924..7619924 100644
--- a/src/src/configurebase.ui
+++ b/src/configurebase.ui
diff --git a/src/doc/Makefile.am b/src/doc/Makefile.am
deleted file mode 100644
index 81fee21..0000000
--- a/src/doc/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-SUBDIRS = en
diff --git a/src/src/interface.cpp b/src/interface.cpp
index 1ac98a8..1ac98a8 100644
--- a/src/src/interface.cpp
+++ b/src/interface.cpp
diff --git a/src/src/interface.h b/src/interface.h
index 66bffc8..66bffc8 100644
--- a/src/src/interface.h
+++ b/src/interface.h
diff --git a/src/src/knetstats.cpp b/src/knetstats.cpp
index bfbb1b2..bfbb1b2 100644
--- a/src/src/knetstats.cpp
+++ b/src/knetstats.cpp
diff --git a/src/src/knetstats.h b/src/knetstats.h
index e5042da..e5042da 100644
--- a/src/src/knetstats.h
+++ b/src/knetstats.h
diff --git a/src/src/knetstatsview.cpp b/src/knetstatsview.cpp
index 72af3b4..72af3b4 100644
--- a/src/src/knetstatsview.cpp
+++ b/src/knetstatsview.cpp
diff --git a/src/src/knetstatsview.h b/src/knetstatsview.h
index e8cc0b8..e8cc0b8 100644
--- a/src/src/knetstatsview.h
+++ b/src/knetstatsview.h
diff --git a/src/src/main.cpp b/src/main.cpp
index b35cf41..b35cf41 100644
--- a/src/src/main.cpp
+++ b/src/main.cpp
diff --git a/src/src/pics/CMakeLists.txt b/src/pics/CMakeLists.txt
index e7d1781..e7d1781 100644
--- a/src/src/pics/CMakeLists.txt
+++ b/src/pics/CMakeLists.txt
diff --git a/src/src/pics/Makefile.am b/src/pics/Makefile.am
index fab68d0..fab68d0 100644
--- a/src/src/pics/Makefile.am
+++ b/src/pics/Makefile.am
diff --git a/src/src/pics/icon_pci.png b/src/pics/icon_pci.png
index f7a607e..f7a607e 100644
--- a/src/src/pics/icon_pci.png
+++ b/src/pics/icon_pci.png
diff --git a/src/src/pics/theme0_both.png b/src/pics/theme0_both.png
index 0950f8b..0950f8b 100644
--- a/src/src/pics/theme0_both.png
+++ b/src/pics/theme0_both.png
diff --git a/src/src/pics/theme0_error.png b/src/pics/theme0_error.png
index b618a9a..b618a9a 100644
--- a/src/src/pics/theme0_error.png
+++ b/src/pics/theme0_error.png
diff --git a/src/src/pics/theme0_none.png b/src/pics/theme0_none.png
index b953009..b953009 100644
--- a/src/src/pics/theme0_none.png
+++ b/src/pics/theme0_none.png
diff --git a/src/src/pics/theme0_rx.png b/src/pics/theme0_rx.png
index e902270..e902270 100644
--- a/src/src/pics/theme0_rx.png
+++ b/src/pics/theme0_rx.png
diff --git a/src/src/pics/theme0_tx.png b/src/pics/theme0_tx.png
index d3ad8be..d3ad8be 100644
--- a/src/src/pics/theme0_tx.png
+++ b/src/pics/theme0_tx.png
diff --git a/src/src/pics/theme1_both.png b/src/pics/theme1_both.png
index 851c1cb..851c1cb 100644
--- a/src/src/pics/theme1_both.png
+++ b/src/pics/theme1_both.png
diff --git a/src/src/pics/theme1_error.png b/src/pics/theme1_error.png
index 4b121a2..4b121a2 100644
--- a/src/src/pics/theme1_error.png
+++ b/src/pics/theme1_error.png
diff --git a/src/src/pics/theme1_none.png b/src/pics/theme1_none.png
index 57f0142..57f0142 100644
--- a/src/src/pics/theme1_none.png
+++ b/src/pics/theme1_none.png
diff --git a/src/src/pics/theme1_rx.png b/src/pics/theme1_rx.png
index 0a38fa3..0a38fa3 100644
--- a/src/src/pics/theme1_rx.png
+++ b/src/pics/theme1_rx.png
diff --git a/src/src/pics/theme1_tx.png b/src/pics/theme1_tx.png
index 9708c27..9708c27 100644
--- a/src/src/pics/theme1_tx.png
+++ b/src/pics/theme1_tx.png
diff --git a/src/src/pics/theme2_both.png b/src/pics/theme2_both.png
index 0ce25c8..0ce25c8 100644
--- a/src/src/pics/theme2_both.png
+++ b/src/pics/theme2_both.png
diff --git a/src/src/pics/theme2_error.png b/src/pics/theme2_error.png
index 4418e97..4418e97 100644
--- a/src/src/pics/theme2_error.png
+++ b/src/pics/theme2_error.png
diff --git a/src/src/pics/theme2_none.png b/src/pics/theme2_none.png
index a686cba..a686cba 100644
--- a/src/src/pics/theme2_none.png
+++ b/src/pics/theme2_none.png
diff --git a/src/src/pics/theme2_rx.png b/src/pics/theme2_rx.png
index 8d992d9..8d992d9 100644
--- a/src/src/pics/theme2_rx.png
+++ b/src/pics/theme2_rx.png
diff --git a/src/src/pics/theme2_tx.png b/src/pics/theme2_tx.png
index d176fac..d176fac 100644
--- a/src/src/pics/theme2_tx.png
+++ b/src/pics/theme2_tx.png
diff --git a/src/src/pics/theme3_both.png b/src/pics/theme3_both.png
index 8670266..8670266 100644
--- a/src/src/pics/theme3_both.png
+++ b/src/pics/theme3_both.png
diff --git a/src/src/pics/theme3_error.png b/src/pics/theme3_error.png
index ee08863..ee08863 100644
--- a/src/src/pics/theme3_error.png
+++ b/src/pics/theme3_error.png
diff --git a/src/src/pics/theme3_none.png b/src/pics/theme3_none.png
index 4fbdbe5..4fbdbe5 100644
--- a/src/src/pics/theme3_none.png
+++ b/src/pics/theme3_none.png
diff --git a/src/src/pics/theme3_rx.png b/src/pics/theme3_rx.png
index c0a6daf..c0a6daf 100644
--- a/src/src/pics/theme3_rx.png
+++ b/src/pics/theme3_rx.png
diff --git a/src/src/pics/theme3_tx.png b/src/pics/theme3_tx.png
index bf1c21e..bf1c21e 100644
--- a/src/src/pics/theme3_tx.png
+++ b/src/pics/theme3_tx.png
diff --git a/src/src/pics/theme4_both.png b/src/pics/theme4_both.png
index d237404..d237404 100644
--- a/src/src/pics/theme4_both.png
+++ b/src/pics/theme4_both.png
diff --git a/src/src/pics/theme4_error.png b/src/pics/theme4_error.png
index b14a709..b14a709 100644
--- a/src/src/pics/theme4_error.png
+++ b/src/pics/theme4_error.png
diff --git a/src/src/pics/theme4_none.png b/src/pics/theme4_none.png
index 02c7131..02c7131 100644
--- a/src/src/pics/theme4_none.png
+++ b/src/pics/theme4_none.png
diff --git a/src/src/pics/theme4_rx.png b/src/pics/theme4_rx.png
index d77b01d..d77b01d 100644
--- a/src/src/pics/theme4_rx.png
+++ b/src/pics/theme4_rx.png
diff --git a/src/src/pics/theme4_tx.png b/src/pics/theme4_tx.png
index 86591c6..86591c6 100644
--- a/src/src/pics/theme4_tx.png
+++ b/src/pics/theme4_tx.png
diff --git a/src/src/CMakeLists.txt b/src/src/CMakeLists.txt
deleted file mode 100644
index 4b74eac..0000000
--- a/src/src/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-add_subdirectory( pics )
-
-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}
-)
-
-
-##### knetstats (executable)
-
-tde_add_executable( ${PROJECT_NAME} AUTOMOC
-
-  SOURCES
-        configurebase.ui
-        configure.cpp
-        statisticsbase.ui
-        main.cpp
-        knetstats.cpp
-        knetstatsview.cpp
-        statistics.cpp
-        chart.cpp
-        interface.cpp
-  LINK
-     tdecore-shared
-     tdeui-shared
-     tdeio-shared
-     tdeui-shared
-     
-  DESTINATION ${BIN_INSTALL_DIR}
-)
diff --git a/src/src/Makefile.am b/src/src/Makefile.am
deleted file mode 100644
index 43dc752..0000000
--- a/src/src/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-INCLUDES = $(all_includes)
-
-SUBDIRS = pics
-
-bin_PROGRAMS = knetstats
-
-knetstats_SOURCES = configurebase.ui configure.cpp statisticsbase.ui main.cpp \
-	knetstats.cpp knetstatsview.cpp statistics.cpp chart.cpp interface.cpp
-knetstats_LDADD = $(LIB_TDEUI)
-knetstats_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
-METASOURCES = configure.moc knetstats.moc knetstatsview.moc statistics.moc
-
-# these are the headers for your project
-noinst_HEADERS = chart.h configure.h knetstats.h knetstatsview.h statistics.h \
-	interface.h
-
-messages: rc.cpp
-	$(EXTRACTRC) *.ui >> rc.cpp
-	$(XGETTEXT) *.cpp -o $(podir)/knetstats.pot
-
-KDE_OPTIONS = nofinal
-
diff --git a/src/src/statistics.cpp b/src/statistics.cpp
index 6097be1..6097be1 100644
--- a/src/src/statistics.cpp
+++ b/src/statistics.cpp
diff --git a/src/src/statistics.h b/src/statistics.h
index a979961..a979961 100644
--- a/src/src/statistics.h
+++ b/src/statistics.h
diff --git a/src/src/statisticsbase.ui b/src/statisticsbase.ui
index c10548e..c10548e 100644
--- a/src/src/statisticsbase.ui
+++ b/src/statisticsbase.ui
diff --git a/subdirs b/subdirs
index 34efd98..7f26902 100644
--- a/subdirs
+++ b/subdirs
@@ -1,2 +1,4 @@
 src
+icons
+doc
 translations