Move accounts, checks and pixmaps into a data directory

At the same time move the art directory into contrib to unclutter the top level
This commit is contained in:
Geert Janssens 2017-08-11 22:14:31 +02:00
parent 83d14e1c1c
commit afecab330a
518 changed files with 60 additions and 47 deletions

View File

@ -680,8 +680,7 @@ SET(SCHEME_INSTALLED_SOURCE_DIR ${CMAKE_INSTALL_PREFIX}/share/gnucash/scm)
SET(SCHEME_INSTALLED_CACHE_DIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}) SET(SCHEME_INSTALLED_CACHE_DIR ${CMAKE_INSTALL_PREFIX}/lib/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
# The subdirectories # The subdirectories
ADD_SUBDIRECTORY (accounts) ADD_SUBDIRECTORY (data)
ADD_SUBDIRECTORY (checks)
ADD_SUBDIRECTORY (doc) ADD_SUBDIRECTORY (doc)
ADD_SUBDIRECTORY (lib) ADD_SUBDIRECTORY (lib)
ADD_SUBDIRECTORY (macros) ADD_SUBDIRECTORY (macros)
@ -725,7 +724,7 @@ SET_LOCAL_DIST(toplvl_DIST ${toplvl_DIST_local})
# then uses a (SET ${foo_DIST} ${locals....} PARENT_SCOPE) command to report up. See the bottom of # then uses a (SET ${foo_DIST} ${locals....} PARENT_SCOPE) command to report up. See the bottom of
# libgnucash/app-utils/CMakeLists.txt for an example of this. # libgnucash/app-utils/CMakeLists.txt for an example of this.
SET(ALL_DIST ${accounts_DIST} ${bindings_DIST} ${checks_DIST} ${cmake_DIST} ${common_DIST} SET(ALL_DIST ${bindings_DIST} ${cmake_DIST} ${common_DIST} ${data_DIST}
${doc_DIST} ${gnucash_DIST} ${lib_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST} ${doc_DIST} ${gnucash_DIST} ${lib_DIST} ${libgnucash_DIST} ${macros_DIST} ${packaging_DIST}
${po_DIST} ${test_templates_DIST} ${toplvl_DIST} ${util_DIST}) ${po_DIST} ${test_templates_DIST} ${toplvl_DIST} ${util_DIST})

View File

@ -3,7 +3,7 @@ if GNUCASH_ENABLE_GUI
else else
GNUCASH_SUBDIR = GNUCASH_SUBDIR =
endif endif
SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} packaging po accounts checks SUBDIRS = . doc lib common libgnucash bindings ${GNUCASH_SUBDIR} packaging po data
GNC_CTAGS_FILE = @GNC_CTAGS_FILE@ GNC_CTAGS_FILE = @GNC_CTAGS_FILE@
GNC_ETAGS_FILE = @GNC_ETAGS_FILE@ GNC_ETAGS_FILE = @GNC_ETAGS_FILE@

View File

@ -1602,45 +1602,47 @@ AC_CONFIG_FILES(
po/Makefile.in po/Makefile.in
dnl # Makefiles dnl # Makefiles
Makefile Makefile
accounts/Makefile data/Makefile
accounts/C/Makefile data/accounts/Makefile
accounts/cs/Makefile data/accounts/C/Makefile
accounts/da/Makefile data/accounts/cs/Makefile
accounts/de_AT/Makefile data/accounts/da/Makefile
accounts/de_CH/Makefile data/accounts/de_AT/Makefile
accounts/de_DE/Makefile data/accounts/de_CH/Makefile
accounts/el_GR/Makefile data/accounts/de_DE/Makefile
accounts/en_GB/Makefile data/accounts/el_GR/Makefile
accounts/es_ES/Makefile data/accounts/en_GB/Makefile
accounts/es_MX/Makefile data/accounts/es_ES/Makefile
accounts/fi_FI/Makefile data/accounts/es_MX/Makefile
accounts/fr_CA/Makefile data/accounts/fi_FI/Makefile
accounts/fr_CH/Makefile data/accounts/fr_CA/Makefile
accounts/fr_FR/Makefile data/accounts/fr_CH/Makefile
accounts/hu_HU/Makefile data/accounts/fr_FR/Makefile
accounts/it/Makefile data/accounts/hu_HU/Makefile
accounts/ja/Makefile data/accounts/it/Makefile
accounts/ko/Makefile data/accounts/ja/Makefile
accounts/lt/Makefile data/accounts/ko/Makefile
accounts/lv/Makefile data/accounts/lt/Makefile
accounts/nb/Makefile data/accounts/lv/Makefile
accounts/nl/Makefile data/accounts/nb/Makefile
accounts/pl/Makefile data/accounts/nl/Makefile
accounts/pt_BR/Makefile data/accounts/pl/Makefile
accounts/pt_PT/Makefile data/accounts/pt_BR/Makefile
accounts/ru/Makefile data/accounts/pt_PT/Makefile
accounts/sk/Makefile data/accounts/ru/Makefile
accounts/sv_AX/Makefile data/accounts/sk/Makefile
accounts/sv_FI/Makefile data/accounts/sv_AX/Makefile
accounts/sv_SE/Makefile data/accounts/sv_FI/Makefile
accounts/tr_TR/Makefile data/accounts/sv_SE/Makefile
accounts/zh_CN/Makefile data/accounts/tr_TR/Makefile
accounts/zh_HK/Makefile data/accounts/zh_CN/Makefile
accounts/zh_TW/Makefile data/accounts/zh_HK/Makefile
data/accounts/zh_TW/Makefile
data/checks/Makefile
data/pixmaps/Makefile
bindings/Makefile bindings/Makefile
bindings/python/Makefile bindings/python/Makefile
bindings/python/tests/Makefile bindings/python/tests/Makefile
checks/Makefile
common/Makefile common/Makefile
common/debug/Makefile common/debug/Makefile
common/debug/valgrind/Makefile common/debug/valgrind/Makefile
@ -1742,7 +1744,6 @@ AC_CONFIG_FILES(
libgnucash/gnc-module/test/mod-bar/Makefile libgnucash/gnc-module/test/mod-bar/Makefile
libgnucash/gnc-module/test/mod-baz/Makefile libgnucash/gnc-module/test/mod-baz/Makefile
libgnucash/gnc-module/test/misc-mods/Makefile libgnucash/gnc-module/test/misc-mods/Makefile
libgnucash/pixmaps/Makefile
libgnucash/quotes/Makefile libgnucash/quotes/Makefile
libgnucash/scm/Makefile libgnucash/scm/Makefile
libgnucash/scm/gnumeric/Makefile libgnucash/scm/gnumeric/Makefile

View File

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

View File

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

11
data/CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
# CMakeLists.txt for data/
# The subdirectories
ADD_SUBDIRECTORY (accounts)
ADD_SUBDIRECTORY (checks)
ADD_SUBDIRECTORY (pixmaps)
SET_LOCAL_DIST(data_DIST_local CMakeLists.txt Makefile.am ${data_EXTRA_DIST})
SET(data_DIST ${data_DIST_local} ${accounts_DIST} ${checks_DIST}
${pixmaps_DIST} PARENT_SCOPE)

4
data/Makefile.am Normal file
View File

@ -0,0 +1,4 @@
SUBDIRS = \
accounts \
checks \
pixmaps

Some files were not shown because too many files have changed in this diff Show More