Fix structure of directories

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

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}
+)

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)

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
+

doc/Makefile.am

@@ -0,0 +1 @@
+SUBDIRS = en man

doc/man/Makefile.am

@@ -1,4 +1,3 @@
-man_MANS = manpage.xml 
+man_MANS = knetstats.1
 
 EXTRA_DIST = $(man_MANS)
-

icons/CMakeLists.txt

@@ -0,0 +1,3 @@
+##### icons
+
+tde_install_icons( ${PROJECT_NAME} )

icons/Makefile.am

@@ -0,0 +1 @@
+KDE_ICON = knetstats

src/.svnignore

@@ -1,2 +0,0 @@
-Makefile.in
-*Makefile.in

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}
 )

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 

src/doc/Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = en

src/src/CMakeLists.txt

@@ -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}
-)

src/src/Makefile.am

@@ -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
-

subdirs

@@ -1,2 +1,4 @@
 src
+icons
+doc
 translations