Browse Source

Fix structure of directories

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/2/head
Slávek Banko 10 months ago
parent
commit
06772a369f
Signed by: Slávek Banko <slavek.banko@axis.cz> GPG Key ID: 608F5293A04BE668
72 changed files with 75 additions and 76 deletions
  1. 0
    0
      CHANGELOG
  2. 10
    0
      CMakeLists.txt
  3. 0
    0
      Doxyfile
  4. 3
    0
      Makefile.am
  5. 3
    0
      Makefile.am.in
  6. 0
    0
      doc/.gitignore
  7. 0
    0
      doc/CMakeLists.txt
  8. 0
    0
      doc/COPYING-DOCS
  9. 1
    0
      doc/Makefile.am
  10. 0
    0
      doc/en/CMakeLists.txt
  11. 0
    0
      doc/en/Makefile.am
  12. 0
    0
      doc/en/index.docbook
  13. 0
    0
      doc/man/CMakeLists.txt
  14. 1
    2
      doc/man/Makefile.am
  15. 0
    0
      doc/man/knetstats.1
  16. 0
    0
      doc/man/manpage.xml
  17. 3
    0
      icons/CMakeLists.txt
  18. 1
    0
      icons/Makefile.am
  19. 0
    0
      icons/hi16-app-knetstats.png
  20. 0
    0
      icons/hi32-app-knetstats.png
  21. 0
    0
      icons/hi48-app-knetstats.png
  22. 0
    0
      knetstats.desktop
  23. 0
    2
      src/.svnignore
  24. 31
    8
      src/CMakeLists.txt
  25. 20
    3
      src/Makefile.am
  26. 0
    0
      src/chart.cpp
  27. 0
    0
      src/chart.h
  28. 0
    0
      src/configure.cpp
  29. 0
    0
      src/configure.h
  30. 0
    0
      src/configurebase.ui
  31. 0
    1
      src/doc/Makefile.am
  32. 0
    0
      src/interface.cpp
  33. 0
    0
      src/interface.h
  34. 0
    0
      src/knetstats.cpp
  35. 0
    0
      src/knetstats.h
  36. 0
    0
      src/knetstatsview.cpp
  37. 0
    0
      src/knetstatsview.h
  38. 0
    0
      src/main.cpp
  39. 0
    0
      src/pics/CMakeLists.txt
  40. 0
    0
      src/pics/Makefile.am
  41. 0
    0
      src/pics/icon_pci.png
  42. 0
    0
      src/pics/theme0_both.png
  43. 0
    0
      src/pics/theme0_error.png
  44. 0
    0
      src/pics/theme0_none.png
  45. 0
    0
      src/pics/theme0_rx.png
  46. 0
    0
      src/pics/theme0_tx.png
  47. 0
    0
      src/pics/theme1_both.png
  48. 0
    0
      src/pics/theme1_error.png
  49. 0
    0
      src/pics/theme1_none.png
  50. 0
    0
      src/pics/theme1_rx.png
  51. 0
    0
      src/pics/theme1_tx.png
  52. 0
    0
      src/pics/theme2_both.png
  53. 0
    0
      src/pics/theme2_error.png
  54. 0
    0
      src/pics/theme2_none.png
  55. 0
    0
      src/pics/theme2_rx.png
  56. 0
    0
      src/pics/theme2_tx.png
  57. 0
    0
      src/pics/theme3_both.png
  58. 0
    0
      src/pics/theme3_error.png
  59. 0
    0
      src/pics/theme3_none.png
  60. 0
    0
      src/pics/theme3_rx.png
  61. 0
    0
      src/pics/theme3_tx.png
  62. 0
    0
      src/pics/theme4_both.png
  63. 0
    0
      src/pics/theme4_error.png
  64. 0
    0
      src/pics/theme4_none.png
  65. 0
    0
      src/pics/theme4_rx.png
  66. 0
    0
      src/pics/theme4_tx.png
  67. 0
    38
      src/src/CMakeLists.txt
  68. 0
    22
      src/src/Makefile.am
  69. 0
    0
      src/statistics.cpp
  70. 0
    0
      src/statistics.h
  71. 0
    0
      src/statisticsbase.ui
  72. 2
    0
      subdirs

src/CHANGELOG → CHANGELOG View File


+ 10
- 0
CMakeLists.txt View File

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

src/Doxyfile → Doxyfile View File


+ 3
- 0
Makefile.am View File

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

+ 3
- 0
Makefile.am.in View File

@@ -2,3 +2,6 @@ AUTOMAKE_OPTIONS = foreign 1.6.1

include admin/deps.am
include admin/Doxyfile.am

xdg_apps_DATA = knetstats.desktop


+ 0
- 0
doc/.gitignore View File


src/doc/CMakeLists.txt → doc/CMakeLists.txt View File


src/COPYING-DOCS → doc/COPYING-DOCS View File


+ 1
- 0
doc/Makefile.am View File

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

src/doc/en/CMakeLists.txt → doc/en/CMakeLists.txt View File


src/doc/en/Makefile.am → doc/en/Makefile.am View File


src/doc/en/index.docbook → doc/en/index.docbook View File


src/doc/man/CMakeLists.txt → doc/man/CMakeLists.txt View File


src/doc/man/Makefile.am → doc/man/Makefile.am View File

@@ -1,4 +1,3 @@
man_MANS = manpage.xml
man_MANS = knetstats.1

EXTRA_DIST = $(man_MANS)


src/doc/man/knetstats.1 → doc/man/knetstats.1 View File


src/doc/man/manpage.xml → doc/man/manpage.xml View File


+ 3
- 0
icons/CMakeLists.txt View File

@@ -0,0 +1,3 @@
##### icons

tde_install_icons( ${PROJECT_NAME} )

+ 1
- 0
icons/Makefile.am View File

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

src/hi16-app-knetstats.png → icons/hi16-app-knetstats.png View File


src/hi32-app-knetstats.png → icons/hi32-app-knetstats.png View File


src/hi48-app-knetstats.png → icons/hi48-app-knetstats.png View File


src/knetstats.desktop → knetstats.desktop View File


+ 0
- 2
src/.svnignore View File

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

+ 31
- 8
src/CMakeLists.txt View File

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

+ 20
- 3
src/Makefile.am View File

@@ -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_TQT) -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/src/chart.cpp → src/chart.cpp View File


src/src/chart.h → src/chart.h View File


src/src/configure.cpp → src/configure.cpp View File


src/src/configure.h → src/configure.h View File


src/src/configurebase.ui → src/configurebase.ui View File


+ 0
- 1
src/doc/Makefile.am View File

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

src/src/interface.cpp → src/interface.cpp View File


src/src/interface.h → src/interface.h View File


src/src/knetstats.cpp → src/knetstats.cpp View File


src/src/knetstats.h → src/knetstats.h View File


src/src/knetstatsview.cpp → src/knetstatsview.cpp View File


src/src/knetstatsview.h → src/knetstatsview.h View File


src/src/main.cpp → src/main.cpp View File


src/src/pics/CMakeLists.txt → src/pics/CMakeLists.txt View File


src/src/pics/Makefile.am → src/pics/Makefile.am View File


src/src/pics/icon_pci.png → src/pics/icon_pci.png View File


src/src/pics/theme0_both.png → src/pics/theme0_both.png View File


src/src/pics/theme0_error.png → src/pics/theme0_error.png View File


src/src/pics/theme0_none.png → src/pics/theme0_none.png View File


src/src/pics/theme0_rx.png → src/pics/theme0_rx.png View File


src/src/pics/theme0_tx.png → src/pics/theme0_tx.png View File


src/src/pics/theme1_both.png → src/pics/theme1_both.png View File


src/src/pics/theme1_error.png → src/pics/theme1_error.png View File


src/src/pics/theme1_none.png → src/pics/theme1_none.png View File


src/src/pics/theme1_rx.png → src/pics/theme1_rx.png View File


src/src/pics/theme1_tx.png → src/pics/theme1_tx.png View File


src/src/pics/theme2_both.png → src/pics/theme2_both.png View File


src/src/pics/theme2_error.png → src/pics/theme2_error.png View File


src/src/pics/theme2_none.png → src/pics/theme2_none.png View File


src/src/pics/theme2_rx.png → src/pics/theme2_rx.png View File


src/src/pics/theme2_tx.png → src/pics/theme2_tx.png View File


src/src/pics/theme3_both.png → src/pics/theme3_both.png View File


src/src/pics/theme3_error.png → src/pics/theme3_error.png View File


src/src/pics/theme3_none.png → src/pics/theme3_none.png View File


src/src/pics/theme3_rx.png → src/pics/theme3_rx.png View File


src/src/pics/theme3_tx.png → src/pics/theme3_tx.png View File


src/src/pics/theme4_both.png → src/pics/theme4_both.png View File


src/src/pics/theme4_error.png → src/pics/theme4_error.png View File


src/src/pics/theme4_none.png → src/pics/theme4_none.png View File


src/src/pics/theme4_rx.png → src/pics/theme4_rx.png View File


src/src/pics/theme4_tx.png → src/pics/theme4_tx.png View File


+ 0
- 38
src/src/CMakeLists.txt View File

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

+ 0
- 22
src/src/Makefile.am View File

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


src/src/statistics.cpp → src/statistics.cpp View File


src/src/statistics.h → src/statistics.h View File


src/src/statisticsbase.ui → src/statisticsbase.ui View File


+ 2
- 0
subdirs View File

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

Loading…
Cancel
Save