Fix structure of directories

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 06772a369f)
r14.0.x
Slávek Banko 6 years ago
parent 0e396d6b00
commit 42673b0179
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

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

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

@ -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 +1 @@
SUBDIRS = en man

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

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

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

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

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

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

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

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

Before

Width:  |  Height:  |  Size: 704 B

After

Width:  |  Height:  |  Size: 704 B

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 483 B

After

Width:  |  Height:  |  Size: 483 B

Before

Width:  |  Height:  |  Size: 482 B

After

Width:  |  Height:  |  Size: 482 B

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 881 B

Before

Width:  |  Height:  |  Size: 927 B

After

Width:  |  Height:  |  Size: 927 B

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before

Width:  |  Height:  |  Size: 709 B

After

Width:  |  Height:  |  Size: 709 B

Before

Width:  |  Height:  |  Size: 835 B

After

Width:  |  Height:  |  Size: 835 B

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Before

Width:  |  Height:  |  Size: 870 B

After

Width:  |  Height:  |  Size: 870 B

Before

Width:  |  Height:  |  Size: 342 B

After

Width:  |  Height:  |  Size: 342 B

Before

Width:  |  Height:  |  Size: 339 B

After

Width:  |  Height:  |  Size: 339 B

Before

Width:  |  Height:  |  Size: 615 B

After

Width:  |  Height:  |  Size: 615 B

Before

Width:  |  Height:  |  Size: 787 B

After

Width:  |  Height:  |  Size: 787 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Before

Width:  |  Height:  |  Size: 1000 B

After

Width:  |  Height:  |  Size: 1000 B

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

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

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

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

Loading…
Cancel
Save